From: Denis Efremov <efremov@linux.com>
To: Andrew Murray <andrew.murray@arm.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>,
linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org,
Kishon Vijay Abraham I <kishon@ti.com>,
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Subject: Re: [PATCH v3 04/26] PCI: endpoint: Use PCI_STD_NUM_BARS
Date: Wed, 18 Sep 2019 17:20:47 +0300 [thread overview]
Message-ID: <2c5fa911-3aca-216f-7c38-e970840af26a@linux.com> (raw)
In-Reply-To: <20190918091949.GB9720@e119886-lin.cambridge.arm.com>
On 9/18/19 12:19 PM, Andrew Murray wrote:
> On Mon, Sep 16, 2019 at 11:41:36PM +0300, Denis Efremov wrote:
>> 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 to PCI_STD_NUM_BARS where
>> appropriate.
>>
>> Cc: Kishon Vijay Abraham I <kishon@ti.com>
>> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
>> Signed-off-by: Denis Efremov <efremov@linux.com>
>> ---
>> drivers/pci/endpoint/functions/pci-epf-test.c | 10 +++++-----
>> include/linux/pci-epc.h | 2 +-
>> 2 files changed, 6 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/pci/endpoint/functions/pci-epf-test.c b/drivers/pci/endpoint/functions/pci-epf-test.c
>> index 1cfe3687a211..5d74f81ddfe4 100644
>> --- a/drivers/pci/endpoint/functions/pci-epf-test.c
>> +++ b/drivers/pci/endpoint/functions/pci-epf-test.c
>> @@ -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) {
>
> Is it possible to completely remove the BAR_x macros, 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;
>
> 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?
I changed BAR_0 to 0 in order to not mix different notions, i.e. the number
of bars and the concrete bar.
>
> 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
>
> Thanks,
>
> Andrew Murray
>
>> 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)
>> diff --git a/include/linux/pci-epc.h b/include/linux/pci-epc.h
>> index f641badc2c61..56f1846b9d39 100644
>> --- a/include/linux/pci-epc.h
>> +++ b/include/linux/pci-epc.h
>> @@ -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;
>> };
>>
>> --
>> 2.21.0
>>
next prev parent reply other threads:[~2019-09-18 14:20 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20190916204158.6889-1-efremov@linux.com>
2019-09-16 20:41 ` [PATCH v3 02/26] PCI: hv: Use PCI_STD_NUM_BARS Denis Efremov
2019-09-16 21:19 ` Haiyang Zhang
2019-09-26 22:05 ` Bjorn Helgaas
2019-09-27 12:43 ` Bjorn Helgaas
2019-09-27 23:40 ` [PATCH RESEND v3 00/26] Add definition for the number of standard PCI BARs Denis Efremov
2019-09-30 19:58 ` Bjorn Helgaas
2019-09-27 23:43 ` [PATCH RESEND v3 01/26] PCI: Add define " Denis Efremov
2019-09-16 20:41 ` [PATCH v3 03/26] PCI: dwc: Use PCI_STD_NUM_BARS Denis Efremov
2019-09-17 8:36 ` Gustavo Pimentel
2019-09-16 20:41 ` [PATCH v3 04/26] PCI: endpoint: " Denis Efremov
2019-09-18 9:19 ` Andrew Murray
2019-09-18 14:20 ` Denis Efremov [this message]
2019-09-16 20:41 ` [PATCH v3 05/26] misc: pci_endpoint_test: " Denis Efremov
2019-09-16 20:41 ` [PATCH v3 06/26] s390/pci: " Denis Efremov
2019-09-18 8:58 ` Andrew Murray
2019-09-18 14:26 ` Denis Efremov
2019-09-19 8:00 ` Andrew Murray
2019-09-30 19:47 ` Bjorn Helgaas
2019-09-16 20:41 ` [PATCH v3 07/26] x86/PCI: Loop using PCI_STD_NUM_BARS Denis Efremov
2019-09-16 20:41 ` [PATCH v3 08/26] alpha/PCI: Use PCI_STD_NUM_BARS Denis Efremov
2019-09-16 20:41 ` [PATCH v3 09/26] ia64: " Denis Efremov
2019-09-16 20:41 ` [PATCH v3 10/26] stmmac: pci: Loop using PCI_STD_NUM_BARS Denis Efremov
2019-09-16 20:41 ` [PATCH v3 11/26] net: dwc-xlgmac: " Denis Efremov
2019-09-16 20:41 ` [PATCH v3 12/26] ixgb: use PCI_STD_NUM_BARS Denis Efremov
2019-09-16 20:41 ` [PATCH v3 13/26] e1000: Use PCI_STD_NUM_BARS Denis Efremov
2019-09-18 9:05 ` Andrew Murray
2019-09-16 20:41 ` [PATCH v3 14/26] rapidio/tsi721: Loop using PCI_STD_NUM_BARS Denis Efremov
2019-09-16 20:41 ` [PATCH v3 15/26] efifb: " Denis Efremov
2019-09-16 20:41 ` [PATCH v3 16/26] fbmem: use PCI_STD_NUM_BARS Denis Efremov
2019-09-16 20:41 ` [PATCH v3 17/26] vfio_pci: Loop using PCI_STD_NUM_BARS Denis Efremov
2019-09-18 9:17 ` Andrew Murray
2019-09-18 14:31 ` Denis Efremov
2019-09-19 8:00 ` Andrew Murray
2019-09-16 20:41 ` [PATCH v3 18/26] scsi: pm80xx: Use PCI_STD_NUM_BARS Denis Efremov
2019-09-17 9:06 ` Jinpu Wang
2019-09-24 2:22 ` Martin K. Petersen
2019-09-24 9:44 ` Denis Efremov
2019-09-26 2:29 ` Bjorn Helgaas
2019-09-26 22:51 ` Martin K. Petersen
2019-09-16 20:41 ` [PATCH v3 19/26] ata: sata_nv: " Denis Efremov
2019-09-16 20:41 ` [PATCH v3 20/26] staging: gasket: " Denis Efremov
2019-09-16 20:41 ` [PATCH v3 21/26] serial: 8250_pci: " Denis Efremov
2019-09-16 20:41 ` [PATCH v3 22/26] pata_atp867x: " Denis Efremov
2019-09-16 20:41 ` [PATCH v3 23/26] memstick: use PCI_STD_NUM_BARS Denis Efremov
2019-09-20 7:42 ` Ulf Hansson
2019-09-20 8:05 ` Denis Efremov
2019-09-16 20:41 ` [PATCH v3 24/26] USB: core: Use PCI_STD_NUM_BARS Denis Efremov
2019-09-16 20:41 ` [PATCH v3 25/26] usb: pci-quirks: " Denis Efremov
2019-09-16 20:41 ` [PATCH v3 26/26] devres: use PCI_STD_NUM_BARS Denis Efremov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2c5fa911-3aca-216f-7c38-e970840af26a@linux.com \
--to=efremov@linux.com \
--cc=andrew.murray@arm.com \
--cc=bhelgaas@google.com \
--cc=kishon@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).