Commit 9260db66 authored by Damian Muszynski's avatar Damian Muszynski Committed by Herbert Xu
Browse files

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: default avatarDamian Muszynski <damian.muszynski@intel.com>
Reviewed-by: default avatarGiovanni Cabiddu <giovanni.cabiddu@intel.com>
Signed-off-by: default avatarGiovanni Cabiddu <giovanni.cabiddu@intel.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 755b4e7f

drivers/crypto/intel/qat/qat_4xxx/adf_drv.c

+4 −8
Original line number Diff line number Diff line
@@ -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;

drivers/crypto/intel/qat/qat_c3xxx/adf_drv.c

+4 −8
Original line number Diff line number Diff line
@@ -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;

drivers/crypto/intel/qat/qat_c3xxxvf/adf_drv.c

+4 −8
Original line number Diff line number Diff line
@@ -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;

drivers/crypto/intel/qat/qat_c62x/adf_drv.c

+4 −8
Original line number Diff line number Diff line
@@ -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;

drivers/crypto/intel/qat/qat_c62xvf/adf_drv.c

+4 −8
Original line number Diff line number Diff line
@@ -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;