Merge tag 'kbuild-v6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy...

[J-linux.git] / drivers / pci / endpoint / functions / pci-epf-test.c

diff --git a/drivers/pci/endpoint/functions/pci-epf-test.c b/drivers/pci/endpoint/functions/pci-epf-test.c
index 18c80002d3bd57c1116e04937371eb7077582835..cd4ffb39dcdc6137a3569ac420c90fc09cce7983 100644 (file)
--- a/drivers/pci/endpoint/functions/pci-epf-test.c
+++ b/drivers/pci/endpoint/functions/pci-epf-test.c
@@ -729,7 +729,7 @@ static int pci_epf_test_set_bar(struct pci_epf *epf)
                 */
                add = (epf_bar->flags & PCI_BASE_ADDRESS_MEM_TYPE_64) ? 2 : 1;
 
-               if (!!(epc_features->reserved_bar & (1 << bar)))
+               if (epc_features->bar[bar].type == BAR_RESERVED)
                        continue;
 
                ret = pci_epc_set_bar(epc, epf->func_no, epf->vfunc_no,
@@ -841,14 +841,8 @@ static int pci_epf_test_alloc_space(struct pci_epf *epf)
        }
        test_reg_size = test_reg_bar_size + msix_table_size + pba_size;
 
-       if (epc_features->bar_fixed_size[test_reg_bar]) {
-               if (test_reg_size > bar_size[test_reg_bar])
-                       return -ENOMEM;
-               test_reg_size = bar_size[test_reg_bar];
-       }
-
        base = pci_epf_alloc_space(epf, test_reg_size, test_reg_bar,
-                                  epc_features->align, PRIMARY_INTERFACE);
+                                  epc_features, PRIMARY_INTERFACE);
        if (!base) {
                dev_err(dev, "Failed to allocated register space\n");
                return -ENOMEM;
@@ -862,12 +856,11 @@ static int pci_epf_test_alloc_space(struct pci_epf *epf)
                if (bar == test_reg_bar)
                        continue;
 
-               if (!!(epc_features->reserved_bar & (1 << bar)))
+               if (epc_features->bar[bar].type == BAR_RESERVED)
                        continue;
 
                base = pci_epf_alloc_space(epf, bar_size[bar], bar,
-                                          epc_features->align,
-                                          PRIMARY_INTERFACE);
+                                          epc_features, PRIMARY_INTERFACE);
                if (!base)
                        dev_err(dev, "Failed to allocate space for BAR%d\n",
                                bar);
@@ -881,16 +874,12 @@ static void pci_epf_configure_bar(struct pci_epf *epf,
                                  const struct pci_epc_features *epc_features)
 {
        struct pci_epf_bar *epf_bar;
-       bool bar_fixed_64bit;
        int 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)
+               if (epc_features->bar[i].only_64bit)
                        epf_bar->flags |= PCI_BASE_ADDRESS_MEM_TYPE_64;
-               if (epc_features->bar_fixed_size[i])
-                       bar_size[i] = epc_features->bar_fixed_size[i];
        }
 }