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

Commit 04bea68b authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Grant Likely
Browse files

of/pci: move of_irq_map_pci() into generic code 



There is a tiny difference between PPC32 and PPC64. Microblaze uses the
PPC32 variant.

Signed-off-by: default avatarSebastian Andrzej Siewior <sebastian@breakpoint.cc>
[grant.likely@secretlab.ca: Added comment to #endif, moved documentation
	block to function implementation, fixed for non ppc and microblaze
	compiles]
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent c64eae9a

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

+12 −0
Original line number Diff line number Diff line
@@ -104,11 +104,22 @@ struct pci_controller { 
	int global_number;	/* PCI domain number */

};



#ifdef CONFIG_PCI

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
@@ -116,6 +127,7 @@ static inline int isa_vaddr_is_ioport(void __iomem *address) 
	 */

	return 0;

}

#endif /* CONFIG_PCI */



/* These are used for config access before all the PCI probing

   has been done. */

arch/microblaze/include/asm/prom.h

+0 −15
Original line number Diff line number Diff line
@@ -64,21 +64,6 @@ extern void kdump_move_device_tree(void); 
/* CPU OF node matching */

struct device_node *of_get_cpu_node(int cpu, unsigned int *thread);



/**

 * of_irq_map_pci - Resolve the interrupt for a PCI device

 * @pdev:	the device whose interrupt is to be resolved

 * @out_irq:	structure of_irq filled by this function

 *

 * This function resolves the PCI interrupt for a given PCI device. If a

 * device-node exists for a given pci_dev, it will use normal OF tree

 * walking. If not, it will implement standard swizzling and walk up the

 * PCI tree until an device-node is found, at which point it will finish

 * resolving using the OF tree walking.

 */

struct pci_dev;

struct of_irq;

extern int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq);



#endif /* __ASSEMBLY__ */

#endif /* __KERNEL__ */

arch/microblaze/kernel/prom_parse.c

+0 −77
Original line number Diff line number Diff line
@@ -2,88 +2,11 @@ 


#include <linux/kernel.h>

#include <linux/string.h>

#include <linux/pci_regs.h>

#include <linux/module.h>

#include <linux/ioport.h>

#include <linux/etherdevice.h>

#include <linux/of_address.h>

#include <asm/prom.h>

#include <asm/pci-bridge.h>



#ifdef CONFIG_PCI

int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq)

{

	struct device_node *dn, *ppnode;

	struct pci_dev *ppdev;

	u32 lspec;

	u32 laddr[3];

	u8 pin;

	int rc;



	/* Check if we have a device node, if yes, fallback to standard OF

	 * parsing

	 */

	dn = pci_device_to_OF_node(pdev);

	if (dn)

		return of_irq_map_one(dn, 0, out_irq);



	/* Ok, we don't, time to have fun. Let's start by building up an

	 * interrupt spec.  we assume #interrupt-cells is 1, which is standard

	 * for PCI. If you do different, then don't use that routine.

	 */

	rc = pci_read_config_byte(pdev, PCI_INTERRUPT_PIN, &pin);

	if (rc != 0)

		return rc;

	/* No pin, exit */

	if (pin == 0)

		return -ENODEV;



	/* Now we walk up the PCI tree */

	lspec = pin;

	for (;;) {

		/* Get the pci_dev of our parent */

		ppdev = pdev->bus->self;



		/* Ouch, it's a host bridge... */

		if (ppdev == NULL) {

			struct pci_controller *host;

			host = pci_bus_to_host(pdev->bus);

			ppnode = host ? host->dn : NULL;

			/* No node for host bridge ? give up */

			if (ppnode == NULL)

				return -EINVAL;

		} else

			/* We found a P2P bridge, check if it has a node */

			ppnode = pci_device_to_OF_node(ppdev);



		/* Ok, we have found a parent with a device-node, hand over to

		 * the OF parsing code.

		 * We build a unit address from the linux device to be used for

		 * resolution. Note that we use the linux bus number which may

		 * not match your firmware bus numbering.

		 * Fortunately, in most cases, interrupt-map-mask doesn't

		 * include the bus number as part of the matching.

		 * You should still be careful about that though if you intend

		 * to rely on this function (you ship  a firmware that doesn't

		 * create device nodes for all PCI devices).

		 */

		if (ppnode)

			break;



		/* We can only get here if we hit a P2P bridge with no node,

		 * let's do standard swizzling and try again

		 */

		lspec = pci_swizzle_interrupt_pin(pdev, lspec);

		pdev = ppdev;

	}



	laddr[0] = (pdev->bus->number << 16)

		| (pdev->devfn << 8);

	laddr[1]  = laddr[2] = 0;

	return of_irq_map_raw(ppnode, &lspec, 1, laddr, out_irq);

}

EXPORT_SYMBOL_GPL(of_irq_map_pci);

#endif /* CONFIG_PCI */



void of_parse_dma_window(struct device_node *dn, const void *dma_window_prop,

		unsigned long *busno, unsigned long *phys, unsigned long *size)

arch/microblaze/pci/pci-common.c

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <linux/slab.h>

#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/of_pci.h>



#include <asm/processor.h>

#include <asm/io.h>

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

+10 −0
Original line number Diff line number Diff line
@@ -171,6 +171,16 @@ 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