Commit d7451fca authored by Jordan Crouse's avatar Jordan Crouse Committed by Ingo Molnar
Browse files

x86, hpet: SB600 - remove HPET resources from PCI device 



Prevent the HPET resources from appearing in PCI device 14.0 which
confuses the PCI resource engine.

Signed-off-by: default avatarJordan Crouse <jordan.crouse@amd.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 83bd6998

arch/x86/pci/fixup.c

+28 −0
Original line number Diff line number Diff line
@@ -511,3 +511,31 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1201, fam10h_pci_cfg_space_size); 
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1202, fam10h_pci_cfg_space_size);

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1203, fam10h_pci_cfg_space_size);

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1204, fam10h_pci_cfg_space_size);



/*

 * SB600: Disable BAR1 on device 14.0 to avoid HPET resources from

 * confusing the PCI engine:

 */

static void sb600_disable_hpet_bar(struct pci_dev *dev)

{

	u8 val;



	/*

	 * The SB600 and SB700 both share the same device

	 * ID, but the PM register 0x55 does something different

	 * for the SB700, so make sure we are dealing with the

	 * SB600 before touching the bit:

	 */



	pci_read_config_byte(dev, 0x08, &val);



	if (val < 0x2F) {

		outb(0x55, 0xCD6);

		val = inb(0xCD7);



		/* Set bit 7 in PM register 0x55 */

		outb(0x55, 0xCD6);

		outb(val | 0x80, 0xCD7);

	}

}

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_ATI, 0x4385, sb600_disable_hpet_bar);