Unverified Commit 41766052 authored by Niklas Cassel's avatar Niklas Cassel Committed by Krzysztof Wilczyński
Browse files

PCI: endpoint: pci-epf-test: Simplify pci_epf_test_alloc_space() loop 

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.

(The only configuration pci-epf-test does is setting
PCI_BASE_ADDRESS_MEM_TYPE_64 if epc_features has marked the specific BAR
as only_64bit. pci_epc_get_next_free_bar() already takes only_64bit into
account when looping.)

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.

Link: https://lore.kernel.org/linux-pci/20240320113157.322695-2-cassel@kernel.org


Signed-off-by: default avatarNiklas Cassel <cassel@kernel.org>
Signed-off-by: default avatarKrzysztof Wilczyński <kwilczynski@kernel.org>
Reviewed-by: default avatarManivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
parent 4cece764

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

+5 −8
Original line number Diff line number Diff line
@@ -817,14 +817,13 @@ static int pci_epf_test_alloc_space(struct pci_epf *epf) 
{

	struct pci_epf_test *epf_test = epf_get_drvdata(epf);

	struct device *dev = &epf->dev;

	struct pci_epf_bar *epf_bar;

	size_t msix_table_size = 0;

	size_t test_reg_bar_size;

	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 +848,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)