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

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

ahci: add pci quirk for JMB362 



JMB362 is a new variant of jmicron controller which is similar to
JMB360 but has two SATA ports instead of one.  As there is no PATA
port, single function AHCI mode can be used as in JMB360.  Add pci
quirk for JMB362.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Reported-by: default avatarAries Lee <arieslee@jmicron.com>
Cc: stable@kernel.org
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent b475a3b8

drivers/pci/quirks.c

+4 −1
Original line number Diff line number Diff line
@@ -1457,7 +1457,8 @@ static void quirk_jmicron_ata(struct pci_dev *pdev) 
	conf5 &= ~(1 << 24);  /* Clear bit 24 */



	switch (pdev->device) {

	case PCI_DEVICE_ID_JMICRON_JMB360:

	case PCI_DEVICE_ID_JMICRON_JMB360: /* SATA single port */

	case PCI_DEVICE_ID_JMICRON_JMB362: /* SATA dual ports */

		/* The controller should be in single function ahci mode */

		conf1 |= 0x0002A100; /* Set 8, 13, 15, 17 */

		break;
@@ -1493,12 +1494,14 @@ static void quirk_jmicron_ata(struct pci_dev *pdev) 
}

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB360, quirk_jmicron_ata);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB361, quirk_jmicron_ata);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB362, quirk_jmicron_ata);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB363, quirk_jmicron_ata);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB365, quirk_jmicron_ata);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB366, quirk_jmicron_ata);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB368, quirk_jmicron_ata);

DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB360, quirk_jmicron_ata);

DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB361, quirk_jmicron_ata);

DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB362, quirk_jmicron_ata);

DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB363, quirk_jmicron_ata);

DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB365, quirk_jmicron_ata);

DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB366, quirk_jmicron_ata);

include/linux/pci_ids.h

+1 −0
Original line number Diff line number Diff line
@@ -2321,6 +2321,7 @@ 
#define PCI_VENDOR_ID_JMICRON		0x197B

#define PCI_DEVICE_ID_JMICRON_JMB360	0x2360

#define PCI_DEVICE_ID_JMICRON_JMB361	0x2361

#define PCI_DEVICE_ID_JMICRON_JMB362	0x2362

#define PCI_DEVICE_ID_JMICRON_JMB363	0x2363

#define PCI_DEVICE_ID_JMICRON_JMB365	0x2365

#define PCI_DEVICE_ID_JMICRON_JMB366	0x2366