Commit 8cebf274 authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik
Browse files

libata: kill ATA_LFLAG_SKIP_D2H_BSY 



Some controllers can't reliably record the initial D2H FIS after SATA
link is brought online for whatever reason.  Advanced controllers
which don't have traditional TF register based interface often have
this problem as they don't really have the TF registers to update
while the controller and link are being initialized.

SKIP_D2H_BSY works around the problem by skipping the wait for device
readiness before issuing SRST, so for such controllers libata issues
SRST blindly and hopes for the best.

Now that libata defaults to hardreset, this workaround is no longer
necessary.  For controllers which have support for hardreset, SRST is
never issued by itself.  It is only issued as follow-up SRST for
device classification and PMP initialization, so there's no need to
wait for it from prereset.

Kill ATA_LFLAG_SKIP_D2H_BSY.

Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
parent 672b2d65

drivers/ata/ahci.c

+0 −7
Original line number Diff line number Diff line
@@ -198,7 +198,6 @@ enum { 
					  ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA |

					  ATA_FLAG_ACPI_SATA | ATA_FLAG_AN |

					  ATA_FLAG_IPM,

	AHCI_LFLAG_COMMON		= ATA_LFLAG_SKIP_D2H_BSY,



	ICH_MAP				= 0x90, /* ICH MAP register */

};
@@ -407,7 +406,6 @@ static const struct ata_port_info ahci_port_info[] = { 
	/* board_ahci */

	{

		.flags		= AHCI_FLAG_COMMON,

		.link_flags	= AHCI_LFLAG_COMMON,

		.pio_mask	= 0x1f, /* pio0-4 */

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &ahci_ops,
@@ -416,7 +414,6 @@ static const struct ata_port_info ahci_port_info[] = { 
	{

		AHCI_HFLAGS	(AHCI_HFLAG_NO_NCQ | AHCI_HFLAG_NO_PMP),

		.flags		= AHCI_FLAG_COMMON,

		.link_flags	= AHCI_LFLAG_COMMON,

		.pio_mask	= 0x1f, /* pio0-4 */

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &ahci_vt8251_ops,
@@ -425,7 +422,6 @@ static const struct ata_port_info ahci_port_info[] = { 
	{

		AHCI_HFLAGS	(AHCI_HFLAG_IGN_IRQ_IF_ERR),

		.flags		= AHCI_FLAG_COMMON,

		.link_flags	= AHCI_LFLAG_COMMON,

		.pio_mask	= 0x1f, /* pio0-4 */

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &ahci_ops,
@@ -436,7 +432,6 @@ static const struct ata_port_info ahci_port_info[] = { 
				 AHCI_HFLAG_32BIT_ONLY |

				 AHCI_HFLAG_SECT255 | AHCI_HFLAG_NO_PMP),

		.flags		= AHCI_FLAG_COMMON,

		.link_flags	= AHCI_LFLAG_COMMON,

		.pio_mask	= 0x1f, /* pio0-4 */

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &ahci_ops,
@@ -447,7 +442,6 @@ static const struct ata_port_info ahci_port_info[] = { 
				 AHCI_HFLAG_MV_PATA),

		.flags		= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |

				  ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA,

		.link_flags	= AHCI_LFLAG_COMMON,

		.pio_mask	= 0x1f, /* pio0-4 */

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &ahci_ops,
@@ -457,7 +451,6 @@ static const struct ata_port_info ahci_port_info[] = { 
		AHCI_HFLAGS	(AHCI_HFLAG_IGN_SERR_INTERNAL |

				 AHCI_HFLAG_NO_PMP),

		.flags		= AHCI_FLAG_COMMON,

		.link_flags	= AHCI_LFLAG_COMMON,

		.pio_mask	= 0x1f, /* pio0-4 */

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &ahci_ops,

drivers/ata/libata-core.c

+2 −4
Original line number Diff line number Diff line
@@ -3962,10 +3962,8 @@ int ata_std_prereset(struct ata_link *link, unsigned long deadline) 
					"link for reset (errno=%d)\n", rc);

	}



	/* Wait for !BSY if the controller can wait for the first D2H

	 * Reg FIS and we don't know that no device is attached.

	 */

	if (!(link->flags & ATA_LFLAG_SKIP_D2H_BSY) && !ata_link_offline(link)) {

	/* wait for !BSY if we don't know that no device is attached */

	if (!ata_link_offline(link)) {

		rc = ata_wait_ready(ap, deadline);

		if (rc && rc != -ENODEV) {

			ata_link_printk(link, KERN_WARNING, "device not ready "

drivers/ata/sata_fsl.c

+0 −2
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ enum { 
	SATA_FSL_HOST_FLAGS	= (ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |

				ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA |

				ATA_FLAG_NCQ),

	SATA_FSL_HOST_LFLAGS	= ATA_LFLAG_SKIP_D2H_BSY,



	SATA_FSL_MAX_CMDS	= SATA_FSL_QUEUE_DEPTH,

	SATA_FSL_CMD_HDR_SIZE	= 16,	/* 4 DWORDS */
@@ -1241,7 +1240,6 @@ static const struct ata_port_operations sata_fsl_ops = { 
static const struct ata_port_info sata_fsl_port_info[] = {

	{

	 .flags = SATA_FSL_HOST_FLAGS,

	 .link_flags = SATA_FSL_HOST_LFLAGS,

	 .pio_mask = 0x1f,	/* pio 0-4 */

	 .udma_mask = 0x7f,	/* udma 0-6 */

	 .port_ops = &sata_fsl_ops,

drivers/ata/sata_sil24.c

+0 −4
Original line number Diff line number Diff line
@@ -254,7 +254,6 @@ enum { 
				  ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA |

				  ATA_FLAG_NCQ | ATA_FLAG_ACPI_SATA |

				  ATA_FLAG_AN | ATA_FLAG_PMP,

	SIL24_COMMON_LFLAGS	= ATA_LFLAG_SKIP_D2H_BSY,

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



	IRQ_STAT_4PORTS		= 0xf,
@@ -449,7 +448,6 @@ static const struct ata_port_info sil24_port_info[] = { 
	{

		.flags		= SIL24_COMMON_FLAGS | SIL24_NPORTS2FLAG(4) |

				  SIL24_FLAG_PCIX_IRQ_WOC,

		.link_flags	= SIL24_COMMON_LFLAGS,

		.pio_mask	= 0x1f,			/* pio0-4 */

		.mwdma_mask	= 0x07,			/* mwdma0-2 */

		.udma_mask	= ATA_UDMA5,		/* udma0-5 */
@@ -458,7 +456,6 @@ static const struct ata_port_info sil24_port_info[] = { 
	/* sil_3132 */

	{

		.flags		= SIL24_COMMON_FLAGS | SIL24_NPORTS2FLAG(2),

		.link_flags	= SIL24_COMMON_LFLAGS,

		.pio_mask	= 0x1f,			/* pio0-4 */

		.mwdma_mask	= 0x07,			/* mwdma0-2 */

		.udma_mask	= ATA_UDMA5,		/* udma0-5 */
@@ -467,7 +464,6 @@ static const struct ata_port_info sil24_port_info[] = { 
	/* sil_3131/sil_3531 */

	{

		.flags		= SIL24_COMMON_FLAGS | SIL24_NPORTS2FLAG(1),

		.link_flags	= SIL24_COMMON_LFLAGS,

		.pio_mask	= 0x1f,			/* pio0-4 */

		.mwdma_mask	= 0x07,			/* mwdma0-2 */

		.udma_mask	= ATA_UDMA5,		/* udma0-5 */

include/linux/libata.h

+0 −2
Original line number Diff line number Diff line
@@ -163,8 +163,6 @@ enum { 
	ATA_DEV_NONE		= 9,	/* no device */



	/* struct ata_link flags */

	ATA_LFLAG_SKIP_D2H_BSY	= (1 << 1), /* can't wait for the first D2H

					     * Register FIS clearing BSY */

	ATA_LFLAG_NO_SRST	= (1 << 2), /* avoid softreset */

	ATA_LFLAG_ASSUME_ATA	= (1 << 3), /* assume ATA class */

	ATA_LFLAG_ASSUME_SEMB	= (1 << 4), /* assume SEMB class */

CRA Git | Maintained and supported by SUSTech CRA and CCSE