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

Commit 8293b0f6 authored by David O'Shea's avatar David O'Shea Committed by Jesse Barnes
Browse files

PCI: Compaq Evo D510 SMBus quirk using USB instead of VGA 



On the Compaq Evo D510 SFF/CMT, a PCI quirk activated the SMBus device
based on detection of the on-board VGA controller, but the on-board
VGA is disabled if an AGP card is inserted, so look for one of the USB
controllers instead.

Signed-off-by: default avatarDavid O'Shea <dcoshea@hotmail.com>
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 217f45de

drivers/pci/quirks.c

+7 −2
Original line number Diff line number Diff line
@@ -1186,10 +1186,15 @@ static void __init asus_hides_smbus_hostbridge(struct pci_dev *dev) 
				 * its on-board VGA controller */

				asus_hides_smbus = 1;

			}

		else if (dev->device == PCI_DEVICE_ID_INTEL_82845G_IG)

		else if (dev->device == PCI_DEVICE_ID_INTEL_82801DB_2)

			switch(dev->subsystem_device) {

			case 0x00b8: /* Compaq Evo D510 CMT */

			case 0x00b9: /* Compaq Evo D510 SFF */

				/* Motherboard doesn't have Host bridge

				 * subvendor/subdevice IDs and on-board VGA

				 * controller is disabled if an AGP card is

				 * inserted, therefore checking USB UHCI

				 * Controller #1 */

				asus_hides_smbus = 1;

			}

		else if (dev->device == PCI_DEVICE_ID_INTEL_82815_CGC)
@@ -1214,7 +1219,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82855GM_HB, as 
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82915GM_HB, asus_hides_smbus_hostbridge);



DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82810_IG3,	asus_hides_smbus_hostbridge);

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82845G_IG,	asus_hides_smbus_hostbridge);

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82801DB_2,	asus_hides_smbus_hostbridge);

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82815_CGC,	asus_hides_smbus_hostbridge);



static void asus_hides_smbus_lpc(struct pci_dev *dev)

include/linux/pci_ids.h

+1 −0
Original line number Diff line number Diff line
@@ -2373,6 +2373,7 @@ 
#define PCI_DEVICE_ID_INTEL_82801CA_12	0x248c

#define PCI_DEVICE_ID_INTEL_82801DB_0	0x24c0

#define PCI_DEVICE_ID_INTEL_82801DB_1	0x24c1

#define PCI_DEVICE_ID_INTEL_82801DB_2	0x24c2

#define PCI_DEVICE_ID_INTEL_82801DB_3	0x24c3

#define PCI_DEVICE_ID_INTEL_82801DB_5	0x24c5

#define PCI_DEVICE_ID_INTEL_82801DB_6	0x24c6