lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ahci: implement AHCI_HFLAG_NO_FPDMA_AA and update NV quirks

Browse Source 
It turns out different generations of MCPs have differing quirks.

* MCP 65-73 : FPDMA AA broken, lies about PMP support, forgets to report NCQ
* MCP 77-79 : FPDMA AA broken, lies about PMP support
* MCP 89    : FPDMA AA broken

Instead of turngin off FPDMA AA on all NVIDIAs, implement
HFLAG_NO_FPDMA_AA, define additional board IDs and apply necessary
quirks.

This fixes bko#15481 and the list of quirks is verified by Peer Chen.

  http://bugzilla.kernel.org/show_bug.cgi?id=15481

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Peer Chen <pchen@nvidia.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
Tejun Heo
2010-03-30 10:28:32 +09:00
committed by Jeff Garzik
parent ec569af858
commit 83f2b9630c
2 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/ata/ahci.c
View File

@@ -63,6 +63,8 @@ enum board_ids {
/* board IDs for specific chipsets in alphabetical order */ /* board IDs for specific chipsets in alphabetical order */
board_ahci_mcp65, board_ahci_mcp65,
board_ahci_mcp77,
board_ahci_mcp89,
board_ahci_mv, board_ahci_mv,
board_ahci_sb600, board_ahci_sb600,
board_ahci_sb700, /* for SB700 and SB800 */ board_ahci_sb700, /* for SB700 and SB800 */
@@ -72,9 +74,7 @@ enum board_ids {
board_ahci_mcp_linux = board_ahci_mcp65, board_ahci_mcp_linux = board_ahci_mcp65,
board_ahci_mcp67 = board_ahci_mcp65, board_ahci_mcp67 = board_ahci_mcp65,
board_ahci_mcp73 = board_ahci_mcp65, board_ahci_mcp73 = board_ahci_mcp65,
board_ahci_mcp77 = board_ahci, board_ahci_mcp79 = board_ahci_mcp77,
board_ahci_mcp79 = board_ahci,
board_ahci_mcp89 = board_ahci,
}; };
static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent); static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent);
@@ -135,7 +135,24 @@ static const struct ata_port_info ahci_port_info[] = {
/* by chipsets */ /* by chipsets */
[board_ahci_mcp65] = [board_ahci_mcp65] =
{ {
AHCI_HFLAGS (AHCI_HFLAG_YES_NCQ), AHCI_HFLAGS (AHCI_HFLAG_NO_FPDMA_AA | AHCI_HFLAG_NO_PMP |
AHCI_HFLAG_YES_NCQ),
.flags = AHCI_FLAG_COMMON,
.pio_mask = ATA_PIO4,
.udma_mask = ATA_UDMA6,
.port_ops = &ahci_ops,
},
[board_ahci_mcp77] =
{
AHCI_HFLAGS (AHCI_HFLAG_NO_FPDMA_AA | AHCI_HFLAG_NO_PMP),
.flags = AHCI_FLAG_COMMON,
.pio_mask = ATA_PIO4,
.udma_mask = ATA_UDMA6,
.port_ops = &ahci_ops,
},
[board_ahci_mcp89] =
{
AHCI_HFLAGS (AHCI_HFLAG_NO_FPDMA_AA),
.flags = AHCI_FLAG_COMMON, .flags = AHCI_FLAG_COMMON,
.pio_mask = ATA_PIO4, .pio_mask = ATA_PIO4,
.udma_mask = ATA_UDMA6, .udma_mask = ATA_UDMA6,
@@ -1103,12 +1120,13 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
/* prepare host */ /* prepare host */
if (hpriv->cap & HOST_CAP_NCQ) { if (hpriv->cap & HOST_CAP_NCQ) {
pi.flags |= ATA_FLAG_NCQ; pi.flags |= ATA_FLAG_NCQ;
/* Auto-activate optimization is supposed to be supported on /*
all AHCI controllers indicating NCQ support, but it seems * Auto-activate optimization is supposed to be
to be broken at least on some NVIDIA MCP79 chipsets. * supported on all AHCI controllers indicating NCQ
Until we get info on which NVIDIA chipsets don't have this * capability, but it seems to be broken on some
issue, if any, disable AA on all NVIDIA AHCIs. */ * chipsets including NVIDIAs.
if (pdev->vendor != PCI_VENDOR_ID_NVIDIA) */
if (!(hpriv->flags & AHCI_HFLAG_NO_FPDMA_AA))
pi.flags |= ATA_FLAG_FPDMA_AA; pi.flags |= ATA_FLAG_FPDMA_AA;
} }

1
drivers/ata/ahci.h
View File

@@ -208,6 +208,7 @@ enum {
AHCI_HFLAG_SRST_TOUT_IS_OFFLINE = (1 << 11), /* treat SRST timeout as AHCI_HFLAG_SRST_TOUT_IS_OFFLINE = (1 << 11), /* treat SRST timeout as
link offline */ link offline */
AHCI_HFLAG_NO_SNTF = (1 << 12), /* no sntf */ AHCI_HFLAG_NO_SNTF = (1 << 12), /* no sntf */
AHCI_HFLAG_NO_FPDMA_AA = (1 << 13), /* no FPDMA AA */
/* ap->flags bits */ /* ap->flags bits */