PCI: endpoint: Create configfs entry for EPC device and EPF driver

Invoke APIs provided by pci-ep-cfs to create configfs entry for every EPC
device and EPF driver to help users in creating EPF device and binding the
EPF device to the EPC device.

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/drivers/pci/endpoint/pci-epc-core.c b/drivers/pci/endpoint/pci-epc-core.c
index 7c71dd94721c48f9b903aefec2476e895772e8e3..caa7be10e473f0e0df8f6b45584da72fdf545d0b 100644 (file)
--- a/drivers/pci/endpoint/pci-epc-core.c
+++ b/drivers/pci/endpoint/pci-epc-core.c
@@ -24,6 +24,7 @@
 
 #include <linux/pci-epc.h>
 #include <linux/pci-epf.h>
+#include <linux/pci-ep-cfs.h>
 
 static struct class *pci_epc_class;
 
@@ -442,6 +443,7 @@ EXPORT_SYMBOL_GPL(pci_epc_linkup);
  */
 void pci_epc_destroy(struct pci_epc *epc)
 {
+       pci_ep_cfs_remove_epc_group(epc->group);
        device_unregister(&epc->dev);
        kfree(epc);
 }
@@ -508,6 +510,8 @@ __pci_epc_create(struct device *dev, const struct pci_epc_ops *ops,
        if (ret)
                goto put_dev;
 
+       epc->group = pci_ep_cfs_add_epc_group(dev_name(dev));
+
        return epc;
 
 put_dev:

diff --git a/drivers/pci/endpoint/pci-epf-core.c b/drivers/pci/endpoint/pci-epf-core.c
index a281c599a5040b08d77becba9627325f062a88b6..6877d6a5bcc9770136f3f14d100fd90ddc965396 100644 (file)
--- a/drivers/pci/endpoint/pci-epf-core.c
+++ b/drivers/pci/endpoint/pci-epf-core.c
@@ -24,6 +24,7 @@
 
 #include <linux/pci-epc.h>
 #include <linux/pci-epf.h>
+#include <linux/pci-ep-cfs.h>
 
 static struct bus_type pci_epf_bus_type;
 static struct device_type pci_epf_type;
@@ -149,6 +150,7 @@ EXPORT_SYMBOL_GPL(pci_epf_alloc_space);
  */
 void pci_epf_unregister_driver(struct pci_epf_driver *driver)
 {
+       pci_ep_cfs_remove_epf_group(driver->group);
        driver_unregister(&driver->driver);
 }
 EXPORT_SYMBOL_GPL(pci_epf_unregister_driver);
@@ -178,6 +180,8 @@ int __pci_epf_register_driver(struct pci_epf_driver *driver,
        if (ret)
                return ret;
 
+       driver->group = pci_ep_cfs_add_epf_group(driver->driver.name);
+
        return 0;
 }
 EXPORT_SYMBOL_GPL(__pci_epf_register_driver);

diff --git a/include/linux/pci-epc.h b/include/linux/pci-epc.h
index 8c63d3c37f761b8e8f838b781af451319d7cbc36..af5edbf3eea3c2d1767bfaf660634ec63729b54f 100644 (file)
--- a/include/linux/pci-epc.h
+++ b/include/linux/pci-epc.h
@@ -77,6 +77,7 @@ struct pci_epc_mem {
  * @ops: function pointers for performing endpoint operations
  * @mem: address space of the endpoint controller
  * @max_functions: max number of functions that can be configured in this EPC
+ * @group: configfs group representing the PCI EPC device
  * @lock: spinlock to protect pci_epc ops
  */
 struct pci_epc {
@@ -85,6 +86,7 @@ struct pci_epc {
        const struct pci_epc_ops        *ops;
        struct pci_epc_mem              *mem;
        u8                              max_functions;
+       struct config_group             *group;
        /* spinlock to protect against concurrent access of EP controller */
        spinlock_t                      lock;
 };

diff --git a/include/linux/pci-epf.h b/include/linux/pci-epf.h
index 5628714f7bcfd7f96d0b551c9866be544ebd2c2a..0d529cb9014398df67893a72efb7f2f171111345 100644 (file)
--- a/include/linux/pci-epf.h
+++ b/include/linux/pci-epf.h
@@ -82,6 +82,7 @@ struct pci_epf_ops {
  * @driver: PCI EPF driver
  * @ops: set of function pointers for performing EPF operations
  * @owner: the owner of the module that registers the PCI EPF driver
+ * @group: configfs group corresponding to the PCI EPF driver
  * @id_table: identifies EPF devices for probing
  */
 struct pci_epf_driver {
@@ -91,6 +92,7 @@ struct pci_epf_driver {
        struct device_driver    driver;
        struct pci_epf_ops      *ops;
        struct module           *owner;
+       struct config_group     *group;
        const struct pci_epf_device_id  *id_table;
 };