Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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: default avatarTejun Heo <tj@kernel.org>
Cc: Peer Chen <pchen@nvidia.com>
Cc: stable@kernel.org
Reported-by: default avatarAnders Østhus <grapz666@gmail.com>
Reported-by: default avatarAndreas Graf <andreas_graf@csgraf.de>
Reported-by: default avatarBenoit Gschwind <gschwind@gnu-log.net>
Reported-by: default avatarDamien Cassou <damien.cassou@gmail.com>
Reported-by: default avatar <tixetsal@juno.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent f9ce889b

drivers/ata/ahci.c

+10 −0
Original line number Diff line number Diff line
@@ -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.

drivers/ata/ata_generic.c

+6 −0
Original line number Diff line number Diff line
@@ -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),  },

include/linux/pci_ids.h

+1 −0
Original line number Diff line number Diff line
@@ -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