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

Commit c065488f authored by Kumar Gala's avatar Kumar Gala
Browse files

powerpc/pci: Move FSL fixup from 32-bit to common 



We need the FSL specific header fixup code on both 32-bit and 64-bit
platforms so just move the code into pci-common.c.

Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent 2602a212

arch/powerpc/kernel/pci-common.c

+18 −0
Original line number Diff line number Diff line
@@ -1728,3 +1728,21 @@ void __devinit pcibios_scan_phb(struct pci_controller *hose) 
	if (mode == PCI_PROBE_NORMAL)

		hose->last_busno = bus->subordinate = pci_scan_child_bus(bus);

}



static void fixup_hide_host_resource_fsl(struct pci_dev *dev)

{

	int i, class = dev->class >> 8;



	if ((class == PCI_CLASS_PROCESSOR_POWERPC ||

	     class == PCI_CLASS_BRIDGE_OTHER) &&

		(dev->hdr_type == PCI_HEADER_TYPE_NORMAL) &&

		(dev->bus->parent == NULL)) {

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

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

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

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

		}

	}

}

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MOTOROLA, PCI_ANY_ID, fixup_hide_host_resource_fsl);

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_FREESCALE, PCI_ANY_ID, fixup_hide_host_resource_fsl);

arch/powerpc/kernel/pci_32.c

+0 −19
Original line number Diff line number Diff line
@@ -50,25 +50,6 @@ static int pci_bus_count; 
struct pci_dev *isa_bridge_pcidev;

EXPORT_SYMBOL_GPL(isa_bridge_pcidev);



static void

fixup_hide_host_resource_fsl(struct pci_dev *dev)

{

	int i, class = dev->class >> 8;



	if ((class == PCI_CLASS_PROCESSOR_POWERPC ||

	     class == PCI_CLASS_BRIDGE_OTHER) &&

		(dev->hdr_type == PCI_HEADER_TYPE_NORMAL) &&

		(dev->bus->parent == NULL)) {

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

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

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

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

		}

	}

}

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MOTOROLA, PCI_ANY_ID, fixup_hide_host_resource_fsl); 

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_FREESCALE, PCI_ANY_ID, fixup_hide_host_resource_fsl); 



static void

fixup_cpc710_pci64(struct pci_dev* dev)

{