PCI: Introduce pci_dev_for_each_resource()
Subsystems (8)
PATCH 1/1 PCI: Introduce pci_dev_for_each_resource()
Instead of open-coding it everywhere introduce a tiny helper that can be used to iterate over each resource of a PCI device, and convert the most obvious users into it.
While at it drop doubled empty line before pdev_sort_resources().
No functional changes intended.
---
This applies on top of this patch I just sent out:
https://lore.kernel.org/linux-pci/[email protected]/
arch/alpha/kernel/pci.c | 5 ++--- arch/arm/kernel/bios32.c | 13 +++++++------ arch/mips/pci/pci-legacy.c | 3 +-- arch/powerpc/kernel/pci-common.c | 5 ++--- arch/sparc/kernel/leon_pci.c | 5 ++--- arch/sparc/kernel/pci.c | 10 ++++------ arch/sparc/kernel/pcic.c | 5 ++--- drivers/pci/remove.c | 4 ++-- drivers/pci/setup-bus.c | 23 ++++++++++------------- drivers/pci/setup-res.c | 4 +--- drivers/pci/xen-pcifront.c | 4 +--- include/linux/pci.h | 11 +++++++++++ 12 files changed, 45 insertions(+), 47 deletions(-)
arch/alpha/kernel/pci.c +2 -3
@@ -288,11 +288,10 @@ pcibios_claim_one_bus(struct pci_bus *b)struct pci_bus *child_bus;list_for_each_entry (dev, &b->devices, bus_list) { +struct resource *r;int i; -for (i =0 ; i <PCI_NUM_RESOURCES ; i++) { -struct resource *r = &dev->resource[i]; - +pci_dev_for_each_resource (dev, r, i) {if (r->parent || !r->start || !r->flags)continue ; if (pci_has_flag(PCI_PROBE_ONLY) ||
arch/arm/kernel/bios32.c +7 -6
@@ -145,12 +145,14 @@ static void pci_fixup_dec21285(struct pci_dev *dev)int i;if (dev->devfn ==0 ) { +struct resource *r; + dev->class &=0xff ; dev->class |=PCI_CLASS_BRIDGE_HOST <<8 ; -for (i =0 ; i <PCI_NUM_RESOURCES ; i++) { - dev->resource[i].start =0 ; - dev->resource[i].end =0 ; - dev->resource[i].flags =0 ; +pci_dev_for_each_resource (dev, r, i) { + r->start =0 ; + r->end =0 ; + r->flags =0 ; } } }
@@ -167,8 +169,7 @@ static void pci_fixup_ide_bases(struct pci_dev *dev)if ((dev->class >>8 ) !=PCI_CLASS_STORAGE_IDE )return ; -for (i =0 ; i <PCI_NUM_RESOURCES ; i++) { - r = dev->resource + i; +pci_dev_for_each_resource (dev, r, i) {if ((r->start & ~0x80 ) ==0x374 ) { r->start |=2 ; r->end = r->start;
arch/mips/pci/pci-legacy.c +1 -2
@@ -249,12 +249,11 @@ static int pcibios_enable_resources(struct pci_dev *dev, int mask)pci_read_config_word (dev,PCI_COMMAND , &cmd); old_cmd = cmd; -for (idx =0 ; idx <PCI_NUM_RESOURCES ; idx++) { +pci_dev_for_each_resource (dev, r, idx) {/* Only set up the requested stuff */ if (!(mask & (1 <<idx)))continue ; - r = &dev->resource[idx];if (!(r->flags & (IORESOURCE_IO |IORESOURCE_MEM )))continue ; if ((idx == PCI_ROM_RESOURCE) &&
arch/powerpc/kernel/pci-common.c +2 -3
@@ -1452,11 +1452,10 @@ void pcibios_claim_one_bus(struct pci_bus *bus)struct pci_bus *child_bus;list_for_each_entry (dev, &bus->devices, bus_list) { +struct resource *r;int i; -for (i =0 ; i <PCI_NUM_RESOURCES ; i++) { -struct resource *r = &dev->resource[i]; - +pci_dev_for_each_resource (dev, r, i) {if (r->parent || !r->start || !r->flags)continue ;
arch/sparc/kernel/leon_pci.c +2 -3
@@ -62,15 +62,14 @@ void leon_pci_init(struct platform_device *ofdev, struct leon_pci_info *info)int pcibios_enable_device (struct pci_dev *dev,int mask) { +struct resource *res;u16 cmd, oldcmd;int i;pci_read_config_word (dev,PCI_COMMAND , &cmd); oldcmd = cmd; -for (i =0 ; i <PCI_NUM_RESOURCES ; i++) { -struct resource *res = &dev->resource[i]; - +pci_dev_for_each_resource (dev, res, i) {/* Only set up the requested stuff */ if (!(mask & (1 <<i)))continue ;
arch/sparc/kernel/pci.c +4 -6
@@ -663,11 +663,10 @@ static void pci_claim_bus_resources(struct pci_bus *bus)struct pci_dev *dev;list_for_each_entry (dev, &bus->devices, bus_list) { +struct resource *r;int i; -for (i =0 ; i <PCI_NUM_RESOURCES ; i++) { -struct resource *r = &dev->resource[i]; - +pci_dev_for_each_resource (dev, r, i) {if (r->parent || !r->start || !r->flags)continue ;
@@ -724,15 +723,14 @@ struct pci_bus *pci_scan_one_pbm(struct pci_pbm_info *pbm,int pcibios_enable_device (struct pci_dev *dev,int mask) { +struct resource *res;u16 cmd, oldcmd;int i;pci_read_config_word (dev,PCI_COMMAND , &cmd); oldcmd = cmd; -for (i =0 ; i <PCI_NUM_RESOURCES ; i++) { -struct resource *res = &dev->resource[i]; - +pci_dev_for_each_resource (dev, res, i) {/* Only set up the requested stuff */ if (!(mask & (1 <<i)))continue ;
arch/sparc/kernel/pcic.c +2 -3
@@ -643,15 +643,14 @@ void pcibios_fixup_bus(struct pci_bus *bus)int pcibios_enable_device (struct pci_dev *dev,int mask) { +struct resource *res;u16 cmd, oldcmd;int i;pci_read_config_word (dev,PCI_COMMAND , &cmd); oldcmd = cmd; -for (i =0 ; i <PCI_NUM_RESOURCES ; i++) { -struct resource *res = &dev->resource[i]; - +pci_dev_for_each_resource (dev, res, i) {/* Only set up the requested stuff */ if (!(mask & (1 <<i)))continue ;
drivers/pci/remove.c +2 -2
@@ -5,10 +5,10 @@static void pci_free_resources (struct pci_dev *dev) { +struct resource *res;int i; -for (i =0 ; i <PCI_NUM_RESOURCES ; i++) { -struct resource *res = dev->resource + i; +pci_dev_for_each_resource (dev, res, i) {if (res->parent)release_resource (res); }
drivers/pci/setup-bus.c +10 -13
@@ -124,20 +124,17 @@ static resource_size_t get_res_add_align(struct list_head *head,return dev_res ? dev_res->min_align :0 ; } -/* Sort resources by alignment */ static void pdev_sort_resources (struct pci_dev *dev,struct list_head *head) { +struct resource *r;int i; -for (i =0 ; i <PCI_NUM_RESOURCES ; i++) { -struct resource *r; +pci_dev_for_each_resource (dev, r, i) {struct pci_dev_resource *dev_res, *tmp;resource_size_t r_align;struct list_head *n; - r = &dev->resource[i]; -if (r->flags &IORESOURCE_PCI_FIXED )continue ;
@@ -895,10 +892,10 @@ static void pbus_size_io(struct pci_bus *bus, resource_size_t min_size, min_align =window_alignment (bus,IORESOURCE_IO );list_for_each_entry (dev, &bus->devices, bus_list) { +struct resource *r;int i; -for (i =0 ; i <PCI_NUM_RESOURCES ; i++) { -struct resource *r = &dev->resource[i]; +pci_dev_for_each_resource (dev, r, i) {unsigned long r_size;if (r->parent || !(r->flags &IORESOURCE_IO ))
@@ -1014,10 +1011,10 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask, size =0 ;list_for_each_entry (dev, &bus->devices, bus_list) { +struct resource *r;int i; -for (i =0 ; i <PCI_NUM_RESOURCES ; i++) { -struct resource *r = &dev->resource[i]; +pci_dev_for_each_resource (dev, r, i) {resource_size_t r_size; if (r->parent || (r->flags & IORESOURCE_PCI_FIXED) ||
@@ -1358,11 +1355,11 @@ static void assign_fixed_resource_on_bus(struct pci_bus *b, struct resource *r)*/ static void pdev_assign_fixed_resources (struct pci_dev *dev) { +struct resource *r;int i; -for (i =0 ; i <PCI_NUM_RESOURCES ; i++) { +pci_dev_for_each_resource (dev, r, i) {struct pci_bus *b; -struct resource *r = &dev->resource[i];if (r->parent || !(r->flags &IORESOURCE_PCI_FIXED ) || !(r->flags & (IORESOURCE_IO |IORESOURCE_MEM )))
@@ -1845,6 +1842,7 @@ static void pci_bus_distribute_available_resources(struct pci_bus *bus,* distributing the rest. */ list_for_each_entry (dev, &bus->devices, bus_list) { +struct resource *dev_res;int i;if (dev == bridge)
@@ -1857,8 +1855,7 @@ static void pci_bus_distribute_available_resources(struct pci_bus *bus,if (!dev->multifunction)return ; -for (i =0 ; i <PCI_NUM_RESOURCES ; i++) { -const struct resource *dev_res = &dev->resource[i]; +pci_dev_for_each_resource (dev, dev_res, i) {resource_size_t dev_sz;struct resource *b_res;
drivers/pci/setup-res.c +1 -3
@@ -484,12 +484,10 @@ int pci_enable_resources(struct pci_dev *dev, int mask)pci_read_config_word (dev,PCI_COMMAND , &cmd); old_cmd = cmd; -for (i =0 ; i <PCI_NUM_RESOURCES ; i++) { +pci_dev_for_each_resource (dev, r, i) {if (!(mask & (1 << i)))continue ; - r = &dev->resource[i]; -if (!(r->flags & (IORESOURCE_IO |IORESOURCE_MEM )))continue ; if ((i == PCI_ROM_RESOURCE) &&
drivers/pci/xen-pcifront.c +1 -3
@@ -390,9 +390,7 @@ static int pcifront_claim_resource(struct pci_dev *dev, void *data)int i;struct resource *r; -for (i =0 ; i <PCI_NUM_RESOURCES ; i++) { - r = &dev->resource[i]; - +pci_dev_for_each_resource (dev, r, i) {if (!r->parent && r->start && r->flags) {dev_info (&pdev->xdev->dev,"claiming resource %s/%d\n" ,pci_name (dev), i);
include/linux/pci.h +11 -0
@@ -1407,6 +1407,17 @@ int pci_request_selected_regions(struct pci_dev *, int, const char *);int pci_request_selected_regions_exclusive (struct pci_dev *,int ,const char *);void pci_release_selected_regions (struct pci_dev *,int ); +/** +* pci_dev_for_each_resource() - Iterate over each PCI device resource +* @dev: PCI device +* @res: Variable that holds the current resource +* @i: Iterator +*/ +#define pci_dev_for_each_resource (dev, res, i) \ + for (i = 0; \ + res = &(dev)->resource[i], i < PCI_NUM_RESOURCES; \ + i++) +/* drivers/pci/bus.c */ void pci_add_resource (struct list_head *resources,struct resource *res); void pci_add_resource_offset(struct list_head *resources, struct resource *res,
Signature · 1 line
2.35.1
Quoted 7 lines · Mika Westerberg
Instead of open-coding it everywhere introduce a tiny helper that can be used to iterate over each resource of a PCI device, and convert the most obvious users into it.
While at it drop doubled empty line before
pdev_sort_resources().No functional changes intended.
Thanks! But this has one subtle difference to what I suggested, see below.
...
include/linux/pci.h int pci_request_selected_regions(struct pci_dev *, int, const char *); · line 1417
Quoted 8 lines
include/linux/pci.h +8
-0+/** +* pci_dev_for_each_resource() - Iterate over each PCI device resource +* @dev: PCI device +* @res: Variable that holds the current resource +* @i: Iterator +*/ +#define pci_dev_for_each_resource (dev, res, i) \ + for (i = 0; \
unsigned int i = 0;
include/linux/pci.h int pci_request_selected_regions(struct pci_dev *, int, const char *); · line 1419
Quoted 2 lines
include/linux/pci.h +2
-0+ res = &(dev)->resource[i], i <PCI_NUM_RESOURCES ; \ + i++)
That's the idea to hide the iterator variable inside the loop. It might be though needed in some cases, so for them this conversion can't be done right now.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 25 lines · Andy Shevchenko
Quoted 7 lines · Mika Westerberg
Instead of open-coding it everywhere introduce a tiny helper that can be used to iterate over each resource of a PCI device, and convert the most obvious users into it.
While at it drop doubled empty line before
pdev_sort_resources().No functional changes intended.
Thanks! But this has one subtle difference to what I suggested, see below.
...
include/linux/pci.h int pci_request_selected_regions(struct pci_dev *, int, const char *); · line 1417
Quoted 8 lines
include/linux/pci.h +8
-0+/** +* pci_dev_for_each_resource() - Iterate over each PCI device resource +* @dev: PCI device +* @res: Variable that holds the current resource +* @i: Iterator +*/ +#define pci_dev_for_each_resource (dev, res, i) \ + for (i = 0; \unsigned int i = 0;
Quoted 6 lines
include/linux/pci.h int pci_request_selected_regions(struct pci_dev *, int, const char *); · line 1419
Quoted 2 lines
include/linux/pci.h +2
-0+ res = &(dev)->resource[i], i <PCI_NUM_RESOURCES ; \ + i++)That's the idea to hide the iterator variable inside the loop. It might be though needed in some cases, so for them this conversion can't be done right now.
Yes, some of the cases need the iterator so that's why I left it (and therefore it cannot be 'unsigned int' either).
I'm fine if this patch gets ignored ;-) Sorry about the noise then.
Quoted 1 line · Mika Westerberg
On Thu, Nov 03, 2022 at 01:55:04PM +0200, Andy Shevchenko wrote:
...
Quoted 1 line
I'm fine if this patch gets ignored ;-) Sorry about the noise then.
No, that's not what I implied.
Let me take it and see if we can do better/
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 2 lines · Andy Shevchenko
Quoted 1 line · Mika Westerberg
On Thu, Nov 03, 2022 at 01:55:04PM +0200, Andy Shevchenko wrote:
...
Quoted 4 lines
Quoted 1 line
I'm fine if this patch gets ignored ;-) Sorry about the noise then.
No, that's not what I implied.
Let me take it and see if we can do better/
I have send a new version (which become a series out of 4 patches).
Signature · 2 lines
With Best Regards, Andy Shevchenko