Add definition for the number of standard PCI BARs
Subsystems (36)
v3 cover Add definition for the number of standard PCI BARs
Code that iterates over all standard PCI BARs typically uses PCI_STD_RESOURCE_END, but this is error-prone because it requires "i <= PCI_STD_RESOURCE_END" rather than something like
"i < PCI_STD_NUM_BARS". We could add such a definition and use it the same way PCI_SRIOV_NUM_BARS is used. The patchset also replaces constant (6) with new define PCI_STD_NUM_BARS where appropriate and removes local declarations for the number of PCI BARs.
Changes in v3:
- Updated commits description.
- Refactored "< PCI_ROM_RESOURCE" with "< PCI_STD_NUM_BARS" in loops.
- Refactored "<= BAR_5" with "< PCI_STD_NUM_BARS" in loops.
- Removed local define GASKET_NUM_BARS.
- Removed local define PCI_NUM_BAR_RESOURCES.
Changes in v2:
- Reversed checks in pci_iomap_range,pci_iomap_wc_range.
- Refactored loops in vfio_pci to keep PCI_STD_RESOURCES.
- Added 2 new patches to replace the magic constant with new define.
- Splitted net patch in v1 to separate stmmac and dwc-xlgmac patches.
Denis Efremov (26):
PCI: Add define for the number of standard PCI BARs
PCI: hv: Use PCI_STD_NUM_BARS
PCI: dwc: Use PCI_STD_NUM_BARS
PCI: endpoint: Use PCI_STD_NUM_BARS
misc: pci_endpoint_test: Use PCI_STD_NUM_BARS s390/pci: Use PCI_STD_NUM_BARS
x86/PCI: Loop using PCI_STD_NUM_BARS alpha/PCI: Use PCI_STD_NUM_BARS
ia64: Use PCI_STD_NUM_BARS
stmmac: pci: Loop using PCI_STD_NUM_BARS
net: dwc-xlgmac: Loop using PCI_STD_NUM_BARS
ixgb: use PCI_STD_NUM_BARS
e1000: Use PCI_STD_NUM_BARS
rapidio/tsi721: Loop using PCI_STD_NUM_BARS
efifb: Loop using PCI_STD_NUM_BARS
fbmem: use PCI_STD_NUM_BARS
vfio_pci: Loop using PCI_STD_NUM_BARS
scsi: pm80xx: Use PCI_STD_NUM_BARS
ata: sata_nv: Use PCI_STD_NUM_BARS
staging: gasket: Use PCI_STD_NUM_BARS
serial: 8250_pci: Use PCI_STD_NUM_BARS
pata_atp867x: Use PCI_STD_NUM_BARS
memstick: use PCI_STD_NUM_BARS
USB: core: Use PCI_STD_NUM_BARS
usb: pci-quirks: Use PCI_STD_NUM_BARS
devres: use PCI_STD_NUM_BARS
arch/alpha/kernel/pci-sysfs.c | 8 ++--- arch/ia64/sn/pci/pcibr/pcibr_dma.c | 4 +-- arch/s390/include/asm/pci.h | 5 +-- arch/s390/include/asm/pci_clp.h | 6 ++-- arch/s390/pci/pci.c | 16 +++++----- arch/s390/pci/pci_clp.c | 6 ++-- arch/x86/pci/common.c | 2 +- arch/x86/pci/intel_mid_pci.c | 2 +- drivers/ata/pata_atp867x.c | 2 +- drivers/ata/sata_nv.c | 2 +- drivers/memstick/host/jmb38x_ms.c | 2 +- drivers/misc/pci_endpoint_test.c | 8 ++--- drivers/net/ethernet/intel/e1000/e1000.h | 1 - drivers/net/ethernet/intel/e1000/e1000_main.c | 2 +- drivers/net/ethernet/intel/ixgb/ixgb.h | 1 - drivers/net/ethernet/intel/ixgb/ixgb_main.c | 2 +- .../net/ethernet/stmicro/stmmac/stmmac_pci.c | 4 +-- .../net/ethernet/synopsys/dwc-xlgmac-pci.c | 2 +- drivers/pci/controller/dwc/pci-dra7xx.c | 2 +- .../pci/controller/dwc/pci-layerscape-ep.c | 2 +- drivers/pci/controller/dwc/pcie-artpec6.c | 2 +- .../pci/controller/dwc/pcie-designware-plat.c | 2 +- drivers/pci/controller/dwc/pcie-designware.h | 2 +- drivers/pci/controller/pci-hyperv.c | 10 +++--- drivers/pci/endpoint/functions/pci-epf-test.c | 10 +++--- drivers/pci/pci-sysfs.c | 4 +-- drivers/pci/pci.c | 13 ++++---- drivers/pci/proc.c | 4 +-- drivers/pci/quirks.c | 4 +-- drivers/rapidio/devices/tsi721.c | 2 +- drivers/scsi/pm8001/pm8001_hwi.c | 2 +- drivers/scsi/pm8001/pm8001_init.c | 2 +- drivers/staging/gasket/gasket_constants.h | 3 -- drivers/staging/gasket/gasket_core.c | 12 +++---- drivers/staging/gasket/gasket_core.h | 4 +-- drivers/tty/serial/8250/8250_pci.c | 8 ++--- drivers/usb/core/hcd-pci.c | 2 +- drivers/usb/host/pci-quirks.c | 2 +- drivers/vfio/pci/vfio_pci.c | 11 ++++--- drivers/vfio/pci/vfio_pci_config.c | 32 ++++++++++--------- drivers/vfio/pci/vfio_pci_private.h | 4 +-- drivers/video/fbdev/core/fbmem.c | 4 +-- drivers/video/fbdev/efifb.c | 2 +- include/linux/pci-epc.h | 2 +- include/linux/pci.h | 2 +- include/uapi/linux/pci_regs.h | 1 + lib/devres.c | 2 +- 47 files changed, 112 insertions(+), 115 deletions(-)
Signature · 1 line
2.21.0
PATCH v3 8/26 alpha/PCI: Use PCI_STD_NUM_BARS
Use define PCI_STD_NUM_BARS instead of PCI_ROM_RESOURCE for the number of PCI BARs.
--- arch/alpha/kernel/pci-sysfs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/alpha/kernel/pci-sysfs.c +4 -4
@@ -71,10 +71,10 @@ static int pci_mmap_resource(struct kobject *kobj,struct pci_bus_region bar;int i; -for (i =0 ; i <PCI_ROM_RESOURCE ; i++) +for (i =0 ; i <PCI_STD_NUM_BARS ; i++)if (res == &pdev->resource[i])break ; -if (i >=PCI_ROM_RESOURCE ) +if (i >=PCI_STD_NUM_BARS )return -ENODEV ;if (res->flags &IORESOURCE_MEM &&iomem_is_exclusive (res->start))
@@ -115,7 +115,7 @@ void pci_remove_resource_files(struct pci_dev *pdev) {int i; -for (i =0 ; i <PCI_ROM_RESOURCE ; i++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) {struct bin_attribute *res_attr; res_attr = pdev->res_attr[i];
@@ -232,7 +232,7 @@ int pci_create_resource_files(struct pci_dev *pdev)int retval;/* Expose the PCI resources from this device as files */ -for (i =0 ; i <PCI_ROM_RESOURCE ; i++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) {/* skip empty resources */ if (!pci_resource_len (pdev, i))
Signature · 1 line
2.21.0
PATCH v3 9/26 ia64: Use PCI_STD_NUM_BARS
In reply to Denis EfremovUse define PCI_STD_NUM_BARS instead of PCI_ROM_RESOURCE for the number of PCI BARs.
--- arch/ia64/sn/pci/pcibr/pcibr_dma.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/ia64/sn/pci/pcibr/pcibr_dma.c +2 -2
@@ -295,14 +295,14 @@ void sn_dma_flush(u64 addr)/* find a matching BAR */ for (i =0 ; i <DEV_PER_WIDGET ; i++,p++) { common = p->common; -for (j =0 ; j <PCI_ROM_RESOURCE ; j++) { +for (j =0 ; j <PCI_STD_NUM_BARS ; j++) {if (common->sfdl_bar_list[j].start =0 )break ;if (addr >= common->sfdl_bar_list[j].start && addr <= common->sfdl_bar_list[j].end)break ; } -if (j <PCI_ROM_RESOURCE && common->sfdl_bar_list[j].start !=0 ) +if (j <PCI_STD_NUM_BARS && common->sfdl_bar_list[j].start !=0 )break ; }
Signature · 1 line
2.21.0
PATCH v3 15/26 efifb: Loop using PCI_STD_NUM_BARS
In reply to Denis EfremovRefactor loops to use idiomatic C style and avoid the fencepost error of using "i < PCI_STD_RESOURCE_END" when "i <= PCI_STD_RESOURCE_END" is required, e.g., commit 2f686f1d9bee ("PCI: Correct PCI_STD_RESOURCE_END usage").
To iterate through all possible BARs, loop conditions changed to the *number* of BARs "i < PCI_STD_NUM_BARS", instead of the index of the last valid BAR "i <= PCI_STD_RESOURCE_END".
--- drivers/video/fbdev/efifb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/fbdev/efifb.c +1 -1
@@ -668,7 +668,7 @@ static void efifb_fixup_resources(struct pci_dev *dev)if (!base)return ; -for (i =0 ; i <=PCI_STD_RESOURCE_END ; i++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) {struct resource *res = &dev->resource[i];if (!(res->flags &IORESOURCE_MEM ))
Signature · 1 line
2.21.0
PATCH v3 16/26 fbmem: use PCI_STD_NUM_BARS
In reply to Denis EfremovUse define PCI_STD_NUM_BARS instead of PCI_ROM_RESOURCE for the number of PCI BARs.
--- drivers/video/fbdev/core/fbmem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/video/fbdev/core/fbmem.c +2 -2
@@ -1784,7 +1784,7 @@ int remove_conflicting_pci_framebuffers(struct pci_dev *pdev, int res_id, constint err, idx, bar;bool res_id_found = false; -for (idx =0 , bar =0 ; bar <PCI_ROM_RESOURCE ; bar++) { +for (idx =0 , bar =0 ; bar <PCI_STD_NUM_BARS ; bar++) {if (!(pci_resource_flags (pdev, bar) &IORESOURCE_MEM ))continue ; idx++;
@@ -1794,7 +1794,7 @@ int remove_conflicting_pci_framebuffers(struct pci_dev *pdev, int res_id, constif (!ap)return -ENOMEM ; -for (idx =0 , bar =0 ; bar <PCI_ROM_RESOURCE ; bar++) { +for (idx =0 , bar =0 ; bar <PCI_STD_NUM_BARS ; bar++) {if (!(pci_resource_flags (pdev, bar) &IORESOURCE_MEM ))continue ; ap->ranges[idx].base =pci_resource_start (pdev, bar);
Signature · 1 line
2.21.0
PATCH v3 21/26 serial: 8250_pci: Use PCI_STD_NUM_BARS
In reply to Denis EfremovRemove local definition PCI_NUM_BAR_RESOURCES for the number of PCI BARs and use global one PCI_STD_NUM_BARS instead.
--- drivers/tty/serial/8250/8250_pci.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/tty/serial/8250/8250_pci.c +3 -5
@@ -43,8 +43,6 @@ struct pci_serial_quirk {void (*exit)(struct pci_dev *dev); }; -#define PCI_NUM_BAR_RESOURCES 6 -struct serial_private {struct pci_dev *dev;unsigned int nr;
@@ -74,7 +72,7 @@ setup_port(struct serial_private *priv, struct uart_8250_port *port, {struct pci_dev *dev = priv->dev; -if (bar >=PCI_NUM_BAR_RESOURCES ) +if (bar >=PCI_STD_NUM_BARS )return -EINVAL ;if (pci_resource_flags (dev, bar) &IORESOURCE_MEM ) {
@@ -3583,7 +3581,7 @@ serial_pci_guess_board(struct pci_dev *dev, struct pciserial_board *board)return -ENODEV ; num_iomem = num_port =0 ; -for (i =0 ; i <PCI_NUM_BAR_RESOURCES ; i++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) {if (pci_resource_flags (dev, i) &IORESOURCE_IO ) { num_port++;if (first_port ==-1 )
@@ -3611,7 +3609,7 @@ serial_pci_guess_board(struct pci_dev *dev, struct pciserial_board *board)*/ first_port =-1 ; num_port =0 ; -for (i =0 ; i <PCI_NUM_BAR_RESOURCES ; i++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) {if (pci_resource_flags (dev, i) &IORESOURCE_IO &&pci_resource_len (dev, i) ==8 && (first_port ==-1 || (first_port + num_port) == i)) {
Signature · 1 line
2.21.0
PATCH v3 23/26 memstick: use PCI_STD_NUM_BARS
In reply to Denis EfremovUse define PCI_STD_NUM_BARS instead of PCI_ROM_RESOURCE for the number of PCI BARs.
--- drivers/memstick/host/jmb38x_ms.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/memstick/host/jmb38x_ms.c +1 -1
@@ -848,7 +848,7 @@ static int jmb38x_ms_count_slots(struct pci_dev *pdev) {int cnt, rc =0 ; -for (cnt =0 ; cnt <PCI_ROM_RESOURCE ; ++cnt) { +for (cnt =0 ; cnt <PCI_STD_NUM_BARS ; ++cnt) {if (!(IORESOURCE_MEM &pci_resource_flags (pdev, cnt)))break ;
Signature · 1 line
2.21.0
PATCH v3 2/26 PCI: hv: Use PCI_STD_NUM_BARS
In reply to Denis EfremovReplace the magic constant (6) with define PCI_STD_NUM_BARS representing the number of PCI BARs.
--- drivers/pci/controller/pci-hyperv.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/pci/controller/pci-hyperv.c +5 -5
@@ -307,7 +307,7 @@ struct pci_bus_relations {struct pci_q_res_req_response {struct vmpacket_descriptor hdr;s32 status;/* negative values are failures */ -u32 probed_bar[6 ]; +u32 probed_bar[PCI_STD_NUM_BARS ]; } __packed;struct pci_set_power {
@@ -503,7 +503,7 @@ struct hv_pci_dev {* What would be observed if one wrote 0xFFFFFFFF to a BAR and then * read it back, for each of the BAR offsets within config space. */ -u32 probed_bar[6 ]; +u32 probed_bar[PCI_STD_NUM_BARS ]; };struct hv_pci_compl {
@@ -1327,7 +1327,7 @@ static void survey_child_resources(struct hv_pcibus_device *hbus)* so it's sufficient to just add them up without tracking alignment. */ list_for_each_entry (hpdev, &hbus->children, list_entry) { -for (i =0 ; i <6 ; i++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) {if (hpdev->probed_bar[i] &PCI_BASE_ADDRESS_SPACE_IO )dev_err (&hbus->hdev->device,"There's an I/O BAR in this list!\n" );
@@ -1401,7 +1401,7 @@ static void prepopulate_bars(struct hv_pcibus_device *hbus)/* Pick addresses for the BARs. */ do { list_for_each_entry(hpdev, &hbus->children, list_entry) { - for (i = 0; i < 6; i++) { + for (i = 0; i < PCI_STD_NUM_BARS; i++) { bar_val = hpdev->probed_bar[i]; if (bar_val == 0) continue;
@@ -1558,7 +1558,7 @@ static void q_resource_requirements(void *context, struct pci_response *resp,"query resource requirements failed: %x\n" , resp->status); }else { -for (i =0 ; i <6 ; i++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) { completion->hpdev->probed_bar[i] = q_res_req->probed_bar[i]; }
Signature · 1 line
2.21.0
PATCH v3 3/26 PCI: dwc: Use PCI_STD_NUM_BARS
In reply to Denis EfremovTo iterate through all possible BARs, loop conditions refactored to the *number* of BARs "i < PCI_STD_NUM_BARS", instead of the index of the last valid BAR "i <= BAR_5". This is more idiomatic C style and allows to avoid the fencepost error. Array definitions changed to PCI_STD_NUM_BARS where appropriate.
--- drivers/pci/controller/dwc/pci-dra7xx.c | 2 +- drivers/pci/controller/dwc/pci-layerscape-ep.c | 2 +- drivers/pci/controller/dwc/pcie-artpec6.c | 2 +- drivers/pci/controller/dwc/pcie-designware-plat.c | 2 +- drivers/pci/controller/dwc/pcie-designware.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
drivers/pci/controller/dwc/pci-dra7xx.c +1 -1
@@ -353,7 +353,7 @@ static void dra7xx_pcie_ep_init(struct dw_pcie_ep *ep)struct dra7xx_pcie *dra7xx =to_dra7xx_pcie (pci);enum pci_barno bar; -for (bar =BAR_0 ; bar <=BAR_5 ; bar++) +for (bar =0 ; bar <PCI_STD_NUM_BARS ; bar++)dw_pcie_ep_reset_bar (pci, bar);dra7xx_pcie_enable_wrapper_interrupts (dra7xx);
drivers/pci/controller/dwc/pci-layerscape-ep.c +1 -1
@@ -57,7 +57,7 @@ static void ls_pcie_ep_init(struct dw_pcie_ep *ep)struct dw_pcie *pci =to_dw_pcie_from_ep (ep);enum pci_barno bar; -for (bar =BAR_0 ; bar <=BAR_5 ; bar++) +for (bar =0 ; bar <PCI_STD_NUM_BARS ; bar++)dw_pcie_ep_reset_bar (pci, bar); }
drivers/pci/controller/dwc/pcie-artpec6.c +1 -1
@@ -422,7 +422,7 @@ static void artpec6_pcie_ep_init(struct dw_pcie_ep *ep)artpec6_pcie_wait_for_phy (artpec6_pcie);artpec6_pcie_set_nfts (artpec6_pcie); -for (bar =BAR_0 ; bar <=BAR_5 ; bar++) +for (bar =0 ; bar <PCI_STD_NUM_BARS ; bar++)dw_pcie_ep_reset_bar (pci, bar); }
drivers/pci/controller/dwc/pcie-designware-plat.c +1 -1
@@ -70,7 +70,7 @@ static void dw_plat_pcie_ep_init(struct dw_pcie_ep *ep)struct dw_pcie *pci =to_dw_pcie_from_ep (ep);enum pci_barno bar; -for (bar =BAR_0 ; bar <=BAR_5 ; bar++) +for (bar =0 ; bar <PCI_STD_NUM_BARS ; bar++)dw_pcie_ep_reset_bar (pci, bar); }
drivers/pci/controller/dwc/pcie-designware.h +1 -1
@@ -205,7 +205,7 @@ struct dw_pcie_ep {phys_addr_t phys_base;size_t addr_size;size_t page_size; -u8 bar_to_atu[6 ]; +u8 bar_to_atu[PCI_STD_NUM_BARS ];phys_addr_t *outbound_addr;unsigned long *ib_window_map;unsigned long *ob_window_map;
Signature · 1 line
2.21.0
PATCH v3 4/26 PCI: endpoint: Use PCI_STD_NUM_BARS
In reply to Denis EfremovTo iterate through all possible BARs, loop conditions refactored to the *number* of BARs "i < PCI_STD_NUM_BARS", instead of the index of the last valid BAR "i <= BAR_5". This is more idiomatic C style and allows to avoid the fencepost error. Array definitions changed to PCI_STD_NUM_BARS where appropriate.
--- drivers/pci/endpoint/functions/pci-epf-test.c | 10 +++++----- include/linux/pci-epc.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-)
drivers/pci/endpoint/functions/pci-epf-test.c +5 -5
@@ -44,7 +44,7 @@static struct workqueue_struct *kpcitest_workqueue;struct pci_epf_test { -void *reg[6 ]; +void *reg[PCI_STD_NUM_BARS ];struct pci_epf *epf;enum pci_barno test_reg_bar;struct delayed_work cmd_handler;
@@ -377,7 +377,7 @@ static void pci_epf_test_unbind(struct pci_epf *epf)cancel_delayed_work (&epf_test->cmd_handler);pci_epc_stop (epc); -for (bar =BAR_0 ; bar <=BAR_5 ; bar++) { +for (bar =0 ; bar <PCI_STD_NUM_BARS ; bar++) { epf_bar = &epf->bar[bar];if (epf_test->reg[bar]) {
@@ -400,7 +400,7 @@ static int pci_epf_test_set_bar(struct pci_epf *epf) epc_features = epf_test->epc_features; -for (bar =BAR_0 ; bar <=BAR_5 ; bar += add) { +for (bar =0 ; bar <PCI_STD_NUM_BARS ; bar += add) { epf_bar = &epf->bar[bar];/* * pci_epc_set_bar() sets PCI_BASE_ADDRESS_MEM_TYPE_64
@@ -450,7 +450,7 @@ static int pci_epf_test_alloc_space(struct pci_epf *epf) } epf_test->reg[test_reg_bar] = base; -for (bar =BAR_0 ; bar <=BAR_5 ; bar += add) { +for (bar =0 ; bar <PCI_STD_NUM_BARS ; bar += add) { epf_bar = &epf->bar[bar]; add = (epf_bar->flags &PCI_BASE_ADDRESS_MEM_TYPE_64 ) ?2 :1 ;
@@ -478,7 +478,7 @@ static void pci_epf_configure_bar(struct pci_epf *epf,bool bar_fixed_64bit;int i; -for (i =BAR_0 ; i <=BAR_5 ; i++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) { epf_bar = &epf->bar[i]; bar_fixed_64bit = !!(epc_features->bar_fixed_64bit & (1 << i));if (bar_fixed_64bit)
include/linux/pci-epc.h +1 -1
@@ -117,7 +117,7 @@ struct pci_epc_features { unsigned int msix_capable : 1;u8 reserved_bar;u8 bar_fixed_64bit; -u64 bar_fixed_size[BAR_5 +1 ]; +u64 bar_fixed_size[PCI_STD_NUM_BARS ];size_t align; };
Signature · 1 line
2.21.0
PATCH v3 5/26 misc: pci_endpoint_test: Use PCI_STD_NUM_BARS
In reply to Denis EfremovTo iterate through all possible BARs, loop conditions refactored to the *number* of BARs "i < PCI_STD_NUM_BARS", instead of the index of the last valid BAR "i <= BAR_5". This is more idiomatic C style and allows to avoid the fencepost error. Array definitions changed to PCI_STD_NUM_BARS where appropriate.
--- drivers/misc/pci_endpoint_test.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/misc/pci_endpoint_test.c +4 -4
@@ -94,7 +94,7 @@ enum pci_barno {struct pci_endpoint_test {struct pci_dev *pdev;void __iomem *base; -void __iomem *bar[6 ]; +void __iomem *bar[PCI_STD_NUM_BARS ];struct completion irq_raised;int last_irq;int num_irqs;
@@ -687,7 +687,7 @@ static int pci_endpoint_test_probe(struct pci_dev *pdev,if (!pci_endpoint_test_request_irq (test)) goto err_disable_irq; -for (bar =BAR_0 ; bar <=BAR_5 ; bar++) { +for (bar =0 ; bar <PCI_STD_NUM_BARS ; bar++) {if (pci_resource_flags (pdev, bar) &IORESOURCE_MEM ) { base =pci_ioremap_bar (pdev, bar);if (!base) {
@@ -740,7 +740,7 @@ static int pci_endpoint_test_probe(struct pci_dev *pdev,ida_simple_remove (&pci_endpoint_test_ida, id); err_iounmap: -for (bar =BAR_0 ; bar <=BAR_5 ; bar++) { +for (bar =0 ; bar <PCI_STD_NUM_BARS ; bar++) {if (test->bar[bar])pci_iounmap (pdev, test->bar[bar]); }
@@ -771,7 +771,7 @@ static void pci_endpoint_test_remove(struct pci_dev *pdev)misc_deregister (&test->miscdev);kfree (misc_device->name);ida_simple_remove (&pci_endpoint_test_ida, id); -for (bar =BAR_0 ; bar <=BAR_5 ; bar++) { +for (bar =0 ; bar <PCI_STD_NUM_BARS ; bar++) {if (test->bar[bar])pci_iounmap (pdev, test->bar[bar]); }
Signature · 1 line
2.21.0
PATCH v3 6/26 s390/pci: Use PCI_STD_NUM_BARS
In reply to Denis EfremovRemove local definition PCI_BAR_COUNT for the number of PCI BARs and use global one PCI_STD_NUM_BARS instead.
--- arch/s390/include/asm/pci.h | 5 +---- arch/s390/include/asm/pci_clp.h | 6 +++--- arch/s390/pci/pci.c | 16 ++++++++-------- arch/s390/pci/pci_clp.c | 6 +++--- 4 files changed, 15 insertions(+), 18 deletions(-)
arch/s390/include/asm/pci.h +1 -4
@@ -2,9 +2,6 @@#ifndef __ASM_S390_PCI_H#define __ASM_S390_PCI_H -/* must be set before including pci_clp.h */ -#define PCI_BAR_COUNT 6 -#include <linux/pci.h> #include <linux/mutex.h> #include <linux/iommu.h>
@@ -138,7 +135,7 @@ struct zpci_dev {char res_name[16 ];bool mio_capable; -struct zpci_bar_struct bars[PCI_BAR_COUNT ]; +struct zpci_bar_struct bars[PCI_STD_NUM_BARS ];u64 start_dma;/* Start of available DMA addresses */ u64 end_dma;/* End of available DMA addresses */
arch/s390/include/asm/pci_clp.h +3 -3
@@ -77,7 +77,7 @@ struct mio_info {struct {u64 wb;u64 wt; - } addr[PCI_BAR_COUNT ]; + } addr[PCI_STD_NUM_BARS ];u32 reserved[6 ]; } __packed;
@@ -98,9 +98,9 @@ struct clp_rsp_query_pci { u16 util_str_avail : 1; /* utility string available? */ u16 pfgid : 8; /* pci function group id */u32 fid;/* pci function id */ -u8 bar_size[PCI_BAR_COUNT ]; +u8 bar_size[PCI_STD_NUM_BARS ];u16 pchid; -__le32 bar[PCI_BAR_COUNT ]; +__le32 bar[PCI_STD_NUM_BARS ];u8 pfip[CLP_PFIP_NR_SEGMENTS ];/* pci function internal path */ u32 :16 ;u8 fmb_len;
arch/s390/pci/pci.c +8 -8
@@ -43,7 +43,7 @@ static DECLARE_BITMAP(zpci_domain, ZPCI_NR_DEVICES);static DEFINE_SPINLOCK (zpci_domain_lock);#define ZPCI_IOMAP_ENTRIES \ - min(((unsigned long) ZPCI_NR_DEVICES * PCI_BAR_COUNT / 2), \ + min(((unsigned long) ZPCI_NR_DEVICES * PCI_STD_NUM_BARS / 2), \ ZPCI_IOMAP_MAX_ENTRIES)static DEFINE_SPINLOCK (zpci_iomap_lock);
@@ -294,7 +294,7 @@ static void __iomem *pci_iomap_range_mio(struct pci_dev *pdev, int bar,void __iomem *pci_iomap_range (struct pci_dev *pdev,int bar,unsigned long offset,unsigned long max) { -if (!pci_resource_len (pdev, bar) || bar >=PCI_BAR_COUNT ) +if (bar >=PCI_STD_NUM_BARS || !pci_resource_len (pdev, bar))return NULL ;if (static_branch_likely (&have_mio))
@@ -324,7 +324,7 @@ static void __iomem *pci_iomap_wc_range_mio(struct pci_dev *pdev, int bar,void __iomem *pci_iomap_wc_range (struct pci_dev *pdev,int bar,unsigned long offset,unsigned long max) { -if (!pci_resource_len (pdev, bar) || bar >=PCI_BAR_COUNT ) +if (bar >=PCI_STD_NUM_BARS || !pci_resource_len (pdev, bar))return NULL ;if (static_branch_likely (&have_mio))
@@ -416,7 +416,7 @@ static void zpci_map_resources(struct pci_dev *pdev)resource_size_t len;int i; -for (i =0 ; i <PCI_BAR_COUNT ; i++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) { len =pci_resource_len (pdev, i);if (!len)continue ;
@@ -451,7 +451,7 @@ static void zpci_unmap_resources(struct pci_dev *pdev)if (zpci_use_mio (zdev))return ; -for (i =0 ; i <PCI_BAR_COUNT ; i++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) { len =pci_resource_len (pdev, i);if (!len)continue ;
@@ -514,7 +514,7 @@ static int zpci_setup_bus_resources(struct zpci_dev *zdev,snprintf (zdev->res_name,sizeof (zdev->res_name),"PCI Bus %04x:%02x" , zdev->domain,ZPCI_BUS_NR ); -for (i =0 ; i <PCI_BAR_COUNT ; i++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) {if (!zdev->bars[i].size)continue ; entry =zpci_alloc_iomap (zdev);
@@ -551,7 +551,7 @@ static void zpci_cleanup_bus_resources(struct zpci_dev *zdev) {int i; -for (i =0 ; i <PCI_BAR_COUNT ; i++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) {if (!zdev->bars[i].size || !zdev->bars[i].res)continue ;
@@ -573,7 +573,7 @@ int pcibios_add_device(struct pci_dev *pdev) pdev->dev.dma_ops = &s390_pci_dma_ops;zpci_map_resources (pdev); -for (i =0 ; i <PCI_BAR_COUNT ; i++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) { res = &pdev->resource[i];if (res->parent || !res->flags)continue ;
arch/s390/pci/pci_clp.c +3 -3
@@ -145,7 +145,7 @@ static int clp_store_query_pci_fn(struct zpci_dev *zdev, {int i; -for (i =0 ; i <PCI_BAR_COUNT ; i++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) { zdev->bars[i].val =le32_to_cpu (response->bar[i]); zdev->bars[i].size = response->bar_size[i]; }
@@ -164,8 +164,8 @@ static int clp_store_query_pci_fn(struct zpci_dev *zdev, sizeof(zdev->util_str)); } zdev->mio_capable = response->mio_addr_avail; -for (i =0 ; i <PCI_BAR_COUNT ; i++) { -if (!(response->mio.valid & (1 << (PCI_BAR_COUNT - i -1 )))) +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) { +if (!(response->mio.valid & (1 << (PCI_STD_NUM_BARS - i -1 ))))continue ; zdev->bars[i].mio_wb = (void __iomem *) response->mio.addr[i].wb;
Signature · 1 line
2.21.0
PATCH v3 7/26 x86/PCI: Loop using PCI_STD_NUM_BARS
In reply to Denis EfremovRefactor loops to use idiomatic C style and avoid the fencepost error of using "i < PCI_STD_RESOURCE_END" when "i <= PCI_STD_RESOURCE_END" is required, e.g., commit 2f686f1d9bee ("PCI: Correct PCI_STD_RESOURCE_END usage").
To iterate through all possible BARs, loop conditions changed to the *number* of BARs "i < PCI_STD_NUM_BARS", instead of the index of the last valid BAR "i <= PCI_STD_RESOURCE_END" or PCI_ROM_RESOURCE.
--- arch/x86/pci/common.c | 2 +- arch/x86/pci/intel_mid_pci.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/x86/pci/common.c +1 -1
@@ -135,7 +135,7 @@ static void pcibios_fixup_device_resources(struct pci_dev *dev)* resource so the kernel doesn't attempt to assign * it later on in pci_assign_unassigned_resources */ -for (bar =0 ; bar <=PCI_STD_RESOURCE_END ; bar++) { +for (bar =0 ; bar <PCI_STD_NUM_BARS ; bar++) { bar_r = &dev->resource[bar];if (bar_r->start ==0 && bar_r->end !=0 ) { bar_r->flags =0 ;
arch/x86/pci/intel_mid_pci.c +1 -1
@@ -382,7 +382,7 @@ static void pci_fixed_bar_fixup(struct pci_dev *dev) PCI_DEVFN(2, 2) == dev->devfn)return ; -for (i =0 ; i <PCI_ROM_RESOURCE ; i++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) {pci_read_config_dword (dev, offset +8 + (i *4 ), &size); dev->resource[i].end = dev->resource[i].start + size -1 ; dev->resource[i].flags |=IORESOURCE_PCI_FIXED ;
Signature · 1 line
2.21.0
PATCH v3 10/26 stmmac: pci: Loop using PCI_STD_NUM_BARS
In reply to Denis EfremovRefactor loops to use idiomatic C style and avoid the fencepost error of using "i < PCI_STD_RESOURCE_END" when "i <= PCI_STD_RESOURCE_END" is required, e.g., commit 2f686f1d9bee ("PCI: Correct PCI_STD_RESOURCE_END usage").
To iterate through all possible BARs, loop conditions changed to the *number* of BARs "i < PCI_STD_NUM_BARS", instead of the index of the last valid BAR "i <= PCI_STD_RESOURCE_END".
--- drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c +2 -2
@@ -258,7 +258,7 @@ static int stmmac_pci_probe(struct pci_dev *pdev, }/* Get the base address of device */ -for (i =0 ; i <=PCI_STD_RESOURCE_END ; i++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) {if (pci_resource_len (pdev, i) ==0 )continue ; ret =pcim_iomap_regions (pdev,BIT (i),pci_name (pdev));
@@ -296,7 +296,7 @@ static void stmmac_pci_remove(struct pci_dev *pdev)stmmac_dvr_remove (&pdev->dev); -for (i =0 ; i <=PCI_STD_RESOURCE_END ; i++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) {if (pci_resource_len (pdev, i) ==0 )continue ;pcim_iounmap_regions (pdev,BIT (i));
Signature · 1 line
2.21.0
PATCH v3 11/26 net: dwc-xlgmac: Loop using PCI_STD_NUM_BARS
In reply to Denis EfremovRefactor loops to use idiomatic C style and avoid the fencepost error of using "i < PCI_STD_RESOURCE_END" when "i <= PCI_STD_RESOURCE_END" is required, e.g., commit 2f686f1d9bee ("PCI: Correct PCI_STD_RESOURCE_END usage").
To iterate through all possible BARs, loop conditions changed to the *number* of BARs "i < PCI_STD_NUM_BARS", instead of the index of the last valid BAR "i <= PCI_STD_RESOURCE_END".
--- drivers/net/ethernet/synopsys/dwc-xlgmac-pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/synopsys/dwc-xlgmac-pci.c +1 -1
@@ -34,7 +34,7 @@ static int xlgmac_probe(struct pci_dev *pcidev, const struct pci_device_id *id)return ret; } -for (i =0 ; i <=PCI_STD_RESOURCE_END ; i++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) {if (pci_resource_len (pcidev, i) ==0 )continue ; ret =pcim_iomap_regions (pcidev,BIT (i),XLGMAC_DRV_NAME );
Signature · 1 line
2.21.0
PATCH v3 12/26 ixgb: use PCI_STD_NUM_BARS
In reply to Denis EfremovTo iterate through all possible BARs, loop conditions refactored to the *number* of BARs "i < PCI_STD_NUM_BARS", instead of the index of the last valid BAR "i <= BAR_5". This is more idiomatic C style and allows to avoid the fencepost error.
--- drivers/net/ethernet/intel/ixgb/ixgb.h | 1 - drivers/net/ethernet/intel/ixgb/ixgb_main.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)
drivers/net/ethernet/intel/ixgb/ixgb.h +0 -1
@@ -42,7 +42,6 @@#define BAR_0 0#define BAR_1 1 -#define BAR_5 5struct ixgb_adapter ;#include "ixgb_hw.h"
drivers/net/ethernet/intel/ixgb/ixgb_main.c +1 -1
@@ -412,7 +412,7 @@ ixgb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) goto err_ioremap; } -for (i =BAR_1 ; i <=BAR_5 ; i++) { +for (i =BAR_1 ; i <PCI_STD_NUM_BARS ; i++) {if (pci_resource_len (pdev, i) ==0 )continue ;if (pci_resource_flags (pdev, i) &IORESOURCE_IO ) {
Signature · 1 line
2.21.0
PATCH v3 13/26 e1000: Use PCI_STD_NUM_BARS
In reply to Denis EfremovTo iterate through all possible BARs, loop conditions refactored to the *number* of BARs "i < PCI_STD_NUM_BARS", instead of the index of the last valid BAR "i <= BAR_5". This is more idiomatic C style and allows to avoid the fencepost error.
--- drivers/net/ethernet/intel/e1000/e1000.h | 1 - drivers/net/ethernet/intel/e1000/e1000_main.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)
drivers/net/ethernet/intel/e1000/e1000.h +0 -1
@@ -45,7 +45,6 @@#define BAR_0 0#define BAR_1 1 -#define BAR_5 5#define INTEL_E1000_ETHERNET_DEVICE (device_id) {\ PCI_DEVICE(PCI_VENDOR_ID_INTEL, device_id)}
drivers/net/ethernet/intel/e1000/e1000_main.c +1 -1
@@ -977,7 +977,7 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent) goto err_ioremap;if (adapter->need_ioport) { -for (i =BAR_1 ; i <=BAR_5 ; i++) { +for (i =BAR_1 ; i <PCI_STD_NUM_BARS ; i++) {if (pci_resource_len (pdev, i) ==0 )continue ;if (pci_resource_flags (pdev, i) &IORESOURCE_IO ) {
Signature · 1 line
2.21.0
PATCH v3 14/26 rapidio/tsi721: Loop using PCI_STD_NUM_BARS
In reply to Denis EfremovRefactor loops to use idiomatic C style and avoid the fencepost error of using "i < PCI_STD_RESOURCE_END" when "i <= PCI_STD_RESOURCE_END" is required, e.g., commit 2f686f1d9bee ("PCI: Correct PCI_STD_RESOURCE_END usage").
To iterate through all possible BARs, loop conditions changed to the *number* of BARs "i < PCI_STD_NUM_BARS", instead of the index of the last valid BAR "i <= PCI_STD_RESOURCE_END".
--- drivers/rapidio/devices/tsi721.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/rapidio/devices/tsi721.c +1 -1
@@ -2755,7 +2755,7 @@ static int tsi721_probe(struct pci_dev *pdev, {int i; -for (i =0 ; i <=PCI_STD_RESOURCE_END ; i++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) {tsi_debug (INIT , &pdev->dev,"res%d %pR" , i, &pdev->resource[i]); }
Signature · 1 line
2.21.0
PATCH v3 17/26 vfio_pci: Loop using PCI_STD_NUM_BARS
In reply to Denis EfremovRefactor loops to use idiomatic C style and avoid the fencepost error of using "i < PCI_STD_RESOURCE_END" when "i <= PCI_STD_RESOURCE_END" is required, e.g., commit 2f686f1d9bee ("PCI: Correct PCI_STD_RESOURCE_END usage").
To iterate through all possible BARs, loop conditions changed to the *number* of BARs "i < PCI_STD_NUM_BARS", instead of the index of the last valid BAR "i <= PCI_STD_RESOURCE_END".
--- drivers/vfio/pci/vfio_pci.c | 11 ++++++---- drivers/vfio/pci/vfio_pci_config.c | 32 +++++++++++++++-------------- drivers/vfio/pci/vfio_pci_private.h | 4 ++-- 3 files changed, 26 insertions(+), 21 deletions(-)
drivers/vfio/pci/vfio_pci.c +7 -4
@@ -110,13 +110,15 @@ static inline bool vfio_pci_is_vga(struct pci_dev *pdev)static void vfio_pci_probe_mmaps (struct vfio_pci_device *vdev) {struct resource *res; -int bar; +int i;struct vfio_pci_dummy_resource *dummy_res;INIT_LIST_HEAD (&vdev->dummy_resources_list); -for (bar =PCI_STD_RESOURCES ; bar <=PCI_STD_RESOURCE_END ; bar++) { - res = vdev->pdev->resource + bar; +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) { +int bar = i +PCI_STD_RESOURCES ; + + res = &vdev->pdev->resource[bar];if (!IS_ENABLED (CONFIG_VFIO_PCI_MMAP )) goto no_mmap;
@@ -399,7 +401,8 @@ static void vfio_pci_disable(struct vfio_pci_device *vdev)vfio_config_free (vdev); -for (bar =PCI_STD_RESOURCES ; bar <=PCI_STD_RESOURCE_END ; bar++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) { + bar = i +PCI_STD_RESOURCES ;if (!vdev->barmap[bar])continue ;pci_iounmap (pdev, vdev->barmap[bar]);
drivers/vfio/pci/vfio_pci_config.c +17 -15
@@ -450,30 +450,32 @@ static void vfio_bar_fixup(struct vfio_pci_device *vdev) {struct pci_dev *pdev = vdev->pdev;int i; -__le32 *bar; +__le32 *vbar;u64 mask; - bar = (__le32 *)&vdev->vconfig[PCI_BASE_ADDRESS_0 ]; + vbar = (__le32 *)&vdev->vconfig[PCI_BASE_ADDRESS_0 ]; -for (i =PCI_STD_RESOURCES ; i <=PCI_STD_RESOURCE_END ; i++, bar++) { -if (!pci_resource_start (pdev, i)) { - *bar =0 ;/* Unmapped by host = unimplemented to user */ +for (i =0 ; i <PCI_STD_NUM_BARS ; i++, vbar++) { +int bar = i +PCI_STD_RESOURCES ; + +if (!pci_resource_start (pdev, bar)) { + *vbar =0 ;/* Unmapped by host = unimplemented to user */ continue ; } - mask = ~(pci_resource_len (pdev, i) -1 ); + mask = ~(pci_resource_len (pdev, bar) -1 ); - *bar &=cpu_to_le32 ((u32 )mask); - *bar |=vfio_generate_bar_flags (pdev, i); + *vbar &=cpu_to_le32 ((u32 )mask); + *vbar |=vfio_generate_bar_flags (pdev, bar); -if (*bar &cpu_to_le32 (PCI_BASE_ADDRESS_MEM_TYPE_64 )) { - bar++; - *bar &=cpu_to_le32 ((u32)(mask >>32 )); +if (*vbar &cpu_to_le32 (PCI_BASE_ADDRESS_MEM_TYPE_64 )) { + vbar++; + *vbar &=cpu_to_le32 ((u32)(mask >>32 )); i++; } } - bar = (__le32 *)&vdev->vconfig[PCI_ROM_ADDRESS ]; + vbar = (__le32 *)&vdev->vconfig[PCI_ROM_ADDRESS ];/* * NB. REGION_INFO will have reported zero size if we weren't able
@@ -483,14 +485,14 @@ static void vfio_bar_fixup(struct vfio_pci_device *vdev)if (pci_resource_start (pdev,PCI_ROM_RESOURCE )) { mask = ~(pci_resource_len (pdev,PCI_ROM_RESOURCE ) -1 ); mask |=PCI_ROM_ADDRESS_ENABLE ; - *bar &=cpu_to_le32 ((u32 )mask); + *vbar &=cpu_to_le32 ((u32 )mask); }else if (pdev->resource[PCI_ROM_RESOURCE ].flags &IORESOURCE_ROM_SHADOW ) { mask = ~(0x20000 -1 ); mask |=PCI_ROM_ADDRESS_ENABLE ; - *bar &=cpu_to_le32 ((u32 )mask); + *vbar &=cpu_to_le32 ((u32 )mask); }else - *bar =0 ; + *vbar =0 ; vdev->bardirty = false; }
drivers/vfio/pci/vfio_pci_private.h +2 -2
@@ -86,8 +86,8 @@ struct vfio_pci_reflck {struct vfio_pci_device {struct pci_dev *pdev; -void __iomem *barmap[PCI_STD_RESOURCE_END +1 ]; -bool bar_mmap_supported[PCI_STD_RESOURCE_END +1 ]; +void __iomem *barmap[PCI_STD_NUM_BARS ]; +bool bar_mmap_supported[PCI_STD_NUM_BARS ];u8 *pci_config_map;u8 *vconfig;struct perm_bits *msi_perm;
Signature · 1 line
2.21.0
PATCH v3 18/26 scsi: pm80xx: Use PCI_STD_NUM_BARS
In reply to Denis EfremovReplace the magic constant (6) with define PCI_STD_NUM_BARS representing the number of PCI BARs.
--- drivers/scsi/pm8001/pm8001_hwi.c | 2 +- drivers/scsi/pm8001/pm8001_init.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/pm8001/pm8001_hwi.c +1 -1
@@ -1186,7 +1186,7 @@ static void pm8001_hw_chip_rst(struct pm8001_hba_info *pm8001_ha)void pm8001_chip_iounmap (struct pm8001_hba_info *pm8001_ha) {s8 bar, logical =0 ; -for (bar =0 ; bar <6 ; bar++) { +for (bar =0 ; bar <PCI_STD_NUM_BARS ; bar++) {/* ** logical BARs for SPC: ** bar 0 and 1 - logical BAR0
drivers/scsi/pm8001/pm8001_init.c +1 -1
@@ -401,7 +401,7 @@ static int pm8001_ioremap(struct pm8001_hba_info *pm8001_ha) pdev = pm8001_ha->pdev;/* map pci mem (PMC pci base 0-3)*/ -for (bar =0 ; bar <6 ; bar++) { +for (bar =0 ; bar <PCI_STD_NUM_BARS ; bar++) {/* ** logical BARs for SPC: ** bar 0 and 1 - logical BAR0
Signature · 1 line
2.21.0
PATCH v3 19/26 ata: sata_nv: Use PCI_STD_NUM_BARS
In reply to Denis EfremovReplace the magic constant (6) with define PCI_STD_NUM_BARS representing the number of PCI BARs.
--- drivers/ata/sata_nv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ata/sata_nv.c +1 -1
@@ -2329,7 +2329,7 @@ static int nv_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)// Make sure this is a SATA controller by counting the number of bars // (NVIDIA SATA controllers will always have six bars). Otherwise, // it's an IDE controller and we ignore it. -for (bar =0 ; bar <6 ; bar++) +for (bar =0 ; bar <PCI_STD_NUM_BARS ; bar++)if (pci_resource_start (pdev, bar) ==0 )return -ENODEV ;
Signature · 1 line
2.21.0
PATCH v3 20/26 staging: gasket: Use PCI_STD_NUM_BARS
In reply to Denis EfremovRemove local definition GASKET_NUM_BARS for the number of PCI BARs and use global one PCI_STD_NUM_BARS instead.
--- drivers/staging/gasket/gasket_constants.h | 3 --- drivers/staging/gasket/gasket_core.c | 12 ++++++------ drivers/staging/gasket/gasket_core.h | 4 ++-- 3 files changed, 8 insertions(+), 11 deletions(-)
drivers/staging/gasket/gasket_constants.h +0 -3
@@ -13,9 +13,6 @@/* The maximum devices per each type. */ #define GASKET_DEV_MAX 256 -/* The number of supported (and possible) PCI BARs. */ -#define GASKET_NUM_BARS 6 -/* The number of supported Gasket page tables per device. */ #define GASKET_MAX_NUM_PAGE_TABLES 1
drivers/staging/gasket/gasket_core.c +6 -6
@@ -371,7 +371,7 @@ static int gasket_setup_pci(struct pci_dev *pci_dev, {int i, mapped_bars, ret; -for (i =0 ; i <GASKET_NUM_BARS ; i++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) { ret =gasket_map_pci_bar (gasket_dev, i);if (ret) { mapped_bars = i;
@@ -393,7 +393,7 @@ static void gasket_cleanup_pci(struct gasket_dev *gasket_dev) {int i; -for (i =0 ; i <GASKET_NUM_BARS ; i++) +for (i =0 ; i <PCI_STD_NUM_BARS ; i++)gasket_unmap_pci_bar (gasket_dev, i); }
@@ -493,7 +493,7 @@ static ssize_t gasket_sysfs_data_show(struct device *device, (enum gasket_sysfs_attribute_type )gasket_attr->data.attr_type;switch (sysfs_type) {case ATTR_BAR_OFFSETS : -for (i =0 ; i <GASKET_NUM_BARS ; i++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) { bar_desc = &driver_desc->bar_descriptions[i];if (bar_desc->size ==0 )continue ;
@@ -505,7 +505,7 @@ static ssize_t gasket_sysfs_data_show(struct device *device, }break ;case ATTR_BAR_SIZES : -for (i =0 ; i <GASKET_NUM_BARS ; i++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) { bar_desc = &driver_desc->bar_descriptions[i];if (bar_desc->size ==0 )continue ;
@@ -556,7 +556,7 @@ static ssize_t gasket_sysfs_data_show(struct device *device, ret =snprintf (buf,PAGE_SIZE ,"%d\n" , gasket_dev->reset_count);break ;case ATTR_USER_MEM_RANGES : -for (i =0 ; i <GASKET_NUM_BARS ; ++i) { +for (i =0 ; i <PCI_STD_NUM_BARS ; ++i) { current_written =gasket_write_mappable_regions (buf, driver_desc, i);
@@ -736,7 +736,7 @@ static int gasket_get_bar_index(const struct gasket_dev *gasket_dev,const struct gasket_driver_desc *driver_desc; driver_desc = gasket_dev->internal_desc->driver_desc; -for (i =0 ; i <GASKET_NUM_BARS ; ++i) { +for (i =0 ; i <PCI_STD_NUM_BARS ; ++i) {struct gasket_bar_desc bar_desc = driver_desc->bar_descriptions[i];
drivers/staging/gasket/gasket_core.h +2 -2
@@ -268,7 +268,7 @@ struct gasket_dev {char kobj_name[GASKET_NAME_MAX ];/* Virtual address of mapped BAR memory range. */ -struct gasket_bar_data bar_data[GASKET_NUM_BARS ]; +struct gasket_bar_data bar_data[PCI_STD_NUM_BARS ];/* Coherent buffer. */ struct gasket_coherent_buffer coherent_buffer;
@@ -369,7 +369,7 @@ struct gasket_driver_desc {/* Set of 6 bar descriptions that describe all PCIe bars. * Note that BUS/AXI devices (i.e. non PCI devices) use those. */ -struct gasket_bar_desc bar_descriptions[GASKET_NUM_BARS ]; +struct gasket_bar_desc bar_descriptions[PCI_STD_NUM_BARS ];/* * Coherent buffer description.
Signature · 1 line
2.21.0
PATCH v3 22/26 pata_atp867x: Use PCI_STD_NUM_BARS
In reply to Denis EfremovUse define PCI_STD_NUM_BARS instead of PCI_ROM_RESOURCE for the number of PCI BARs.
--- drivers/ata/pata_atp867x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ata/pata_atp867x.c +1 -1
@@ -422,7 +422,7 @@ static int atp867x_ata_pci_sff_init_host(struct ata_host *host)#ifdef ATP867X_DEBUG atp867x_check_res (pdev); -for (i =0 ; i <PCI_ROM_RESOURCE ; i++) +for (i =0 ; i <PCI_STD_NUM_BARS ; i++)printk (KERN_DEBUG "ATP867X: iomap[%d]=0x%llx\n" , i, (unsigned long long )(host->iomap[i]));#endif
Signature · 1 line
2.21.0
PATCH v3 24/26 USB: core: Use PCI_STD_NUM_BARS
In reply to Denis EfremovUse define PCI_STD_NUM_BARS instead of PCI_ROM_RESOURCE for the number of PCI BARs.
--- drivers/usb/core/hcd-pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/core/hcd-pci.c +1 -1
@@ -234,7 +234,7 @@ int usb_hcd_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)/* UHCI */ int region; -for (region =0 ; region <PCI_ROM_RESOURCE ; region++) { +for (region =0 ; region <PCI_STD_NUM_BARS ; region++) {if (!(pci_resource_flags (dev, region) &IORESOURCE_IO ))continue ;
Signature · 1 line
2.21.0
PATCH v3 25/26 usb: pci-quirks: Use PCI_STD_NUM_BARS
In reply to Denis EfremovUse define PCI_STD_NUM_BARS instead of PCI_ROM_RESOURCE for the number of PCI BARs.
--- drivers/usb/host/pci-quirks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/host/pci-quirks.c +1 -1
@@ -728,7 +728,7 @@ static void quirk_usb_handoff_uhci(struct pci_dev *pdev)if (!pio_enabled (pdev))return ; -for (i =0 ; i <PCI_ROM_RESOURCE ; i++) +for (i =0 ; i <PCI_STD_NUM_BARS ; i++)if ((pci_resource_flags (pdev, i) &IORESOURCE_IO )) { base =pci_resource_start (pdev, i);break ;
Signature · 1 line
2.21.0
PATCH v3 26/26 devres: use PCI_STD_NUM_BARS
In reply to Denis EfremovUse define PCI_STD_NUM_BARS instead of PCI_ROM_RESOURCE for the number of PCI BARs.
--- lib/devres.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/devres.c +1 -1
@@ -262,7 +262,7 @@ EXPORT_SYMBOL(devm_ioport_unmap);/* * PCI iomap devres */ -#define PCIM_IOMAP_MAX PCI_ROM_RESOURCE +#define PCIM_IOMAP_MAX PCI_STD_NUM_BARSstruct pcim_iomap_devres {void __iomem *table[PCIM_IOMAP_MAX ];
Signature · 1 line
2.21.0
RE: [PATCH v3 02/26] PCI: hv: Use PCI_STD_NUM_BARS
In reply to Denis EfremovQuoted 79 lines
-----Original Message-----
From: Denis Efremov <[email protected]>
Sent: Monday, September 16, 2019 4:42 PM
To: Bjorn Helgaas <[email protected]>
Cc: Denis Efremov <[email protected]>; [email protected]; [email protected]; Andrew Murray <[email protected]>; [email protected]; KY Srinivasan <[email protected]>; Haiyang Zhang <[email protected]>; Stephen Hemminger <[email protected]>; Sasha Levin <[email protected]>
Subject: [PATCH v3 02/26] PCI: hv: UsePCI_STD_NUM_BARSReplace the magic constant (6) with define
PCI_STD_NUM_BARSrepresenting the number of PCI BARs.Cc "K. Y. Srinivasan" <[email protected]>Cc Haiyang Zhang <[email protected]>Cc Stephen Hemminger <[email protected]>Cc Sasha Levin <[email protected]>Signed-off-by Denis Efremov <[email protected]>--- drivers/pci/controller/pci-hyperv.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)drivers/pci/controller/pci- renamed from drivers/pci/controller/pci-hyperv.c +0
-0
hyperv.c
index40b625458afa..1665c23b649f100644drivers/pci/controller/pci-hyperv.c +1
-1@@ -307,7 +307,7 @@ struct pci_bus_relations { struct pci_q_res_req_response {struct vmpacket_descriptor hdr;s32 status;/* negative values are failures */ -u32 probed_bar[6 ]; +u32 probed_bar[PCI_STD_NUM_BARS ]; } __packed;struct pci_set_power {@@ -503,7 +503,7 @@ struct hv_pci_dev {* What would be observed if one wrote 0xFFFFFFFF to a BAR and then
drivers/pci/controller/pci-hyperv.c +2
-2* read it back, for each of the BAR offsets within config space. */ -u32 probed_bar[6 ]; +u32 probed_bar[PCI_STD_NUM_BARS ]; };struct hv_pci_compl {@@ -1327,7 +1327,7 @@ static void survey_child_resources(structhv_pcibus_device *hbus) * so it's sufficient to just add them up without tracking alignment. */ list_for_each_entry (hpdev, &hbus->children, list_entry) { -for (i =0 ; i <6 ; i++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) {if (hpdev->probed_bar[i] &PCI_BASE_ADDRESS_SPACE_IO )drivers/pci/controller/pci-hyperv.c +1
-1dev_err (&hbus->hdev->device,"There's an I/O BAR in this list!\n" );@@ -1401,7 +1401,7 @@ static void prepopulate_bars(struct hv_pcibus_device *hbus) /* Pick addresses for the BARs. */ do {list_for_each_entry (hpdev, &hbus->children, list_entry) { -for (i =0 ; i <6 ; i++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) { bar_val = hpdev->probed_bar[i];if (bar_val ==0 )drivers/pci/controller/pci-hyperv.c +1
-1continue ;@@ -1558,7 +1558,7 @@ static void q_resource_requirements(void *context, struct pci_response *resp,"query resource requirements failed: %x\n" , resp->status); }else { -for (i =0 ; i <6 ; i++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) { completion->hpdev->probed_bar[i] = q_res_req->probed_bar[i];
Quoted 1 line
}
Thanks.
RE: [PATCH v3 03/26] PCI: dwc: Use PCI_STD_NUM_BARS
In reply to Denis EfremovQuoted 85 lines · Denis Efremov
To iterate through all possible BARs, loop conditions refactored to the *number* of BARs "i <
PCI_STD_NUM_BARS", instead of the index of the last valid BAR "i <=BAR_5". This is more idiomatic C style and allows to avoid the fencepost error. Array definitions changed toPCI_STD_NUM_BARSwhere appropriate.Cc Kishon Vijay Abraham I <[email protected]>Cc Lorenzo Pieralisi <[email protected]>Cc Gustavo Pimentel <[email protected]>Signed-off-by Denis Efremov <[email protected]>--- drivers/pci/controller/dwc/pci-dra7xx.c | 2 +- drivers/pci/controller/dwc/pci-layerscape-ep.c | 2 +- drivers/pci/controller/dwc/pcie-artpec6.c | 2 +- drivers/pci/controller/dwc/pcie-designware-plat.c | 2 +- drivers/pci/controller/dwc/pcie-designware.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)drivers/pci/controller/dwc/pci-dra7xx.c +1
-1@@ -353,7 +353,7 @@ static void dra7xx_pcie_ep_init(struct dw_pcie_ep *ep)struct dra7xx_pcie *dra7xx =to_dra7xx_pcie (pci);enum pci_barno bar; -for (bar =BAR_0 ; bar <=BAR_5 ; bar++) +for (bar =0 ; bar <PCI_STD_NUM_BARS ; bar++)dw_pcie_ep_reset_bar (pci, bar);dra7xx_pcie_enable_wrapper_interrupts (dra7xx);drivers/pci/controller/dwc/pci-layerscape-ep.c +1
-1@@ -57,7 +57,7 @@ static void ls_pcie_ep_init(struct dw_pcie_ep *ep)struct dw_pcie *pci =to_dw_pcie_from_ep (ep);enum pci_barno bar; -for (bar =BAR_0 ; bar <=BAR_5 ; bar++) +for (bar =0 ; bar <PCI_STD_NUM_BARS ; bar++)dw_pcie_ep_reset_bar (pci, bar); }drivers/pci/controller/dwc/pcie-artpec6.c +1
-1@@ -422,7 +422,7 @@ static void artpec6_pcie_ep_init(struct dw_pcie_ep *ep)artpec6_pcie_wait_for_phy (artpec6_pcie);artpec6_pcie_set_nfts (artpec6_pcie); -for (bar =BAR_0 ; bar <=BAR_5 ; bar++) +for (bar =0 ; bar <PCI_STD_NUM_BARS ; bar++)dw_pcie_ep_reset_bar (pci, bar); }drivers/pci/controller/dwc/pcie-designware-plat.c +1
-1@@ -70,7 +70,7 @@ static void dw_plat_pcie_ep_init(struct dw_pcie_ep *ep)struct dw_pcie *pci =to_dw_pcie_from_ep (ep);enum pci_barno bar; -for (bar =BAR_0 ; bar <=BAR_5 ; bar++) +for (bar =0 ; bar <PCI_STD_NUM_BARS ; bar++)dw_pcie_ep_reset_bar (pci, bar); }drivers/pci/controller/dwc/pcie-designware.h +1
-1@@ -205,7 +205,7 @@ struct dw_pcie_ep {phys_addr_t phys_base;size_t addr_size;size_t page_size; -u8 bar_to_atu[6 ]; +u8 bar_to_atu[PCI_STD_NUM_BARS ];phys_addr_t *outbound_addr;unsigned long *ib_window_map;unsigned long *ob_window_map;Signature · 1 line
2.21.0
Re: [PATCH v3 18/26] scsi: pm80xx: Use PCI_STD_NUM_BARS
In reply to Denis EfremovQuoted 7 lines · Denis Efremov
Replace the magic constant (6) with define
PCI_STD_NUM_BARSrepresenting the number of PCI BARs.Cc Jack Wang <[email protected]>Cc "James E.J. Bottomley" <[email protected]>Signed-off-by Denis Efremov <[email protected]>
Looks fine, thanks!
Quoted 34 lines
--- drivers/scsi/pm8001/pm8001_hwi.c | 2 +- drivers/scsi/pm8001/pm8001_init.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)drivers/scsi/pm8001/pm8001_hwi.c +1
-1@@ -1186,7 +1186,7 @@ static void pm8001_hw_chip_rst(struct pm8001_hba_info *pm8001_ha)void pm8001_chip_iounmap (struct pm8001_hba_info *pm8001_ha) {s8 bar, logical =0 ; -for (bar =0 ; bar <6 ; bar++) { +for (bar =0 ; bar <PCI_STD_NUM_BARS ; bar++) {/* ** logical BARs for SPC: ** bar 0 and 1 - logical BAR0 drivers/scsi/pm8001/pm8001_init.c +1
-2@@ -401,7 +401,7 @@ static int pm8001_ioremap(struct pm8001_hba_info *pm8001_ha) pdev = pm8001_ha->pdev;/* map pci mem (PMC pci base 0-3)*/ -for (bar =0 ; bar <6 ; bar++) { +for (bar =0 ; bar <PCI_STD_NUM_BARS ; bar++) {/* ** logical BARs for SPC: ** bar 0 and 1 - logical BAR0 -- 2.21.0
Signature · 3 lines
Jack Wang Linux Kernel Developer Platform Engineering Compute (IONOS Cloud)
Re: [PATCH v3 06/26] s390/pci: Use PCI_STD_NUM_BARS
In reply to Denis EfremovQuoted 84 lines · Denis Efremov
Remove local definition
PCI_BAR_COUNTfor the number of PCI BARs and use global onePCI_STD_NUM_BARSinstead.Acked-by Sebastian Ott <[email protected]>Cc Gerald Schaefer <[email protected]>Signed-off-by Denis Efremov <[email protected]>--- arch/s390/include/asm/pci.h | 5 +---- arch/s390/include/asm/pci_clp.h | 6 +++--- arch/s390/pci/pci.c | 16 ++++++++-------- arch/s390/pci/pci_clp.c | 6 +++--- 4 files changed, 15 insertions(+), 18 deletions(-)arch/s390/include/asm/pci.h +1
-4@@ -2,9 +2,6 @@#ifndef __ASM_S390_PCI_H#define __ASM_S390_PCI_H -/* must be set before including pci_clp.h */ -#define PCI_BAR_COUNT 6 -#include <linux/pci.h> #include <linux/mutex.h> #include <linux/iommu.h> @@ -138,7 +135,7 @@ struct zpci_dev {char res_name[16 ];bool mio_capable; -struct zpci_bar_struct bars[PCI_BAR_COUNT ]; +struct zpci_bar_struct bars[PCI_STD_NUM_BARS ];u64 start_dma;/* Start of available DMA addresses */ u64 end_dma;/* End of available DMA addresses */ arch/s390/include/asm/pci_clp.h +3
-3@@ -77,7 +77,7 @@ struct mio_info {struct {u64 wb;u64 wt; - } addr[PCI_BAR_COUNT ]; + } addr[PCI_STD_NUM_BARS ];u32 reserved[6 ]; } __packed;@@ -98,9 +98,9 @@ struct clp_rsp_query_pci { u16 util_str_avail : 1; /* utility string available? */ u16 pfgid : 8; /* pci function group id */u32 fid;/* pci function id */ -u8 bar_size[PCI_BAR_COUNT ]; +u8 bar_size[PCI_STD_NUM_BARS ];u16 pchid; -__le32 bar[PCI_BAR_COUNT ]; +__le32 bar[PCI_STD_NUM_BARS ];u8 pfip[CLP_PFIP_NR_SEGMENTS ];/* pci function internal path */ u32 :16 ;u8 fmb_len;arch/s390/pci/pci.c +2
-2@@ -43,7 +43,7 @@ static DECLARE_BITMAP(zpci_domain, ZPCI_NR_DEVICES);static DEFINE_SPINLOCK (zpci_domain_lock);#define ZPCI_IOMAP_ENTRIES \ - min(((unsigned long) ZPCI_NR_DEVICES * PCI_BAR_COUNT / 2), \ + min(((unsigned long) ZPCI_NR_DEVICES * PCI_STD_NUM_BARS / 2), \ ZPCI_IOMAP_MAX_ENTRIES)static DEFINE_SPINLOCK (zpci_iomap_lock);@@ -294,7 +294,7 @@ static void __iomem *pci_iomap_range_mio(struct pci_dev *pdev, int bar,void __iomem *pci_iomap_range (struct pci_dev *pdev,int bar,unsigned long offset,unsigned long max) { -if (!pci_resource_len (pdev, bar) || bar >=PCI_BAR_COUNT ) +if (bar >=PCI_STD_NUM_BARS || !pci_resource_len (pdev, bar))return NULL ;if (static_branch_likely (&have_mio))
arch/s390/pci/pci.c static void __iomem *pci_iomap_wc_range_mio(struct pci_dev *pdev, int bar, · line 328
Quoted 6 lines
arch/s390/pci/pci.c +1
-1@@ -324,7 +324,7 @@ static void __iomem *pci_iomap_wc_range_mio(struct pci_dev *pdev, int bar,void __iomem *pci_iomap_wc_range (struct pci_dev *pdev,int bar,unsigned long offset,unsigned long max) { -if (!pci_resource_len (pdev, bar) || bar >=PCI_BAR_COUNT ) +if (bar >=PCI_STD_NUM_BARS || !pci_resource_len (pdev, bar))return NULL ;
This looks like a latent bug fix here. If 'bar' is out of range we return NULL instead accessing an invalid item of an array. Should this not be a separate patch and tagged as stable?
Thanks,
Andrew Murray
Quoted 74 lines
arch/s390/pci/pci.c +5
-5if (static_branch_likely (&have_mio))@@ -416,7 +416,7 @@ static void zpci_map_resources(struct pci_dev *pdev)resource_size_t len;int i; -for (i =0 ; i <PCI_BAR_COUNT ; i++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) { len =pci_resource_len (pdev, i);if (!len)continue ;@@ -451,7 +451,7 @@ static void zpci_unmap_resources(struct pci_dev *pdev)if (zpci_use_mio (zdev))return ; -for (i =0 ; i <PCI_BAR_COUNT ; i++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) { len =pci_resource_len (pdev, i);if (!len)continue ;@@ -514,7 +514,7 @@ static int zpci_setup_bus_resources(struct zpci_dev *zdev,snprintf (zdev->res_name,sizeof (zdev->res_name),"PCI Bus %04x:%02x" , zdev->domain,ZPCI_BUS_NR ); -for (i =0 ; i <PCI_BAR_COUNT ; i++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) {if (!zdev->bars[i].size)continue ; entry =zpci_alloc_iomap (zdev);@@ -551,7 +551,7 @@ static void zpci_cleanup_bus_resources(struct zpci_dev *zdev) {int i; -for (i =0 ; i <PCI_BAR_COUNT ; i++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) {if (!zdev->bars[i].size || !zdev->bars[i].res)continue ;@@ -573,7 +573,7 @@ int pcibios_add_device(struct pci_dev *pdev) pdev->dev.dma_ops = &s390_pci_dma_ops;zpci_map_resources (pdev); -for (i =0 ; i <PCI_BAR_COUNT ; i++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) { res = &pdev->resource[i];if (res->parent || !res->flags)continue ;arch/s390/pci/pci_clp.c +3
-3@@ -145,7 +145,7 @@ static int clp_store_query_pci_fn(struct zpci_dev *zdev, {int i; -for (i =0 ; i <PCI_BAR_COUNT ; i++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) { zdev->bars[i].val =le32_to_cpu (response->bar[i]); zdev->bars[i].size = response->bar_size[i]; }@@ -164,8 +164,8 @@ static int clp_store_query_pci_fn(struct zpci_dev *zdev, sizeof(zdev->util_str)); } zdev->mio_capable = response->mio_addr_avail; -for (i =0 ; i <PCI_BAR_COUNT ; i++) { -if (!(response->mio.valid & (1 << (PCI_BAR_COUNT - i -1 )))) +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) { +if (!(response->mio.valid & (1 << (PCI_STD_NUM_BARS - i -1 ))))continue ; zdev->bars[i].mio_wb = (void __iomem *) response->mio.addr[i].wb;Signature · 1 line
2.21.0
Re: [PATCH v3 13/26] e1000: Use PCI_STD_NUM_BARS
In reply to Denis EfremovQuoted 18 lines · Denis Efremov
To iterate through all possible BARs, loop conditions refactored to the *number* of BARs "i <
PCI_STD_NUM_BARS", instead of the index of the last valid BAR "i <=BAR_5". This is more idiomatic C style and allows to avoid the fencepost error.Cc Jeff Kirsher <[email protected]>Cc "David S. Miller" <[email protected]>Signed-off-by Denis Efremov <[email protected]>--- drivers/net/ethernet/intel/e1000/e1000.h | 1 - drivers/net/ethernet/intel/e1000/e1000_main.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)drivers/net/ethernet/intel/e1000/e1000.h +0
-0
drivers/net/ethernet/intel/e1000/e1000.h line 48
Quoted 4 lines
drivers/net/ethernet/intel/e1000/e1000.h +0
-1@@ -45,7 +45,6 @@#define BAR_0 0#define BAR_1 1 -#define BAR_5 5
No issue with this patch. However I noticed that at least 5 of the network drivers have these same definitions, which are identical to the pci_barno enum of include/linux/pci-epf.h. There are mostly used with pci_ioremap_bar and pci_resource_** macros. I wonder if this is an indicator that these defintions should live in the core.
Thanks,
Andrew Murray
Quoted 19 lines
drivers/net/ethernet/intel/e1000/e1000.h +0
-0#define INTEL_E1000_ETHERNET_DEVICE (device_id) {\ PCI_DEVICE(PCI_VENDOR_ID_INTEL, device_id)}drivers/net/ethernet/intel/e1000/e1000_main.c +1
-1@@ -977,7 +977,7 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent) goto err_ioremap;if (adapter->need_ioport) { -for (i =BAR_1 ; i <=BAR_5 ; i++) { +for (i =BAR_1 ; i <PCI_STD_NUM_BARS ; i++) {if (pci_resource_len (pdev, i) ==0 )continue ;if (pci_resource_flags (pdev, i) &IORESOURCE_IO ) {Signature · 1 line
2.21.0
Re: [PATCH v3 17/26] vfio_pci: Loop using PCI_STD_NUM_BARS
In reply to Denis EfremovQuoted 28 lines · Denis Efremov
Refactor loops to use idiomatic C style and avoid the fencepost error of using "i <
PCI_STD_RESOURCE_END" when "i <=PCI_STD_RESOURCE_END" is required, e.g., commit2f686f1d9bee("PCI: CorrectPCI_STD_RESOURCE_ENDusage").To iterate through all possible BARs, loop conditions changed to the *number* of BARs "i <
PCI_STD_NUM_BARS", instead of the index of the last valid BAR "i <=PCI_STD_RESOURCE_END".Cc Cornelia Huck <[email protected]>Cc Alex Williamson <[email protected]>Signed-off-by Denis Efremov <[email protected]>--- drivers/vfio/pci/vfio_pci.c | 11 ++++++---- drivers/vfio/pci/vfio_pci_config.c | 32 +++++++++++++++-------------- drivers/vfio/pci/vfio_pci_private.h | 4 ++-- 3 files changed, 26 insertions(+), 21 deletions(-)drivers/vfio/pci/vfio_pci.c +1
-1@@ -110,13 +110,15 @@ static inline bool vfio_pci_is_vga(struct pci_dev *pdev)static void vfio_pci_probe_mmaps (struct vfio_pci_device *vdev) {struct resource *res; -int bar; +int i;
drivers/vfio/pci/vfio_pci.c static inline bool vfio_pci_is_vga(struct pci_dev *pdev) · line 121
Quoted 10 lines
drivers/vfio/pci/vfio_pci.c +4
-2struct vfio_pci_dummy_resource *dummy_res;INIT_LIST_HEAD (&vdev->dummy_resources_list); -for (bar =PCI_STD_RESOURCES ; bar <=PCI_STD_RESOURCE_END ; bar++) { - res = vdev->pdev->resource + bar; +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) { +int bar = i +PCI_STD_RESOURCES ; + + res = &vdev->pdev->resource[bar];
Why can't we just drop PCI_STD_RESOURCES and replace it was 0. I understand the abstraction here, but we don't do it elsewhere across the kernel. Is this necessary?
Thanks,
Andrew Murray
Quoted 98 lines
drivers/vfio/pci/vfio_pci.c +2
-1if (!IS_ENABLED (CONFIG_VFIO_PCI_MMAP )) goto no_mmap;@@ -399,7 +401,8 @@ static void vfio_pci_disable(struct vfio_pci_device *vdev)vfio_config_free (vdev); -for (bar =PCI_STD_RESOURCES ; bar <=PCI_STD_RESOURCE_END ; bar++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) { + bar = i +PCI_STD_RESOURCES ;if (!vdev->barmap[bar])continue ;pci_iounmap (pdev, vdev->barmap[bar]);drivers/vfio/pci/vfio_pci_config.c +17
-15@@ -450,30 +450,32 @@ static void vfio_bar_fixup(struct vfio_pci_device *vdev) {struct pci_dev *pdev = vdev->pdev;int i; -__le32 *bar; +__le32 *vbar;u64 mask; - bar = (__le32 *)&vdev->vconfig[PCI_BASE_ADDRESS_0 ]; + vbar = (__le32 *)&vdev->vconfig[PCI_BASE_ADDRESS_0 ]; -for (i =PCI_STD_RESOURCES ; i <=PCI_STD_RESOURCE_END ; i++, bar++) { -if (!pci_resource_start (pdev, i)) { - *bar =0 ;/* Unmapped by host = unimplemented to user */ +for (i =0 ; i <PCI_STD_NUM_BARS ; i++, vbar++) { +int bar = i +PCI_STD_RESOURCES ; + +if (!pci_resource_start (pdev, bar)) { + *vbar =0 ;/* Unmapped by host = unimplemented to user */ continue ; } - mask = ~(pci_resource_len (pdev, i) -1 ); + mask = ~(pci_resource_len (pdev, bar) -1 ); - *bar &=cpu_to_le32 ((u32 )mask); - *bar |=vfio_generate_bar_flags (pdev, i); + *vbar &=cpu_to_le32 ((u32 )mask); + *vbar |=vfio_generate_bar_flags (pdev, bar); -if (*bar &cpu_to_le32 (PCI_BASE_ADDRESS_MEM_TYPE_64 )) { - bar++; - *bar &=cpu_to_le32 ((u32)(mask >>32 )); +if (*vbar &cpu_to_le32 (PCI_BASE_ADDRESS_MEM_TYPE_64 )) { + vbar++; + *vbar &=cpu_to_le32 ((u32)(mask >>32 )); i++; } } - bar = (__le32 *)&vdev->vconfig[PCI_ROM_ADDRESS ]; + vbar = (__le32 *)&vdev->vconfig[PCI_ROM_ADDRESS ];/* * NB. REGION_INFO will have reported zero size if we weren't able @@ -483,14 +485,14 @@ static void vfio_bar_fixup(struct vfio_pci_device *vdev)if (pci_resource_start (pdev,PCI_ROM_RESOURCE )) { mask = ~(pci_resource_len (pdev,PCI_ROM_RESOURCE ) -1 ); mask |=PCI_ROM_ADDRESS_ENABLE ; - *bar &=cpu_to_le32 ((u32 )mask); + *vbar &=cpu_to_le32 ((u32 )mask); }else if (pdev->resource[PCI_ROM_RESOURCE ].flags &IORESOURCE_ROM_SHADOW ) { mask = ~(0x20000 -1 ); mask |=PCI_ROM_ADDRESS_ENABLE ; - *bar &=cpu_to_le32 ((u32 )mask); + *vbar &=cpu_to_le32 ((u32 )mask); }else - *bar =0 ; + *vbar =0 ; vdev->bardirty = false; }drivers/vfio/pci/vfio_pci_private.h +2
-2@@ -86,8 +86,8 @@ struct vfio_pci_reflck {struct vfio_pci_device {struct pci_dev *pdev; -void __iomem *barmap[PCI_STD_RESOURCE_END +1 ]; -bool bar_mmap_supported[PCI_STD_RESOURCE_END +1 ]; +void __iomem *barmap[PCI_STD_NUM_BARS ]; +bool bar_mmap_supported[PCI_STD_NUM_BARS ];u8 *pci_config_map;u8 *vconfig;struct perm_bits *msi_perm;Signature · 1 line
2.21.0
Re: [PATCH v3 04/26] PCI: endpoint: Use PCI_STD_NUM_BARS
In reply to Denis EfremovQuoted 37 lines · Denis Efremov
To iterate through all possible BARs, loop conditions refactored to the *number* of BARs "i <
PCI_STD_NUM_BARS", instead of the index of the last valid BAR "i <=BAR_5". This is more idiomatic C style and allows to avoid the fencepost error. Array definitions changed toPCI_STD_NUM_BARSwhere appropriate.Cc Kishon Vijay Abraham I <[email protected]>Cc Lorenzo Pieralisi <[email protected]>Signed-off-by Denis Efremov <[email protected]>--- drivers/pci/endpoint/functions/pci-epf-test.c | 10 +++++----- include/linux/pci-epc.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-)drivers/pci/endpoint/functions/pci-epf-test.c +2
-2@@ -44,7 +44,7 @@static struct workqueue_struct *kpcitest_workqueue;struct pci_epf_test { -void *reg[6 ]; +void *reg[PCI_STD_NUM_BARS ];struct pci_epf *epf;enum pci_barno test_reg_bar;struct delayed_work cmd_handler;@@ -377,7 +377,7 @@ static void pci_epf_test_unbind(struct pci_epf *epf)cancel_delayed_work (&epf_test->cmd_handler);pci_epc_stop (epc); -for (bar =BAR_0 ; bar <=BAR_5 ; bar++) { +for (bar =0 ; bar <PCI_STD_NUM_BARS ; bar++) { epf_bar = &epf->bar[bar];if (epf_test->reg[bar]) {
drivers/pci/endpoint/functions/pci-epf-test.c static int pci_epf_test_set_bar(struct pci_epf *epf) · line 403
Quoted 5 lines
drivers/pci/endpoint/functions/pci-epf-test.c +1
-1@@ -400,7 +400,7 @@ static int pci_epf_test_set_bar(struct pci_epf *epf) epc_features = epf_test->epc_features; -for (bar =BAR_0 ; bar <=BAR_5 ; bar += add) { +for (bar =0 ; bar <PCI_STD_NUM_BARS ; bar += add) {
Is it possible to completely remove the BAR_x macros, or are there exsiting users after this patchset?
As your patchset replaces BAR_0 with 0 and BAR_1 with 1, does this suggest that other users of BAR_x should be removed and also replaced with a number?
Apologies if you this doesn't fall in the remit of this patchset.
Thanks,
Andrew Murray
Quoted 37 lines
drivers/pci/endpoint/functions/pci-epf-test.c +2
-2epf_bar = &epf->bar[bar];/* * pci_epc_set_bar() sets PCI_BASE_ADDRESS_MEM_TYPE_64 @@ -450,7 +450,7 @@ static int pci_epf_test_alloc_space(struct pci_epf *epf) } epf_test->reg[test_reg_bar] = base; -for (bar =BAR_0 ; bar <=BAR_5 ; bar += add) { +for (bar =0 ; bar <PCI_STD_NUM_BARS ; bar += add) { epf_bar = &epf->bar[bar]; add = (epf_bar->flags &PCI_BASE_ADDRESS_MEM_TYPE_64 ) ?2 :1 ;@@ -478,7 +478,7 @@ static void pci_epf_configure_bar(struct pci_epf *epf,bool bar_fixed_64bit;int i; -for (i =BAR_0 ; i <=BAR_5 ; i++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) { epf_bar = &epf->bar[i]; bar_fixed_64bit = !!(epc_features->bar_fixed_64bit & (1 << i));if (bar_fixed_64bit)include/linux/pci-epc.h +1
-1@@ -117,7 +117,7 @@ struct pci_epc_features { unsigned int msix_capable : 1;u8 reserved_bar;u8 bar_fixed_64bit; -u64 bar_fixed_size[BAR_5 +1 ]; +u64 bar_fixed_size[PCI_STD_NUM_BARS ];size_t align; };Signature · 1 line
2.21.0
Quoted 7 lines · Denis Efremov
Code that iterates over all standard PCI BARs typically uses
PCI_STD_RESOURCE_END, but this is error-prone because it requires "i <=PCI_STD_RESOURCE_END" rather than something like
"i <PCI_STD_NUM_BARS". We could add such a definition and use it the same wayPCI_SRIOV_NUM_BARSis used. The patchset also replaces constant (6) with new definePCI_STD_NUM_BARSwhere appropriate and removes local declarations for the number of PCI BARs.
I've made several comments to various patches, however for all the patches you can add:
Quoted 94 lines
Changes in v3:
- Updated commits description.
- Refactored "<PCI_ROM_RESOURCE" with "<PCI_STD_NUM_BARS" in loops.
- Refactored "<=BAR_5" with "<PCI_STD_NUM_BARS" in loops.
- Removed local defineGASKET_NUM_BARS.
- Removed local definePCI_NUM_BAR_RESOURCES.Changes in v2:
- Reversed checks in pci_iomap_range,pci_iomap_wc_range.
- Refactored loops invfio_pcito keepPCI_STD_RESOURCES.
- Added 2 new patches to replace the magic constant with new define.
- Splitted net patch in v1 to separate stmmac and dwc-xlgmac patches.Denis Efremov (26):
PCI: Add define for the number of standard PCI BARs
PCI: hv: UsePCI_STD_NUM_BARS
PCI: dwc: UsePCI_STD_NUM_BARS
PCI: endpoint: UsePCI_STD_NUM_BARS
misc:pci_endpoint_test: UsePCI_STD_NUM_BARSs390/pci: UsePCI_STD_NUM_BARS
x86/PCI: Loop usingPCI_STD_NUM_BARSalpha/PCI: UsePCI_STD_NUM_BARS
ia64: UsePCI_STD_NUM_BARS
stmmac: pci: Loop usingPCI_STD_NUM_BARS
net: dwc-xlgmac: Loop usingPCI_STD_NUM_BARS
ixgb: usePCI_STD_NUM_BARS
e1000: UsePCI_STD_NUM_BARS
rapidio/tsi721: Loop usingPCI_STD_NUM_BARS
efifb: Loop usingPCI_STD_NUM_BARS
fbmem: usePCI_STD_NUM_BARS
vfio_pci: Loop usingPCI_STD_NUM_BARS
scsi: pm80xx: UsePCI_STD_NUM_BARS
ata:sata_nv: UsePCI_STD_NUM_BARS
staging: gasket: UsePCI_STD_NUM_BARS
serial: 8250_pci: UsePCI_STD_NUM_BARS
pata_atp867x: UsePCI_STD_NUM_BARS
memstick: usePCI_STD_NUM_BARS
USB: core: UsePCI_STD_NUM_BARS
usb: pci-quirks: UsePCI_STD_NUM_BARS
devres: usePCI_STD_NUM_BARSarch/alpha/kernel/pci-sysfs.c | 8 ++--- arch/ia64/sn/pci/pcibr/pcibr_dma.c | 4 +-- arch/s390/include/asm/pci.h | 5 +-- arch/s390/include/asm/pci_clp.h | 6 ++-- arch/s390/pci/pci.c | 16 +++++----- arch/s390/pci/pci_clp.c | 6 ++-- arch/x86/pci/common.c | 2 +- arch/x86/pci/intel_mid_pci.c | 2 +- drivers/ata/pata_atp867x.c | 2 +- drivers/ata/sata_nv.c | 2 +- drivers/memstick/host/jmb38x_ms.c | 2 +- drivers/misc/pci_endpoint_test.c | 8 ++--- drivers/net/ethernet/intel/e1000/e1000.h | 1 - drivers/net/ethernet/intel/e1000/e1000_main.c | 2 +- drivers/net/ethernet/intel/ixgb/ixgb.h | 1 - drivers/net/ethernet/intel/ixgb/ixgb_main.c | 2 +- .../net/ethernet/stmicro/stmmac/stmmac_pci.c | 4 +-- .../net/ethernet/synopsys/dwc-xlgmac-pci.c | 2 +- drivers/pci/controller/dwc/pci-dra7xx.c | 2 +- .../pci/controller/dwc/pci-layerscape-ep.c | 2 +- drivers/pci/controller/dwc/pcie-artpec6.c | 2 +- .../pci/controller/dwc/pcie-designware-plat.c | 2 +- drivers/pci/controller/dwc/pcie-designware.h | 2 +- drivers/pci/controller/pci-hyperv.c | 10 +++--- drivers/pci/endpoint/functions/pci-epf-test.c | 10 +++--- drivers/pci/pci-sysfs.c | 4 +-- drivers/pci/pci.c | 13 ++++---- drivers/pci/proc.c | 4 +-- drivers/pci/quirks.c | 4 +-- drivers/rapidio/devices/tsi721.c | 2 +- drivers/scsi/pm8001/pm8001_hwi.c | 2 +- drivers/scsi/pm8001/pm8001_init.c | 2 +- drivers/staging/gasket/gasket_constants.h | 3 -- drivers/staging/gasket/gasket_core.c | 12 +++---- drivers/staging/gasket/gasket_core.h | 4 +-- drivers/tty/serial/8250/8250_pci.c | 8 ++--- drivers/usb/core/hcd-pci.c | 2 +- drivers/usb/host/pci-quirks.c | 2 +- drivers/vfio/pci/vfio_pci.c | 11 ++++--- drivers/vfio/pci/vfio_pci_config.c | 32 ++++++++++--------- drivers/vfio/pci/vfio_pci_private.h | 4 +-- drivers/video/fbdev/core/fbmem.c | 4 +-- drivers/video/fbdev/efifb.c | 2 +- include/linux/pci-epc.h | 2 +- include/linux/pci.h | 2 +- include/uapi/linux/pci_regs.h | 1 + lib/devres.c | 2 +- 47 files changed, 112 insertions(+), 115 deletions(-)Signature · 1 line
2.21.0
Re: [PATCH v3 04/26] PCI: endpoint: Use PCI_STD_NUM_BARS
In reply to Andrew MurrayQuoted 39 lines · Andrew Murray
Quoted 38 lines · Denis Efremov
To iterate through all possible BARs, loop conditions refactored to the *number* of BARs "i <
PCI_STD_NUM_BARS", instead of the index of the last valid BAR "i <=BAR_5". This is more idiomatic C style and allows to avoid the fencepost error. Array definitions changed toPCI_STD_NUM_BARSwhere appropriate.Cc Kishon Vijay Abraham I <[email protected]>Cc Lorenzo Pieralisi <[email protected]>Signed-off-by Denis Efremov <[email protected]>--- drivers/pci/endpoint/functions/pci-epf-test.c | 10 +++++----- include/linux/pci-epc.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-)drivers/pci/endpoint/functions/pci-epf-test.c +2
-2@@ -44,7 +44,7 @@static struct workqueue_struct *kpcitest_workqueue;struct pci_epf_test { -void *reg[6 ]; +void *reg[PCI_STD_NUM_BARS ];struct pci_epf *epf;enum pci_barno test_reg_bar;struct delayed_work cmd_handler;@@ -377,7 +377,7 @@ static void pci_epf_test_unbind(struct pci_epf *epf)cancel_delayed_work (&epf_test->cmd_handler);pci_epc_stop (epc); -for (bar =BAR_0 ; bar <=BAR_5 ; bar++) { +for (bar =0 ; bar <PCI_STD_NUM_BARS ; bar++) { epf_bar = &epf->bar[bar];if (epf_test->reg[bar]) {@@ -400,7 +400,7 @@ static int pci_epf_test_set_bar(struct pci_epf *epf)
Quoted 7 lines
drivers/pci/endpoint/functions/pci-epf-test.c static int pci_epf_test_set_bar(struct pci_epf *epf) · line 403
Quoted 4 lines
drivers/pci/endpoint/functions/pci-epf-test.c +1
-1epc_features = epf_test->epc_features; -for (bar =BAR_0 ; bar <=BAR_5 ; bar += add) { +for (bar =0 ; bar <PCI_STD_NUM_BARS ; bar += add) {Is it possible to completely remove the
BAR_xmacros, or are there exsiting users after this patchset?
They are still used in other parts of the code. So, I've decided to preserve the defines in this case.
pci-epc-core.c
400: (epf_bar->barno == BAR_5 &&
429: (epf_bar->barno == BAR_5 &&functions/pci-epf-test.c
497: enum pci_barno test_reg_bar = BAR_0;
Quoted 3 lines
As your patchset replaces
BAR_0with 0 andBAR_1with 1, does this suggest that other users ofBAR_xshould be removed and also replaced with a number?
I changed BAR_0 to 0 in order to not mix different notions, i.e. the number of bars and the concrete bar.
Quoted 2 lines
Apologies if you this doesn't fall in the remit of this patchset.
I don't know what is better here. It's simple enough to remove these defines. However, I would prefer to wait for the endpoint developers opinion.
Thanks for the review!
Denis
Quoted 42 lines
Thanks,
Andrew Murray
Quoted 37 lines
drivers/pci/endpoint/functions/pci-epf-test.c +2
-2epf_bar = &epf->bar[bar];/* * pci_epc_set_bar() sets PCI_BASE_ADDRESS_MEM_TYPE_64 @@ -450,7 +450,7 @@ static int pci_epf_test_alloc_space(struct pci_epf *epf) } epf_test->reg[test_reg_bar] = base; -for (bar =BAR_0 ; bar <=BAR_5 ; bar += add) { +for (bar =0 ; bar <PCI_STD_NUM_BARS ; bar += add) { epf_bar = &epf->bar[bar]; add = (epf_bar->flags &PCI_BASE_ADDRESS_MEM_TYPE_64 ) ?2 :1 ;@@ -478,7 +478,7 @@ static void pci_epf_configure_bar(struct pci_epf *epf,bool bar_fixed_64bit;int i; -for (i =BAR_0 ; i <=BAR_5 ; i++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) { epf_bar = &epf->bar[i]; bar_fixed_64bit = !!(epc_features->bar_fixed_64bit & (1 << i));if (bar_fixed_64bit)include/linux/pci-epc.h +1
-1@@ -117,7 +117,7 @@ struct pci_epc_features { unsigned int msix_capable : 1;u8 reserved_bar;u8 bar_fixed_64bit; -u64 bar_fixed_size[BAR_5 +1 ]; +u64 bar_fixed_size[PCI_STD_NUM_BARS ];size_t align; };Signature · 1 line
2.21.0
Re: [PATCH v3 06/26] s390/pci: Use PCI_STD_NUM_BARS
In reply to Andrew MurrayQuoted 83 lines · Andrew Murray
Quoted 82 lines · Denis Efremov
Remove local definition
PCI_BAR_COUNTfor the number of PCI BARs and use global onePCI_STD_NUM_BARSinstead.Acked-by Sebastian Ott <[email protected]>Cc Gerald Schaefer <[email protected]>Signed-off-by Denis Efremov <[email protected]>--- arch/s390/include/asm/pci.h | 5 +---- arch/s390/include/asm/pci_clp.h | 6 +++--- arch/s390/pci/pci.c | 16 ++++++++-------- arch/s390/pci/pci_clp.c | 6 +++--- 4 files changed, 15 insertions(+), 18 deletions(-)arch/s390/include/asm/pci.h +1
-4@@ -2,9 +2,6 @@#ifndef __ASM_S390_PCI_H#define __ASM_S390_PCI_H -/* must be set before including pci_clp.h */ -#define PCI_BAR_COUNT 6 -#include <linux/pci.h> #include <linux/mutex.h> #include <linux/iommu.h> @@ -138,7 +135,7 @@ struct zpci_dev {char res_name[16 ];bool mio_capable; -struct zpci_bar_struct bars[PCI_BAR_COUNT ]; +struct zpci_bar_struct bars[PCI_STD_NUM_BARS ];u64 start_dma;/* Start of available DMA addresses */ u64 end_dma;/* End of available DMA addresses */ arch/s390/include/asm/pci_clp.h +3
-3@@ -77,7 +77,7 @@ struct mio_info {struct {u64 wb;u64 wt; - } addr[PCI_BAR_COUNT ]; + } addr[PCI_STD_NUM_BARS ];u32 reserved[6 ]; } __packed;@@ -98,9 +98,9 @@ struct clp_rsp_query_pci { u16 util_str_avail : 1; /* utility string available? */ u16 pfgid : 8; /* pci function group id */u32 fid;/* pci function id */ -u8 bar_size[PCI_BAR_COUNT ]; +u8 bar_size[PCI_STD_NUM_BARS ];u16 pchid; -__le32 bar[PCI_BAR_COUNT ]; +__le32 bar[PCI_STD_NUM_BARS ];u8 pfip[CLP_PFIP_NR_SEGMENTS ];/* pci function internal path */ u32 :16 ;u8 fmb_len;arch/s390/pci/pci.c +2
-2@@ -43,7 +43,7 @@ static DECLARE_BITMAP(zpci_domain, ZPCI_NR_DEVICES);static DEFINE_SPINLOCK (zpci_domain_lock);#define ZPCI_IOMAP_ENTRIES \ - min(((unsigned long) ZPCI_NR_DEVICES * PCI_BAR_COUNT / 2), \ + min(((unsigned long) ZPCI_NR_DEVICES * PCI_STD_NUM_BARS / 2), \ ZPCI_IOMAP_MAX_ENTRIES)static DEFINE_SPINLOCK (zpci_iomap_lock);@@ -294,7 +294,7 @@ static void __iomem *pci_iomap_range_mio(struct pci_dev *pdev, int bar,void __iomem *pci_iomap_range (struct pci_dev *pdev,int bar,unsigned long offset,unsigned long max) { -if (!pci_resource_len (pdev, bar) || bar >=PCI_BAR_COUNT ) +if (bar >=PCI_STD_NUM_BARS || !pci_resource_len (pdev, bar))return NULL ;
Quoted 13 lines
arch/s390/pci/pci.c static void __iomem *pci_iomap_wc_range_mio(struct pci_dev *pdev, int bar, · line 328
Quoted 8 lines
arch/s390/pci/pci.c +1
-1if (static_branch_likely (&have_mio))@@ -324,7 +324,7 @@ static void __iomem *pci_iomap_wc_range_mio(struct pci_dev *pdev, int bar,void __iomem *pci_iomap_wc_range (struct pci_dev *pdev,int bar,unsigned long offset,unsigned long max) { -if (!pci_resource_len (pdev, bar) || bar >=PCI_BAR_COUNT ) +if (bar >=PCI_STD_NUM_BARS || !pci_resource_len (pdev, bar))return NULL ;This looks like a latent bug fix here. If 'bar' is out of range we return NULL instead accessing an invalid item of an array. Should this not be a separate patch and tagged as stable?
This fix was suggested by Bjorn in v1 review:
https://lkml.org/lkml/2019/8/12/997
Quoted 78 lines
Thanks,
Andrew Murray
Quoted 74 lines
arch/s390/pci/pci.c +5
-5if (static_branch_likely (&have_mio))@@ -416,7 +416,7 @@ static void zpci_map_resources(struct pci_dev *pdev)resource_size_t len;int i; -for (i =0 ; i <PCI_BAR_COUNT ; i++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) { len =pci_resource_len (pdev, i);if (!len)continue ;@@ -451,7 +451,7 @@ static void zpci_unmap_resources(struct pci_dev *pdev)if (zpci_use_mio (zdev))return ; -for (i =0 ; i <PCI_BAR_COUNT ; i++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) { len =pci_resource_len (pdev, i);if (!len)continue ;@@ -514,7 +514,7 @@ static int zpci_setup_bus_resources(struct zpci_dev *zdev,snprintf (zdev->res_name,sizeof (zdev->res_name),"PCI Bus %04x:%02x" , zdev->domain,ZPCI_BUS_NR ); -for (i =0 ; i <PCI_BAR_COUNT ; i++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) {if (!zdev->bars[i].size)continue ; entry =zpci_alloc_iomap (zdev);@@ -551,7 +551,7 @@ static void zpci_cleanup_bus_resources(struct zpci_dev *zdev) {int i; -for (i =0 ; i <PCI_BAR_COUNT ; i++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) {if (!zdev->bars[i].size || !zdev->bars[i].res)continue ;@@ -573,7 +573,7 @@ int pcibios_add_device(struct pci_dev *pdev) pdev->dev.dma_ops = &s390_pci_dma_ops;zpci_map_resources (pdev); -for (i =0 ; i <PCI_BAR_COUNT ; i++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) { res = &pdev->resource[i];if (res->parent || !res->flags)continue ;arch/s390/pci/pci_clp.c +3
-3@@ -145,7 +145,7 @@ static int clp_store_query_pci_fn(struct zpci_dev *zdev, {int i; -for (i =0 ; i <PCI_BAR_COUNT ; i++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) { zdev->bars[i].val =le32_to_cpu (response->bar[i]); zdev->bars[i].size = response->bar_size[i]; }@@ -164,8 +164,8 @@ static int clp_store_query_pci_fn(struct zpci_dev *zdev, sizeof(zdev->util_str)); } zdev->mio_capable = response->mio_addr_avail; -for (i =0 ; i <PCI_BAR_COUNT ; i++) { -if (!(response->mio.valid & (1 << (PCI_BAR_COUNT - i -1 )))) +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) { +if (!(response->mio.valid & (1 << (PCI_STD_NUM_BARS - i -1 ))))continue ; zdev->bars[i].mio_wb = (void __iomem *) response->mio.addr[i].wb;Signature · 1 line
2.21.0
Re: [PATCH v3 17/26] vfio_pci: Loop using PCI_STD_NUM_BARS
In reply to Andrew MurrayQuoted 33 lines · Andrew Murray
Quoted 32 lines · Denis Efremov
Refactor loops to use idiomatic C style and avoid the fencepost error of using "i <
PCI_STD_RESOURCE_END" when "i <=PCI_STD_RESOURCE_END" is required, e.g., commit2f686f1d9bee("PCI: CorrectPCI_STD_RESOURCE_ENDusage").To iterate through all possible BARs, loop conditions changed to the *number* of BARs "i <
PCI_STD_NUM_BARS", instead of the index of the last valid BAR "i <=PCI_STD_RESOURCE_END".Cc Cornelia Huck <[email protected]>Cc Alex Williamson <[email protected]>Signed-off-by Denis Efremov <[email protected]>--- drivers/vfio/pci/vfio_pci.c | 11 ++++++---- drivers/vfio/pci/vfio_pci_config.c | 32 +++++++++++++++-------------- drivers/vfio/pci/vfio_pci_private.h | 4 ++-- 3 files changed, 26 insertions(+), 21 deletions(-)drivers/vfio/pci/vfio_pci.c +1
-1@@ -110,13 +110,15 @@ static inline bool vfio_pci_is_vga(struct pci_dev *pdev)static void vfio_pci_probe_mmaps (struct vfio_pci_device *vdev) {struct resource *res; -int bar; +int i;struct vfio_pci_dummy_resource *dummy_res;INIT_LIST_HEAD (&vdev->dummy_resources_list);
Quoted 10 lines
drivers/vfio/pci/vfio_pci.c static inline bool vfio_pci_is_vga(struct pci_dev *pdev) · line 121
Quoted 6 lines
drivers/vfio/pci/vfio_pci.c +4
-2-for (bar =PCI_STD_RESOURCES ; bar <=PCI_STD_RESOURCE_END ; bar++) { - res = vdev->pdev->resource + bar; +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) { +int bar = i +PCI_STD_RESOURCES ; + + res = &vdev->pdev->resource[bar];Why can't we just drop
PCI_STD_RESOURCESand replace it was 0. I understand the abstraction here, but we don't do it elsewhere across the kernel. Is this necessary?
There was a discussion about this particular case:
https://lkml.org/lkml/2019/8/12/999
It was decided to save the original style for vfio drivers.
Quoted 103 lines
Thanks,
Andrew Murray
Quoted 98 lines
drivers/vfio/pci/vfio_pci.c +2
-1if (!IS_ENABLED (CONFIG_VFIO_PCI_MMAP )) goto no_mmap;@@ -399,7 +401,8 @@ static void vfio_pci_disable(struct vfio_pci_device *vdev)vfio_config_free (vdev); -for (bar =PCI_STD_RESOURCES ; bar <=PCI_STD_RESOURCE_END ; bar++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) { + bar = i +PCI_STD_RESOURCES ;if (!vdev->barmap[bar])continue ;pci_iounmap (pdev, vdev->barmap[bar]);drivers/vfio/pci/vfio_pci_config.c +17
-15@@ -450,30 +450,32 @@ static void vfio_bar_fixup(struct vfio_pci_device *vdev) {struct pci_dev *pdev = vdev->pdev;int i; -__le32 *bar; +__le32 *vbar;u64 mask; - bar = (__le32 *)&vdev->vconfig[PCI_BASE_ADDRESS_0 ]; + vbar = (__le32 *)&vdev->vconfig[PCI_BASE_ADDRESS_0 ]; -for (i =PCI_STD_RESOURCES ; i <=PCI_STD_RESOURCE_END ; i++, bar++) { -if (!pci_resource_start (pdev, i)) { - *bar =0 ;/* Unmapped by host = unimplemented to user */ +for (i =0 ; i <PCI_STD_NUM_BARS ; i++, vbar++) { +int bar = i +PCI_STD_RESOURCES ; + +if (!pci_resource_start (pdev, bar)) { + *vbar =0 ;/* Unmapped by host = unimplemented to user */ continue ; } - mask = ~(pci_resource_len (pdev, i) -1 ); + mask = ~(pci_resource_len (pdev, bar) -1 ); - *bar &=cpu_to_le32 ((u32 )mask); - *bar |=vfio_generate_bar_flags (pdev, i); + *vbar &=cpu_to_le32 ((u32 )mask); + *vbar |=vfio_generate_bar_flags (pdev, bar); -if (*bar &cpu_to_le32 (PCI_BASE_ADDRESS_MEM_TYPE_64 )) { - bar++; - *bar &=cpu_to_le32 ((u32)(mask >>32 )); +if (*vbar &cpu_to_le32 (PCI_BASE_ADDRESS_MEM_TYPE_64 )) { + vbar++; + *vbar &=cpu_to_le32 ((u32)(mask >>32 )); i++; } } - bar = (__le32 *)&vdev->vconfig[PCI_ROM_ADDRESS ]; + vbar = (__le32 *)&vdev->vconfig[PCI_ROM_ADDRESS ];/* * NB. REGION_INFO will have reported zero size if we weren't able @@ -483,14 +485,14 @@ static void vfio_bar_fixup(struct vfio_pci_device *vdev)if (pci_resource_start (pdev,PCI_ROM_RESOURCE )) { mask = ~(pci_resource_len (pdev,PCI_ROM_RESOURCE ) -1 ); mask |=PCI_ROM_ADDRESS_ENABLE ; - *bar &=cpu_to_le32 ((u32 )mask); + *vbar &=cpu_to_le32 ((u32 )mask); }else if (pdev->resource[PCI_ROM_RESOURCE ].flags &IORESOURCE_ROM_SHADOW ) { mask = ~(0x20000 -1 ); mask |=PCI_ROM_ADDRESS_ENABLE ; - *bar &=cpu_to_le32 ((u32 )mask); + *vbar &=cpu_to_le32 ((u32 )mask); }else - *bar =0 ; + *vbar =0 ; vdev->bardirty = false; }drivers/vfio/pci/vfio_pci_private.h +2
-2@@ -86,8 +86,8 @@ struct vfio_pci_reflck {struct vfio_pci_device {struct pci_dev *pdev; -void __iomem *barmap[PCI_STD_RESOURCE_END +1 ]; -bool bar_mmap_supported[PCI_STD_RESOURCE_END +1 ]; +void __iomem *barmap[PCI_STD_NUM_BARS ]; +bool bar_mmap_supported[PCI_STD_NUM_BARS ];u8 *pci_config_map;u8 *vconfig;struct perm_bits *msi_perm;Signature · 1 line
2.21.0
Re: [PATCH v3 06/26] s390/pci: Use PCI_STD_NUM_BARS
In reply to Denis EfremovQuoted 98 lines · Denis Efremov
Quoted 83 lines · Andrew Murray
Quoted 82 lines · Denis Efremov
Remove local definition
PCI_BAR_COUNTfor the number of PCI BARs and use global onePCI_STD_NUM_BARSinstead.Acked-by Sebastian Ott <[email protected]>Cc Gerald Schaefer <[email protected]>Signed-off-by Denis Efremov <[email protected]>--- arch/s390/include/asm/pci.h | 5 +---- arch/s390/include/asm/pci_clp.h | 6 +++--- arch/s390/pci/pci.c | 16 ++++++++-------- arch/s390/pci/pci_clp.c | 6 +++--- 4 files changed, 15 insertions(+), 18 deletions(-)arch/s390/include/asm/pci.h +1
-4@@ -2,9 +2,6 @@#ifndef __ASM_S390_PCI_H#define __ASM_S390_PCI_H -/* must be set before including pci_clp.h */ -#define PCI_BAR_COUNT 6 -#include <linux/pci.h> #include <linux/mutex.h> #include <linux/iommu.h> @@ -138,7 +135,7 @@ struct zpci_dev {char res_name[16 ];bool mio_capable; -struct zpci_bar_struct bars[PCI_BAR_COUNT ]; +struct zpci_bar_struct bars[PCI_STD_NUM_BARS ];u64 start_dma;/* Start of available DMA addresses */ u64 end_dma;/* End of available DMA addresses */ arch/s390/include/asm/pci_clp.h +3
-3@@ -77,7 +77,7 @@ struct mio_info {struct {u64 wb;u64 wt; - } addr[PCI_BAR_COUNT ]; + } addr[PCI_STD_NUM_BARS ];u32 reserved[6 ]; } __packed;@@ -98,9 +98,9 @@ struct clp_rsp_query_pci { u16 util_str_avail : 1; /* utility string available? */ u16 pfgid : 8; /* pci function group id */u32 fid;/* pci function id */ -u8 bar_size[PCI_BAR_COUNT ]; +u8 bar_size[PCI_STD_NUM_BARS ];u16 pchid; -__le32 bar[PCI_BAR_COUNT ]; +__le32 bar[PCI_STD_NUM_BARS ];u8 pfip[CLP_PFIP_NR_SEGMENTS ];/* pci function internal path */ u32 :16 ;u8 fmb_len;arch/s390/pci/pci.c +2
-2@@ -43,7 +43,7 @@ static DECLARE_BITMAP(zpci_domain, ZPCI_NR_DEVICES);static DEFINE_SPINLOCK (zpci_domain_lock);#define ZPCI_IOMAP_ENTRIES \ - min(((unsigned long) ZPCI_NR_DEVICES * PCI_BAR_COUNT / 2), \ + min(((unsigned long) ZPCI_NR_DEVICES * PCI_STD_NUM_BARS / 2), \ ZPCI_IOMAP_MAX_ENTRIES)static DEFINE_SPINLOCK (zpci_iomap_lock);@@ -294,7 +294,7 @@ static void __iomem *pci_iomap_range_mio(struct pci_dev *pdev, int bar,void __iomem *pci_iomap_range (struct pci_dev *pdev,int bar,unsigned long offset,unsigned long max) { -if (!pci_resource_len (pdev, bar) || bar >=PCI_BAR_COUNT ) +if (bar >=PCI_STD_NUM_BARS || !pci_resource_len (pdev, bar))return NULL ;Quoted 13 lines
arch/s390/pci/pci.c static void __iomem *pci_iomap_wc_range_mio(struct pci_dev *pdev, int bar, · line 328
Quoted 8 lines
arch/s390/pci/pci.c +1
-1if (static_branch_likely (&have_mio))@@ -324,7 +324,7 @@ static void __iomem *pci_iomap_wc_range_mio(struct pci_dev *pdev, int bar,void __iomem *pci_iomap_wc_range (struct pci_dev *pdev,int bar,unsigned long offset,unsigned long max) { -if (!pci_resource_len (pdev, bar) || bar >=PCI_BAR_COUNT ) +if (bar >=PCI_STD_NUM_BARS || !pci_resource_len (pdev, bar))return NULL ;This looks like a latent bug fix here. If 'bar' is out of range we return NULL instead accessing an invalid item of an array. Should this not be a separate patch and tagged as stable?
Quoted 3 lines
This fix was suggested by Bjorn in v1 review:
https://lkml.org/lkml/2019/8/12/997
Ah yes, apologies - I'll re-read the previous threads next time.
Thanks,
Andrew Murray
Quoted 80 lines
Quoted 79 lines
Thanks,
Andrew Murray
Quoted 74 lines
arch/s390/pci/pci.c +5
-5if (static_branch_likely (&have_mio))@@ -416,7 +416,7 @@ static void zpci_map_resources(struct pci_dev *pdev)resource_size_t len;int i; -for (i =0 ; i <PCI_BAR_COUNT ; i++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) { len =pci_resource_len (pdev, i);if (!len)continue ;@@ -451,7 +451,7 @@ static void zpci_unmap_resources(struct pci_dev *pdev)if (zpci_use_mio (zdev))return ; -for (i =0 ; i <PCI_BAR_COUNT ; i++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) { len =pci_resource_len (pdev, i);if (!len)continue ;@@ -514,7 +514,7 @@ static int zpci_setup_bus_resources(struct zpci_dev *zdev,snprintf (zdev->res_name,sizeof (zdev->res_name),"PCI Bus %04x:%02x" , zdev->domain,ZPCI_BUS_NR ); -for (i =0 ; i <PCI_BAR_COUNT ; i++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) {if (!zdev->bars[i].size)continue ; entry =zpci_alloc_iomap (zdev);@@ -551,7 +551,7 @@ static void zpci_cleanup_bus_resources(struct zpci_dev *zdev) {int i; -for (i =0 ; i <PCI_BAR_COUNT ; i++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) {if (!zdev->bars[i].size || !zdev->bars[i].res)continue ;@@ -573,7 +573,7 @@ int pcibios_add_device(struct pci_dev *pdev) pdev->dev.dma_ops = &s390_pci_dma_ops;zpci_map_resources (pdev); -for (i =0 ; i <PCI_BAR_COUNT ; i++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) { res = &pdev->resource[i];if (res->parent || !res->flags)continue ;arch/s390/pci/pci_clp.c +3
-3@@ -145,7 +145,7 @@ static int clp_store_query_pci_fn(struct zpci_dev *zdev, {int i; -for (i =0 ; i <PCI_BAR_COUNT ; i++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) { zdev->bars[i].val =le32_to_cpu (response->bar[i]); zdev->bars[i].size = response->bar_size[i]; }@@ -164,8 +164,8 @@ static int clp_store_query_pci_fn(struct zpci_dev *zdev, sizeof(zdev->util_str)); } zdev->mio_capable = response->mio_addr_avail; -for (i =0 ; i <PCI_BAR_COUNT ; i++) { -if (!(response->mio.valid & (1 << (PCI_BAR_COUNT - i -1 )))) +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) { +if (!(response->mio.valid & (1 << (PCI_STD_NUM_BARS - i -1 ))))continue ; zdev->bars[i].mio_wb = (void __iomem *) response->mio.addr[i].wb;Signature · 1 line
2.21.0
Re: [PATCH v3 17/26] vfio_pci: Loop using PCI_STD_NUM_BARS
In reply to Denis EfremovQuoted 45 lines · Denis Efremov
Quoted 33 lines · Andrew Murray
Quoted 32 lines · Denis Efremov
Refactor loops to use idiomatic C style and avoid the fencepost error of using "i <
PCI_STD_RESOURCE_END" when "i <=PCI_STD_RESOURCE_END" is required, e.g., commit2f686f1d9bee("PCI: CorrectPCI_STD_RESOURCE_ENDusage").To iterate through all possible BARs, loop conditions changed to the *number* of BARs "i <
PCI_STD_NUM_BARS", instead of the index of the last valid BAR "i <=PCI_STD_RESOURCE_END".Cc Cornelia Huck <[email protected]>Cc Alex Williamson <[email protected]>Signed-off-by Denis Efremov <[email protected]>--- drivers/vfio/pci/vfio_pci.c | 11 ++++++---- drivers/vfio/pci/vfio_pci_config.c | 32 +++++++++++++++-------------- drivers/vfio/pci/vfio_pci_private.h | 4 ++-- 3 files changed, 26 insertions(+), 21 deletions(-)drivers/vfio/pci/vfio_pci.c +1
-1@@ -110,13 +110,15 @@ static inline bool vfio_pci_is_vga(struct pci_dev *pdev)static void vfio_pci_probe_mmaps (struct vfio_pci_device *vdev) {struct resource *res; -int bar; +int i;struct vfio_pci_dummy_resource *dummy_res;INIT_LIST_HEAD (&vdev->dummy_resources_list);Quoted 10 lines
drivers/vfio/pci/vfio_pci.c static inline bool vfio_pci_is_vga(struct pci_dev *pdev) · line 121
Quoted 6 lines
drivers/vfio/pci/vfio_pci.c +4
-2-for (bar =PCI_STD_RESOURCES ; bar <=PCI_STD_RESOURCE_END ; bar++) { - res = vdev->pdev->resource + bar; +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) { +int bar = i +PCI_STD_RESOURCES ; + + res = &vdev->pdev->resource[bar];Why can't we just drop
PCI_STD_RESOURCESand replace it was 0. I understand the abstraction here, but we don't do it elsewhere across the kernel. Is this necessary?
Quoted 4 lines
There was a discussion about this particular case:
https://lkml.org/lkml/2019/8/12/999It was decided to save the original style for vfio drivers.
OK no problem.
Thanks,
Andrew Murray
Quoted 105 lines
Quoted 104 lines
Thanks,
Andrew Murray
Quoted 98 lines
drivers/vfio/pci/vfio_pci.c +2
-1if (!IS_ENABLED (CONFIG_VFIO_PCI_MMAP )) goto no_mmap;@@ -399,7 +401,8 @@ static void vfio_pci_disable(struct vfio_pci_device *vdev)vfio_config_free (vdev); -for (bar =PCI_STD_RESOURCES ; bar <=PCI_STD_RESOURCE_END ; bar++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) { + bar = i +PCI_STD_RESOURCES ;if (!vdev->barmap[bar])continue ;pci_iounmap (pdev, vdev->barmap[bar]);drivers/vfio/pci/vfio_pci_config.c +17
-15@@ -450,30 +450,32 @@ static void vfio_bar_fixup(struct vfio_pci_device *vdev) {struct pci_dev *pdev = vdev->pdev;int i; -__le32 *bar; +__le32 *vbar;u64 mask; - bar = (__le32 *)&vdev->vconfig[PCI_BASE_ADDRESS_0 ]; + vbar = (__le32 *)&vdev->vconfig[PCI_BASE_ADDRESS_0 ]; -for (i =PCI_STD_RESOURCES ; i <=PCI_STD_RESOURCE_END ; i++, bar++) { -if (!pci_resource_start (pdev, i)) { - *bar =0 ;/* Unmapped by host = unimplemented to user */ +for (i =0 ; i <PCI_STD_NUM_BARS ; i++, vbar++) { +int bar = i +PCI_STD_RESOURCES ; + +if (!pci_resource_start (pdev, bar)) { + *vbar =0 ;/* Unmapped by host = unimplemented to user */ continue ; } - mask = ~(pci_resource_len (pdev, i) -1 ); + mask = ~(pci_resource_len (pdev, bar) -1 ); - *bar &=cpu_to_le32 ((u32 )mask); - *bar |=vfio_generate_bar_flags (pdev, i); + *vbar &=cpu_to_le32 ((u32 )mask); + *vbar |=vfio_generate_bar_flags (pdev, bar); -if (*bar &cpu_to_le32 (PCI_BASE_ADDRESS_MEM_TYPE_64 )) { - bar++; - *bar &=cpu_to_le32 ((u32)(mask >>32 )); +if (*vbar &cpu_to_le32 (PCI_BASE_ADDRESS_MEM_TYPE_64 )) { + vbar++; + *vbar &=cpu_to_le32 ((u32)(mask >>32 )); i++; } } - bar = (__le32 *)&vdev->vconfig[PCI_ROM_ADDRESS ]; + vbar = (__le32 *)&vdev->vconfig[PCI_ROM_ADDRESS ];/* * NB. REGION_INFO will have reported zero size if we weren't able @@ -483,14 +485,14 @@ static void vfio_bar_fixup(struct vfio_pci_device *vdev)if (pci_resource_start (pdev,PCI_ROM_RESOURCE )) { mask = ~(pci_resource_len (pdev,PCI_ROM_RESOURCE ) -1 ); mask |=PCI_ROM_ADDRESS_ENABLE ; - *bar &=cpu_to_le32 ((u32 )mask); + *vbar &=cpu_to_le32 ((u32 )mask); }else if (pdev->resource[PCI_ROM_RESOURCE ].flags &IORESOURCE_ROM_SHADOW ) { mask = ~(0x20000 -1 ); mask |=PCI_ROM_ADDRESS_ENABLE ; - *bar &=cpu_to_le32 ((u32 )mask); + *vbar &=cpu_to_le32 ((u32 )mask); }else - *bar =0 ; + *vbar =0 ; vdev->bardirty = false; }drivers/vfio/pci/vfio_pci_private.h +2
-2@@ -86,8 +86,8 @@ struct vfio_pci_reflck {struct vfio_pci_device {struct pci_dev *pdev; -void __iomem *barmap[PCI_STD_RESOURCE_END +1 ]; -bool bar_mmap_supported[PCI_STD_RESOURCE_END +1 ]; +void __iomem *barmap[PCI_STD_NUM_BARS ]; +bool bar_mmap_supported[PCI_STD_NUM_BARS ];u8 *pci_config_map;u8 *vconfig;struct perm_bits *msi_perm;Signature · 1 line
2.21.0
Re: [PATCH v3 23/26] memstick: use PCI_STD_NUM_BARS
In reply to Denis EfremovQuoted 8 lines · Denis Efremov
Use define
PCI_STD_NUM_BARSinstead ofPCI_ROM_RESOURCEfor the number of PCI BARs.Cc Maxim Levitsky <[email protected]>Cc Alex Dubov <[email protected]>Cc Ulf Hansson <[email protected]>Signed-off-by Denis Efremov <[email protected]>
Assuming this depends on other changes in the series? Thus this is probably for PCI maintainers to pick up?
Kind regards
Uffe
Quoted 20 lines
--- drivers/memstick/host/jmb38x_ms.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/memstick/host/jmb38x_ms.c +1
-2@@ -848,7 +848,7 @@ static int jmb38x_ms_count_slots(struct pci_dev *pdev) {int cnt, rc =0 ; -for (cnt =0 ; cnt <PCI_ROM_RESOURCE ; ++cnt) { +for (cnt =0 ; cnt <PCI_STD_NUM_BARS ; ++cnt) {if (!(IORESOURCE_MEM &pci_resource_flags (pdev, cnt)))break ; --2.21.0
Re: [PATCH v3 23/26] memstick: use PCI_STD_NUM_BARS
Quoted 11 lines · Ulf Hansson
Quoted 8 lines · Denis Efremov
Use define
PCI_STD_NUM_BARSinstead ofPCI_ROM_RESOURCEfor the number of PCI BARs.Cc Maxim Levitsky <[email protected]>Cc Alex Dubov <[email protected]>Cc Ulf Hansson <[email protected]>Signed-off-by Denis Efremov <[email protected]>Assuming this depends on other changes in the series?
Yes, the first patch introduce define PCI_STD_NUM_BARS.
Quoted 2 lines
Thus this is
probably for PCI maintainers to pick up?
Yes, this is for Bjorn's tree.
Quoted 26 lines
Acked-by Ulf Hansson <[email protected]>Kind regards
UffeQuoted 20 lines
--- drivers/memstick/host/jmb38x_ms.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/memstick/host/jmb38x_ms.c +1
-2@@ -848,7 +848,7 @@ static int jmb38x_ms_count_slots(struct pci_dev *pdev) {int cnt, rc =0 ; -for (cnt =0 ; cnt <PCI_ROM_RESOURCE ; ++cnt) { +for (cnt =0 ; cnt <PCI_STD_NUM_BARS ; ++cnt) {if (!(IORESOURCE_MEM &pci_resource_flags (pdev, cnt)))break ; --2.21.0
Martin K. Petersen
AppliedRe: [PATCH v3 18/26] scsi: pm80xx: Use PCI_STD_NUM_BARS
In reply to Denis EfremovDenis,
Quoted 2 lines
Replace the magic constant (6) with define
PCI_STD_NUM_BARSrepresenting the number of PCI BARs.
Applied to 5.4/scsi-fixes. Thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Re: [PATCH v3 18/26] scsi: pm80xx: Use PCI_STD_NUM_BARS
Hi,
Quoted 8 lines · Martin K. Petersen
Denis,
Quoted 2 lines
Replace the magic constant (6) with define
PCI_STD_NUM_BARSrepresenting the number of PCI BARs.Applied to 5.4/scsi-fixes. Thanks!
This constant PCI_STD_NUM_BARS is introduced in the first patch [01/26]. I'm afraid that this patch without the first one will break the compilation. This patchset is dedicated to Bjorn's tree. Sorry for confusing you.
Thanks,
Denis
Re: [PATCH v3 18/26] scsi: pm80xx: Use PCI_STD_NUM_BARS
In reply to Martin K. PetersenQuoted 7 lines · Martin K. Petersen
Denis,
Quoted 2 lines
Replace the magic constant (6) with define
PCI_STD_NUM_BARSrepresenting the number of PCI BARs.Applied to 5.4/scsi-fixes. Thanks!
I think this depends on a previous patch that actually adds the PCI_STD_NUM_BARS definition. It will probably be easier if I apply the whole series via the PCI tree.
Bjorn
Re: [PATCH v3 02/26] PCI: hv: Use PCI_STD_NUM_BARS
In reply to Denis EfremovQuoted 2 lines · Denis Efremov
Replace the magic constant (6) with define
PCI_STD_NUM_BARSrepresenting the number of PCI BARs.
For some reason patches 0 and 1 didn't make it to the list. Can you resend them?
Martin K. Petersen
Acked-byRe: [PATCH v3 18/26] scsi: pm80xx: Use PCI_STD_NUM_BARS
In reply to Bjorn HelgaasBjorn,
Quoted 3 lines
I think this depends on a previous patch that actually adds the
PCI_STD_NUM_BARSdefinition. It will probably be easier if I apply the whole series via the PCI tree.
Looks like my mail about this getting dropped due to the missing definition got lost in transit. In any case, feel free to take this through the PCI tree.
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Re: [PATCH v3 02/26] PCI: hv: Use PCI_STD_NUM_BARS
In reply to Bjorn HelgaasQuoted 6 lines · Bjorn Helgaas
Quoted 2 lines · Denis Efremov
Replace the magic constant (6) with define
PCI_STD_NUM_BARSrepresenting the number of PCI BARs.For some reason patches 0 and 1 didn't make it to the list. Can you resend them?
(No need to resend the whole series, which might annoy all the other maintainers. Just send 0 (the cover letter) and 1 (which I assume adds the PCI_STD_NUM_BARS definition)).
v3 cover Add definition for the number of standard PCI BARs
In reply to Denis EfremovCode that iterates over all standard PCI BARs typically uses PCI_STD_RESOURCE_END, but this is error-prone because it requires "i <= PCI_STD_RESOURCE_END" rather than something like
"i < PCI_STD_NUM_BARS". We could add such a definition and use it the same way PCI_SRIOV_NUM_BARS is used. The patchset also replaces constant (6) with new define PCI_STD_NUM_BARS where appropriate and removes local declarations for the number of PCI BARs.
Changes in v3:
- Updated commits description.
- Refactored "< PCI_ROM_RESOURCE" with "< PCI_STD_NUM_BARS" in loops.
- Refactored "<= BAR_5" with "< PCI_STD_NUM_BARS" in loops.
- Removed local define GASKET_NUM_BARS.
- Removed local define PCI_NUM_BAR_RESOURCES.
Changes in v2:
- Reversed checks in pci_iomap_range,pci_iomap_wc_range.
- Refactored loops in vfio_pci to keep PCI_STD_RESOURCES.
- Added 2 new patches to replace the magic constant with new define.
- Splitted net patch in v1 to separate stmmac and dwc-xlgmac patches.
Denis Efremov (26):
PCI: Add define for the number of standard PCI BARs
PCI: hv: Use PCI_STD_NUM_BARS
PCI: dwc: Use PCI_STD_NUM_BARS
PCI: endpoint: Use PCI_STD_NUM_BARS
misc: pci_endpoint_test: Use PCI_STD_NUM_BARS s390/pci: Use PCI_STD_NUM_BARS
x86/PCI: Loop using PCI_STD_NUM_BARS alpha/PCI: Use PCI_STD_NUM_BARS
ia64: Use PCI_STD_NUM_BARS
stmmac: pci: Loop using PCI_STD_NUM_BARS
net: dwc-xlgmac: Loop using PCI_STD_NUM_BARS
ixgb: use PCI_STD_NUM_BARS
e1000: Use PCI_STD_NUM_BARS
rapidio/tsi721: Loop using PCI_STD_NUM_BARS
efifb: Loop using PCI_STD_NUM_BARS
fbmem: use PCI_STD_NUM_BARS
vfio_pci: Loop using PCI_STD_NUM_BARS
scsi: pm80xx: Use PCI_STD_NUM_BARS
ata: sata_nv: Use PCI_STD_NUM_BARS
staging: gasket: Use PCI_STD_NUM_BARS
serial: 8250_pci: Use PCI_STD_NUM_BARS
pata_atp867x: Use PCI_STD_NUM_BARS
memstick: use PCI_STD_NUM_BARS
USB: core: Use PCI_STD_NUM_BARS
usb: pci-quirks: Use PCI_STD_NUM_BARS
devres: use PCI_STD_NUM_BARS
arch/alpha/kernel/pci-sysfs.c | 8 ++--- arch/ia64/sn/pci/pcibr/pcibr_dma.c | 4 +-- arch/s390/include/asm/pci.h | 5 +-- arch/s390/include/asm/pci_clp.h | 6 ++-- arch/s390/pci/pci.c | 16 +++++----- arch/s390/pci/pci_clp.c | 6 ++-- arch/x86/pci/common.c | 2 +- arch/x86/pci/intel_mid_pci.c | 2 +- drivers/ata/pata_atp867x.c | 2 +- drivers/ata/sata_nv.c | 2 +- drivers/memstick/host/jmb38x_ms.c | 2 +- drivers/misc/pci_endpoint_test.c | 8 ++--- drivers/net/ethernet/intel/e1000/e1000.h | 1 - drivers/net/ethernet/intel/e1000/e1000_main.c | 2 +- drivers/net/ethernet/intel/ixgb/ixgb.h | 1 - drivers/net/ethernet/intel/ixgb/ixgb_main.c | 2 +- .../net/ethernet/stmicro/stmmac/stmmac_pci.c | 4 +-- .../net/ethernet/synopsys/dwc-xlgmac-pci.c | 2 +- drivers/pci/controller/dwc/pci-dra7xx.c | 2 +- .../pci/controller/dwc/pci-layerscape-ep.c | 2 +- drivers/pci/controller/dwc/pcie-artpec6.c | 2 +- .../pci/controller/dwc/pcie-designware-plat.c | 2 +- drivers/pci/controller/dwc/pcie-designware.h | 2 +- drivers/pci/controller/pci-hyperv.c | 10 +++--- drivers/pci/endpoint/functions/pci-epf-test.c | 10 +++--- drivers/pci/pci-sysfs.c | 4 +-- drivers/pci/pci.c | 13 ++++---- drivers/pci/proc.c | 4 +-- drivers/pci/quirks.c | 4 +-- drivers/rapidio/devices/tsi721.c | 2 +- drivers/scsi/pm8001/pm8001_hwi.c | 2 +- drivers/scsi/pm8001/pm8001_init.c | 2 +- drivers/staging/gasket/gasket_constants.h | 3 -- drivers/staging/gasket/gasket_core.c | 12 +++---- drivers/staging/gasket/gasket_core.h | 4 +-- drivers/tty/serial/8250/8250_pci.c | 8 ++--- drivers/usb/core/hcd-pci.c | 2 +- drivers/usb/host/pci-quirks.c | 2 +- drivers/vfio/pci/vfio_pci.c | 11 ++++--- drivers/vfio/pci/vfio_pci_config.c | 32 ++++++++++--------- drivers/vfio/pci/vfio_pci_private.h | 4 +-- drivers/video/fbdev/core/fbmem.c | 4 +-- drivers/video/fbdev/efifb.c | 2 +- include/linux/pci-epc.h | 2 +- include/linux/pci.h | 2 +- include/uapi/linux/pci_regs.h | 1 + lib/devres.c | 2 +- 47 files changed, 112 insertions(+), 115 deletions(-)
Signature · 1 line
2.21.0
PATCH RESEND v3 1/26 PCI: Add define for the number of standard PCI BARs
In reply to Denis EfremovCode that iterates over all standard PCI BARs typically uses PCI_STD_RESOURCE_END. However, it requires the "unusual" loop condition "i <= PCI_STD_RESOURCE_END" rather than something more standard like "i < PCI_STD_NUM_BARS".
This patch adds the definition PCI_STD_NUM_BARS which is equivalent to "PCI_STD_RESOURCE_END + 1". To iterate through all possible BARs, loop conditions changed to the *number* of BARs "i < PCI_STD_NUM_BARS", instead of the index of the last valid BAR "i <= PCI_STD_RESOURCE_END" or PCI_ROM_RESOURCE. The magic constant (6) is also replaced with new define PCI_STD_NUM_BARS.
--- drivers/pci/pci-sysfs.c | 4 ++-- drivers/pci/pci.c | 13 +++++++------ drivers/pci/proc.c | 4 ++-- drivers/pci/quirks.c | 4 ++-- include/linux/pci.h | 2 +- include/uapi/linux/pci_regs.h | 1 + 6 files changed, 15 insertions(+), 13 deletions(-)
drivers/pci/pci-sysfs.c +2 -2
@@ -1257,7 +1257,7 @@ static void pci_remove_resource_files(struct pci_dev *pdev) {int i; -for (i =0 ; i <PCI_ROM_RESOURCE ; i++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) {struct bin_attribute *res_attr; res_attr = pdev->res_attr[i];
@@ -1328,7 +1328,7 @@ static int pci_create_resource_files(struct pci_dev *pdev)int retval;/* Expose the PCI resources from this device as files */ -for (i =0 ; i <PCI_ROM_RESOURCE ; i++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) {/* skip empty resources */ if (!pci_resource_len (pdev, i))
drivers/pci/pci.c +7 -6
@@ -674,7 +674,7 @@ struct resource *pci_find_resource(struct pci_dev *dev, struct resource *res) {int i; -for (i =0 ; i <PCI_ROM_RESOURCE ; i++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) {struct resource *r = &dev->resource[i];if (r->start &&resource_contains (r, res))
@@ -3768,7 +3768,7 @@ void pci_release_selected_regions(struct pci_dev *pdev, int bars) {int i; -for (i =0 ; i <6 ; i++) +for (i =0 ; i <PCI_STD_NUM_BARS ; i++)if (bars & (1 << i))pci_release_region (pdev, i); }
@@ -3779,7 +3779,7 @@ static int __pci_request_selected_regions(struct pci_dev *pdev, int bars, {int i; -for (i =0 ; i <6 ; i++) +for (i =0 ; i <PCI_STD_NUM_BARS ; i++)if (bars & (1 << i))if (__pci_request_region (pdev, i, res_name, excl)) goto err_out;
@@ -3827,7 +3827,7 @@ EXPORT_SYMBOL(pci_request_selected_regions_exclusive);void pci_release_regions (struct pci_dev *pdev) { -pci_release_selected_regions (pdev, (1 <<6 ) -1 ); +pci_release_selected_regions (pdev, (1 <<PCI_STD_NUM_BARS ) -1 ); }EXPORT_SYMBOL (pci_release_regions);
@@ -3846,7 +3846,8 @@ EXPORT_SYMBOL(pci_release_regions);*/ int pci_request_regions (struct pci_dev *pdev,const char *res_name) { -return pci_request_selected_regions (pdev, ((1 <<6 ) -1 ), res_name); +return pci_request_selected_regions (pdev, + ((1 <<PCI_STD_NUM_BARS ) -1 ), res_name); }EXPORT_SYMBOL (pci_request_regions);
@@ -3868,7 +3869,7 @@ EXPORT_SYMBOL(pci_request_regions);int pci_request_regions_exclusive (struct pci_dev *pdev,const char *res_name) {return pci_request_selected_regions_exclusive (pdev, - ((1 <<6 ) -1 ), res_name); + ((1 <<PCI_STD_NUM_BARS ) -1 ), res_name); }EXPORT_SYMBOL (pci_request_regions_exclusive);
drivers/pci/proc.c +2 -2
@@ -248,13 +248,13 @@ static int proc_bus_pci_mmap(struct file *file, struct vm_area_struct *vma) }/* Make sure the caller is mapping a real resource for this device */ -for (i =0 ; i <PCI_ROM_RESOURCE ; i++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) {if (dev->resource[i].flags & res_bit &&pci_mmap_fits (dev, i, vma,PCI_MMAP_PROCFS ))break ; } -if (i >=PCI_ROM_RESOURCE ) +if (i >=PCI_STD_NUM_BARS )return -ENODEV ; if (fpriv->mmap_state == pci_mmap_mem &&
drivers/pci/quirks.c +2 -2
@@ -475,7 +475,7 @@ static void quirk_extend_bar_to_page(struct pci_dev *dev) {int i; -for (i =0 ; i <=PCI_STD_RESOURCE_END ; i++) { +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) {struct resource *r = &dev->resource[i];if (r->flags &IORESOURCE_MEM &&resource_size (r) <PAGE_SIZE ) {
@@ -1810,7 +1810,7 @@ static void quirk_alder_ioapic(struct pci_dev *pdev)* The next five BARs all seem to be rubbish, so just clean * them out. */ -for (i =1 ; i <6 ; i++) +for (i =1 ; i <PCI_STD_NUM_BARS ; i++)memset (&pdev->resource[i],0 ,sizeof (pdev->resource[i])); }DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_EESSC , quirk_alder_ioapic);
include/linux/pci.h +1 -1
@@ -76,7 +76,7 @@ enum pci_mmap_state {enum {/* #0-5: standard PCI resources */ PCI_STD_RESOURCES , -PCI_STD_RESOURCE_END =5 , +PCI_STD_RESOURCE_END =PCI_STD_RESOURCES +PCI_STD_NUM_BARS -1 ,/* #6: expansion ROM resource */ PCI_ROM_RESOURCE ,
include/uapi/linux/pci_regs.h +1 -0
@@ -34,6 +34,7 @@* of which the first 64 bytes are standardized as follows: */ #define PCI_STD_HEADER_SIZEOF 64 +#define PCI_STD_NUM_BARS 6/* Number of standard BARs */ #define PCI_VENDOR_ID 0x00/* 16 bits */ #define PCI_DEVICE_ID 0x02/* 16 bits */ #define PCI_COMMAND 0x04/* 16 bits */
Signature · 1 line
2.21.0
Bjorn Helgaas
AppliedQuoted 89 lines · Denis Efremov
Code that iterates over all standard PCI BARs typically uses
PCI_STD_RESOURCE_END, but this is error-prone because it requires "i <=PCI_STD_RESOURCE_END" rather than something like
"i <PCI_STD_NUM_BARS". We could add such a definition and use it the same wayPCI_SRIOV_NUM_BARSis used. The patchset also replaces constant (6) with new definePCI_STD_NUM_BARSwhere appropriate and removes local declarations for the number of PCI BARs.Changes in v3:
- Updated commits description.
- Refactored "<PCI_ROM_RESOURCE" with "<PCI_STD_NUM_BARS" in loops.
- Refactored "<=BAR_5" with "<PCI_STD_NUM_BARS" in loops.
- Removed local defineGASKET_NUM_BARS.
- Removed local definePCI_NUM_BAR_RESOURCES.Changes in v2:
- Reversed checks in pci_iomap_range,pci_iomap_wc_range.
- Refactored loops invfio_pcito keepPCI_STD_RESOURCES.
- Added 2 new patches to replace the magic constant with new define.
- Splitted net patch in v1 to separate stmmac and dwc-xlgmac patches.Denis Efremov (26):
PCI: Add define for the number of standard PCI BARs
PCI: hv: UsePCI_STD_NUM_BARS
PCI: dwc: UsePCI_STD_NUM_BARS
PCI: endpoint: UsePCI_STD_NUM_BARS
misc:pci_endpoint_test: UsePCI_STD_NUM_BARSs390/pci: UsePCI_STD_NUM_BARS
x86/PCI: Loop usingPCI_STD_NUM_BARSalpha/PCI: UsePCI_STD_NUM_BARS
ia64: UsePCI_STD_NUM_BARS
stmmac: pci: Loop usingPCI_STD_NUM_BARS
net: dwc-xlgmac: Loop usingPCI_STD_NUM_BARS
ixgb: usePCI_STD_NUM_BARS
e1000: UsePCI_STD_NUM_BARS
rapidio/tsi721: Loop usingPCI_STD_NUM_BARS
efifb: Loop usingPCI_STD_NUM_BARS
fbmem: usePCI_STD_NUM_BARS
vfio_pci: Loop usingPCI_STD_NUM_BARS
scsi: pm80xx: UsePCI_STD_NUM_BARS
ata:sata_nv: UsePCI_STD_NUM_BARS
staging: gasket: UsePCI_STD_NUM_BARS
serial: 8250_pci: UsePCI_STD_NUM_BARS
pata_atp867x: UsePCI_STD_NUM_BARS
memstick: usePCI_STD_NUM_BARS
USB: core: UsePCI_STD_NUM_BARS
usb: pci-quirks: UsePCI_STD_NUM_BARS
devres: usePCI_STD_NUM_BARSarch/alpha/kernel/pci-sysfs.c | 8 ++--- arch/ia64/sn/pci/pcibr/pcibr_dma.c | 4 +-- arch/s390/include/asm/pci.h | 5 +-- arch/s390/include/asm/pci_clp.h | 6 ++-- arch/s390/pci/pci.c | 16 +++++----- arch/s390/pci/pci_clp.c | 6 ++-- arch/x86/pci/common.c | 2 +- arch/x86/pci/intel_mid_pci.c | 2 +- drivers/ata/pata_atp867x.c | 2 +- drivers/ata/sata_nv.c | 2 +- drivers/memstick/host/jmb38x_ms.c | 2 +- drivers/misc/pci_endpoint_test.c | 8 ++--- drivers/net/ethernet/intel/e1000/e1000.h | 1 - drivers/net/ethernet/intel/e1000/e1000_main.c | 2 +- drivers/net/ethernet/intel/ixgb/ixgb.h | 1 - drivers/net/ethernet/intel/ixgb/ixgb_main.c | 2 +- .../net/ethernet/stmicro/stmmac/stmmac_pci.c | 4 +-- .../net/ethernet/synopsys/dwc-xlgmac-pci.c | 2 +- drivers/pci/controller/dwc/pci-dra7xx.c | 2 +- .../pci/controller/dwc/pci-layerscape-ep.c | 2 +- drivers/pci/controller/dwc/pcie-artpec6.c | 2 +- .../pci/controller/dwc/pcie-designware-plat.c | 2 +- drivers/pci/controller/dwc/pcie-designware.h | 2 +- drivers/pci/controller/pci-hyperv.c | 10 +++--- drivers/pci/endpoint/functions/pci-epf-test.c | 10 +++--- drivers/pci/pci-sysfs.c | 4 +-- drivers/pci/pci.c | 13 ++++---- drivers/pci/proc.c | 4 +-- drivers/pci/quirks.c | 4 +-- drivers/rapidio/devices/tsi721.c | 2 +- drivers/scsi/pm8001/pm8001_hwi.c | 2 +- drivers/scsi/pm8001/pm8001_init.c | 2 +- drivers/staging/gasket/gasket_constants.h | 3 -- drivers/staging/gasket/gasket_core.c | 12 +++---- drivers/staging/gasket/gasket_core.h | 4 +-- drivers/tty/serial/8250/8250_pci.c | 8 ++--- drivers/usb/core/hcd-pci.c | 2 +- drivers/usb/host/pci-quirks.c | 2 +- drivers/vfio/pci/vfio_pci.c | 11 ++++--- drivers/vfio/pci/vfio_pci_config.c | 32 ++++++++++---------
Quoted 8 lines
drivers/vfio/pci/vfio_pci_private.h | 4 +-- drivers/video/fbdev/core/fbmem.c | 4 +-- drivers/video/fbdev/efifb.c | 2 +- include/linux/pci-epc.h | 2 +- include/linux/pci.h | 2 +- include/uapi/linux/pci_regs.h | 1 + lib/devres.c | 2 +- 47 files changed, 112 insertions(+), 115 deletions(-)
Applied to pci/resource for v5.5, thanks!
I ended up squashing these all together because they're all related and tiny.
Re: [PATCH v3 06/26] s390/pci: Use PCI_STD_NUM_BARS
In reply to Andrew MurrayQuoted 83 lines · Andrew Murray
Quoted 82 lines · Denis Efremov
Remove local definition
PCI_BAR_COUNTfor the number of PCI BARs and use global onePCI_STD_NUM_BARSinstead.Acked-by Sebastian Ott <[email protected]>Cc Gerald Schaefer <[email protected]>Signed-off-by Denis Efremov <[email protected]>--- arch/s390/include/asm/pci.h | 5 +---- arch/s390/include/asm/pci_clp.h | 6 +++--- arch/s390/pci/pci.c | 16 ++++++++-------- arch/s390/pci/pci_clp.c | 6 +++--- 4 files changed, 15 insertions(+), 18 deletions(-)arch/s390/include/asm/pci.h +1
-4@@ -2,9 +2,6 @@#ifndef __ASM_S390_PCI_H#define __ASM_S390_PCI_H -/* must be set before including pci_clp.h */ -#define PCI_BAR_COUNT 6 -#include <linux/pci.h> #include <linux/mutex.h> #include <linux/iommu.h> @@ -138,7 +135,7 @@ struct zpci_dev {char res_name[16 ];bool mio_capable; -struct zpci_bar_struct bars[PCI_BAR_COUNT ]; +struct zpci_bar_struct bars[PCI_STD_NUM_BARS ];u64 start_dma;/* Start of available DMA addresses */ u64 end_dma;/* End of available DMA addresses */ arch/s390/include/asm/pci_clp.h +3
-3@@ -77,7 +77,7 @@ struct mio_info {struct {u64 wb;u64 wt; - } addr[PCI_BAR_COUNT ]; + } addr[PCI_STD_NUM_BARS ];u32 reserved[6 ]; } __packed;@@ -98,9 +98,9 @@ struct clp_rsp_query_pci { u16 util_str_avail : 1; /* utility string available? */ u16 pfgid : 8; /* pci function group id */u32 fid;/* pci function id */ -u8 bar_size[PCI_BAR_COUNT ]; +u8 bar_size[PCI_STD_NUM_BARS ];u16 pchid; -__le32 bar[PCI_BAR_COUNT ]; +__le32 bar[PCI_STD_NUM_BARS ];u8 pfip[CLP_PFIP_NR_SEGMENTS ];/* pci function internal path */ u32 :16 ;u8 fmb_len;arch/s390/pci/pci.c +2
-2@@ -43,7 +43,7 @@ static DECLARE_BITMAP(zpci_domain, ZPCI_NR_DEVICES);static DEFINE_SPINLOCK (zpci_domain_lock);#define ZPCI_IOMAP_ENTRIES \ - min(((unsigned long) ZPCI_NR_DEVICES * PCI_BAR_COUNT / 2), \ + min(((unsigned long) ZPCI_NR_DEVICES * PCI_STD_NUM_BARS / 2), \ ZPCI_IOMAP_MAX_ENTRIES)static DEFINE_SPINLOCK (zpci_iomap_lock);@@ -294,7 +294,7 @@ static void __iomem *pci_iomap_range_mio(struct pci_dev *pdev, int bar,void __iomem *pci_iomap_range (struct pci_dev *pdev,int bar,unsigned long offset,unsigned long max) { -if (!pci_resource_len (pdev, bar) || bar >=PCI_BAR_COUNT ) +if (bar >=PCI_STD_NUM_BARS || !pci_resource_len (pdev, bar))return NULL ;
Quoted 12 lines
arch/s390/pci/pci.c static void __iomem *pci_iomap_wc_range_mio(struct pci_dev *pdev, int bar, · line 328
Quoted 8 lines
arch/s390/pci/pci.c +1
-1if (static_branch_likely (&have_mio))@@ -324,7 +324,7 @@ static void __iomem *pci_iomap_wc_range_mio(struct pci_dev *pdev, int bar,void __iomem *pci_iomap_wc_range (struct pci_dev *pdev,int bar,unsigned long offset,unsigned long max) { -if (!pci_resource_len (pdev, bar) || bar >=PCI_BAR_COUNT ) +if (bar >=PCI_STD_NUM_BARS || !pci_resource_len (pdev, bar))return NULL ;This looks like a latent bug fix here. If 'bar' is out of range we return NULL instead accessing an invalid item of an array. Should this not be a separate patch and tagged as stable?
Sharp eyes! I didn't think of this as accessing an invalid item, but indeed it does (if 'bar' is out of range). But I doubt it's worth the hassle of a separate patch, since we return failure anyway.