| Message ID | 20240313105804.100168-5-cassel@kernel.org |
|---|---|
| State | New |
| Headers | show |
| Series | PCI: endpoint: set prefetchable bit for 64-bit BARs | expand |
On Wed, Mar 13, 2024 at 11:57:56AM +0100, Niklas Cassel wrote: > Make pci-epf-test use pci_epc_get_next_free_bar() just like pci-epf-ntb.c > and pci-epf-vntb.c. > > Using pci_epc_get_next_free_bar() also makes it more obvious that > pci-epf-test does no special configuration at all. > > This way, the code is more consistent between EPF drivers, and pci-epf-test > does not need to explicitly check if the BAR is reserved, or if the index > belongs to a BAR succeeding a 64-bit only BAR. > > Signed-off-by: Niklas Cassel <cassel@kernel.org> Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> - Mani > --- > drivers/pci/endpoint/functions/pci-epf-test.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/drivers/pci/endpoint/functions/pci-epf-test.c b/drivers/pci/endpoint/functions/pci-epf-test.c > index 7dc9704128dc..20c79610712d 100644 > --- a/drivers/pci/endpoint/functions/pci-epf-test.c > +++ b/drivers/pci/endpoint/functions/pci-epf-test.c > @@ -823,8 +823,8 @@ static int pci_epf_test_alloc_space(struct pci_epf *epf) > size_t pba_size = 0; > bool msix_capable; > void *base; > - int bar, add; > enum pci_barno test_reg_bar = epf_test->test_reg_bar; > + enum pci_barno bar; > const struct pci_epc_features *epc_features; > size_t test_reg_size; > > @@ -849,16 +849,14 @@ static int pci_epf_test_alloc_space(struct pci_epf *epf) > } > epf_test->reg[test_reg_bar] = base; > > - 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; > + for (bar = BAR_0; bar < PCI_STD_NUM_BARS; bar++) { > + bar = pci_epc_get_next_free_bar(epc_features, bar); > + if (bar == NO_BAR) > + break; > > if (bar == test_reg_bar) > continue; > > - if (epc_features->bar[bar].type == BAR_RESERVED) > - continue; > - > base = pci_epf_alloc_space(epf, bar_size[bar], bar, > epc_features, PRIMARY_INTERFACE); > if (!base) > @@ -871,7 +869,9 @@ static int pci_epf_test_alloc_space(struct pci_epf *epf) > * either because the BAR can only be a 64-bit BAR, or if > * we requested a size larger than 4 GB. > */ > - add = (epf_bar->flags & PCI_BASE_ADDRESS_MEM_TYPE_64) ? 2 : 1; > + epf_bar = &epf->bar[bar]; > + if (epf_bar->flags & PCI_BASE_ADDRESS_MEM_TYPE_64) > + bar++; > } > > return 0; > -- > 2.44.0 >
diff --git a/drivers/pci/endpoint/functions/pci-epf-test.c b/drivers/pci/endpoint/functions/pci-epf-test.c index 7dc9704128dc..20c79610712d 100644 --- a/drivers/pci/endpoint/functions/pci-epf-test.c +++ b/drivers/pci/endpoint/functions/pci-epf-test.c @@ -823,8 +823,8 @@ static int pci_epf_test_alloc_space(struct pci_epf *epf) size_t pba_size = 0; bool msix_capable; void *base; - int bar, add; enum pci_barno test_reg_bar = epf_test->test_reg_bar; + enum pci_barno bar; const struct pci_epc_features *epc_features; size_t test_reg_size; @@ -849,16 +849,14 @@ static int pci_epf_test_alloc_space(struct pci_epf *epf) } epf_test->reg[test_reg_bar] = base; - 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; + for (bar = BAR_0; bar < PCI_STD_NUM_BARS; bar++) { + bar = pci_epc_get_next_free_bar(epc_features, bar); + if (bar == NO_BAR) + break; if (bar == test_reg_bar) continue; - if (epc_features->bar[bar].type == BAR_RESERVED) - continue; - base = pci_epf_alloc_space(epf, bar_size[bar], bar, epc_features, PRIMARY_INTERFACE); if (!base) @@ -871,7 +869,9 @@ static int pci_epf_test_alloc_space(struct pci_epf *epf) * either because the BAR can only be a 64-bit BAR, or if * we requested a size larger than 4 GB. */ - add = (epf_bar->flags & PCI_BASE_ADDRESS_MEM_TYPE_64) ? 2 : 1; + epf_bar = &epf->bar[bar]; + if (epf_bar->flags & PCI_BASE_ADDRESS_MEM_TYPE_64) + bar++; } return 0;
Make pci-epf-test use pci_epc_get_next_free_bar() just like pci-epf-ntb.c and pci-epf-vntb.c. Using pci_epc_get_next_free_bar() also makes it more obvious that pci-epf-test does no special configuration at all. This way, the code is more consistent between EPF drivers, and pci-epf-test does not need to explicitly check if the BAR is reserved, or if the index belongs to a BAR succeeding a 64-bit only BAR. Signed-off-by: Niklas Cassel <cassel@kernel.org> --- drivers/pci/endpoint/functions/pci-epf-test.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)