Commit c9c13ba4 authored by Denis Efremov's avatar Denis Efremov Committed by Bjorn Helgaas
Browse files

PCI: Add PCI_STD_NUM_BARS for the number of standard BARs 

Code that iterates over all standard PCI BARs typically uses
PCI_STD_RESOURCE_END.  However, that requires the unusual test
"i <= PCI_STD_RESOURCE_END" rather than something the typical
"i < PCI_STD_NUM_BARS".

Add a definition for PCI_STD_NUM_BARS and change loops to use the more
idiomatic C style to help avoid fencepost errors.

Link: https://lore.kernel.org/r/20190927234026.23342-1-efremov@linux.com
Link: https://lore.kernel.org/r/20190927234308.23935-1-efremov@linux.com
Link: https://lore.kernel.org/r/20190916204158.6889-3-efremov@linux.com


Signed-off-by: default avatarDenis Efremov <efremov@linux.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: Sebastian Ott <sebott@linux.ibm.com>			# arch/s390/
Acked-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>	# video/fbdev/
Acked-by: Gustavo Pimentel <gustavo.pimentel@synopsys.com>	# pci/controller/dwc/
Acked-by: Jack Wang <jinpu.wang@cloud.ionos.com>		# scsi/pm8001/
Acked-by: Martin K. Petersen <martin.petersen@oracle.com>	# scsi/pm8001/
Acked-by: Ulf Hansson <ulf.hansson@linaro.org>			# memstick/
parent 7608158d

arch/alpha/kernel/pci-sysfs.c

+4 −4
Original line number Diff line number Diff line
@@ -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))

arch/s390/include/asm/pci.h

+1 −4
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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;