Merge branch 'of-pci' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc (acb41c0f) · Commits · 戴 / test

arch/microblaze/include/asm/pci-bridge.h

+0 −13

Original line number	Diff line number	Diff line
		@@ -19,9 +19,6 @@ enum {
		*/
		PCI_REASSIGN_ALL_RSRC = 0x00000001,

		/* Re-assign all bus numbers */
		PCI_REASSIGN_ALL_BUS = 0x00000002,

		/* Do not try to assign, just use existing setup */
		PCI_PROBE_ONLY = 0x00000004,

		@@ -110,16 +107,6 @@ static inline struct pci_controller pci_bus_to_host(const struct pci_bus bus)
		return bus->sysdata;
		}

		static inline struct device_node pci_bus_to_OF_node(struct pci_bus bus)
		{
		struct pci_controller *host;

		if (bus->self)
		return pci_device_to_OF_node(bus->self);
		host = pci_bus_to_host(bus);
		return host ? host->dn : NULL;
		}

		static inline int isa_vaddr_is_ioport(void __iomem *address)
		{
		/* No specific ISA handling on ppc32 at this stage, it

arch/microblaze/include/asm/pci.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -40,8 +40,7 @@ struct pci_dev;
		* Set this to 1 if you want the kernel to re-assign all PCI
		* bus numbers (don't do that on ppc64 yet !)
		*/
		#define pcibios_assign_all_busses() \
		(pci_has_flag(PCI_REASSIGN_ALL_BUS))
		#define pcibios_assign_all_busses() 0

		static inline void pcibios_set_master(struct pci_dev *dev)
		{

arch/microblaze/include/asm/prom.h

+0 −15

Original line number	Diff line number	Diff line
		@@ -29,21 +29,6 @@
		extern int early_uartlite_console(void);
		extern int early_uart16550_console(void);

		#ifdef CONFIG_PCI
		/*
		* PCI <-> OF matching functions
		* (XXX should these be here?)
		*/
		struct pci_bus;
		struct pci_dev;
		extern int pci_device_from_OF_node(struct device_node *node,
		u8 bus, u8 devfn);
		extern struct device_node pci_busdev_to_OF_node(struct pci_bus bus,
		int devfn);
		extern struct device_node pci_device_to_OF_node(struct pci_dev dev);
		extern void pci_create_OF_bus_map(void);
		#endif

		/*
		* OF address retreival & translation
		*/

arch/microblaze/pci/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,5 +2,5 @@
		# Makefile
		#

		obj-$(CONFIG_PCI) += pci_32.o pci-common.o indirect_pci.o iomap.o
		obj-$(CONFIG_PCI) += pci-common.o indirect_pci.o iomap.o
		obj-$(CONFIG_PCI_XILINX) += xilinx_pci.o

arch/microblaze/pci/pci-common.c

+112 −0

Original line number	Diff line number	Diff line
		@@ -50,6 +50,11 @@ unsigned int pci_flags;

		static struct dma_map_ops *pci_dma_ops = &dma_direct_ops;

		unsigned long isa_io_base;
		unsigned long pci_dram_offset;
		static int pci_bus_count;


		void set_pci_dma_ops(struct dma_map_ops *dma_ops)
		{
		pci_dma_ops = dma_ops;
		@@ -1558,6 +1563,112 @@ void __devinit pcibios_setup_phb_resources(struct pci_controller *hose)
		(unsigned long)hose->io_base_virt - _IO_BASE);
		}

		struct device_node pcibios_get_phb_of_node(struct pci_bus bus)
		{
		struct pci_controller *hose = bus->sysdata;

		return of_node_get(hose->dn);
		}

		static void __devinit pcibios_scan_phb(struct pci_controller *hose)
		{
		struct pci_bus *bus;
		struct device_node *node = hose->dn;
		unsigned long io_offset;
		struct resource *res = &hose->io_resource;

		pr_debug("PCI: Scanning PHB %s\n",
		node ? node->full_name : "<NO NAME>");

		/* Create an empty bus for the toplevel */
		bus = pci_create_bus(hose->parent, hose->first_busno, hose->ops, hose);
		if (bus == NULL) {
		printk(KERN_ERR "Failed to create bus for PCI domain %04x\n",
		hose->global_number);
		return;
		}
		bus->secondary = hose->first_busno;
		hose->bus = bus;

		/* Fixup IO space offset */
		io_offset = (unsigned long)hose->io_base_virt - isa_io_base;
		res->start = (res->start + io_offset) & 0xffffffffu;
		res->end = (res->end + io_offset) & 0xffffffffu;

		/* Wire up PHB bus resources */
		pcibios_setup_phb_resources(hose);

		/* Scan children */
		hose->last_busno = bus->subordinate = pci_scan_child_bus(bus);
		}

		static int __init pcibios_init(void)
		{
		struct pci_controller hose, tmp;
		int next_busno = 0;

		printk(KERN_INFO "PCI: Probing PCI hardware\n");

		/* Scan all of the recorded PCI controllers. */
		list_for_each_entry_safe(hose, tmp, &hose_list, list_node) {
		hose->last_busno = 0xff;
		pcibios_scan_phb(hose);
		printk(KERN_INFO "calling pci_bus_add_devices()\n");
		pci_bus_add_devices(hose->bus);
		if (next_busno <= hose->last_busno)
		next_busno = hose->last_busno + 1;
		}
		pci_bus_count = next_busno;

		/* Call common code to handle resource allocation */
		pcibios_resource_survey();

		return 0;
		}

		subsys_initcall(pcibios_init);

		static struct pci_controller *pci_bus_to_hose(int bus)
		{
		struct pci_controller hose, tmp;

		list_for_each_entry_safe(hose, tmp, &hose_list, list_node)
		if (bus >= hose->first_busno && bus <= hose->last_busno)
		return hose;
		return NULL;
		}

		/* Provide information on locations of various I/O regions in physical
		* memory. Do this on a per-card basis so that we choose the right
		* root bridge.
		* Note that the returned IO or memory base is a physical address
		*/

		long sys_pciconfig_iobase(long which, unsigned long bus, unsigned long devfn)
		{
		struct pci_controller *hose;
		long result = -EOPNOTSUPP;

		hose = pci_bus_to_hose(bus);
		if (!hose)
		return -ENODEV;

		switch (which) {
		case IOBASE_BRIDGE_NUMBER:
		return (long)hose->first_busno;
		case IOBASE_MEMORY:
		return (long)hose->pci_mem_offset;
		case IOBASE_IO:
		return (long)hose->io_base_phys;
		case IOBASE_ISA_IO:
		return (long)isa_io_base;
		case IOBASE_ISA_MEM:
		return (long)isa_mem_base;
		}

		return result;
		}

		/*
		* Null PCI config access functions, for the case when we can't
		* find a hose.
		@@ -1626,3 +1737,4 @@ int early_find_capability(struct pci_controller *hose, int bus, int devfn,
		{
		return pci_bus_find_capability(fake_pci_bus(hose, bus), devfn, cap);
		}

Admin message