80 lines
3.2 KiB
Diff
80 lines
3.2 KiB
Diff
From: Tejun Heo <tj@kernel.org>
|
|
Date: Thu, 17 Jun 2010 09:42:22 +0000 (+0200)
|
|
Subject: ahci,ata_generic: let ata_generic handle new MBP w/ MCP89
|
|
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=c6353b4520788e34098bbf61c73fb9618ca7fdd6
|
|
|
|
ahci,ata_generic: let ata_generic handle new MBP w/ MCP89
|
|
|
|
For yet unknown reason, MCP89 on MBP 7,1 doesn't work w/ ahci under
|
|
linux but the controller doesn't require explicit mode setting and
|
|
works fine with ata_generic. Make ahci ignore the controller on MBP
|
|
7,1 and let ata_generic take it for now.
|
|
|
|
Reported in bko#15923.
|
|
|
|
https://bugzilla.kernel.org/show_bug.cgi?id=15923
|
|
|
|
NVIDIA is investigating why ahci mode doesn't work.
|
|
|
|
Signed-off-by: Tejun Heo <tj@kernel.org>
|
|
Cc: Peer Chen <pchen@nvidia.com>
|
|
Cc: stable@kernel.org
|
|
Reported-by: Anders Østhus <grapz666@gmail.com>
|
|
Reported-by: Andreas Graf <andreas_graf@csgraf.de>
|
|
Reported-by: Benoit Gschwind <gschwind@gnu-log.net>
|
|
Reported-by: Damien Cassou <damien.cassou@gmail.com>
|
|
Reported-by: tixetsal@juno.com
|
|
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
|
|
---
|
|
|
|
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
|
|
index 8ca16f5..f252253 100644
|
|
--- a/drivers/ata/ahci.c
|
|
+++ b/drivers/ata/ahci.c
|
|
@@ -1053,6 +1053,16 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|
if (pdev->vendor == PCI_VENDOR_ID_MARVELL && !marvell_enable)
|
|
return -ENODEV;
|
|
|
|
+ /*
|
|
+ * For some reason, MCP89 on MacBook 7,1 doesn't work with
|
|
+ * ahci, use ata_generic instead.
|
|
+ */
|
|
+ if (pdev->vendor == PCI_VENDOR_ID_NVIDIA &&
|
|
+ pdev->device == PCI_DEVICE_ID_NVIDIA_NFORCE_MCP89_SATA &&
|
|
+ pdev->subsystem_vendor == PCI_VENDOR_ID_APPLE &&
|
|
+ pdev->subsystem_device == 0xcb89)
|
|
+ return -ENODEV;
|
|
+
|
|
/* Promise's PDC42819 is a SAS/SATA controller that has an AHCI mode.
|
|
* At the moment, we can only use the AHCI mode. Let the users know
|
|
* that for SAS drives they're out of luck.
|
|
diff --git a/drivers/ata/ata_generic.c b/drivers/ata/ata_generic.c
|
|
index 573158a..d4ccf74 100644
|
|
--- a/drivers/ata/ata_generic.c
|
|
+++ b/drivers/ata/ata_generic.c
|
|
@@ -168,6 +168,12 @@ static struct pci_device_id ata_generic[] = {
|
|
{ PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C561), },
|
|
{ PCI_DEVICE(PCI_VENDOR_ID_OPTI, PCI_DEVICE_ID_OPTI_82C558), },
|
|
{ PCI_DEVICE(PCI_VENDOR_ID_CENATEK,PCI_DEVICE_ID_CENATEK_IDE), },
|
|
+ /*
|
|
+ * For some reason, MCP89 on MacBook 7,1 doesn't work with
|
|
+ * ahci, use ata_generic instead.
|
|
+ */
|
|
+ { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP89_SATA,
|
|
+ PCI_VENDOR_ID_APPLE, 0xcb89, },
|
|
#if !defined(CONFIG_PATA_TOSHIBA) && !defined(CONFIG_PATA_TOSHIBA_MODULE)
|
|
{ PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO_1), },
|
|
{ PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO_2), },
|
|
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
|
|
index 4eb4679..3bedcc1 100644
|
|
--- a/include/linux/pci_ids.h
|
|
+++ b/include/linux/pci_ids.h
|
|
@@ -1261,6 +1261,7 @@
|
|
#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP77_IDE 0x0759
|
|
#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP73_SMBUS 0x07D8
|
|
#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP79_SMBUS 0x0AA2
|
|
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP89_SATA 0x0D85
|
|
|
|
#define PCI_VENDOR_ID_IMS 0x10e0
|
|
#define PCI_DEVICE_ID_IMS_TT128 0x9128
|