Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72dd299d authored by Dan Williams's avatar Dan Williams Committed by Tejun Heo
Browse files

libata: allow sata_sil24 to opt-out of tag ordered submission 

Ronny reports: https://bugzilla.kernel.org/show_bug.cgi?id=87101


    "Since commit 8a4aeec8 "libata/ahci: accommodate tag ordered
    controllers" the access to the harddisk on the first SATA-port is
    failing on its first access. The access to the harddisk on the
    second port is working normal.

    When reverting the above commit, access to both harddisks is working
    fine again."

Maintain tag ordered submission as the default, but allow sata_sil24 to
continue with the old behavior.

Cc: <stable@vger.kernel.org>
Cc: Tejun Heo <tj@kernel.org>
Reported-by: default avatarRonny Hegewald <Ronny.Hegewald@online.de>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 19406d7d

drivers/ata/libata-core.c

+4 −1
Original line number Diff line number Diff line
@@ -4771,6 +4771,9 @@ static struct ata_queued_cmd *ata_qc_new(struct ata_port *ap) 
		return NULL;



	for (i = 0, tag = ap->last_tag + 1; i < max_queue; i++, tag++) {

		if (ap->flags & ATA_FLAG_LOWTAG)

			tag = i;

		else

			tag = tag < max_queue ? tag : 0;



		/* the last tag is reserved for internal command. */

drivers/ata/sata_sil24.c

+1 −1
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ enum { 
	/* host flags */

	SIL24_COMMON_FLAGS	= ATA_FLAG_SATA | ATA_FLAG_PIO_DMA |

				  ATA_FLAG_NCQ | ATA_FLAG_ACPI_SATA |

				  ATA_FLAG_AN | ATA_FLAG_PMP,

				  ATA_FLAG_AN | ATA_FLAG_PMP | ATA_FLAG_LOWTAG,

	SIL24_FLAG_PCIX_IRQ_WOC	= (1 << 24), /* IRQ loss errata on PCI-X */



	IRQ_STAT_4PORTS		= 0xf,

include/linux/libata.h

+1 −0
Original line number Diff line number Diff line
@@ -231,6 +231,7 @@ enum { 
	ATA_FLAG_SW_ACTIVITY	= (1 << 22), /* driver supports sw activity

					      * led */

	ATA_FLAG_NO_DIPM	= (1 << 23), /* host not happy with DIPM */

	ATA_FLAG_LOWTAG		= (1 << 24), /* host wants lowest available tag */



	/* bits 24:31 of ap->flags are reserved for LLD specific flags */