[v3,07/26] x86/PCI: Loop using PCI_STD_NUM_BARS

Message ID	20190916204158.6889-8-efremov@linux.com
State	Deferred
Delegated to:	Bjorn Helgaas
Headers	show Return-Path: <linux-pci-owner@vger.kernel.org> From: Denis Efremov <efremov@linux.com> To: Bjorn Helgaas <bhelgaas@google.com> Cc: Denis Efremov <efremov@linux.com>, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, Andrew Murray <andrew.murray@arm.com>, x86@kernel.org, "H . Peter Anvin" <hpa@zytor.com>, Thomas Gleixner <tglx@linutronix.de> Subject: [PATCH v3 07/26] x86/PCI: Loop using PCI_STD_NUM_BARS Date: Mon, 16 Sep 2019 23:41:39 +0300 Message-Id: <20190916204158.6889-8-efremov@linux.com> In-Reply-To: <20190916204158.6889-1-efremov@linux.com> References: <20190916204158.6889-1-efremov@linux.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-pci-owner@vger.kernel.org Precedence: bulk
Series	[RESEND,v3,01/26] PCI: Add define for the number of standard PCI BARs \| expand [v3,02/26] PCI: hv: Use PCI_STD_NUM_BARS [v3,03/26] PCI: dwc: Use PCI_STD_NUM_BARS [v3,04/26] PCI: endpoint: Use PCI_STD_NUM_BARS [v3,05/26] misc: pci_endpoint_test: Use PCI_STD_NUM_BARS [v3,06/26] s390/pci: Use PCI_STD_NUM_BARS [v3,07/26] x86/PCI: Loop using PCI_STD_NUM_BARS [v3,08/26] alpha/PCI: Use PCI_STD_NUM_BARS [v3,09/26] ia64: Use PCI_STD_NUM_BARS [v3,10/26] stmmac: pci: Loop using PCI_STD_NUM_BARS [v3,11/26] net: dwc-xlgmac: Loop using PCI_STD_NUM_BARS [v3,12/26] ixgb: use PCI_STD_NUM_BARS [v3,13/26] e1000: Use PCI_STD_NUM_BARS [v3,14/26] rapidio/tsi721: Loop using PCI_STD_NUM_BARS [v3,15/26] efifb: Loop using PCI_STD_NUM_BARS [v3,16/26] fbmem: use PCI_STD_NUM_BARS [v3,17/26] vfio_pci: Loop using PCI_STD_NUM_BARS [v3,18/26] scsi: pm80xx: Use PCI_STD_NUM_BARS [v3,19/26] ata: sata_nv: Use PCI_STD_NUM_BARS [v3,20/26] staging: gasket: Use PCI_STD_NUM_BARS [v3,21/26] serial: 8250_pci: Use PCI_STD_NUM_BARS [v3,22/26] pata_atp867x: Use PCI_STD_NUM_BARS [v3,23/26] memstick: use PCI_STD_NUM_BARS [v3,24/26] USB: core: Use PCI_STD_NUM_BARS [v3,25/26] usb: pci-quirks: Use PCI_STD_NUM_BARS [v3,26/26] devres: use PCI_STD_NUM_BARS [RESEND,v3,01/26] PCI: Add define for the number of standard PCI BARs

Message ID

20190916204158.6889-8-efremov@linux.com

State

Deferred

Delegated to:

Bjorn Helgaas

Headers

From: Denis Efremov <efremov@linux.com>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: Denis Efremov <efremov@linux.com>, linux-kernel@vger.kernel.org,
	linux-pci@vger.kernel.org, Andrew Murray <andrew.murray@arm.com>,
	x86@kernel.org, "H . Peter Anvin" <hpa@zytor.com>,
	Thomas Gleixner <tglx@linutronix.de>
Subject: [PATCH v3 07/26] x86/PCI: Loop using PCI_STD_NUM_BARS
Date: Mon, 16 Sep 2019 23:41:39 +0300
Message-Id: <20190916204158.6889-8-efremov@linux.com>
In-Reply-To: <20190916204158.6889-1-efremov@linux.com>
References: <20190916204158.6889-1-efremov@linux.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Sender: linux-pci-owner@vger.kernel.org
Precedence: bulk

Series

[RESEND,v3,01/26] PCI: Add define for the number of standard PCI BARs | expand

Commit Message

Denis Efremov Sept. 16, 2019, 8:41 p.m. UTC

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., 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.

Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Denis Efremov <efremov@linux.com>
---
 arch/x86/pci/common.c        | 2 +-
 arch/x86/pci/intel_mid_pci.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
index 9acab6ac28f5..1e59df041456 100644
--- a/arch/x86/pci/common.c
+++ b/arch/x86/pci/common.c
@@ -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;
diff --git a/arch/x86/pci/intel_mid_pci.c b/arch/x86/pci/intel_mid_pci.c
index 43867bc85368..00c62115f39c 100644
--- a/arch/x86/pci/intel_mid_pci.c
+++ b/arch/x86/pci/intel_mid_pci.c
@@ -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;

[v3,07/26] x86/PCI: Loop using PCI_STD_NUM_BARS

Commit Message

Patch