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

Commit 1dc831bf authored by Jason Gunthorpe's avatar Jason Gunthorpe Committed by Jason Cooper
Browse files

ARM: Kirkwood: Update PCI-E fixup 



- The code relies on rc_pci_fixup being called, which only happens
  when CONFIG_PCI_QUIRKS is enabled, so add that to Kconfig. Omitting
  this causes a booting failure with a non-obvious cause.
- Update rc_pci_fixup to set the class properly, copying the
  more modern style from other places
- Correct the rc_pci_fixup comment

Signed-off-by: default avatarJason Gunthorpe <jgunthorpe@obsidianresearch.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent d356cf5a

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -547,6 +547,7 @@ config ARCH_KIRKWOOD 
	select CPU_FEROCEON

	select GENERIC_CLOCKEVENTS

	select PCI

	select PCI_QUIRKS

	select PLAT_ORION_LEGACY

	help

	  Support for the following Marvell Kirkwood series SoCs:

arch/arm/mach-kirkwood/pcie.c

+8 −3
Original line number Diff line number Diff line
@@ -207,14 +207,19 @@ static int __init kirkwood_pcie_setup(int nr, struct pci_sys_data *sys) 
	return 1;

}



static void __devinit rc_pci_fixup(struct pci_dev *dev)

{

/*

	 * Prevent enumeration of root complex.

 * The root complex has a hardwired class of PCI_CLASS_MEMORY_OTHER, when it

 * is operating as a root complex this needs to be switched to

 * PCI_CLASS_BRIDGE_HOST or Linux will errantly try to process the BAR's on

 * the device. Decoding setup is handled by the orion code.

 */

static void __devinit rc_pci_fixup(struct pci_dev *dev)

{

	if (dev->bus->parent == NULL && dev->devfn == 0) {

		int i;



		dev->class &= 0xff;

		dev->class |= PCI_CLASS_BRIDGE_HOST << 8;

		for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {

			dev->resource[i].start = 0;

			dev->resource[i].end   = 0;