Skip to content

Commit e49eab9

Browse files
floatiouskwilczynski
authored andcommitted
PCI: endpoint: pci-epf-test: Simplify pci_epf_test_set_bar() loop
Simplify the loop in pci_epf_test_set_bar(). If we allocated memory for the BAR, we need to call set_bar() for that BAR, if we did not allocated memory for that BAR, we need to skip. It is as simple as that. This also matches the logic in pci_epf_test_unbind(). A 64-bit BAR will still only be one allocation, with the BAR succeeding the 64-bit BAR being null. While at it, remove the misleading comment. A EPC .set_bar() callback should never change the epf_bar->flags. (E.g. to set a 64-bit BAR if we requested a 32-bit BAR.) A .set_bar() callback should do what we request it to do. If it can't satisfy the request, it should return an error. If platform has a specific requirement, e.g. that a certain BAR has to be a 64-bit BAR, then it should specify that by setting the .only_64bit flag for that specific BAR in epc_features->bar[], such that pci_epf_alloc_space() will return a epf_bar with the 64-bit flag set. (Such that .set_bar() will receive a request to set a 64-bit BAR.) Link: https://lore.kernel.org/linux-pci/[email protected] Signed-off-by: Niklas Cassel <[email protected]> Signed-off-by: Krzysztof Wilczyński <[email protected]> Reviewed-by: Manivannan Sadhasivam <[email protected]>
1 parent 828e870 commit e49eab9

File tree

1 file changed

+4
-17
lines changed

1 file changed

+4
-17
lines changed

drivers/pci/endpoint/functions/pci-epf-test.c

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -709,31 +709,18 @@ static void pci_epf_test_unbind(struct pci_epf *epf)
709709

710710
static int pci_epf_test_set_bar(struct pci_epf *epf)
711711
{
712-
int bar, add;
713-
int ret;
714-
struct pci_epf_bar *epf_bar;
712+
int bar, ret;
715713
struct pci_epc *epc = epf->epc;
716714
struct device *dev = &epf->dev;
717715
struct pci_epf_test *epf_test = epf_get_drvdata(epf);
718716
enum pci_barno test_reg_bar = epf_test->test_reg_bar;
719-
const struct pci_epc_features *epc_features;
720717

721-
epc_features = epf_test->epc_features;
722-
723-
for (bar = 0; bar < PCI_STD_NUM_BARS; bar += add) {
724-
epf_bar = &epf->bar[bar];
725-
/*
726-
* pci_epc_set_bar() sets PCI_BASE_ADDRESS_MEM_TYPE_64
727-
* if the specific implementation required a 64-bit BAR,
728-
* even if we only requested a 32-bit BAR.
729-
*/
730-
add = (epf_bar->flags & PCI_BASE_ADDRESS_MEM_TYPE_64) ? 2 : 1;
731-
732-
if (epc_features->bar[bar].type == BAR_RESERVED)
718+
for (bar = 0; bar < PCI_STD_NUM_BARS; bar++) {
719+
if (!epf_test->reg[bar])
733720
continue;
734721

735722
ret = pci_epc_set_bar(epc, epf->func_no, epf->vfunc_no,
736-
epf_bar);
723+
&epf->bar[bar]);
737724
if (ret) {
738725
pci_epf_free_space(epf, epf_test->reg[bar], bar,
739726
PRIMARY_INTERFACE);

0 commit comments

Comments
 (0)