Commit 6e7b06a4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-5.5/libata-20191121' of git://git.kernel.dk/linux-block 

Pull libata updates from Jens Axboe:
 "Just a few fixes all over the place, support for the Annapurna SATA
  controller, and a patchset that cleans up the error defines and
  ultimately fixes anissue with sata_mv"

* tag 'for-5.5/libata-20191121' of git://git.kernel.dk/linux-block:
  ata: pata_artop: make arrays static const, makes object smaller
  ata_piix: remove open-coded dmi_match(DMI_OEM_STRING)
  ata: sata_mv, avoid trigerrable BUG_ON
  ata: make qc_prep return ata_completion_errors
  ata: define AC_ERR_OK
  ata: Documentation, fix function names
  libata: Ensure ata_port probe has completed before detach
  ahci: tegra: use regulator_bulk_set_supply_names()
  ahci: Add support for Amazon's Annapurna Labs SATA controller
parents fb4b3d3f 44bdc2fb

Documentation/driver-api/libata.rst

+7 −7
Original line number Diff line number Diff line
@@ -250,23 +250,23 @@ High-level taskfile hooks 


::



    void (*qc_prep) (struct ata_queued_cmd *qc);

    enum ata_completion_errors (*qc_prep) (struct ata_queued_cmd *qc);

    int (*qc_issue) (struct ata_queued_cmd *qc);





Higher-level hooks, these two hooks can potentially supercede several of

Higher-level hooks, these two hooks can potentially supersede several of

the above taskfile/DMA engine hooks. ``->qc_prep`` is called after the

buffers have been DMA-mapped, and is typically used to populate the

hardware's DMA scatter-gather table. Most drivers use the standard

:c:func:`ata_qc_prep` helper function, but more advanced drivers roll their

own.

hardware's DMA scatter-gather table. Some drivers use the standard

:c:func:`ata_bmdma_qc_prep` and :c:func:`ata_bmdma_dumb_qc_prep` helper

functions, but more advanced drivers roll their own.



``->qc_issue`` is used to make a command active, once the hardware and S/G

tables have been prepared. IDE BMDMA drivers use the helper function

:c:func:`ata_qc_issue_prot` for taskfile protocol-based dispatch. More

:c:func:`ata_sff_qc_issue` for taskfile protocol-based dispatch. More

advanced drivers implement their own ``->qc_issue``.



:c:func:`ata_qc_issue_prot` calls ``->tf_load()``, ``->bmdma_setup()``, and

:c:func:`ata_sff_qc_issue` calls ``->sff_tf_load()``, ``->bmdma_setup()``, and

``->bmdma_start()`` as necessary to initiate a transfer.



Exception and probe handling (EH)

drivers/ata/acard-ahci.c

+4 −2
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ struct acard_sg { 
	__le32			size;	 /* bit 31 (EOT) max==0x10000 (64k) */

};



static void acard_ahci_qc_prep(struct ata_queued_cmd *qc);

static enum ata_completion_errors acard_ahci_qc_prep(struct ata_queued_cmd *qc);

static bool acard_ahci_qc_fill_rtf(struct ata_queued_cmd *qc);

static int acard_ahci_port_start(struct ata_port *ap);

static int acard_ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent);
@@ -210,7 +210,7 @@ static unsigned int acard_ahci_fill_sg(struct ata_queued_cmd *qc, void *cmd_tbl) 
	return si;

}



static void acard_ahci_qc_prep(struct ata_queued_cmd *qc)

static enum ata_completion_errors acard_ahci_qc_prep(struct ata_queued_cmd *qc)

{

	struct ata_port *ap = qc->ap;

	struct ahci_port_priv *pp = ap->private_data;
@@ -248,6 +248,8 @@ static void acard_ahci_qc_prep(struct ata_queued_cmd *qc) 
		opts |= AHCI_CMD_ATAPI | AHCI_CMD_PREFETCH;



	ahci_fill_cmd_slot(pp, qc->hw_tag, opts);



	return AC_ERR_OK;

}



static bool acard_ahci_qc_fill_rtf(struct ata_queued_cmd *qc)

drivers/ata/ahci.c

+13 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ enum board_ids { 
	board_ahci_yes_fbs,



	/* board IDs for specific chipsets in alphabetical order */

	board_ahci_al,

	board_ahci_avn,

	board_ahci_mcp65,

	board_ahci_mcp77,
@@ -167,6 +168,13 @@ static const struct ata_port_info ahci_port_info[] = { 
		.port_ops	= &ahci_ops,

	},

	/* by chipsets */

	[board_ahci_al] = {

		AHCI_HFLAGS	(AHCI_HFLAG_NO_PMP | AHCI_HFLAG_NO_MSI),

		.flags		= AHCI_FLAG_COMMON,

		.pio_mask	= ATA_PIO4,

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &ahci_ops,

	},

	[board_ahci_avn] = {

		.flags		= AHCI_FLAG_COMMON,

		.pio_mask	= ATA_PIO4,
@@ -415,6 +423,11 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	{ PCI_VDEVICE(ATI, 0x4394), board_ahci_sb700 }, /* ATI SB700/800 */

	{ PCI_VDEVICE(ATI, 0x4395), board_ahci_sb700 }, /* ATI SB700/800 */



	/* Amazon's Annapurna Labs support */

	{ PCI_DEVICE(PCI_VENDOR_ID_AMAZON_ANNAPURNA_LABS, 0x0031),

		.class = PCI_CLASS_STORAGE_SATA_AHCI,

		.class_mask = 0xffffff,

		board_ahci_al },

	/* AMD */

	{ PCI_VDEVICE(AMD, 0x7800), board_ahci }, /* AMD Hudson-2 */

	{ PCI_VDEVICE(AMD, 0x7900), board_ahci }, /* AMD CZ */

drivers/ata/ahci_tegra.c

+3 −3
Original line number Diff line number Diff line
@@ -483,7 +483,6 @@ static int tegra_ahci_probe(struct platform_device *pdev) 
	struct tegra_ahci_priv *tegra;

	struct resource *res;

	int ret;

	unsigned int i;



	hpriv = ahci_platform_get_resources(pdev, 0);

	if (IS_ERR(hpriv))
@@ -543,8 +542,9 @@ static int tegra_ahci_probe(struct platform_device *pdev) 
	if (!tegra->supplies)

		return -ENOMEM;



	for (i = 0; i < tegra->soc->num_supplies; i++)

		tegra->supplies[i].supply = tegra->soc->supply_names[i];

	regulator_bulk_set_supply_names(tegra->supplies,

					tegra->soc->supply_names,

					tegra->soc->num_supplies);



	ret = devm_regulator_bulk_get(&pdev->dev,

				      tegra->soc->num_supplies,

drivers/ata/ata_piix.c

+6 −8
Original line number Diff line number Diff line
@@ -840,6 +840,12 @@ static int piix_broken_suspend(void) 
				DMI_MATCH(DMI_PRODUCT_NAME, "Tecra M3"),

			},

		},

		{

			.ident = "TECRA M3",

			.matches = {

				DMI_MATCH(DMI_OEM_STRING, "Tecra M3,"),

			},

		},

		{

			.ident = "TECRA M4",

			.matches = {
@@ -955,18 +961,10 @@ static int piix_broken_suspend(void) 


		{ }	/* terminate list */

	};

	static const char *oemstrs[] = {

		"Tecra M3,",

	};

	int i;



	if (dmi_check_system(sysids))

		return 1;



	for (i = 0; i < ARRAY_SIZE(oemstrs); i++)

		if (dmi_find_device(DMI_DEV_TYPE_OEM_STRING, oemstrs[i], NULL))

			return 1;



	/* TECRA M4 sometimes forgets its identify and reports bogus

	 * DMI information.  As the bogus information is a bit

	 * generic, match as many entries as possible.  This manual

CRA Git | Maintained and supported by SUSTech CRA and CCSE