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

[PATCH] sata_nv: SRST sometimes fails after hotplug, use HRST_TO_RESUME 



NV controllers sometimes fail to perform softreset after hotplug.
Make it use hardreset to resume link.

Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 90088bb4

drivers/ata/sata_nv.c

+6 −3
Original line number Diff line number Diff line
@@ -442,7 +442,8 @@ static struct ata_port_info nv_port_info[] = { 
	/* generic */

	{

		.sht		= &nv_sht,

		.flags		= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY,

		.flags		= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |

				  ATA_FLAG_HRST_TO_RESUME,

		.pio_mask	= NV_PIO_MASK,

		.mwdma_mask	= NV_MWDMA_MASK,

		.udma_mask	= NV_UDMA_MASK,
@@ -451,7 +452,8 @@ static struct ata_port_info nv_port_info[] = { 
	/* nforce2/3 */

	{

		.sht		= &nv_sht,

		.flags		= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY,

		.flags		= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |

				  ATA_FLAG_HRST_TO_RESUME,

		.pio_mask	= NV_PIO_MASK,

		.mwdma_mask	= NV_MWDMA_MASK,

		.udma_mask	= NV_UDMA_MASK,
@@ -460,7 +462,8 @@ static struct ata_port_info nv_port_info[] = { 
	/* ck804 */

	{

		.sht		= &nv_sht,

		.flags		= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY,

		.flags		= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |

				  ATA_FLAG_HRST_TO_RESUME,

		.pio_mask	= NV_PIO_MASK,

		.mwdma_mask	= NV_MWDMA_MASK,

		.udma_mask	= NV_UDMA_MASK,