[POWERPC] Generic OF platform driver for PCI host bridges. (4c9d2800) · Commits · 戴 / test

arch/powerpc/Kconfig

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -223,6 +223,11 @@ config PPC_DCR
	depends on PPC_DCR_NATIVE \|\| PPC_DCR_MMIO		depends on PPC_DCR_NATIVE \|\| PPC_DCR_MMIO
	default y		default y

			config PPC_OF_PLATFORM_PCI
			bool
			depends on PPC64 # not supported on 32 bits yet
			default n

	config BOOKE		config BOOKE
	bool		bool
	depends on E200 \|\| E500		depends on E200 \|\| E500
	@@ -469,6 +474,7 @@ config PPC_CELL_NATIVE
	bool		bool
	select PPC_CELL		select PPC_CELL
	select PPC_DCR_MMIO		select PPC_DCR_MMIO
			select PPC_OF_PLATFORM_PCI
	select MPIC		select MPIC
	default n		default n

arch/powerpc/kernel/of_platform.c

+103 −0

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* Copyright (C) 2006 Benjamin Herrenschmidt, IBM Corp.		* Copyright (C) 2006 Benjamin Herrenschmidt, IBM Corp.
	* <benh@kernel.crashing.org>		* <benh@kernel.crashing.org>
			* and Arnd Bergmann, IBM Corp.
	*		*
	* This program is free software; you can redistribute it and/or		* This program is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License		* modify it under the terms of the GNU General Public License
	@@ -17,12 +18,15 @@
	#include <linux/module.h>		#include <linux/module.h>
	#include <linux/mod_devicetable.h>		#include <linux/mod_devicetable.h>
	#include <linux/slab.h>		#include <linux/slab.h>
			#include <linux/pci.h>

	#include <asm/errno.h>		#include <asm/errno.h>
	#include <asm/dcr.h>		#include <asm/dcr.h>
	#include <asm/of_device.h>		#include <asm/of_device.h>
	#include <asm/of_platform.h>		#include <asm/of_platform.h>
	#include <asm/topology.h>		#include <asm/topology.h>
			#include <asm/pci-bridge.h>
			#include <asm/ppc-pci.h>

	/*		/*
	* The list of OF IDs below is used for matching bus types in the		* The list of OF IDs below is used for matching bus types in the
	@@ -377,3 +381,102 @@ struct of_device *of_find_device_by_phandle(phandle ph)
	return NULL;		return NULL;
	}		}
	EXPORT_SYMBOL(of_find_device_by_phandle);		EXPORT_SYMBOL(of_find_device_by_phandle);


			#ifdef CONFIG_PPC_OF_PLATFORM_PCI

			/* The probing of PCI controllers from of_platform is currently
			* 64 bits only, mostly due to gratuitous differences between
			* the 32 and 64 bits PCI code on PowerPC and the 32 bits one
			* lacking some bits needed here.
			*/

			static int __devinit of_pci_phb_probe(struct of_device *dev,
			const struct of_device_id *match)
			{
			struct pci_controller *phb;

			/* Check if we can do that ... */
			if (ppc_md.pci_setup_phb == NULL)
			return -ENODEV;

			printk(KERN_INFO "Setting up PCI bus %s\n", dev->node->full_name);

			/* Alloc and setup PHB data structure */
			phb = pcibios_alloc_controller(dev->node);
			if (!phb)
			return -ENODEV;

			/* Setup parent in sysfs */
			phb->parent = &dev->dev;

			/* Setup the PHB using arch provided callback */
			if (ppc_md.pci_setup_phb(phb)) {
			pcibios_free_controller(phb);
			return -ENODEV;
			}

			/* Process "ranges" property */
			pci_process_bridge_OF_ranges(phb, dev->node, 0);

			/* Setup IO space.
			* This will not work properly for ISA IOs, something needs to be done
			* about it if we ever generalize that way of probing PCI brigdes
			*/
			pci_setup_phb_io_dynamic(phb, 0);

			/* Init pci_dn data structures */
			pci_devs_phb_init_dynamic(phb);

			/* Register devices with EEH */
			#ifdef CONFIG_EEH
			if (dev->node->child)
			eeh_add_device_tree_early(dev->node);
			#endif /* CONFIG_EEH */

			/* Scan the bus */
			scan_phb(phb);

			/* Claim resources. This might need some rework as well depending
			* wether we are doing probe-only or not, like assigning unassigned
			* resources etc...
			*/
			pcibios_claim_one_bus(phb->bus);

			/* Finish EEH setup */
			#ifdef CONFIG_EEH
			eeh_add_device_tree_late(phb->bus);
			#endif

			/* Add probed PCI devices to the device model */
			pci_bus_add_devices(phb->bus);

			return 0;
			}

			static struct of_device_id of_pci_phb_ids[] = {
			{ .type = "pci", },
			{ .type = "pcix", },
			{ .type = "pcie", },
			{ .type = "pciex", },
			{ .type = "ht", },
			{}
			};

			static struct of_platform_driver of_pci_phb_driver = {
			.name = "of-pci",
			.match_table = of_pci_phb_ids,
			.probe = of_pci_phb_probe,
			.driver = {
			.multithread_probe = 1,
			},
			};

			static __init int of_pci_phb_init(void)
			{
			return of_register_platform_driver(&of_pci_phb_driver);
			}

			device_initcall(of_pci_phb_init);

			#endif /* CONFIG_PPC_OF_PLATFORM_PCI */

arch/powerpc/kernel/pci_64.c

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -210,6 +210,10 @@ struct pci_controller * pcibios_alloc_controller(struct device_node *dev)

	void pcibios_free_controller(struct pci_controller *phb)		void pcibios_free_controller(struct pci_controller *phb)
	{		{
			spin_lock(&hose_spinlock);
			list_del(&phb->list_node);
			spin_unlock(&hose_spinlock);

	if (phb->is_dynamic)		if (phb->is_dynamic)
	kfree(phb);		kfree(phb);
	}		}
	@@ -1242,6 +1246,11 @@ static void __devinit do_bus_setup(struct pci_bus *bus)
	void __devinit pcibios_fixup_bus(struct pci_bus *bus)		void __devinit pcibios_fixup_bus(struct pci_bus *bus)
	{		{
	struct pci_dev *dev = bus->self;		struct pci_dev *dev = bus->self;
			struct device_node *np;

			np = pci_bus_to_OF_node(bus);

			DBG("pcibios_fixup_bus(%s)\n", np ? np->full_name : "<???>");

	if (dev && pci_probe_only &&		if (dev && pci_probe_only &&
	(dev->class >> 8) == PCI_CLASS_BRIDGE_PCI) {		(dev->class >> 8) == PCI_CLASS_BRIDGE_PCI) {

arch/powerpc/kernel/rtas_pci.c

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -257,8 +257,10 @@ static int phb_set_bus_ranges(struct device_node *dev,
	return 0;		return 0;
	}		}

	int __devinit setup_phb(struct device_node dev, struct pci_controller phb)		int __devinit rtas_setup_phb(struct pci_controller *phb)
	{		{
			struct device_node *dev = phb->arch_data;

	if (is_python(dev))		if (is_python(dev))
	python_countermeasures(dev);		python_countermeasures(dev);

	@@ -290,7 +292,7 @@ unsigned long __init find_and_init_phbs(void)
	phb = pcibios_alloc_controller(node);		phb = pcibios_alloc_controller(node);
	if (!phb)		if (!phb)
	continue;		continue;
	setup_phb(node, phb);		rtas_setup_phb(phb);
	pci_process_bridge_OF_ranges(phb, node, 0);		pci_process_bridge_OF_ranges(phb, node, 0);
	pci_setup_phb_io(phb, index == 0);		pci_setup_phb_io(phb, index == 0);
	index++;		index++;
	@@ -362,7 +364,6 @@ int pcibios_remove_root_bus(struct pci_controller *phb)
	}		}
	}		}

	list_del(&phb->list_node);
	pcibios_free_controller(phb);		pcibios_free_controller(phb);

	return 0;		return 0;

arch/powerpc/platforms/cell/setup.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -256,6 +256,7 @@ define_machine(cell) {
	.check_legacy_ioport = cell_check_legacy_ioport,		.check_legacy_ioport = cell_check_legacy_ioport,
	.progress = cell_progress,		.progress = cell_progress,
	.init_IRQ = cell_init_irq,		.init_IRQ = cell_init_irq,
			.pci_setup_phb = rtas_setup_phb,
	#ifdef CONFIG_KEXEC		#ifdef CONFIG_KEXEC
	.machine_kexec = default_machine_kexec,		.machine_kexec = default_machine_kexec,
	.machine_kexec_prepare = default_machine_kexec_prepare,		.machine_kexec_prepare = default_machine_kexec_prepare,

Admin message