crypto: qat - move dbgfs init to separate file

Move initialization of debugfs entries to a separate file.
This simplifies the exclusion of the debugfs logic in the QAT driver
when the kernel is built with CONFIG_DEBUG_FS=n.
In addition, it will allow to consolidate the addition of debugfs
entries to a single location in the code.

This implementation adds infrastructure to create (and remove) debugfs
entries at two different stages. The first, done when a device is probed,
allows to keep debugfs entries persistent between a transition in device
state (up to down or vice versa). The second, done after the initialization
phase, allows to have debugfs entries that are accessible only when
the device is up.

In addition, move the creation of debugfs entries for configuration
to the newly created function adf_dbgfs_init() and replace symbolic
permissions with octal permissions when creating the debugfs files.
This is to resolve the following warning reported by checkpatch:

  WARNING: Symbolic permissions 'S_IRUSR' are not preferred. Consider using octal permissions '0400'.

Signed-off-by: Damian Muszynski <damian.muszynski@intel.com>
Reviewed-by: Giovanni Cabiddu <giovanni.cabiddu@intel.com>
Signed-off-by: Giovanni Cabiddu <giovanni.cabiddu@intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/intel/qat/qat_4xxx/adf_drv.c b/drivers/crypto/intel/qat/qat_4xxx/adf_drv.c
index ceb87327a5fe0f8cfdaf24c972c8192165c20a7e..3ecc19087780141ba9500297d1eaae31ad2097bf 100644 (file)
--- a/drivers/crypto/intel/qat/qat_4xxx/adf_drv.c
+++ b/drivers/crypto/intel/qat/qat_4xxx/adf_drv.c
@@ -7,6 +7,7 @@
 #include <adf_accel_devices.h>
 #include <adf_cfg.h>
 #include <adf_common_drv.h>
+#include <adf_dbgfs.h>
 
 #include "adf_4xxx_hw_data.h"
 #include "qat_compression.h"
@@ -37,8 +38,8 @@ static void adf_cleanup_accel(struct adf_accel_dev *accel_dev)
                adf_clean_hw_data_4xxx(accel_dev->hw_device);
                accel_dev->hw_device = NULL;
        }
+       adf_dbgfs_exit(accel_dev);
        adf_cfg_dev_remove(accel_dev);
-       debugfs_remove(accel_dev->debugfs_dir);
        adf_devmgr_rm_dev(accel_dev, NULL);
 }
 
@@ -289,7 +290,6 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        struct adf_accel_dev *accel_dev;
        struct adf_accel_pci *accel_pci_dev;
        struct adf_hw_device_data *hw_data;
-       char name[ADF_DEVICE_NAME_LENGTH];
        unsigned int i, bar_nr;
        unsigned long bar_mask;
        struct adf_bar *bar;
@@ -348,12 +348,6 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                goto out_err;
        }
 
-       /* Create dev top level debugfs entry */
-       snprintf(name, sizeof(name), "%s%s_%s", ADF_DEVICE_NAME_PREFIX,
-                hw_data->dev_class->name, pci_name(pdev));
-
-       accel_dev->debugfs_dir = debugfs_create_dir(name, NULL);
-
        /* Create device configuration table */
        ret = adf_cfg_dev_add(accel_dev);
        if (ret)
@@ -410,6 +404,8 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                goto out_err;
        }
 
+       adf_dbgfs_init(accel_dev);
+
        ret = adf_dev_up(accel_dev, true);
        if (ret)
                goto out_err_dev_stop;

diff --git a/drivers/crypto/intel/qat/qat_c3xxx/adf_drv.c b/drivers/crypto/intel/qat/qat_c3xxx/adf_drv.c
index bb4dca735ab5ad8894b961301d969e8e56c07e5d..468c9102093fce93303fe2cfeb3ed27df10a8598 100644 (file)
--- a/drivers/crypto/intel/qat/qat_c3xxx/adf_drv.c
+++ b/drivers/crypto/intel/qat/qat_c3xxx/adf_drv.c
@@ -16,6 +16,7 @@
 #include <adf_accel_devices.h>
 #include <adf_common_drv.h>
 #include <adf_cfg.h>
+#include <adf_dbgfs.h>
 #include "adf_c3xxx_hw_data.h"
 
 static const struct pci_device_id adf_pci_tbl[] = {
@@ -65,8 +66,8 @@ static void adf_cleanup_accel(struct adf_accel_dev *accel_dev)
                kfree(accel_dev->hw_device);
                accel_dev->hw_device = NULL;
        }
+       adf_dbgfs_exit(accel_dev);
        adf_cfg_dev_remove(accel_dev);
-       debugfs_remove(accel_dev->debugfs_dir);
        adf_devmgr_rm_dev(accel_dev, NULL);
 }
 
@@ -75,7 +76,6 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        struct adf_accel_dev *accel_dev;
        struct adf_accel_pci *accel_pci_dev;
        struct adf_hw_device_data *hw_data;
-       char name[ADF_DEVICE_NAME_LENGTH];
        unsigned int i, bar_nr;
        unsigned long bar_mask;
        int ret;
@@ -142,12 +142,6 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                goto out_err;
        }
 
-       /* Create dev top level debugfs entry */
-       snprintf(name, sizeof(name), "%s%s_%s", ADF_DEVICE_NAME_PREFIX,
-                hw_data->dev_class->name, pci_name(pdev));
-
-       accel_dev->debugfs_dir = debugfs_create_dir(name, NULL);
-
        /* Create device configuration table */
        ret = adf_cfg_dev_add(accel_dev);
        if (ret)
@@ -199,6 +193,8 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                goto out_err_free_reg;
        }
 
+       adf_dbgfs_init(accel_dev);
+
        ret = adf_dev_up(accel_dev, true);
        if (ret)
                goto out_err_dev_stop;

diff --git a/drivers/crypto/intel/qat/qat_c3xxxvf/adf_drv.c b/drivers/crypto/intel/qat/qat_c3xxxvf/adf_drv.c
index e8cc10f641343786b02354032804b3d3c3379202..d5a0ecca9d0bba4929863448d479d52258d00a8d 100644 (file)
--- a/drivers/crypto/intel/qat/qat_c3xxxvf/adf_drv.c
+++ b/drivers/crypto/intel/qat/qat_c3xxxvf/adf_drv.c
@@ -16,6 +16,7 @@
 #include <adf_accel_devices.h>
 #include <adf_common_drv.h>
 #include <adf_cfg.h>
+#include <adf_dbgfs.h>
 #include "adf_c3xxxvf_hw_data.h"
 
 static const struct pci_device_id adf_pci_tbl[] = {
@@ -64,8 +65,8 @@ static void adf_cleanup_accel(struct adf_accel_dev *accel_dev)
                kfree(accel_dev->hw_device);
                accel_dev->hw_device = NULL;
        }
+       adf_dbgfs_exit(accel_dev);
        adf_cfg_dev_remove(accel_dev);
-       debugfs_remove(accel_dev->debugfs_dir);
        pf = adf_devmgr_pci_to_accel_dev(accel_pci_dev->pci_dev->physfn);
        adf_devmgr_rm_dev(accel_dev, pf);
 }
@@ -76,7 +77,6 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        struct adf_accel_dev *pf;
        struct adf_accel_pci *accel_pci_dev;
        struct adf_hw_device_data *hw_data;
-       char name[ADF_DEVICE_NAME_LENGTH];
        unsigned int i, bar_nr;
        unsigned long bar_mask;
        int ret;
@@ -123,12 +123,6 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        hw_data->ae_mask = hw_data->get_ae_mask(hw_data);
        accel_pci_dev->sku = hw_data->get_sku(hw_data);
 
-       /* Create dev top level debugfs entry */
-       snprintf(name, sizeof(name), "%s%s_%s", ADF_DEVICE_NAME_PREFIX,
-                hw_data->dev_class->name, pci_name(pdev));
-
-       accel_dev->debugfs_dir = debugfs_create_dir(name, NULL);
-
        /* Create device configuration table */
        ret = adf_cfg_dev_add(accel_dev);
        if (ret)
@@ -173,6 +167,8 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        /* Completion for VF2PF request/response message exchange */
        init_completion(&accel_dev->vf.msg_received);
 
+       adf_dbgfs_init(accel_dev);
+
        ret = adf_dev_up(accel_dev, false);
        if (ret)
                goto out_err_dev_stop;

diff --git a/drivers/crypto/intel/qat/qat_c62x/adf_drv.c b/drivers/crypto/intel/qat/qat_c62x/adf_drv.c
index ca18ae14c09972d33b07f49a99ce11173b5d9cd9..0186921be93689d041b0e0b7a88ef4437ae49907 100644 (file)
--- a/drivers/crypto/intel/qat/qat_c62x/adf_drv.c
+++ b/drivers/crypto/intel/qat/qat_c62x/adf_drv.c
@@ -16,6 +16,7 @@
 #include <adf_accel_devices.h>
 #include <adf_common_drv.h>
 #include <adf_cfg.h>
+#include <adf_dbgfs.h>
 #include "adf_c62x_hw_data.h"
 
 static const struct pci_device_id adf_pci_tbl[] = {
@@ -65,8 +66,8 @@ static void adf_cleanup_accel(struct adf_accel_dev *accel_dev)
                kfree(accel_dev->hw_device);
                accel_dev->hw_device = NULL;
        }
+       adf_dbgfs_exit(accel_dev);
        adf_cfg_dev_remove(accel_dev);
-       debugfs_remove(accel_dev->debugfs_dir);
        adf_devmgr_rm_dev(accel_dev, NULL);
 }
 
@@ -75,7 +76,6 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        struct adf_accel_dev *accel_dev;
        struct adf_accel_pci *accel_pci_dev;
        struct adf_hw_device_data *hw_data;
-       char name[ADF_DEVICE_NAME_LENGTH];
        unsigned int i, bar_nr;
        unsigned long bar_mask;
        int ret;
@@ -142,12 +142,6 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                goto out_err;
        }
 
-       /* Create dev top level debugfs entry */
-       snprintf(name, sizeof(name), "%s%s_%s", ADF_DEVICE_NAME_PREFIX,
-                hw_data->dev_class->name, pci_name(pdev));
-
-       accel_dev->debugfs_dir = debugfs_create_dir(name, NULL);
-
        /* Create device configuration table */
        ret = adf_cfg_dev_add(accel_dev);
        if (ret)
@@ -199,6 +193,8 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                goto out_err_free_reg;
        }
 
+       adf_dbgfs_init(accel_dev);
+
        ret = adf_dev_up(accel_dev, true);
        if (ret)
                goto out_err_dev_stop;

diff --git a/drivers/crypto/intel/qat/qat_c62xvf/adf_drv.c b/drivers/crypto/intel/qat/qat_c62xvf/adf_drv.c
index 37566309df943a931ced86abcfc73f75be859a55..c9ae6c0d0dca2ec39b872de9d0e8e443c8605b3a 100644 (file)
--- a/drivers/crypto/intel/qat/qat_c62xvf/adf_drv.c
+++ b/drivers/crypto/intel/qat/qat_c62xvf/adf_drv.c
@@ -16,6 +16,7 @@
 #include <adf_accel_devices.h>
 #include <adf_common_drv.h>
 #include <adf_cfg.h>
+#include <adf_dbgfs.h>
 #include "adf_c62xvf_hw_data.h"
 
 static const struct pci_device_id adf_pci_tbl[] = {
@@ -64,8 +65,8 @@ static void adf_cleanup_accel(struct adf_accel_dev *accel_dev)
                kfree(accel_dev->hw_device);
                accel_dev->hw_device = NULL;
        }
+       adf_dbgfs_exit(accel_dev);
        adf_cfg_dev_remove(accel_dev);
-       debugfs_remove(accel_dev->debugfs_dir);
        pf = adf_devmgr_pci_to_accel_dev(accel_pci_dev->pci_dev->physfn);
        adf_devmgr_rm_dev(accel_dev, pf);
 }
@@ -76,7 +77,6 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        struct adf_accel_dev *pf;
        struct adf_accel_pci *accel_pci_dev;
        struct adf_hw_device_data *hw_data;
-       char name[ADF_DEVICE_NAME_LENGTH];
        unsigned int i, bar_nr;
        unsigned long bar_mask;
        int ret;
@@ -123,12 +123,6 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        hw_data->ae_mask = hw_data->get_ae_mask(hw_data);
        accel_pci_dev->sku = hw_data->get_sku(hw_data);
 
-       /* Create dev top level debugfs entry */
-       snprintf(name, sizeof(name), "%s%s_%s", ADF_DEVICE_NAME_PREFIX,
-                hw_data->dev_class->name, pci_name(pdev));
-
-       accel_dev->debugfs_dir = debugfs_create_dir(name, NULL);
-
        /* Create device configuration table */
        ret = adf_cfg_dev_add(accel_dev);
        if (ret)
@@ -173,6 +167,8 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        /* Completion for VF2PF request/response message exchange */
        init_completion(&accel_dev->vf.msg_received);
 
+       adf_dbgfs_init(accel_dev);
+
        ret = adf_dev_up(accel_dev, false);
        if (ret)
                goto out_err_dev_stop;

diff --git a/drivers/crypto/intel/qat/qat_common/Makefile b/drivers/crypto/intel/qat/qat_common/Makefile
index 1fb8d50f509f82c24361a1d93e6148b8244e2c94..38de3aba6e8ce360b0c92fac9a2667ecb6a51f11 100644 (file)
--- a/drivers/crypto/intel/qat/qat_common/Makefile
+++ b/drivers/crypto/intel/qat/qat_common/Makefile
@@ -27,7 +27,9 @@ intel_qat-objs := adf_cfg.o \
        qat_hal.o \
        qat_bl.o
 
-intel_qat-$(CONFIG_DEBUG_FS) += adf_transport_debug.o
+intel_qat-$(CONFIG_DEBUG_FS) += adf_transport_debug.o \
+                               adf_dbgfs.o
+
 intel_qat-$(CONFIG_PCI_IOV) += adf_sriov.o adf_vf_isr.o adf_pfvf_utils.o \
                               adf_pfvf_pf_msg.o adf_pfvf_pf_proto.o \
                               adf_pfvf_vf_msg.o adf_pfvf_vf_proto.o \

diff --git a/drivers/crypto/intel/qat/qat_common/adf_cfg.c b/drivers/crypto/intel/qat/qat_common/adf_cfg.c
index 1931e5b37f2bd16d84b493a369aaaac74f0c53d1..8836f015c39c41e0fbdb9c2db230c1aa8b9952c9 100644 (file)
--- a/drivers/crypto/intel/qat/qat_common/adf_cfg.c
+++ b/drivers/crypto/intel/qat/qat_common/adf_cfg.c
@@ -74,15 +74,30 @@ int adf_cfg_dev_add(struct adf_accel_dev *accel_dev)
        INIT_LIST_HEAD(&dev_cfg_data->sec_list);
        init_rwsem(&dev_cfg_data->lock);
        accel_dev->cfg = dev_cfg_data;
+       return 0;
+}
+EXPORT_SYMBOL_GPL(adf_cfg_dev_add);
 
-       /* accel_dev->debugfs_dir should always be non-NULL here */
-       dev_cfg_data->debug = debugfs_create_file("dev_cfg", S_IRUSR,
+void adf_cfg_dev_dbgfs_add(struct adf_accel_dev *accel_dev)
+{
+       struct adf_cfg_device_data *dev_cfg_data = accel_dev->cfg;
+
+       dev_cfg_data->debug = debugfs_create_file("dev_cfg", 0400,
                                                  accel_dev->debugfs_dir,
                                                  dev_cfg_data,
                                                  &qat_dev_cfg_fops);
-       return 0;
 }
-EXPORT_SYMBOL_GPL(adf_cfg_dev_add);
+
+void adf_cfg_dev_dbgfs_rm(struct adf_accel_dev *accel_dev)
+{
+       struct adf_cfg_device_data *dev_cfg_data = accel_dev->cfg;
+
+       if (!dev_cfg_data)
+               return;
+
+       debugfs_remove(dev_cfg_data->debug);
+       dev_cfg_data->debug = NULL;
+}
 
 static void adf_cfg_section_del_all(struct list_head *head);
 
@@ -116,7 +131,6 @@ void adf_cfg_dev_remove(struct adf_accel_dev *accel_dev)
        down_write(&dev_cfg_data->lock);
        adf_cfg_section_del_all(&dev_cfg_data->sec_list);
        up_write(&dev_cfg_data->lock);
-       debugfs_remove(dev_cfg_data->debug);
        kfree(dev_cfg_data);
        accel_dev->cfg = NULL;
 }

diff --git a/drivers/crypto/intel/qat/qat_common/adf_cfg.h b/drivers/crypto/intel/qat/qat_common/adf_cfg.h
index 376cde61a60ea7094444103c0dfccd47a417efb8..c0c9052b22135c8e4227d08ed50fceb7da6a5d47 100644 (file)
--- a/drivers/crypto/intel/qat/qat_common/adf_cfg.h
+++ b/drivers/crypto/intel/qat/qat_common/adf_cfg.h
@@ -31,6 +31,8 @@ struct adf_cfg_device_data {
 
 int adf_cfg_dev_add(struct adf_accel_dev *accel_dev);
 void adf_cfg_dev_remove(struct adf_accel_dev *accel_dev);
+void adf_cfg_dev_dbgfs_add(struct adf_accel_dev *accel_dev);
+void adf_cfg_dev_dbgfs_rm(struct adf_accel_dev *accel_dev);
 int adf_cfg_section_add(struct adf_accel_dev *accel_dev, const char *name);
 void adf_cfg_del_all(struct adf_accel_dev *accel_dev);
 int adf_cfg_add_key_value_param(struct adf_accel_dev *accel_dev,

diff --git a/drivers/crypto/intel/qat/qat_common/adf_dbgfs.c b/drivers/crypto/intel/qat/qat_common/adf_dbgfs.c
new file mode 100644 (file)
index 0000000..d0a2f89
--- /dev/null
+++ b/drivers/crypto/intel/qat/qat_common/adf_dbgfs.c
@@ -0,0 +1,69 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/* Copyright(c) 2023 Intel Corporation */
+
+#include <linux/debugfs.h>
+#include "adf_accel_devices.h"
+#include "adf_cfg.h"
+#include "adf_common_drv.h"
+#include "adf_dbgfs.h"
+
+/**
+ * adf_dbgfs_init() - add persistent debugfs entries
+ * @accel_dev:  Pointer to acceleration device.
+ *
+ * This function creates debugfs entries that are persistent through a device
+ * state change (from up to down or vice versa).
+ */
+void adf_dbgfs_init(struct adf_accel_dev *accel_dev)
+{
+       char name[ADF_DEVICE_NAME_LENGTH];
+       void *ret;
+
+       /* Create dev top level debugfs entry */
+       snprintf(name, sizeof(name), "%s%s_%s", ADF_DEVICE_NAME_PREFIX,
+                accel_dev->hw_device->dev_class->name,
+                pci_name(accel_dev->accel_pci_dev.pci_dev));
+
+       ret = debugfs_create_dir(name, NULL);
+       if (IS_ERR_OR_NULL(ret))
+               return;
+
+       accel_dev->debugfs_dir = ret;
+
+       adf_cfg_dev_dbgfs_add(accel_dev);
+}
+EXPORT_SYMBOL_GPL(adf_dbgfs_init);
+
+/**
+ * adf_dbgfs_exit() - remove persistent debugfs entries
+ * @accel_dev:  Pointer to acceleration device.
+ */
+void adf_dbgfs_exit(struct adf_accel_dev *accel_dev)
+{
+       adf_cfg_dev_dbgfs_rm(accel_dev);
+       debugfs_remove(accel_dev->debugfs_dir);
+}
+EXPORT_SYMBOL_GPL(adf_dbgfs_exit);
+
+/**
+ * adf_dbgfs_add() - add non-persistent debugfs entries
+ * @accel_dev:  Pointer to acceleration device.
+ *
+ * This function creates debugfs entries that are not persistent through
+ * a device state change (from up to down or vice versa).
+ */
+void adf_dbgfs_add(struct adf_accel_dev *accel_dev)
+{
+       if (!accel_dev->debugfs_dir)
+               return;
+}
+
+/**
+ * adf_dbgfs_rm() - remove non-persistent debugfs entries
+ * @accel_dev:  Pointer to acceleration device.
+ */
+void adf_dbgfs_rm(struct adf_accel_dev *accel_dev)
+{
+       if (!accel_dev->debugfs_dir)
+               return;
+}

diff --git a/drivers/crypto/intel/qat/qat_common/adf_dbgfs.h b/drivers/crypto/intel/qat/qat_common/adf_dbgfs.h
new file mode 100644 (file)
index 0000000..1d64ad1
--- /dev/null
+++ b/drivers/crypto/intel/qat/qat_common/adf_dbgfs.h
@@ -0,0 +1,29 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/* Copyright(c) 2023 Intel Corporation */
+
+#ifndef ADF_DBGFS_H
+#define ADF_DBGFS_H
+
+#ifdef CONFIG_DEBUG_FS
+void adf_dbgfs_init(struct adf_accel_dev *accel_dev);
+void adf_dbgfs_add(struct adf_accel_dev *accel_dev);
+void adf_dbgfs_rm(struct adf_accel_dev *accel_dev);
+void adf_dbgfs_exit(struct adf_accel_dev *accel_dev);
+#else
+static inline void adf_dbgfs_init(struct adf_accel_dev *accel_dev)
+{
+}
+
+static inline void adf_dbgfs_add(struct adf_accel_dev *accel_dev)
+{
+}
+
+static inline void adf_dbgfs_rm(struct adf_accel_dev *accel_dev)
+{
+}
+
+static inline void adf_dbgfs_cleanup(struct adf_accel_dev *accel_dev)
+{
+}
+#endif
+#endif

diff --git a/drivers/crypto/intel/qat/qat_common/adf_init.c b/drivers/crypto/intel/qat/qat_common/adf_init.c
index 0985f64ab11ab5c623f324ae8c2d43f5f045a245..826179c985241d15eb4b76e4bc832915de8e21a9 100644 (file)
--- a/drivers/crypto/intel/qat/qat_common/adf_init.c
+++ b/drivers/crypto/intel/qat/qat_common/adf_init.c
@@ -7,6 +7,7 @@
 #include "adf_accel_devices.h"
 #include "adf_cfg.h"
 #include "adf_common_drv.h"
+#include "adf_dbgfs.h"
 
 static LIST_HEAD(service_table);
 static DEFINE_MUTEX(service_lock);
@@ -216,6 +217,9 @@ static int adf_dev_start(struct adf_accel_dev *accel_dev)
                clear_bit(ADF_STATUS_STARTED, &accel_dev->status);
                return -EFAULT;
        }
+
+       adf_dbgfs_add(accel_dev);
+
        return 0;
 }
 
@@ -240,6 +244,8 @@ static void adf_dev_stop(struct adf_accel_dev *accel_dev)
            !test_bit(ADF_STATUS_STARTING, &accel_dev->status))
                return;
 
+       adf_dbgfs_rm(accel_dev);
+
        clear_bit(ADF_STATUS_STARTING, &accel_dev->status);
        clear_bit(ADF_STATUS_STARTED, &accel_dev->status);
 

diff --git a/drivers/crypto/intel/qat/qat_dh895xcc/adf_drv.c b/drivers/crypto/intel/qat/qat_dh895xcc/adf_drv.c
index e18860ab5c8e4d8f863f013e3a419f831e72ec88..1e748e8ce12d5df17d92d7f921c1ffb16f8598cf 100644 (file)
--- a/drivers/crypto/intel/qat/qat_dh895xcc/adf_drv.c
+++ b/drivers/crypto/intel/qat/qat_dh895xcc/adf_drv.c
@@ -16,6 +16,7 @@
 #include <adf_accel_devices.h>
 #include <adf_common_drv.h>
 #include <adf_cfg.h>
+#include <adf_dbgfs.h>
 #include "adf_dh895xcc_hw_data.h"
 
 static const struct pci_device_id adf_pci_tbl[] = {
@@ -65,8 +66,8 @@ static void adf_cleanup_accel(struct adf_accel_dev *accel_dev)
                kfree(accel_dev->hw_device);
                accel_dev->hw_device = NULL;
        }
+       adf_dbgfs_exit(accel_dev);
        adf_cfg_dev_remove(accel_dev);
-       debugfs_remove(accel_dev->debugfs_dir);
        adf_devmgr_rm_dev(accel_dev, NULL);
 }
 
@@ -75,7 +76,6 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        struct adf_accel_dev *accel_dev;
        struct adf_accel_pci *accel_pci_dev;
        struct adf_hw_device_data *hw_data;
-       char name[ADF_DEVICE_NAME_LENGTH];
        unsigned int i, bar_nr;
        unsigned long bar_mask;
        int ret;
@@ -140,12 +140,6 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                goto out_err;
        }
 
-       /* Create dev top level debugfs entry */
-       snprintf(name, sizeof(name), "%s%s_%s", ADF_DEVICE_NAME_PREFIX,
-                hw_data->dev_class->name, pci_name(pdev));
-
-       accel_dev->debugfs_dir = debugfs_create_dir(name, NULL);
-
        /* Create device configuration table */
        ret = adf_cfg_dev_add(accel_dev);
        if (ret)
@@ -199,6 +193,8 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                goto out_err_free_reg;
        }
 
+       adf_dbgfs_init(accel_dev);
+
        ret = adf_dev_up(accel_dev, true);
        if (ret)
                goto out_err_dev_stop;

diff --git a/drivers/crypto/intel/qat/qat_dh895xccvf/adf_drv.c b/drivers/crypto/intel/qat/qat_dh895xccvf/adf_drv.c
index 96854a1cd87e8c6a9e7a610152ac72b60ecc257c..fefb85ceaeb9a2b261a06a1b8a1702e019c26d4a 100644 (file)
--- a/drivers/crypto/intel/qat/qat_dh895xccvf/adf_drv.c
+++ b/drivers/crypto/intel/qat/qat_dh895xccvf/adf_drv.c
@@ -16,6 +16,7 @@
 #include <adf_accel_devices.h>
 #include <adf_common_drv.h>
 #include <adf_cfg.h>
+#include <adf_dbgfs.h>
 #include "adf_dh895xccvf_hw_data.h"
 
 static const struct pci_device_id adf_pci_tbl[] = {
@@ -64,8 +65,8 @@ static void adf_cleanup_accel(struct adf_accel_dev *accel_dev)
                kfree(accel_dev->hw_device);
                accel_dev->hw_device = NULL;
        }
+       adf_dbgfs_exit(accel_dev);
        adf_cfg_dev_remove(accel_dev);
-       debugfs_remove(accel_dev->debugfs_dir);
        pf = adf_devmgr_pci_to_accel_dev(accel_pci_dev->pci_dev->physfn);
        adf_devmgr_rm_dev(accel_dev, pf);
 }
@@ -76,7 +77,6 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        struct adf_accel_dev *pf;
        struct adf_accel_pci *accel_pci_dev;
        struct adf_hw_device_data *hw_data;
-       char name[ADF_DEVICE_NAME_LENGTH];
        unsigned int i, bar_nr;
        unsigned long bar_mask;
        int ret;
@@ -123,12 +123,6 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        hw_data->ae_mask = hw_data->get_ae_mask(hw_data);
        accel_pci_dev->sku = hw_data->get_sku(hw_data);
 
-       /* Create dev top level debugfs entry */
-       snprintf(name, sizeof(name), "%s%s_%s", ADF_DEVICE_NAME_PREFIX,
-                hw_data->dev_class->name, pci_name(pdev));
-
-       accel_dev->debugfs_dir = debugfs_create_dir(name, NULL);
-
        /* Create device configuration table */
        ret = adf_cfg_dev_add(accel_dev);
        if (ret)
@@ -173,6 +167,8 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        /* Completion for VF2PF request/response message exchange */
        init_completion(&accel_dev->vf.msg_received);
 
+       adf_dbgfs_init(accel_dev);
+
        ret = adf_dev_up(accel_dev, false);
        if (ret)
                goto out_err_dev_stop;