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

Commit 6693e74a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

PCI: be more verbose about resource quirks 



When reserving an PCI quirk, note that in the kernel bootup messages.

Also, parse the strange PIIX4 device resources - they should get their
own PCI resource quirks, but for now just print out what it finds to
verify that the code does the right thing.

Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5ed688a7

drivers/pci/quirks.c

+88 −13
Original line number Diff line number Diff line
@@ -241,7 +241,8 @@ static void __devinit quirk_s3_64M(struct pci_dev *dev) 
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_S3,	PCI_DEVICE_ID_S3_868,		quirk_s3_64M );

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_S3,	PCI_DEVICE_ID_S3_968,		quirk_s3_64M );



static void __devinit quirk_io_region(struct pci_dev *dev, unsigned region, unsigned size, int nr)

static void __devinit quirk_io_region(struct pci_dev *dev, unsigned region,

	unsigned size, int nr, const char *name)

{

	region &= ~(size-1);

	if (region) {
@@ -259,6 +260,7 @@ static void __devinit quirk_io_region(struct pci_dev *dev, unsigned region, unsi 
		pcibios_bus_to_resource(dev, res, &bus_region);



		pci_claim_resource(dev, nr);

		printk("PCI quirk: region %04x-%04x claimed by %s\n", region, region + size - 1, name);

	}

}
@@ -291,25 +293,98 @@ static void __devinit quirk_ali7101_acpi(struct pci_dev *dev) 
	u16 region;



	pci_read_config_word(dev, 0xE0, &region);

	quirk_io_region(dev, region, 64, PCI_BRIDGE_RESOURCES);

	quirk_io_region(dev, region, 64, PCI_BRIDGE_RESOURCES, "ali7101 ACPI");

	pci_read_config_word(dev, 0xE2, &region);

	quirk_io_region(dev, region, 32, PCI_BRIDGE_RESOURCES+1);

	quirk_io_region(dev, region, 32, PCI_BRIDGE_RESOURCES+1, "ali7101 SMB");

}

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AL,	PCI_DEVICE_ID_AL_M7101,		quirk_ali7101_acpi );



static void piix4_io_quirk(struct pci_dev *dev, const char *name, unsigned int port, unsigned int enable)

{

	u32 devres;

	u32 mask, size, base;



	pci_read_config_dword(dev, port, &devres);

	if ((devres & enable) != enable)

		return;

	mask = (devres >> 16) & 15;

	base = devres & 0xffff;

	size = 16;

	for (;;) {

		unsigned bit = size >> 1;

		if ((bit & mask) == bit)

			break;

		size = bit;

	}

	/*

	 * For now we only print it out. Eventually we'll want to

	 * reserve it (at least if it's in the 0x1000+ range), but

	 * let's get enough confirmation reports first. 

	 */

	base &= -size;

	printk("%s PIO at %04x-%04x\n", name, base, base + size - 1);

}



static void piix4_mem_quirk(struct pci_dev *dev, const char *name, unsigned int port, unsigned int enable)

{

	u32 devres;

	u32 mask, size, base;



	pci_read_config_dword(dev, port, &devres);

	if ((devres & enable) != enable)

		return;

	base = devres & 0xffff0000;

	mask = (devres & 0x3f) << 16;

	size = 128 << 16;

	for (;;) {

		unsigned bit = size >> 1;

		if ((bit & mask) == bit)

			break;

		size = bit;

	}

	/*

	 * For now we only print it out. Eventually we'll want to

	 * reserve it, but let's get enough confirmation reports first. 

	 */

	base &= -size;

	printk("%s MMIO at %04x-%04x\n", name, base, base + size - 1);

}



/*

 * PIIX4 ACPI: Two IO regions pointed to by longwords at

 *	0x40 (64 bytes of ACPI registers)

 *	0x90 (32 bytes of SMB registers)

 * and a few strange programmable PIIX4 device resources.

 */

static void __devinit quirk_piix4_acpi(struct pci_dev *dev)

{

	u32 region;

	u32 region, res_a;



	pci_read_config_dword(dev, 0x40, &region);

	quirk_io_region(dev, region, 64, PCI_BRIDGE_RESOURCES);

	quirk_io_region(dev, region, 64, PCI_BRIDGE_RESOURCES, "PIIX4 ACPI");

	pci_read_config_dword(dev, 0x90, &region);

	quirk_io_region(dev, region, 32, PCI_BRIDGE_RESOURCES+1);

	quirk_io_region(dev, region, 32, PCI_BRIDGE_RESOURCES+1, "PIIX4 SMB");



	/* Device resource A has enables for some of the other ones */

	pci_read_config_dword(dev, 0x5c, &res_a);



	piix4_io_quirk(dev, "PIIX4 devres B", 0x60, 3 << 21);

	piix4_io_quirk(dev, "PIIX4 devres C", 0x64, 3 << 21);



	/* Device resource D is just bitfields for static resources */



	/* Device 12 enabled? */

	if (res_a & (1 << 29)) {

		piix4_io_quirk(dev, "PIIX4 devres E", 0x68, 1 << 20);

		piix4_mem_quirk(dev, "PIIX4 devres F", 0x6c, 1 << 7);

	}

	/* Device 13 enabled? */

	if (res_a & (1 << 30)) {

		piix4_io_quirk(dev, "PIIX4 devres G", 0x70, 1 << 20);

		piix4_mem_quirk(dev, "PIIX4 devres H", 0x74, 1 << 7);

	}

	piix4_io_quirk(dev, "PIIX4 devres I", 0x78, 1 << 20);

	piix4_io_quirk(dev, "PIIX4 devres J", 0x7c, 1 << 20);

}

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82371AB_3,	quirk_piix4_acpi );
@@ -323,10 +398,10 @@ static void __devinit quirk_ich4_lpc_acpi(struct pci_dev *dev) 
	u32 region;



	pci_read_config_dword(dev, 0x40, &region);

	quirk_io_region(dev, region, 128, PCI_BRIDGE_RESOURCES);

	quirk_io_region(dev, region, 128, PCI_BRIDGE_RESOURCES, "ICH4 ACPI/GPIO/TCO");



	pci_read_config_dword(dev, 0x58, &region);

	quirk_io_region(dev, region, 64, PCI_BRIDGE_RESOURCES+1);

	quirk_io_region(dev, region, 64, PCI_BRIDGE_RESOURCES+1, "ICH4 GPIO");

}

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,    PCI_DEVICE_ID_INTEL_82801AA_0,		quirk_ich4_lpc_acpi );

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,    PCI_DEVICE_ID_INTEL_82801AB_0,		quirk_ich4_lpc_acpi );
@@ -352,7 +427,7 @@ static void __devinit quirk_vt82c586_acpi(struct pci_dev *dev) 
	if (rev & 0x10) {

		pci_read_config_dword(dev, 0x48, &region);

		region &= PCI_BASE_ADDRESS_IO_MASK;

		quirk_io_region(dev, region, 256, PCI_BRIDGE_RESOURCES);

		quirk_io_region(dev, region, 256, PCI_BRIDGE_RESOURCES, "vt82c586 ACPI");

	}

}

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA,	PCI_DEVICE_ID_VIA_82C586_3,	quirk_vt82c586_acpi );
@@ -372,11 +447,11 @@ static void __devinit quirk_vt82c686_acpi(struct pci_dev *dev) 


	pci_read_config_word(dev, 0x70, &hm);

	hm &= PCI_BASE_ADDRESS_IO_MASK;

	quirk_io_region(dev, hm, 128, PCI_BRIDGE_RESOURCES + 1);

	quirk_io_region(dev, hm, 128, PCI_BRIDGE_RESOURCES + 1, "vt82c868 HW-mon");



	pci_read_config_dword(dev, 0x90, &smb);

	smb &= PCI_BASE_ADDRESS_IO_MASK;

	quirk_io_region(dev, smb, 16, PCI_BRIDGE_RESOURCES + 2);

	quirk_io_region(dev, smb, 16, PCI_BRIDGE_RESOURCES + 2, "vt82c868 SMB");

}

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA,	PCI_DEVICE_ID_VIA_82C686_4,	quirk_vt82c686_acpi );
@@ -391,11 +466,11 @@ static void __devinit quirk_vt8235_acpi(struct pci_dev *dev) 


	pci_read_config_word(dev, 0x88, &pm);

	pm &= PCI_BASE_ADDRESS_IO_MASK;

	quirk_io_region(dev, pm, 128, PCI_BRIDGE_RESOURCES);

	quirk_io_region(dev, pm, 128, PCI_BRIDGE_RESOURCES, "vt8235 PM");



	pci_read_config_word(dev, 0xd0, &smb);

	smb &= PCI_BASE_ADDRESS_IO_MASK;

	quirk_io_region(dev, smb, 16, PCI_BRIDGE_RESOURCES + 1);

	quirk_io_region(dev, smb, 16, PCI_BRIDGE_RESOURCES + 1, "vt8235 SMB");

}

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA,	PCI_DEVICE_ID_VIA_8235,	quirk_vt8235_acpi);