Commit d4fdf844 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/irq-fixups' into next 

* pci/irq-fixups:
  PCI: Inline and remove pcibios_update_irq()
  PCI: Remove unused pci_fixup_irqs() function
  sparc/PCI: Replace pci_fixup_irqs() call with host bridge IRQ mapping hooks
  unicore32/PCI: Replace pci_fixup_irqs() call with host bridge IRQ mapping hooks
  tile/PCI: Replace pci_fixup_irqs() call with host bridge IRQ mapping hooks
  MIPS: PCI: Replace pci_fixup_irqs() call with host bridge IRQ mapping hooks
  m68k/PCI: Replace pci_fixup_irqs() call with host bridge IRQ mapping hooks
  alpha/PCI: Replace pci_fixup_irqs() call with host bridge IRQ mapping hooks
  sh/PCI: Replace pci_fixup_irqs() call with host bridge IRQ mapping hooks
  sh/PCI: Remove __init optimisations from IRQ mapping functions/data
  MIPS: PCI: Fix pcibios_scan_bus() NULL check code path
parents cf5f9cc8 606799cc

arch/alpha/kernel/pci.c

+20 −7
Original line number Diff line number Diff line
@@ -312,8 +312,9 @@ common_init_pci(void) 
{

	struct pci_controller *hose;

	struct list_head resources;

	struct pci_host_bridge *bridge;

	struct pci_bus *bus;

	int next_busno;

	int ret, next_busno;

	int need_domain_info = 0;

	u32 pci_mem_end;

	u32 sg_base;
@@ -336,11 +337,25 @@ common_init_pci(void) 
		pci_add_resource_offset(&resources, hose->mem_space,

					hose->mem_space->start);



		bus = pci_scan_root_bus(NULL, next_busno, alpha_mv.pci_ops,

					hose, &resources);

		if (!bus)

		bridge = pci_alloc_host_bridge(0);

		if (!bridge)

			continue;

		hose->bus = bus;



		list_splice_init(&resources, &bridge->windows);

		bridge->dev.parent = NULL;

		bridge->sysdata = hose;

		bridge->busnr = next_busno;

		bridge->ops = alpha_mv.pci_ops;

		bridge->swizzle_irq = alpha_mv.pci_swizzle;

		bridge->map_irq = alpha_mv.pci_map_irq;



		ret = pci_scan_root_bus_bridge(bridge);

		if (ret) {

			pci_free_host_bridge(bridge);

			continue;

		}



		bus = hose->bus = bridge->bus;

		hose->need_domain_info = need_domain_info;

		next_busno = bus->busn_res.end + 1;

		/* Don't allow 8-bit bus number overflow inside the hose -
@@ -354,7 +369,6 @@ common_init_pci(void) 
	pcibios_claim_console_setup();



	pci_assign_unassigned_resources();

	pci_fixup_irqs(alpha_mv.pci_swizzle, alpha_mv.pci_map_irq);

	for (hose = hose_head; hose; hose = hose->next) {

		bus = hose->bus;

		if (bus)
@@ -362,7 +376,6 @@ common_init_pci(void) 
	}

}





struct pci_controller * __init

alloc_pci_controller(void)

{

arch/alpha/kernel/sys_nautilus.c

+27 −4
Original line number Diff line number Diff line
@@ -194,22 +194,46 @@ static struct resource irongate_mem = { 
	.name	= "Irongate PCI MEM",

	.flags	= IORESOURCE_MEM,

};

static struct resource busn_resource = {

	.name	= "PCI busn",

	.start	= 0,

	.end	= 255,

	.flags	= IORESOURCE_BUS,

};



void __init

nautilus_init_pci(void)

{

	struct pci_controller *hose = hose_head;

	struct pci_host_bridge *bridge;

	struct pci_bus *bus;

	struct pci_dev *irongate;

	unsigned long bus_align, bus_size, pci_mem;

	unsigned long memtop = max_low_pfn << PAGE_SHIFT;

	int ret;



	bridge = pci_alloc_host_bridge(0);

	if (!bridge)

		return;



	pci_add_resource(&bridge->windows, &ioport_resource);

	pci_add_resource(&bridge->windows, &iomem_resource);

	pci_add_resource(&bridge->windows, &busn_resource);

	bridge->dev.parent = NULL;

	bridge->sysdata = hose;

	bridge->busnr = 0;

	bridge->ops = alpha_mv.pci_ops;

	bridge->swizzle_irq = alpha_mv.pci_swizzle;

	bridge->map_irq = alpha_mv.pci_map_irq;



	/* Scan our single hose.  */

	bus = pci_scan_bus(0, alpha_mv.pci_ops, hose);

	if (!bus)

	ret = pci_scan_root_bus_bridge(bridge);

	if (ret) {

		pci_free_host_bridge(bridge);

		return;

	}



	hose->bus = bus;

	bus = hose->bus = bridge->bus;

	pcibios_claim_one_bus(bus);



	irongate = pci_get_bus_and_slot(0, 0);
@@ -254,7 +278,6 @@ nautilus_init_pci(void) 
	/* pci_common_swizzle() relies on bus->self being NULL

	   for the root bus, so just clear it. */

	bus->self = NULL;

	pci_fixup_irqs(alpha_mv.pci_swizzle, alpha_mv.pci_map_irq);

	pci_bus_add_devices(bus);

}

arch/m68k/coldfire/pci.c

+32 −4
Original line number Diff line number Diff line
@@ -243,6 +243,13 @@ static struct resource mcf_pci_io = { 
	.flags	= IORESOURCE_IO,

};



static struct resource busn_resource = {

	.name	= "PCI busn",

	.start	= 0,

	.end	= 255,

	.flags	= IORESOURCE_BUS,

};



/*

 * Interrupt mapping and setting.

 */
@@ -258,6 +265,13 @@ static int mcf_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) 


static int __init mcf_pci_init(void)

{

	struct pci_host_bridge *bridge;

	int ret;



	bridge = pci_alloc_host_bridge(0);

	if (!bridge)

		return -ENOMEM;



	pr_info("ColdFire: PCI bus initialization...\n");



	/* Reset the external PCI bus */
@@ -312,14 +326,28 @@ static int __init mcf_pci_init(void) 
	set_current_state(TASK_UNINTERRUPTIBLE);

	schedule_timeout(msecs_to_jiffies(200));



	rootbus = pci_scan_bus(0, &mcf_pci_ops, NULL);

	if (!rootbus)

		return -ENODEV;



	pci_add_resource(&bridge->windows, &ioport_resource);

	pci_add_resource(&bridge->windows, &iomem_resource);

	pci_add_resource(&bridge->windows, &busn_resource);

	bridge->dev.parent = NULL;

	bridge->sysdata = NULL;

	bridge->busnr = 0;

	bridge->ops = &mcf_pci_ops;

	bridge->swizzle_irq = pci_common_swizzle;

	bridge->map_irq = mcf_pci_map_irq;



	ret = pci_scan_root_bus_bridge(bridge);

	if (ret) {

		pci_free_host_bridge(bridge);

		return ret;

	}



	rootbus = bridge->bus;



	rootbus->resource[0] = &mcf_pci_io;

	rootbus->resource[1] = &mcf_pci_mem;



	pci_fixup_irqs(pci_common_swizzle, mcf_pci_map_irq);

	pci_bus_size_bridges(rootbus);

	pci_bus_assign_resources(rootbus);

	pci_bus_add_devices(rootbus);

arch/mips/pci/pci-legacy.c

+20 −10
Original line number Diff line number Diff line
@@ -78,6 +78,12 @@ static void pcibios_scanbus(struct pci_controller *hose) 
	static int need_domain_info;

	LIST_HEAD(resources);

	struct pci_bus *bus;

	struct pci_host_bridge *bridge;

	int ret;



	bridge = pci_alloc_host_bridge(0);

	if (!bridge)

		return;



	if (hose->get_busno && pci_has_flag(PCI_PROBE_ONLY))

		next_busno = (*hose->get_busno)();
@@ -87,18 +93,24 @@ static void pcibios_scanbus(struct pci_controller *hose) 
	pci_add_resource_offset(&resources,

				hose->io_resource, hose->io_offset);

	pci_add_resource(&resources, hose->busn_resource);

	bus = pci_scan_root_bus(NULL, next_busno, hose->pci_ops, hose,

				&resources);

	hose->bus = bus;

	list_splice_init(&resources, &bridge->windows);

	bridge->dev.parent = NULL;

	bridge->sysdata = hose;

	bridge->busnr = next_busno;

	bridge->ops = hose->pci_ops;

	bridge->swizzle_irq = pci_common_swizzle;

	bridge->map_irq = pcibios_map_irq;

	ret = pci_scan_root_bus_bridge(bridge);

	if (ret) {

		pci_free_host_bridge(bridge);

		return;

	}



	hose->bus = bus = bridge->bus;



	need_domain_info = need_domain_info || pci_domain_nr(bus);

	set_pci_need_domain_info(hose, need_domain_info);



	if (!bus) {

		pci_free_resource_list(&resources);

		return;

	}



	next_busno = bus->busn_res.end + 1;

	/* Don't allow 8-bit bus number overflow inside the hose -

	   reserve some space for bridges. */
@@ -224,8 +236,6 @@ static int __init pcibios_init(void) 
	list_for_each_entry(hose, &controllers, list)

		pcibios_scanbus(hose);



	pci_fixup_irqs(pci_common_swizzle, pcibios_map_irq);



	pci_initialized = 1;



	return 0;

arch/sh/drivers/pci/fixups-cayman.c

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
#include <cpu/irq.h>

#include "pci-sh5.h"



int __init pcibios_map_platform_irq(const struct pci_dev *dev, u8 slot, u8 pin)

int pcibios_map_platform_irq(const struct pci_dev *dev, u8 slot, u8 pin)

{

	int result = -1;

CRA Git | Maintained and supported by SUSTech CRA and CCSE