Commit 823806ff authored by Alan Cox's avatar Alan Cox Committed by Jesse Barnes

x86/mrst/pci: avoid SoC fixups on non-SoC platforms

The PCI fixups get executed based upon whether they are linked in. We need
to avoid executing them if we boot a dual SoC/PC type kernel on a PC class
system.
Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 8ed30872
...@@ -43,6 +43,8 @@ ...@@ -43,6 +43,8 @@
#define PCI_FIXED_BAR_4_SIZE 0x14 #define PCI_FIXED_BAR_4_SIZE 0x14
#define PCI_FIXED_BAR_5_SIZE 0x1c #define PCI_FIXED_BAR_5_SIZE 0x1c
static int pci_soc_mode = 0;
/** /**
* fixed_bar_cap - return the offset of the fixed BAR cap if found * fixed_bar_cap - return the offset of the fixed BAR cap if found
* @bus: PCI bus * @bus: PCI bus
...@@ -233,10 +235,11 @@ struct pci_ops pci_mrst_ops = { ...@@ -233,10 +235,11 @@ struct pci_ops pci_mrst_ops = {
*/ */
int __init pci_mrst_init(void) int __init pci_mrst_init(void)
{ {
printk(KERN_INFO "Moorestown platform detected, using MRST PCI ops\n"); printk(KERN_INFO "Intel MID platform detected, using MID PCI ops\n");
pci_mmcfg_late_init(); pci_mmcfg_late_init();
pcibios_enable_irq = mrst_pci_irq_enable; pcibios_enable_irq = mrst_pci_irq_enable;
pci_root_ops = pci_mrst_ops; pci_root_ops = pci_mrst_ops;
pci_soc_mode = 1;
/* Continue with standard init */ /* Continue with standard init */
return 1; return 1;
} }
...@@ -246,6 +249,10 @@ int __init pci_mrst_init(void) ...@@ -246,6 +249,10 @@ int __init pci_mrst_init(void)
*/ */
static void __devinit pci_d3delay_fixup(struct pci_dev *dev) static void __devinit pci_d3delay_fixup(struct pci_dev *dev)
{ {
/* PCI fixups are effectively decided compile time. If we have a dual
SoC/non-SoC kernel we don't want to mangle d3 on non SoC devices */
if (!pci_soc_mode)
return;
/* true pci devices in lincroft should allow type 1 access, the rest /* true pci devices in lincroft should allow type 1 access, the rest
* are langwell fake pci devices. * are langwell fake pci devices.
*/ */
...@@ -274,6 +281,9 @@ static void __devinit pci_fixed_bar_fixup(struct pci_dev *dev) ...@@ -274,6 +281,9 @@ static void __devinit pci_fixed_bar_fixup(struct pci_dev *dev)
u32 size; u32 size;
int i; int i;
if (!pci_soc_mode)
return;
/* Must have extended configuration space */ /* Must have extended configuration space */
if (dev->cfg_size < PCIE_CAP_OFFSET + 4) if (dev->cfg_size < PCIE_CAP_OFFSET + 4)
return; return;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment