* [PATCH] PCI: use PCI_SRIOV_NUM_BARS in loops instead of PCI_IOV_RESOURCE_END
@ 2019-08-06 14:07 Denis Efremov
2019-08-06 17:26 ` sathyanarayanan kuppuswamy
2019-08-06 20:45 ` Bjorn Helgaas
0 siblings, 2 replies; 3+ messages in thread
From: Denis Efremov @ 2019-08-06 14:07 UTC (permalink / raw)
To: Bjorn Helgaas; +Cc: Denis Efremov, linux-pci, linux-kernel
It's a general pattern to write loops with 'i < PCI_SRIOV_NUM_BARS'
condition. This patch fixes remaining loops which violates this implicit
agreement.
Signed-off-by: Denis Efremov <efremov@linux.com>
---
drivers/pci/iov.c | 4 ++--
drivers/pci/setup-bus.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c
index 525fd3f272b3..9b48818ced01 100644
--- a/drivers/pci/iov.c
+++ b/drivers/pci/iov.c
@@ -557,8 +557,8 @@ static void sriov_restore_state(struct pci_dev *dev)
ctrl |= iov->ctrl & PCI_SRIOV_CTRL_ARI;
pci_write_config_word(dev, iov->pos + PCI_SRIOV_CTRL, ctrl);
- for (i = PCI_IOV_RESOURCES; i <= PCI_IOV_RESOURCE_END; i++)
- pci_update_resource(dev, i);
+ for (i = 0; i < PCI_SRIOV_NUM_BARS; i++)
+ pci_update_resource(dev, i + PCI_IOV_RESOURCES);
pci_write_config_dword(dev, iov->pos + PCI_SRIOV_SYS_PGSIZE, iov->pgsz);
pci_iov_set_numvfs(dev, iov->num_VFs);
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 79b1fa6519be..e7dbe21705ba 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -1662,8 +1662,8 @@ static int iov_resources_unassigned(struct pci_dev *dev, void *data)
int i;
bool *unassigned = data;
- for (i = PCI_IOV_RESOURCES; i <= PCI_IOV_RESOURCE_END; i++) {
- struct resource *r = &dev->resource[i];
+ for (i = 0; i < PCI_SRIOV_NUM_BARS; i++) {
+ struct resource *r = &dev->resource[i + PCI_IOV_RESOURCES];
struct pci_bus_region region;
/* Not assigned or rejected by kernel? */
--
2.21.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] PCI: use PCI_SRIOV_NUM_BARS in loops instead of PCI_IOV_RESOURCE_END
2019-08-06 14:07 [PATCH] PCI: use PCI_SRIOV_NUM_BARS in loops instead of PCI_IOV_RESOURCE_END Denis Efremov
@ 2019-08-06 17:26 ` sathyanarayanan kuppuswamy
2019-08-06 20:45 ` Bjorn Helgaas
1 sibling, 0 replies; 3+ messages in thread
From: sathyanarayanan kuppuswamy @ 2019-08-06 17:26 UTC (permalink / raw)
To: Denis Efremov, Bjorn Helgaas; +Cc: linux-pci, linux-kernel
On 8/6/19 7:07 AM, Denis Efremov wrote:
> It's a general pattern to write loops with 'i < PCI_SRIOV_NUM_BARS'
> condition. This patch fixes remaining loops which violates this implicit
> agreement.
Looks good to me.
Reviewed-by: Kuppuswamy Sathyanarayanan
<sathyanarayanan.kuppuswamy@linux.intel.com>
>
> Signed-off-by: Denis Efremov <efremov@linux.com>
> ---
> drivers/pci/iov.c | 4 ++--
> drivers/pci/setup-bus.c | 4 ++--
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c
> index 525fd3f272b3..9b48818ced01 100644
> --- a/drivers/pci/iov.c
> +++ b/drivers/pci/iov.c
> @@ -557,8 +557,8 @@ static void sriov_restore_state(struct pci_dev *dev)
> ctrl |= iov->ctrl & PCI_SRIOV_CTRL_ARI;
> pci_write_config_word(dev, iov->pos + PCI_SRIOV_CTRL, ctrl);
>
> - for (i = PCI_IOV_RESOURCES; i <= PCI_IOV_RESOURCE_END; i++)
> - pci_update_resource(dev, i);
> + for (i = 0; i < PCI_SRIOV_NUM_BARS; i++)
> + pci_update_resource(dev, i + PCI_IOV_RESOURCES);
>
> pci_write_config_dword(dev, iov->pos + PCI_SRIOV_SYS_PGSIZE, iov->pgsz);
> pci_iov_set_numvfs(dev, iov->num_VFs);
> diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
> index 79b1fa6519be..e7dbe21705ba 100644
> --- a/drivers/pci/setup-bus.c
> +++ b/drivers/pci/setup-bus.c
> @@ -1662,8 +1662,8 @@ static int iov_resources_unassigned(struct pci_dev *dev, void *data)
> int i;
> bool *unassigned = data;
>
> - for (i = PCI_IOV_RESOURCES; i <= PCI_IOV_RESOURCE_END; i++) {
> - struct resource *r = &dev->resource[i];
> + for (i = 0; i < PCI_SRIOV_NUM_BARS; i++) {
> + struct resource *r = &dev->resource[i + PCI_IOV_RESOURCES];
> struct pci_bus_region region;
>
> /* Not assigned or rejected by kernel? */
--
Sathyanarayanan Kuppuswamy
Linux kernel developer
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] PCI: use PCI_SRIOV_NUM_BARS in loops instead of PCI_IOV_RESOURCE_END
2019-08-06 14:07 [PATCH] PCI: use PCI_SRIOV_NUM_BARS in loops instead of PCI_IOV_RESOURCE_END Denis Efremov
2019-08-06 17:26 ` sathyanarayanan kuppuswamy
@ 2019-08-06 20:45 ` Bjorn Helgaas
1 sibling, 0 replies; 3+ messages in thread
From: Bjorn Helgaas @ 2019-08-06 20:45 UTC (permalink / raw)
To: Denis Efremov; +Cc: linux-pci, linux-kernel
On Tue, Aug 06, 2019 at 05:07:15PM +0300, Denis Efremov wrote:
> It's a general pattern to write loops with 'i < PCI_SRIOV_NUM_BARS'
> condition. This patch fixes remaining loops which violates this implicit
> agreement.
>
> Signed-off-by: Denis Efremov <efremov@linux.com>
Applied with Kuppuswamy's reviewed-by to pci/misc for v5.4, thanks!
> ---
> drivers/pci/iov.c | 4 ++--
> drivers/pci/setup-bus.c | 4 ++--
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c
> index 525fd3f272b3..9b48818ced01 100644
> --- a/drivers/pci/iov.c
> +++ b/drivers/pci/iov.c
> @@ -557,8 +557,8 @@ static void sriov_restore_state(struct pci_dev *dev)
> ctrl |= iov->ctrl & PCI_SRIOV_CTRL_ARI;
> pci_write_config_word(dev, iov->pos + PCI_SRIOV_CTRL, ctrl);
>
> - for (i = PCI_IOV_RESOURCES; i <= PCI_IOV_RESOURCE_END; i++)
> - pci_update_resource(dev, i);
> + for (i = 0; i < PCI_SRIOV_NUM_BARS; i++)
> + pci_update_resource(dev, i + PCI_IOV_RESOURCES);
>
> pci_write_config_dword(dev, iov->pos + PCI_SRIOV_SYS_PGSIZE, iov->pgsz);
> pci_iov_set_numvfs(dev, iov->num_VFs);
> diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
> index 79b1fa6519be..e7dbe21705ba 100644
> --- a/drivers/pci/setup-bus.c
> +++ b/drivers/pci/setup-bus.c
> @@ -1662,8 +1662,8 @@ static int iov_resources_unassigned(struct pci_dev *dev, void *data)
> int i;
> bool *unassigned = data;
>
> - for (i = PCI_IOV_RESOURCES; i <= PCI_IOV_RESOURCE_END; i++) {
> - struct resource *r = &dev->resource[i];
> + for (i = 0; i < PCI_SRIOV_NUM_BARS; i++) {
> + struct resource *r = &dev->resource[i + PCI_IOV_RESOURCES];
> struct pci_bus_region region;
>
> /* Not assigned or rejected by kernel? */
> --
> 2.21.0
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-08-06 20:45 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-06 14:07 [PATCH] PCI: use PCI_SRIOV_NUM_BARS in loops instead of PCI_IOV_RESOURCE_END Denis Efremov
2019-08-06 17:26 ` sathyanarayanan kuppuswamy
2019-08-06 20:45 ` Bjorn Helgaas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).