Re: [v2,4/5] MIPS: Malta PCI changes for PCI 2.1 compatibility and conflicts.
From: Ralf Baechle <hidden>
Date: 2012-05-24 11:25:12
On Fri, Apr 06, 2012 at 03:07:49PM -0500, Steven J. Hill wrote:
quoted hunk ↗ jump to hunk
diff --git a/arch/mips/mti-malta/malta-pci.c b/arch/mips/mti-malta/malta-pci.c index bf80921..afeb619 100644 --- a/arch/mips/mti-malta/malta-pci.c +++ b/arch/mips/mti-malta/malta-pci.c@@ -241,8 +241,9 @@ void __init mips_pcibios_init(void) return; } - if (controller->io_resource->start < 0x00001000UL) /* FIXME */ - controller->io_resource->start = 0x00001000UL; + /* Change start address to avoid conflicts with ACPI and SMB devices */ + if (controller->io_resource->start < 0x00002000UL) /* FIXME */ + controller->io_resource->start = 0x00002000UL;
I think raising this value to 0x2000 solves the FIXME which is there since Maciej's 66d9ad704b25287bfee7e86a5af50b92642b9c72 commit in 2005. Maciej, do you recall you added the FIXME?
quoted hunk ↗ jump to hunk
iomem_resource.end &= 0xfffffffffULL; /* 64 GB */ ioport_resource.end = controller->io_resource->end;diff --git a/arch/mips/mti-malta/malta-setup.c b/arch/mips/mti-malta/malta-setup.c index b7f37d4..b45b343 100644 --- a/arch/mips/mti-malta/malta-setup.c +++ b/arch/mips/mti-malta/malta-setup.c@@ -222,3 +222,17 @@ void __init plat_mem_setup(void) board_be_init = malta_be_init; board_be_handler = malta_be_handler; } + +/* Enable PCI 2.1 compatibility in PIIX4. */ +static void __init quirk_dlcsetup(struct pci_dev *dev) +{ + u8 dlc; + + /* Enable passive releases and delayed transactions. */ + (void) pci_read_config_byte(dev, 0x82, &dlc); + dlc |= 7; + (void) pci_write_config_byte(dev, 0x82, dlc); +} + +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371AB_0, + quirk_dlcsetup);
See 9ead526ca4e6f3d9c7e6b79bb3fda113bd3b0eeb. It would appear that your patch turned stale about two and a half years before it was posted ;-) Ralf