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

libata: kill ATA_LFLAG_HRST_TO_RESUME 



Now that hardreset is the preferred method of resetting, there's no
need for ATA_LFLAG_HRST_TO_RESUME flag.  Kill it.

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

drivers/ata/ahci.c

+1 −1
Original line number Diff line number Diff line
@@ -416,7 +416,7 @@ 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 | ATA_LFLAG_HRST_TO_RESUME,

		.link_flags	= AHCI_LFLAG_COMMON,

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

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &ahci_vt8251_ops,

drivers/ata/libata-pmp.c

+0 −16
Original line number Diff line number Diff line
@@ -453,9 +453,6 @@ static void sata_pmp_quirks(struct ata_port *ap) 
	if (vendor == 0x1095 && devid == 0x3726) {

		/* sil3726 quirks */

		ata_port_for_each_link(link, ap) {

			/* SError.N need a kick in the ass to get working */

			link->flags |= ATA_LFLAG_HRST_TO_RESUME;



			/* class code report is unreliable */

			if (link->pmp < 5)

				link->flags |= ATA_LFLAG_ASSUME_ATA;
@@ -468,9 +465,6 @@ static void sata_pmp_quirks(struct ata_port *ap) 
	} else if (vendor == 0x1095 && devid == 0x4723) {

		/* sil4723 quirks */

		ata_port_for_each_link(link, ap) {

			/* SError.N need a kick in the ass to get working */

			link->flags |= ATA_LFLAG_HRST_TO_RESUME;



			/* class code report is unreliable */

			if (link->pmp < 2)

				link->flags |= ATA_LFLAG_ASSUME_ATA;
@@ -483,9 +477,6 @@ static void sata_pmp_quirks(struct ata_port *ap) 
	} else if (vendor == 0x1095 && devid == 0x4726) {

		/* sil4726 quirks */

		ata_port_for_each_link(link, ap) {

			/* SError.N need a kick in the ass to get working */

			link->flags |= ATA_LFLAG_HRST_TO_RESUME;



			/* Class code report is unreliable and SRST

			 * times out under certain configurations.

			 * Config device can be at port 0 or 5 and
@@ -513,13 +504,6 @@ static void sata_pmp_quirks(struct ata_port *ap) 
		 * otherwise.  Don't try hard to recover it.

		 */

		ap->pmp_link[ap->nr_pmp_links - 1].flags |= ATA_LFLAG_NO_RETRY;

	} else if (vendor == 0x11ab && devid == 0x4140) {

		/* Marvell 88SM4140 quirks.  Fan-out ports require PHY

		 * reset to work; other than that, it behaves very

		 * nicely.

		 */

		ata_port_for_each_link(link, ap)

			link->flags |= ATA_LFLAG_HRST_TO_RESUME;

	}

}

drivers/ata/sata_nv.c

+0 −5
Original line number Diff line number Diff line
@@ -579,7 +579,6 @@ static const struct ata_port_info nv_port_info[] = { 
	{

		.sht		= &nv_sht,

		.flags		= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY,

		.link_flags	= ATA_LFLAG_HRST_TO_RESUME,

		.pio_mask	= NV_PIO_MASK,

		.mwdma_mask	= NV_MWDMA_MASK,

		.udma_mask	= NV_UDMA_MASK,
@@ -590,7 +589,6 @@ static const struct ata_port_info nv_port_info[] = { 
	{

		.sht		= &nv_sht,

		.flags		= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY,

		.link_flags	= ATA_LFLAG_HRST_TO_RESUME,

		.pio_mask	= NV_PIO_MASK,

		.mwdma_mask	= NV_MWDMA_MASK,

		.udma_mask	= NV_UDMA_MASK,
@@ -601,7 +599,6 @@ static const struct ata_port_info nv_port_info[] = { 
	{

		.sht		= &nv_sht,

		.flags		= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY,

		.link_flags	= ATA_LFLAG_HRST_TO_RESUME,

		.pio_mask	= NV_PIO_MASK,

		.mwdma_mask	= NV_MWDMA_MASK,

		.udma_mask	= NV_UDMA_MASK,
@@ -613,7 +610,6 @@ static const struct ata_port_info nv_port_info[] = { 
		.sht		= &nv_adma_sht,

		.flags		= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |

				  ATA_FLAG_MMIO | ATA_FLAG_NCQ,

		.link_flags	= ATA_LFLAG_HRST_TO_RESUME,

		.pio_mask	= NV_PIO_MASK,

		.mwdma_mask	= NV_MWDMA_MASK,

		.udma_mask	= NV_UDMA_MASK,
@@ -625,7 +621,6 @@ static const struct ata_port_info nv_port_info[] = { 
		.sht		= &nv_swncq_sht,

		.flags	        = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |

				  ATA_FLAG_NCQ,

		.link_flags	= ATA_LFLAG_HRST_TO_RESUME,

		.pio_mask	= NV_PIO_MASK,

		.mwdma_mask	= NV_MWDMA_MASK,

		.udma_mask	= NV_UDMA_MASK,

drivers/ata/sata_sil.c

+0 −5
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ enum { 


	SIL_DFL_PORT_FLAGS	= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |

				  ATA_FLAG_MMIO,

	SIL_DFL_LINK_FLAGS	= ATA_LFLAG_HRST_TO_RESUME,



	/*

	 * Controller IDs
@@ -215,7 +214,6 @@ static const struct ata_port_info sil_port_info[] = { 
	/* sil_3112 */

	{

		.flags		= SIL_DFL_PORT_FLAGS | SIL_FLAG_MOD15WRITE,

		.link_flags	= SIL_DFL_LINK_FLAGS,

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

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

		.udma_mask	= ATA_UDMA5,
@@ -225,7 +223,6 @@ static const struct ata_port_info sil_port_info[] = { 
	{

		.flags		= SIL_DFL_PORT_FLAGS | SIL_FLAG_MOD15WRITE |

				  SIL_FLAG_NO_SATA_IRQ,

		.link_flags	= SIL_DFL_LINK_FLAGS,

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

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

		.udma_mask	= ATA_UDMA5,
@@ -234,7 +231,6 @@ static const struct ata_port_info sil_port_info[] = { 
	/* sil_3512 */

	{

		.flags		= SIL_DFL_PORT_FLAGS | SIL_FLAG_RERR_ON_DMA_ACT,

		.link_flags	= SIL_DFL_LINK_FLAGS,

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

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

		.udma_mask	= ATA_UDMA5,
@@ -243,7 +239,6 @@ static const struct ata_port_info sil_port_info[] = { 
	/* sil_3114 */

	{

		.flags		= SIL_DFL_PORT_FLAGS | SIL_FLAG_RERR_ON_DMA_ACT,

		.link_flags	= SIL_DFL_LINK_FLAGS,

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

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

		.udma_mask	= ATA_UDMA5,

include/linux/libata.h

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



	/* struct ata_link flags */

	ATA_LFLAG_HRST_TO_RESUME = (1 << 0), /* hardreset to resume link */

	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 */