PCI: endpoint: Refactor pci_epf_alloc_space() API

Refactor pci_epf_alloc_space() API to accept "epc_features" as a parameter.
This is a preparatory work to make the API more robust.

Reviewed-by: Frank Li <Frank.Li@nxp.com>
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: Niklas Cassel <cassel@kernel.org>
Link: https://lore.kernel.org/r/20240207213922.1796533-2-cassel@kernel.org
[mani: reworded commit message]
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>

diff --git a/drivers/pci/endpoint/functions/pci-epf-ntb.c b/drivers/pci/endpoint/functions/pci-epf-ntb.c
index 0553946005c4d92990af6ca8ce6962ea51e74772..43cd309ce22f6c80e0ca6ab40dd7e28707149e80 100644 (file)
--- a/drivers/pci/endpoint/functions/pci-epf-ntb.c
+++ b/drivers/pci/endpoint/functions/pci-epf-ntb.c
@@ -1067,7 +1067,7 @@ static int epf_ntb_config_spad_bar_alloc(struct epf_ntb *ntb,
        else if (size < ctrl_size + spad_size)
                return -EINVAL;
 
-       base = pci_epf_alloc_space(epf, size, barno, align, type);
+       base = pci_epf_alloc_space(epf, size, barno, epc_features, type);
        if (!base) {
                dev_err(dev, "%s intf: Config/Status/SPAD alloc region fail\n",
                        pci_epc_interface_string(type));

diff --git a/drivers/pci/endpoint/functions/pci-epf-test.c b/drivers/pci/endpoint/functions/pci-epf-test.c
index 18c80002d3bd57c1116e04937371eb7077582835..15bfa7d83489bd079c00ddee1c352f031a45c916 100644 (file)
--- a/drivers/pci/endpoint/functions/pci-epf-test.c
+++ b/drivers/pci/endpoint/functions/pci-epf-test.c
@@ -848,7 +848,7 @@ static int pci_epf_test_alloc_space(struct pci_epf *epf)
        }
 
        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;
@@ -866,8 +866,7 @@ static int pci_epf_test_alloc_space(struct pci_epf *epf)
                        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);

diff --git a/drivers/pci/endpoint/functions/pci-epf-vntb.c b/drivers/pci/endpoint/functions/pci-epf-vntb.c
index e75a2af77328ea47efb67ea358b4f847d4275687..ba509d67188b3b5c3e46d14156dd575cc5a83d30 100644 (file)
--- a/drivers/pci/endpoint/functions/pci-epf-vntb.c
+++ b/drivers/pci/endpoint/functions/pci-epf-vntb.c
@@ -446,7 +446,7 @@ static int epf_ntb_config_spad_bar_alloc(struct epf_ntb *ntb)
        else if (size < ctrl_size + spad_size)
                return -EINVAL;
 
-       base = pci_epf_alloc_space(epf, size, barno, align, 0);
+       base = pci_epf_alloc_space(epf, size, barno, epc_features, 0);
        if (!base) {
                dev_err(dev, "Config/Status/SPAD alloc region fail\n");
                return -ENOMEM;
@@ -550,7 +550,7 @@ static int epf_ntb_db_bar_init(struct epf_ntb *ntb)
 
        barno = ntb->epf_ntb_bar[BAR_DB];
 
-       mw_addr = pci_epf_alloc_space(ntb->epf, size, barno, align, 0);
+       mw_addr = pci_epf_alloc_space(ntb->epf, size, barno, epc_features, 0);
        if (!mw_addr) {
                dev_err(dev, "Failed to allocate OB address\n");
                return -ENOMEM;

diff --git a/drivers/pci/endpoint/pci-epf-core.c b/drivers/pci/endpoint/pci-epf-core.c
index bf655383e5edad5d9ab88b1f7a7d79f5ac574389..9da9a1e9c0861b5251ade592134d392fc6f348b9 100644 (file)
--- a/drivers/pci/endpoint/pci-epf-core.c
+++ b/drivers/pci/endpoint/pci-epf-core.c
@@ -251,14 +251,16 @@ EXPORT_SYMBOL_GPL(pci_epf_free_space);
  * @epf: the EPF device to whom allocate the memory
  * @size: the size of the memory that has to be allocated
  * @bar: the BAR number corresponding to the allocated register space
- * @align: alignment size for the allocation region
+ * @epc_features: the features provided by the EPC specific to this EPF
  * @type: Identifies if the allocation is for primary EPC or secondary EPC
  *
  * Invoke to allocate memory for the PCI EPF register space.
  */
 void *pci_epf_alloc_space(struct pci_epf *epf, size_t size, enum pci_barno bar,
-                         size_t align, enum pci_epc_interface_type type)
+                         const struct pci_epc_features *epc_features,
+                         enum pci_epc_interface_type type)
 {
+       size_t align = epc_features->align;
        struct pci_epf_bar *epf_bar;
        dma_addr_t phys_addr;
        struct pci_epc *epc;

diff --git a/include/linux/pci-epf.h b/include/linux/pci-epf.h
index 77b146e0f6727e2e8b9820b90b16584714063044..adee6a1b35db70e50fa2b95bda6a0fb3632e4f75 100644 (file)
--- a/include/linux/pci-epf.h
+++ b/include/linux/pci-epf.h
@@ -15,6 +15,7 @@
 #include <linux/pci.h>
 
 struct pci_epf;
+struct pci_epc_features;
 enum pci_epc_interface_type;
 
 enum pci_barno {
@@ -216,7 +217,8 @@ int __pci_epf_register_driver(struct pci_epf_driver *driver,
                              struct module *owner);
 void pci_epf_unregister_driver(struct pci_epf_driver *driver);
 void *pci_epf_alloc_space(struct pci_epf *epf, size_t size, enum pci_barno bar,
-                         size_t align, enum pci_epc_interface_type type);
+                         const struct pci_epc_features *epc_features,
+                         enum pci_epc_interface_type type);
 void pci_epf_free_space(struct pci_epf *epf, void *addr, enum pci_barno bar,
                        enum pci_epc_interface_type type);
 int pci_epf_bind(struct pci_epf *epf);