Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code »

Commit c6353b4520788e34098bbf61c73fb9618ca7fdd6

Authored by Tejun Heo
Committed by Jeff Garzik
1 parent f9ce889b8f
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

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>

Showing 3 changed files with 17 additions and 0 deletions Side-by-side Diff

... ... @@ -1053,6 +1053,16 @@
1053 1053 if (pdev->vendor == PCI_VENDOR_ID_MARVELL && !marvell_enable)
1054 1054 return -ENODEV;
1055 1055  
  1056 + /*
  1057 + * For some reason, MCP89 on MacBook 7,1 doesn't work with
  1058 + * ahci, use ata_generic instead.
  1059 + */
  1060 + if (pdev->vendor == PCI_VENDOR_ID_NVIDIA &&
  1061 + pdev->device == PCI_DEVICE_ID_NVIDIA_NFORCE_MCP89_SATA &&
  1062 + pdev->subsystem_vendor == PCI_VENDOR_ID_APPLE &&
  1063 + pdev->subsystem_device == 0xcb89)
  1064 + return -ENODEV;
  1065 +
1056 1066 /* Promise's PDC42819 is a SAS/SATA controller that has an AHCI mode.
1057 1067 * At the moment, we can only use the AHCI mode. Let the users know
1058 1068 * that for SAS drives they're out of luck.
drivers/ata/ata_generic.c
Diff comments   View file @ c6353b4
... ... @@ -168,6 +168,12 @@
168 168 { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C561), },
169 169 { PCI_DEVICE(PCI_VENDOR_ID_OPTI, PCI_DEVICE_ID_OPTI_82C558), },
170 170 { PCI_DEVICE(PCI_VENDOR_ID_CENATEK,PCI_DEVICE_ID_CENATEK_IDE), },
  171 + /*
  172 + * For some reason, MCP89 on MacBook 7,1 doesn't work with
  173 + * ahci, use ata_generic instead.
  174 + */
  175 + { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP89_SATA,
  176 + PCI_VENDOR_ID_APPLE, 0xcb89, },
171 177 #if !defined(CONFIG_PATA_TOSHIBA) && !defined(CONFIG_PATA_TOSHIBA_MODULE)
172 178 { PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO_1), },
173 179 { PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO_2), },
include/linux/pci_ids.h
Diff comments   View file @ c6353b4
... ... @@ -1261,6 +1261,7 @@
1261 1261 #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP77_IDE 0x0759
1262 1262 #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP73_SMBUS 0x07D8
1263 1263 #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP79_SMBUS 0x0AA2
  1264 +#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP89_SATA 0x0D85
1264 1265  
1265 1266 #define PCI_VENDOR_ID_IMS 0x10e0
1266 1267 #define PCI_DEVICE_ID_IMS_TT128 0x9128