diff options
| author | Tejun Heo <htejun@gmail.com> | 2006-09-28 04:49:22 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-12-01 22:40:29 -0500 |
| commit | 722420fe6e2ab63bebc5a9ea346016b59076d75d (patch) | |
| tree | e1b0c8ee59188f5e50762d9b98efd592361abb38 | |
| parent | 90088bb41200b4da962282dfd45db82544adac3b (diff) | |
[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: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
| -rw-r--r-- | drivers/ata/sata_nv.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c index e5615be21565..a57710107619 100644 --- a/drivers/ata/sata_nv.c +++ b/drivers/ata/sata_nv.c | |||
| @@ -442,7 +442,8 @@ static struct ata_port_info nv_port_info[] = { | |||
| 442 | /* generic */ | 442 | /* generic */ |
| 443 | { | 443 | { |
| 444 | .sht = &nv_sht, | 444 | .sht = &nv_sht, |
| 445 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY, | 445 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | |
| 446 | ATA_FLAG_HRST_TO_RESUME, | ||
| 446 | .pio_mask = NV_PIO_MASK, | 447 | .pio_mask = NV_PIO_MASK, |
| 447 | .mwdma_mask = NV_MWDMA_MASK, | 448 | .mwdma_mask = NV_MWDMA_MASK, |
| 448 | .udma_mask = NV_UDMA_MASK, | 449 | .udma_mask = NV_UDMA_MASK, |
| @@ -451,7 +452,8 @@ static struct ata_port_info nv_port_info[] = { | |||
| 451 | /* nforce2/3 */ | 452 | /* nforce2/3 */ |
| 452 | { | 453 | { |
| 453 | .sht = &nv_sht, | 454 | .sht = &nv_sht, |
| 454 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY, | 455 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | |
| 456 | ATA_FLAG_HRST_TO_RESUME, | ||
| 455 | .pio_mask = NV_PIO_MASK, | 457 | .pio_mask = NV_PIO_MASK, |
| 456 | .mwdma_mask = NV_MWDMA_MASK, | 458 | .mwdma_mask = NV_MWDMA_MASK, |
| 457 | .udma_mask = NV_UDMA_MASK, | 459 | .udma_mask = NV_UDMA_MASK, |
| @@ -460,7 +462,8 @@ static struct ata_port_info nv_port_info[] = { | |||
| 460 | /* ck804 */ | 462 | /* ck804 */ |
| 461 | { | 463 | { |
| 462 | .sht = &nv_sht, | 464 | .sht = &nv_sht, |
| 463 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY, | 465 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | |
| 466 | ATA_FLAG_HRST_TO_RESUME, | ||
| 464 | .pio_mask = NV_PIO_MASK, | 467 | .pio_mask = NV_PIO_MASK, |
| 465 | .mwdma_mask = NV_MWDMA_MASK, | 468 | .mwdma_mask = NV_MWDMA_MASK, |
| 466 | .udma_mask = NV_UDMA_MASK, | 469 | .udma_mask = NV_UDMA_MASK, |