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

Commit 1f5bef30 authored by Grant Likely's avatar Grant Likely
Browse files

of/address: merge of_address_to_resource() 



Merge common code between PowerPC and Microblaze.  This patch also
moves the prototype of pci_address_to_pio() out of pci-bridge.h and
into prom.h because the only user of pci_address_to_pio() is
of_address_to_resource().

Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
CC: Michal Simek <monstr@monstr.eu>
CC: Stephen Rothwell <sfr@canb.auug.org.au>
parent 6b884a8d

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

+0 −5
Original line number Diff line number Diff line
@@ -172,13 +172,8 @@ static inline int pci_has_flag(int flag) 


extern struct list_head hose_list;



extern unsigned long pci_address_to_pio(phys_addr_t address);

extern int pcibios_vaddr_is_ioport(void __iomem *address);

#else

static inline unsigned long pci_address_to_pio(phys_addr_t address)

{

	return (unsigned long)-1;

}

static inline int pcibios_vaddr_is_ioport(void __iomem *address)

{

	return 0;

arch/microblaze/include/asm/prom.h

+9 −8
Original line number Diff line number Diff line
@@ -65,17 +65,18 @@ extern const u32 *of_get_address(struct device_node *dev, int index, 
extern const u32 *of_get_pci_address(struct device_node *dev, int bar_no,

			u64 *size, unsigned int *flags);



/* Get an address as a resource. Note that if your address is

 * a PIO address, the conversion will fail if the physical address

 * can't be internally converted to an IO token with

 * pci_address_to_pio(), that is because it's either called to early

 * or it can't be matched to any host bridge IO space

 */

extern int of_address_to_resource(struct device_node *dev, int index,

				struct resource *r);

extern int of_pci_address_to_resource(struct device_node *dev, int bar,

				struct resource *r);



#ifdef CONFIG_PCI

extern unsigned long pci_address_to_pio(phys_addr_t address);

#else

static inline unsigned long pci_address_to_pio(phys_addr_t address)

{

	return (unsigned long)-1;

}

#endif	/* CONFIG_PCI */



/* Parse the ibm,dma-window property of an OF node into the busno, phys and

 * size parameters.

 */

arch/microblaze/kernel/prom_parse.c

+1 −45
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#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>
@@ -17,9 +18,6 @@ 
			(ns) > 0)



static struct of_bus *of_match_bus(struct device_node *np);

static int __of_address_to_resource(struct device_node *dev,

		const u32 *addrp, u64 size, unsigned int flags,

		struct resource *r);



/* Debug utility */

#ifdef DEBUG
@@ -576,48 +574,6 @@ const u32 *of_get_address(struct device_node *dev, int index, u64 *size, 
}

EXPORT_SYMBOL(of_get_address);



static int __of_address_to_resource(struct device_node *dev, const u32 *addrp,

				u64 size, unsigned int flags,

				struct resource *r)

{

	u64 taddr;



	if ((flags & (IORESOURCE_IO | IORESOURCE_MEM)) == 0)

		return -EINVAL;

	taddr = of_translate_address(dev, addrp);

	if (taddr == OF_BAD_ADDR)

		return -EINVAL;

	memset(r, 0, sizeof(struct resource));

	if (flags & IORESOURCE_IO) {

		unsigned long port;

		port = -1; /* pci_address_to_pio(taddr); */

		if (port == (unsigned long)-1)

			return -EINVAL;

		r->start = port;

		r->end = port + size - 1;

	} else {

		r->start = taddr;

		r->end = taddr + size - 1;

	}

	r->flags = flags;

	r->name = dev->name;

	return 0;

}



int of_address_to_resource(struct device_node *dev, int index,

			struct resource *r)

{

	const u32	*addrp;

	u64		size;

	unsigned int	flags;



	addrp = of_get_address(dev, index, &size, &flags);

	if (addrp == NULL)

		return -EINVAL;

	return __of_address_to_resource(dev, addrp, size, flags, r);

}

EXPORT_SYMBOL_GPL(of_address_to_resource);



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

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

{

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

+0 −5
Original line number Diff line number Diff line
@@ -303,13 +303,8 @@ extern void pcibios_free_controller(struct pci_controller *phb); 
extern void pcibios_setup_phb_resources(struct pci_controller *hose);



#ifdef CONFIG_PCI

extern unsigned long pci_address_to_pio(phys_addr_t address);

extern int pcibios_vaddr_is_ioport(void __iomem *address);

#else

static inline unsigned long pci_address_to_pio(phys_addr_t address)

{

	return (unsigned long)-1;

}

static inline int pcibios_vaddr_is_ioport(void __iomem *address)

{

	return 0;

arch/powerpc/include/asm/prom.h

+9 −8
Original line number Diff line number Diff line
@@ -70,14 +70,6 @@ static inline const u32 *of_get_pci_address(struct device_node *dev, 
}

#endif /* CONFIG_PCI */



/* Get an address as a resource. Note that if your address is

 * a PIO address, the conversion will fail if the physical address

 * can't be internally converted to an IO token with

 * pci_address_to_pio(), that is because it's either called to early

 * or it can't be matched to any host bridge IO space

 */

extern int of_address_to_resource(struct device_node *dev, int index,

				  struct resource *r);

#ifdef CONFIG_PCI

extern int of_pci_address_to_resource(struct device_node *dev, int bar,

				      struct resource *r);
@@ -89,6 +81,15 @@ static inline int of_pci_address_to_resource(struct device_node *dev, int bar, 
}

#endif /* CONFIG_PCI */



#ifdef CONFIG_PCI

extern unsigned long pci_address_to_pio(phys_addr_t address);

#else

static inline unsigned long pci_address_to_pio(phys_addr_t address)

{

	return (unsigned long)-1;

}

#endif	/* CONFIG_PCI */



/* Parse the ibm,dma-window property of an OF node into the busno, phys and

 * size parameters.

 */