of/pci: Provide common support for PCI DT parsing
Subsystems (6)
v5 cover of/pci: Provide common support for PCI DT parsing
This patchset factors out duplicated code associated with parsing PCI DT "ranges" properties across the architectures and introduces a "ranges" parser. This parser "of_pci_range_parser" can be used directly by ARM host bridge drivers enabling them to obtain ranges from device trees.
Compared to the v4 (incorrectly labelled v3) sent by Andrew Murray, the following changes have been made:
* Split the patch as suggested by Rob Herring
Compared to the v3 sent by Andrew Murray, the following changes have been made:
* Unify and move duplicate pci_process_bridge_OF_ranges functions to drivers/of/of_pci.c as suggested by Rob Herring
* Fix potential build errors with Microblaze/MIPS
Compared to "[PATCH v5 01/17] of/pci: Provide support for parsing PCI DT ranges property", the following changes have been made:
* Correct use of IORESOURCE_* as suggested by Russell King
* Improved interface and naming as suggested by Thierry Reding
Compared to the v2 sent by Andrew Murray, Thomas Petazzoni did:
* Add a memset() on the struct of_pci_range_iter when starting the for loop in for_each_pci_range(). Otherwise, with an uninitialized of_pci_range_iter, of_pci_process_ranges() may crash.
* Add parenthesis around 'res', 'np' and 'iter' in the for_each_of_pci_range macro definitions. Otherwise, passing something like &foobar as 'res' didn't work.
* Rebased on top of 3.9-rc2, which required fixing a few conflicts in the Microblaze code.
v2:
This follows on from suggestions made by Grant Likely (marc.info/?l=linux-kernel&m=136079602806328)
Andrew Murray (3):
of/pci: Unify pci_process_bridge_OF_ranges from Microblaze and
PowerPC
of/pci: Provide support for parsing PCI DT ranges property of/pci: mips: convert to common of_pci_range_parser
arch/microblaze/include/asm/pci-bridge.h | 5 +- arch/microblaze/pci/pci-common.c | 192 ------------------------------ arch/mips/pci/pci.c | 50 +++------ arch/powerpc/include/asm/pci-bridge.h | 5 +- arch/powerpc/kernel/pci-common.c | 192 ------------------------------ drivers/of/address.c | 63 ++++++++++ drivers/of/of_pci.c | 168 ++++++++++++++++++++++++++ include/linux/of_address.h | 42 +++++++ include/linux/of_pci.h | 3 + 9 files changed, 294 insertions(+), 426 deletions(-)
PATCH v5 1/3 of/pci: Unify pci_process_bridge_OF_ranges from Microblaze and PowerPC
The pci_process_bridge_OF_ranges function, used to parse the "ranges" property of a PCI host device, is found in both Microblaze and PowerPC architectures. These implementations are nearly identical. This patch moves this common code to a common place.
--- arch/microblaze/include/asm/pci-bridge.h | 5 +- arch/microblaze/pci/pci-common.c | 192 ---------------------------- arch/powerpc/include/asm/pci-bridge.h | 5 +- arch/powerpc/kernel/pci-common.c | 192 ---------------------------- drivers/of/of_pci.c | 200 ++++++++++++++++++++++++++++++ include/linux/of_pci.h | 3 + 6 files changed, 205 insertions(+), 392 deletions(-)
arch/microblaze/include/asm/pci-bridge.h +1 -4
@@ -10,6 +10,7 @@#include <linux/pci.h> #include <linux/list.h> #include <linux/ioport.h> +#include <linux/of_pci.h> struct device_node ;
@@ -132,10 +133,6 @@ extern void setup_indirect_pci(struct pci_controller *hose,extern struct pci_controller *pci_find_hose_for_OF_device (struct device_node *node); -/* Fill up host controller resources from the OF node */ -extern void pci_process_bridge_OF_ranges (struct pci_controller *hose, -struct device_node *dev,int primary); -/* Allocate & free a PCI host bridge structure */ extern struct pci_controller *pcibios_alloc_controller (struct device_node *dev);extern void pcibios_free_controller (struct pci_controller *phb);
arch/microblaze/pci/pci-common.c +0 -192
198 lines not on this page · raw message
arch/powerpc/include/asm/pci-bridge.h +1 -4
@@ -10,6 +10,7 @@#include <linux/pci.h> #include <linux/list.h> #include <linux/ioport.h> +#include <linux/of_pci.h> #include <asm-generic/pci-bridge.h> struct device_node ;
@@ -231,10 +232,6 @@ extern int pcibios_map_io_space(struct pci_bus *bus);extern struct pci_controller *pci_find_hose_for_OF_device (struct device_node * node); -/* Fill up host controller resources from the OF node */ -extern void pci_process_bridge_OF_ranges (struct pci_controller *hose, -struct device_node *dev,int primary); -/* Allocate & free a PCI host bridge structure */ extern struct pci_controller *pcibios_alloc_controller (struct device_node *dev);extern void pcibios_free_controller (struct pci_controller *phb);
arch/powerpc/kernel/pci-common.c +0 -192
198 lines not on this page · raw message
drivers/of/of_pci.c +200 -0
209 lines not on this page · raw message
include/linux/of_pci.h +3 -0
@@ -11,4 +11,7 @@ struct device_node;struct device_node *of_pci_find_child_device (struct device_node *parent,unsigned int devfn); +void pci_process_bridge_OF_ranges (struct pci_controller *hose, +struct device_node *dev,int primary); +#endif
Signature · 1 line
1.7.0.4
Re: [PATCH v5 1/3] of/pci: Unify pci_process_bridge_OF_ranges from Microblaze and PowerPC
Adding Ben H and Michal...
Quoted 7 lines · Andrew Murray
The
pci_process_bridge_OF_rangesfunction, used to parse the "ranges" property of a PCI host device, is found in both Microblaze and PowerPC architectures. These implementations are nearly identical. This patch moves this common code to a common place.Signed-off-by Andrew Murray <[email protected]>Signed-off-by Liviu Dudau <[email protected]>
One comment below. Otherwise,
You need also need acks from Ben and Michal.
[...]
drivers/of/of_pci.c struct device_node *of_pci_find_child_device(struct device_node *parent, · line 152
Quoted 13 lines
drivers/of/of_pci.c +13
-0+/* Act based on address space type */ + res =NULL ; +switch ((pci_space >>24 ) &0x3 ) { +case 1 :/* PCI IO space */ +pr_info (" IO 0x%016llx..0x%016llx -> 0x%016llx\n" , + cpu_addr, cpu_addr + size -1 , pci_addr); + +/* We support only one IO range */ +if (hose->pci_io_size) { +pr_info (" \\--> Skipped (too many) !\n" ); +continue ; + } +#if defined(CONFIG_PPC32 ) || defined(CONFIG_MICROBLAZE )
How about "if (!IS_ENABLED(CONFIG_64BIT))" instead.
Quoted 17 lines
drivers/of/of_pci.c +17
-0+/* On 32 bits, limit I/O space to 16MB */ +if (size >0x01000000 ) + size =0x01000000 ; + +/* 32 bits needs to map IOs here */ + hose->io_base_virt =ioremap (cpu_addr, size); + +/* Expect trouble if pci_addr is not 0 */ +if (primary) + isa_io_base = + (unsigned long )hose->io_base_virt; +#endif /* CONFIG_PPC32 || CONFIG_MICROBLAZE */ +/* pci_io_size and io_base_phys always represent IO +* space starting at 0 so we factor in pci_addr +*/ + hose->pci_io_size = pci_addr + size; + hose->io_base_phys = cpu_addr - pci_addr;
Re: [PATCH v5 1/3] of/pci: Unify pci_process_bridge_OF_ranges from Microblaze and PowerPC
Ben, Michal,
Quoted 8 lines · Rob Herring
Adding Ben H and Michal...
Quoted 5 lines · Andrew Murray
The
pci_process_bridge_OF_rangesfunction, used to parse the "ranges" property of a PCI host device, is found in both Microblaze and PowerPC architectures. These implementations are nearly identical. This patch moves this common code to a common place.
Quoted 8 lines
Quoted 2 lines
Signed-off-by Andrew Murray <[email protected]>Signed-off-by Liviu Dudau <[email protected]>One comment below. Otherwise,
Reviewed-by Rob Herring <[email protected]>You need also need acks from Ben and Michal.
Ben, Michal, could you review/test this patch from Andrew Murray? I need it as a dependency of "[PATCH v5 2/3] of/pci: Provide support for parsing PCI DT ranges property", which itself is used by the Marvell PCIe driver I'm hoping to get merged in 3.10.
Thanks a lot for your feedback,
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
Re: [PATCH v5 1/3] of/pci: Unify pci_process_bridge_OF_ranges from Microblaze and PowerPC
Quoted 4 lines · Thomas Petazzoni
Ben, Michal, could you review/test this patch from Andrew Murray? I need it as a dependency of "[PATCH v5 2/3] of/pci: Provide support for parsing PCI DT ranges property", which itself is used by the Marvell PCIe driver I'm hoping to get merged in 3.10.
Second this, I also have a patch series that depend on these patches.
Yours,
Linus Walleij
Re: [PATCH v5 1/3] of/pci: Unify pci_process_bridge_OF_ranges from Microblaze and PowerPC
In reply to Rob HerringQuoted 19 lines · Rob Herring
Adding Ben H and Michal...
Quoted 7 lines · Andrew Murray
The
pci_process_bridge_OF_rangesfunction, used to parse the "ranges" property of a PCI host device, is found in both Microblaze and PowerPC architectures. These implementations are nearly identical. This patch moves this common code to a common place.Signed-off-by Andrew Murray <[email protected]>Signed-off-by Liviu Dudau <[email protected]>One comment below. Otherwise,
Reviewed-by Rob Herring <[email protected]>You need also need acks from Ben and Michal.
[...]
Quoted 15 lines
drivers/of/of_pci.c struct device_node *of_pci_find_child_device(struct device_node *parent, · line 152
Quoted 13 lines
drivers/of/of_pci.c +13
-0+/* Act based on address space type */ + res =NULL ; +switch ((pci_space >>24 ) &0x3 ) { +case 1 :/* PCI IO space */ +pr_info (" IO 0x%016llx..0x%016llx -> 0x%016llx\n" , + cpu_addr, cpu_addr + size -1 , pci_addr); + +/* We support only one IO range */ +if (hose->pci_io_size) { +pr_info (" \\--> Skipped (too many) !\n" ); +continue ; + } +#if defined(CONFIG_PPC32 ) || defined(CONFIG_MICROBLAZE )How about "if (!IS_ENABLED(CONFIG_64BIT))" instead.
OK I'll add in my next re-spin. Would "#ifndef CONFIG_64BIT" suffice?
Quoted 20 lines
Quoted 18 lines
drivers/of/of_pci.c +17
-0+/* On 32 bits, limit I/O space to 16MB */ +if (size >0x01000000 ) + size =0x01000000 ; + +/* 32 bits needs to map IOs here */ + hose->io_base_virt =ioremap (cpu_addr, size); + +/* Expect trouble if pci_addr is not 0 */ +if (primary) + isa_io_base = + (unsigned long )hose->io_base_virt; +#endif /* CONFIG_PPC32 || CONFIG_MICROBLAZE */ +/* pci_io_size and io_base_phys always represent IO +* space starting at 0 so we factor in pci_addr +*/ + hose->pci_io_size = pci_addr + size; + hose->io_base_phys = cpu_addr - pci_addr;
Re: [PATCH v5 1/3] of/pci: Unify pci_process_bridge_OF_ranges from Microblaze and PowerPC
In reply to Andrew MurrayDear Andrew Murray,
include/linux/of_pci.h struct device_node; · line 17
Quoted 12 lines · Andrew Murray
include/linux/of_pci.h +3
-0@@ -11,4 +11,7 @@ struct device_node;struct device_node *of_pci_find_child_device (struct device_node *parent,unsigned int devfn); +void pci_process_bridge_OF_ranges (struct pci_controller *hose, +struct device_node *dev,int primary); +#endif
In this file, 'struct pci_controller' is not defined anywhere, and not in any header file that is included. So I get a warning at compile time when <linux/of_pci.h> is included, but nothing has defined 'struct pci_controller' beforehand. So I think this file should carry a change like:
+struct pci_controller;
In my version of the patch I added it, see:
include/linux/of_pci.h +4 -0
@@ -4,6 +4,7 @@#include <linux/pci.h> struct pci_dev ; +struct pci_controller ;struct of_irq ;int of_irq_map_pci (const struct pci_dev *pdev,struct of_irq *out_irq);
@@ -11,4 +12,7 @@ struct device_node;struct device_node *of_pci_find_child_device (struct device_node *parent,unsigned int devfn); +void pci_process_bridge_OF_ranges (struct pci_controller *hose, +struct device_node *dev,int primary); +#endif
But otherwise, for PATCH 1/3 and 2/3,
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH v5 1/3 of/pci: Unify pci_process_bridge_OF_ranges from Microblaze and PowerPC
Quoted 48 lines · Thomas Petazzoni
Dear Andrew Murray,
include/linux/of_pci.h struct device_node; · line 17
Quoted 12 lines · Andrew Murray
include/linux/of_pci.h +3
-0@@ -11,4 +11,7 @@ struct device_node;struct device_node *of_pci_find_child_device (struct device_node *parent,unsigned int devfn); +void pci_process_bridge_OF_ranges (struct pci_controller *hose, +struct device_node *dev,int primary); +#endif In this file, 'struct
pci_controller' is not defined anywhere, and not in any header file that is included. So I get a warning at compile time when <linux/of_pci.h> is included, but nothing has defined 'structpci_controller' beforehand. So I think this file should carry a change like:+struct
pci_controller;In my version of the patch I added it, see:
include/linux/of_pci.h +4
-0@@ -4,6 +4,7 @@#include <linux/pci.h> struct pci_dev ; +struct pci_controller ;struct of_irq ;int of_irq_map_pci (const struct pci_dev *pdev,struct of_irq *out_irq);@@ -11,4 +12,7 @@ struct device_node;struct device_node *of_pci_find_child_device (struct device_node *parent,unsigned int devfn); +void pci_process_bridge_OF_ranges (struct pci_controller *hose, +struct device_node *dev,int primary); +#endif
Quoted 1 line
But otherwise, for PATCH 1/3 and 2/3,
Thanks - I somehow missed this.
I've included this change in my next respin - but I've put 'struct pci_controller' immediately before 'pci_process_bridge_OF_ranges' rather than above of_irq_map_pci to be consistent with the rest of the file.
Andrew Murray
Quoted 10 lines
Tested-by Thomas Petazzoni <[email protected]>Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH v5 1/3 of/pci: Unify pci_process_bridge_OF_ranges from Microblaze and PowerPC
Dear Andrew Murray,
Quoted 6 lines · Andrew Murray
Thanks - I somehow missed this.
I've included this change in my next respin - but I've put 'struct
pci_controller' immediately before 'pci_process_bridge_OF_ranges' rather than aboveof_irq_map_pcito be consistent with the rest of the file.
Right, sounds good.
Do we have some news from the PowerPC and Microblaze maintainers about their acceptance of PATCH 1/3 ? This of/pci thing is the only last remaining patch for which I need a Ack to get the Marvell PCIe merged.
Thanks!
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH v5 2/3 of/pci: Provide support for parsing PCI DT ranges property
In reply to Andrew MurrayThis patch factors out common implementation patterns to reduce overall kernel code and provide a means for host bridge drivers to directly obtain struct resources from the DT's ranges property without relying on architecture specific DT handling. This will make it easier to write archiecture independent host bridge drivers and mitigate against further duplication of DT parsing code.
This patch can be used in the following way:
struct of_pci_range_parser parser;
struct of_pci_range range;
if (of_pci_range_parser(&parser, np))
; //no ranges property
for_each_of_pci_range(&parser, &range) {
/*
directly access properties of the address range, e.g.:
range.pci_space, range.pci_addr, range.cpu_addr,
range.size, range.flags
alternatively obtain a struct resource, e.g.:
struct resource res;
of_pci_range_to_resource(&range, np, &res);
*/
}Additionally the implementation takes care of adjacent ranges and merges them into a single range (as was the case with powerpc and microblaze).
--- drivers/of/address.c | 63 +++++++++++++++++++++++++ drivers/of/of_pci.c | 112 ++++++++++++++++---------------------------- include/linux/of_address.h | 42 ++++++++++++++++ 3 files changed, 145 insertions(+), 72 deletions(-)
drivers/of/address.c +63 -0
@@ -227,6 +227,69 @@ int of_pci_address_to_resource(struct device_node *dev, int bar,return __of_address_to_resource (dev, addrp, size, flags,NULL , r); }EXPORT_SYMBOL_GPL (of_pci_address_to_resource); + +int of_pci_range_parser (struct of_pci_range_parser *parser, +struct device_node *node) +{ +const int na =3 , ns =2 ; +int rlen; + + parser->node = node; + parser->pna =of_n_addr_cells (node); + parser->np = parser->pna + na + ns; + + parser->range =of_get_property (node,"ranges" , &rlen); +if (parser->range ==NULL ) +return -ENOENT ; + + parser->end = parser->range + rlen /sizeof (__be32); + +return 0 ; +} + +struct of_pci_range *of_pci_process_ranges (struct of_pci_range_parser *parser, +struct of_pci_range *range) +{ +const int na =3 , ns =2 ; + +if (!parser->range || parser->range + parser->np > parser->end) +return NULL ; + + range->pci_space =be32_to_cpup (parser->range); + range->flags =of_bus_pci_get_flags (parser->range); + range->pci_addr =of_read_number (parser->range +1 , ns); + range->cpu_addr =of_translate_address (parser->node, + parser->range + na); + range->size =of_read_number (parser->range + parser->pna + na, ns); + + parser->range += parser->np; + +/* Now consume following elements while they are contiguous */ +while (parser->range + parser->np <= parser->end) { +u32 flags, pci_space; +u64 pci_addr, cpu_addr, size; + + pci_space =be32_to_cpup (parser->range); + flags =of_bus_pci_get_flags (parser->range); + pci_addr =of_read_number (parser->range +1 , ns); + cpu_addr =of_translate_address (parser->node, + parser->range + na); + size =of_read_number (parser->range + parser->pna + na, ns); + +if (flags != range->flags) +break ; +if (pci_addr != range->pci_addr + range->size || + cpu_addr != range->cpu_addr + range->size) +break ; + + range->size += size; + parser->range += parser->np; + } + +return range; +} +EXPORT_SYMBOL_GPL (of_pci_process_ranges); +#endif /* CONFIG_PCI */ /*
drivers/of/of_pci.c +40 -72
180 lines not on this page · raw message
include/linux/of_address.h +42 -0
60 lines not on this page · raw message
Signature · 1 line
1.7.0.4
Re: [PATCH v5 2/3] of/pci: Provide support for parsing PCI DT ranges property
Quoted 27 lines · Andrew Murray
This patch factors out common implementation patterns to reduce overall kernel code and provide a means for host bridge drivers to directly obtain struct resources from the DT's ranges property without relying on architecture specific DT handling. This will make it easier to write archiecture independent host bridge drivers and mitigate against further duplication of DT parsing code.
This patch can be used in the following way:
struct of_pci_range_parser parser; struct of_pci_range range; if (of_pci_range_parser(&parser, np)) ; //no ranges property for_each_of_pci_range(&parser, &range) { /* directly access properties of the address range, e.g.: range.pci_space, range.pci_addr, range.cpu_addr, range.size, range.flags alternatively obtain a struct resource, e.g.: struct resource res; of_pci_range_to_resource(&range, np, &res); */ }
Quoted 7 lines
Additionally the implementation takes care of adjacent ranges and merges them into a single range (as was the case with powerpc and microblaze).
Signed-off-by Andrew Murray <[email protected]>Signed-off-by Liviu Dudau <[email protected]>Signed-off-by Thomas Petazzoni <[email protected]>---
A few minor things below, otherwise:
Quoted 29 lines
drivers/of/address.c | 63 +++++++++++++++++++++++++ drivers/of/of_pci.c | 112 ++++++++++++++++---------------------------- include/linux/of_address.h | 42 ++++++++++++++++ 3 files changed, 145 insertions(+), 72 deletions(-)drivers/of/address.c +16
-0@@ -227,6 +227,69 @@ int of_pci_address_to_resource(struct device_node *dev, int bar,return __of_address_to_resource (dev, addrp, size, flags,NULL , r); }EXPORT_SYMBOL_GPL (of_pci_address_to_resource); + +int of_pci_range_parser (struct of_pci_range_parser *parser, +struct device_node *node) +{ +const int na =3 , ns =2 ; +int rlen; + + parser->node = node; + parser->pna =of_n_addr_cells (node); + parser->np = parser->pna + na + ns; + + parser->range =of_get_property (node,"ranges" , &rlen); +if (parser->range ==NULL ) +return -ENOENT ; + + parser->end = parser->range + rlen /sizeof (__be32);
drivers/of/address.c int of_pci_address_to_resource(struct device_node *dev, int bar, · line 255
Quoted 10 lines
drivers/of/address.c +10
-0+ +return 0 ; +} + +struct of_pci_range *of_pci_process_ranges (struct of_pci_range_parser *parser, +struct of_pci_range *range) +{ +const int na =3 , ns =2 ; + +if (!parser->range || parser->range + parser->np > parser->end)
Add a !range check
Quoted 7 lines
drivers/of/address.c +7
-0+return NULL ; + + range->pci_space =be32_to_cpup (parser->range); + range->flags =of_bus_pci_get_flags (parser->range); + range->pci_addr =of_read_number (parser->range +1 , ns); + range->cpu_addr =of_translate_address (parser->node, + parser->range + na);
drivers/of/address.c int of_pci_address_to_resource(struct device_node *dev, int bar, · line 272
Quoted 10 lines
drivers/of/address.c +10
-0+ range->size =of_read_number (parser->range + parser->pna + na, ns); + + parser->range += parser->np; + +/* Now consume following elements while they are contiguous */ +while (parser->range + parser->np <= parser->end) { +u32 flags, pci_space; +u64 pci_addr, cpu_addr, size; + + pci_space =be32_to_cpup (parser->range);
This line doesn't do anything.
Quoted 217 lines
drivers/of/address.c +20
-0+ flags =of_bus_pci_get_flags (parser->range); + pci_addr =of_read_number (parser->range +1 , ns); + cpu_addr =of_translate_address (parser->node, + parser->range + na); + size =of_read_number (parser->range + parser->pna + na, ns); + +if (flags != range->flags) +break ; +if (pci_addr != range->pci_addr + range->size || + cpu_addr != range->cpu_addr + range->size) +break ; + + range->size += size; + parser->range += parser->np; + } + +return range; +} +EXPORT_SYMBOL_GPL (of_pci_process_ranges); +#endif /* CONFIG_PCI */ /* drivers/of/of_pci.c +40
-72@@ -82,67 +82,43 @@ EXPORT_SYMBOL_GPL(of_pci_find_child_device);void pci_process_bridge_OF_ranges (struct pci_controller *hose,struct device_node *dev,int primary) { -const u32 *ranges; -int rlen; -int pna =of_n_addr_cells (dev); -int np = pna +5 ;int memno =0 , isa_hole =-1 ; -u32 pci_space; -unsigned long long pci_addr, cpu_addr, pci_next, cpu_next, size;unsigned long long isa_mb =0 ;struct resource *res; +struct of_pci_range range; +struct of_pci_range_parser parser; +u32 res_type;pr_info ("PCI host bridge %s %s ranges:\n" , dev->full_name, primary ?"(primary)" :"" ); -/* Get ranges property */ - ranges =of_get_property (dev,"ranges" , &rlen); -if (ranges ==NULL ) +/* Check for ranges property */ +if (of_pci_range_parser (&parser, dev))return ; -/* Parse it */ pr_debug ("Parsing ranges property...\n" ); -while ((rlen -= np *4 ) >=0 ) { +for_each_of_pci_range (&parser, &range) {/* Read next ranges element */ - pci_space = ranges[0 ]; - pci_addr =of_read_number (ranges +1 ,2 ); - cpu_addr =of_translate_address (dev, ranges +3 ); - size =of_read_number (ranges + pna +3 ,2 ); - -pr_debug ("pci_space: 0x%08x pci_addr:0x%016llx " , - pci_space, pci_addr); -pr_debug ("cpu_addr:0x%016llx size:0x%016llx\n" , - cpu_addr, size); - - ranges += np; +pr_debug ("pci_space: 0x%08x pci_addr: 0x%016llx " , + range.pci_space, range.pci_addr); +pr_debug ("cpu_addr: 0x%016llx size: 0x%016llx\n" , + range.cpu_addr, range.size);/* If we failed translation or got a zero-sized region * (some FW try to feed us with non sensical zero sized regions * such as power3 which look like some kind of attempt * at exposing the VGA memory hole) */ -if (cpu_addr ==OF_BAD_ADDR || size ==0 ) +if (range.cpu_addr ==OF_BAD_ADDR || range.size ==0 )continue ; -/* Now consume following elements while they are contiguous */ -for (; rlen >= np *sizeof (u32); - ranges += np, rlen -= np *4 ) { -if (ranges[0 ] != pci_space) -break ; - pci_next =of_read_number (ranges +1 ,2 ); - cpu_next =of_translate_address (dev, ranges +3 ); -if (pci_next != pci_addr + size || - cpu_next != cpu_addr + size) -break ; - size +=of_read_number (ranges + pna +3 ,2 ); - } -/* Act based on address space type */ res =NULL ; -switch ((pci_space >>24 ) &0x3 ) { -case 1 :/* PCI IO space */ + res_type = range.flags &IORESOURCE_TYPE_BITS ; +if (res_type ==IORESOURCE_IO ) {pr_info (" IO 0x%016llx..0x%016llx -> 0x%016llx\n" , - cpu_addr, cpu_addr + size -1 , pci_addr); + range.cpu_addr, range.cpu_addr + range.size -1 , + range.pci_addr);/* We support only one IO range */ if (hose->pci_io_size) {@@ -151,11 +127,12 @@ void pci_process_bridge_OF_ranges(struct pci_controller *hose, }#if defined(CONFIG_PPC32 ) || defined(CONFIG_MICROBLAZE )/* On 32 bits, limit I/O space to 16MB */ -if (size >0x01000000 ) - size =0x01000000 ; +if (range.size >0x01000000 ) + range.size =0x01000000 ;/* 32 bits needs to map IOs here */ - hose->io_base_virt =ioremap (cpu_addr, size); + hose->io_base_virt =ioremap (range.cpu_addr, + range.size);/* Expect trouble if pci_addr is not 0 */ if (primary)@@ -165,19 +142,18 @@ void pci_process_bridge_OF_ranges(struct pci_controller *hose,/* pci_io_size and io_base_phys always represent IO * space starting at 0 so we factor in pci_addr */ - hose->pci_io_size = pci_addr + size; - hose->io_base_phys = cpu_addr - pci_addr; + hose->pci_io_size = range.pci_addr + range.size; + hose->io_base_phys = range.cpu_addr - range.pci_addr;/* Build resource */ res = &hose->io_resource; - res->flags =IORESOURCE_IO ; - res->start = pci_addr; -break ; -case 2 :/* PCI Memory space */ -case 3 :/* PCI 64 bits Memory space */ + range.cpu_addr = range.pci_addr; + }else if (res_type ==IORESOURCE_MEM ) {pr_info (" MEM 0x%016llx..0x%016llx -> 0x%016llx %s\n" , - cpu_addr, cpu_addr + size -1 , pci_addr, - (pci_space &0x40000000 ) ?"Prefetch" :"" ); + range.cpu_addr, range.cpu_addr + range.size -1 , + range.pci_addr, + (range.pci_space &0x40000000 ) ? +"Prefetch" :"" );/* We support only 3 memory ranges */ if (memno >=3 ) {@@ -185,13 +161,13 @@ void pci_process_bridge_OF_ranges(struct pci_controller *hose,continue ; }/* Handles ISA memory hole space here */ -if (pci_addr ==0 ) { - isa_mb = cpu_addr; +if (range.pci_addr ==0 ) { + isa_mb = range.cpu_addr; isa_hole = memno;if (primary || isa_mem_base ==0 ) - isa_mem_base = cpu_addr; - hose->isa_mem_phys = cpu_addr; - hose->isa_mem_size = size; + isa_mem_base = range.cpu_addr; + hose->isa_mem_phys = range.cpu_addr; + hose->isa_mem_size = range.size; }/* We get the PCI/Mem offset from the first range or @@ -199,30 +175,22 @@ void pci_process_bridge_OF_ranges(struct pci_controller *hose,* hole. If they don't match, bugger. */ if (memno ==0 || - (isa_hole >=0 && pci_addr !=0 && + (isa_hole >=0 && range.pci_addr !=0 && hose->pci_mem_offset == isa_mb)) - hose->pci_mem_offset = cpu_addr - pci_addr; -else if (pci_addr !=0 && - hose->pci_mem_offset != cpu_addr - pci_addr) { + hose->pci_mem_offset = range.cpu_addr - + range.pci_addr; +else if (range.pci_addr !=0 && + hose->pci_mem_offset != range.cpu_addr - + range.pci_addr) {pr_info (" \\--> Skipped (offset mismatch) !\n" );continue ; }/* Build resource */ res = &hose->mem_resources[memno++]; - res->flags =IORESOURCE_MEM ; -if (pci_space &0x40000000 ) - res->flags |=IORESOURCE_PREFETCH ; - res->start = cpu_addr; -break ; - } -if (res !=NULL ) { - res->name = dev->full_name; - res->end = res->start + size -1 ; - res->parent =NULL ; - res->sibling =NULL ; - res->child =NULL ; } +if (res !=NULL ) +of_pci_range_to_resource (&range, dev, res); }/* If there's an ISA hole and the pci_mem_offset is -not- matching include/linux/of_address.h +0
-0
include/linux/of_address.h line 9
Quoted 6 lines
include/linux/of_address.h +3
-0@@ -4,6 +4,32 @@#include <linux/errno.h> #include <linux/of.h> +struct of_pci_range_parser { +struct device_node *node; +const __be32 *range, *end;
Split these on to separate lines.
include/linux/of_address.h line 10
Quoted 1 line
include/linux/of_address.h +1
-0+int np, pna;
ditto
Quoted 4 lines
include/linux/of_address.h +4
-0+}; + +struct of_pci_range { +u32 pci_space;
include/linux/of_address.h line 24
Quoted 10 lines
include/linux/of_address.h +10
-0+u64 pci_addr; +u64 cpu_addr; +u64 size; +u32 flags; +}; + +#define for_each_of_pci_range (parser, range) \ + for (; of_pci_process_ranges(parser, range);) + +#define of_pci_range_to_resource (range, np, res) \
Why not a static inline here?
Quoted 42 lines
include/linux/of_address.h +24
-0+do { \ + (res)->flags = (range)->flags; \ + (res)->start = (range)->cpu_addr; \ + (res)->end = (range)->cpu_addr + (range)->size -1 ; \ + (res)->parent = (res)->child = (res)->sibling =NULL ; \ + (res)->name = (np)->full_name; \ + } while (0) +#ifdef CONFIG_OF_ADDRESS extern u64 of_translate_address (struct device_node *np,const __be32 *addr);extern bool of_can_translate_address (struct device_node *dev);@@ -27,6 +53,10 @@ static inline unsigned long pci_address_to_pio(phys_addr_t addr) { return -1; }#define pci_address_to_pio pci_address_to_pio#endif +int of_pci_range_parser (struct of_pci_range_parser *parser, +struct device_node *node); +struct of_pci_range *of_pci_process_ranges (struct of_pci_range_parser *parser, +struct of_pci_range *range);#else /* CONFIG_OF_ADDRESS */ #ifndef of_address_to_resource static inline int of_address_to_resource(struct device_node *dev, int index,@@ -53,6 +83,18 @@ static inline const __be32 *of_get_address(struct device_node *dev, int index, {return NULL ; } + +int of_pci_range_parser (struct of_pci_range_parser *parser, +struct device_noed *node) +{ +return -1 ; +} + +struct of_pci_range *of_pci_process_ranges (struct of_pci_range_parser *parser, +struct of_pci_range *range) +{ +return NULL ; +}#endif /* CONFIG_OF_ADDRESS */
Re: [PATCH v5 2/3] of/pci: Provide support for parsing PCI DT ranges property
Quoted 31 lines · Rob Herring
Quoted 30 lines · Andrew Murray
This patch factors out common implementation patterns to reduce overall kernel code and provide a means for host bridge drivers to directly obtain struct resources from the DT's ranges property without relying on architecture specific DT handling. This will make it easier to write archiecture independent host bridge drivers and mitigate against further duplication of DT parsing code.
This patch can be used in the following way:
struct of_pci_range_parser parser; struct of_pci_range range; if (of_pci_range_parser(&parser, np)) ; //no ranges property for_each_of_pci_range(&parser, &range) { /* directly access properties of the address range, e.g.: range.pci_space, range.pci_addr, range.cpu_addr, range.size, range.flags alternatively obtain a struct resource, e.g.: struct resource res; of_pci_range_to_resource(&range, np, &res); */ }Additionally the implementation takes care of adjacent ranges and merges them into a single range (as was the case with powerpc and microblaze).
Quoted 9 lines
Quoted 4 lines
Signed-off-by Andrew Murray <[email protected]>Signed-off-by Liviu Dudau <[email protected]>Signed-off-by Thomas Petazzoni <[email protected]>---
A few minor things below, otherwise:
Reviewed-by Rob Herring <[email protected]>
Thanks for the feedback, I've included this in my next spin.
Andrew Murray
PATCH v5 3/3 of/pci: mips: convert to common of_pci_range_parser
In reply to Andrew MurrayThis patch converts the pci_load_of_ranges function to use the new common of_pci_range_parser.
--- arch/mips/pci/pci.c | 50 ++++++++++++++++---------------------------------- 1 files changed, 16 insertions(+), 34 deletions(-)
arch/mips/pci/pci.c +16 -34
@@ -122,51 +122,33 @@ static void pcibios_scanbus(struct pci_controller *hose)#ifdef CONFIG_OF void pci_load_of_ranges (struct pci_controller *hose,struct device_node *node) { -const __be32 *ranges; -int rlen; -int pna =of_n_addr_cells (node); -int np = pna +5 ; +struct of_pci_range_range range; +struct of_pci_range_parser parser; +u32 res_type;pr_info ("PCI host bridge %s ranges:\n" , node->full_name); - ranges =of_get_property (node,"ranges" , &rlen); -if (ranges ==NULL ) -return ; hose->of_node = node; -while ((rlen -= np *4 ) >=0 ) { -u32 pci_space; +if (of_pci_range_parser (&parser, node)) +return ; + +for_each_of_pci_range (&parser, &range) {struct resource *res =NULL ; -u64 addr, size; - - pci_space =be32_to_cpup (&ranges[0 ]); - addr =of_translate_address (node, ranges +3 ); - size =of_read_number (ranges + pna +3 ,2 ); - ranges += np; -switch ((pci_space >>24 ) &0x3 ) { -case 1 :/* PCI IO space */ + + res_type = range.flags &IORESOURCE_TYPE_BITS ; +if (res_type ==IORESOURCE_IO ) {pr_info (" IO 0x%016llx..0x%016llx\n" , - addr, addr + size -1 ); + range.addr, range.addr + range.size -1 ); hose->io_map_base = - (unsigned long )ioremap (addr, size); + (unsigned long )ioremap (range.addr, range.size); res = hose->io_resource; - res->flags =IORESOURCE_IO ; -break ; -case 2 :/* PCI Memory space */ -case 3 :/* PCI 64 bits Memory space */ + }else if (res_type ==IORESOURCE_MEM ) {pr_info (" MEM 0x%016llx..0x%016llx\n" , - addr, addr + size -1 ); + range.addr, range.addr + range.size -1 ); res = hose->mem_resource; - res->flags =IORESOURCE_MEM ; -break ; - } -if (res !=NULL ) { - res->start = addr; - res->name = node->full_name; - res->end = res->start + size -1 ; - res->parent =NULL ; - res->sibling =NULL ; - res->child =NULL ; } +if (res !=NULL ) +of_pci_range_to_resource (&range, node, res); } }#endif
Signature · 1 line
1.7.0.4
Re: [PATCH v5 3/3] of/pci: mips: convert to common of_pci_range_parser
Quoted 5 lines · Andrew Murray
This patch converts the
pci_load_of_rangesfunction to use the new commonof_pci_range_parser.Signed-off-by Andrew Murray <[email protected]>Signed-off-by Liviu Dudau <[email protected]>
Quoted 77 lines
--- arch/mips/pci/pci.c | 50 ++++++++++++++++---------------------------------- 1 files changed, 16 insertions(+), 34 deletions(-)arch/mips/pci/pci.c +16
-34@@ -122,51 +122,33 @@ static void pcibios_scanbus(struct pci_controller *hose)#ifdef CONFIG_OF void pci_load_of_ranges (struct pci_controller *hose,struct device_node *node) { -const __be32 *ranges; -int rlen; -int pna =of_n_addr_cells (node); -int np = pna +5 ; +struct of_pci_range_range range; +struct of_pci_range_parser parser; +u32 res_type;pr_info ("PCI host bridge %s ranges:\n" , node->full_name); - ranges =of_get_property (node,"ranges" , &rlen); -if (ranges ==NULL ) -return ; hose->of_node = node; -while ((rlen -= np *4 ) >=0 ) { -u32 pci_space; +if (of_pci_range_parser (&parser, node)) +return ; + +for_each_of_pci_range (&parser, &range) {struct resource *res =NULL ; -u64 addr, size; - - pci_space =be32_to_cpup (&ranges[0 ]); - addr =of_translate_address (node, ranges +3 ); - size =of_read_number (ranges + pna +3 ,2 ); - ranges += np; -switch ((pci_space >>24 ) &0x3 ) { -case 1 :/* PCI IO space */ + + res_type = range.flags &IORESOURCE_TYPE_BITS ; +if (res_type ==IORESOURCE_IO ) {pr_info (" IO 0x%016llx..0x%016llx\n" , - addr, addr + size -1 ); + range.addr, range.addr + range.size -1 ); hose->io_map_base = - (unsigned long )ioremap (addr, size); + (unsigned long )ioremap (range.addr, range.size); res = hose->io_resource; - res->flags =IORESOURCE_IO ; -break ; -case 2 :/* PCI Memory space */ -case 3 :/* PCI 64 bits Memory space */ + }else if (res_type ==IORESOURCE_MEM ) {pr_info (" MEM 0x%016llx..0x%016llx\n" , - addr, addr + size -1 ); + range.addr, range.addr + range.size -1 ); res = hose->mem_resource; - res->flags =IORESOURCE_MEM ; -break ; - } -if (res !=NULL ) { - res->start = addr; - res->name = node->full_name; - res->end = res->start + size -1 ; - res->parent =NULL ; - res->sibling =NULL ; - res->child =NULL ; } +if (res !=NULL ) +of_pci_range_to_resource (&range, node, res); } }#endif