crypto: qat - switch to standard pattern for PCI IDs
Subsystems (2)
Giovanni Cabiddu
maintainerPATCH 1/1 crypto: qat - switch to standard pattern for PCI IDs
Update the names of the defines for PCI IDs to follow the standard naming convention PCI_DEVICE_ID_<DEVICE NAME>.
Also drop the unnecessary inner comma from the pci_device_id tables that use these definitions.
This does not introduce any functional change.
Signed-off-by Giovanni Cabiddu <[email protected]>
Suggested-by Andy Shevchenko <[email protected]>
Reviewed-by Andy Shevchenko <[email protected]>
--- drivers/crypto/intel/qat/qat_420xx/adf_drv.c | 2 +- .../crypto/intel/qat/qat_4xxx/adf_4xxx_hw_data.c | 4 ++-- drivers/crypto/intel/qat/qat_4xxx/adf_drv.c | 6 +++--- .../intel/qat/qat_common/adf_accel_devices.h | 16 ++++++++-------- drivers/crypto/intel/qat/qat_common/qat_hal.c | 10 +++++----- drivers/crypto/intel/qat/qat_common/qat_uclo.c | 8 ++++---- 6 files changed, 23 insertions(+), 23 deletions(-)
drivers/crypto/intel/qat/qat_420xx/adf_drv.c +1 -1
@@ -14,7 +14,7 @@#include "adf_420xx_hw_data.h" static const struct pci_device_id adf_pci_tbl[] = { - {PCI_VDEVICE (INTEL ,ADF_420XX_PCI_DEVICE_ID ), }, + {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_QAT_420XX ) }, { } };MODULE_DEVICE_TABLE (pci, adf_pci_tbl);
drivers/crypto/intel/qat/qat_4xxx/adf_4xxx_hw_data.c +2 -2
@@ -421,13 +421,13 @@ void adf_init_hw_data_4xxx(struct adf_hw_device_data *hw_data, u32 dev_id) hw_data->admin_ae_mask =ADF_4XXX_ADMIN_AE_MASK ; hw_data->num_rps =ADF_GEN4_MAX_RPS ;switch (dev_id) { -case ADF_402XX_PCI_DEVICE_ID : +case PCI_DEVICE_ID_INTEL_QAT_402XX : hw_data->fw_name =ADF_402XX_FW ; hw_data->fw_mmp_name =ADF_402XX_MMP ; hw_data->uof_get_name = uof_get_name_402xx; hw_data->get_ena_thd_mask = get_ena_thd_mask;break ; -case ADF_401XX_PCI_DEVICE_ID : +case PCI_DEVICE_ID_INTEL_QAT_401XX : hw_data->fw_name =ADF_4XXX_FW ; hw_data->fw_mmp_name =ADF_4XXX_MMP ; hw_data->uof_get_name = uof_get_name_4xxx;
drivers/crypto/intel/qat/qat_4xxx/adf_drv.c +3 -3
@@ -14,9 +14,9 @@#include "adf_4xxx_hw_data.h" static const struct pci_device_id adf_pci_tbl[] = { - {PCI_VDEVICE (INTEL ,ADF_4XXX_PCI_DEVICE_ID ), }, - {PCI_VDEVICE (INTEL ,ADF_401XX_PCI_DEVICE_ID ), }, - {PCI_VDEVICE (INTEL ,ADF_402XX_PCI_DEVICE_ID ), }, + {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_QAT_4XXX ) }, + {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_QAT_401XX ) }, + {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_QAT_402XX ) }, { } };MODULE_DEVICE_TABLE (pci, adf_pci_tbl);
drivers/crypto/intel/qat/qat_common/adf_accel_devices.h +8 -8
@@ -25,14 +25,14 @@#define ADF_C3XXXVF_DEVICE_NAME "c3xxxvf"#define ADF_4XXX_DEVICE_NAME "4xxx"#define ADF_420XX_DEVICE_NAME "420xx" -#define ADF_4XXX_PCI_DEVICE_ID 0x4940 -#define ADF_4XXXIOV_PCI_DEVICE_ID 0x4941 -#define ADF_401XX_PCI_DEVICE_ID 0x4942 -#define ADF_401XXIOV_PCI_DEVICE_ID 0x4943 -#define ADF_402XX_PCI_DEVICE_ID 0x4944 -#define ADF_402XXIOV_PCI_DEVICE_ID 0x4945 -#define ADF_420XX_PCI_DEVICE_ID 0x4946 -#define ADF_420XXIOV_PCI_DEVICE_ID 0x4947 +#define PCI_DEVICE_ID_INTEL_QAT_4XXX 0x4940 +#define PCI_DEVICE_ID_INTEL_QAT_4XXXIOV 0x4941 +#define PCI_DEVICE_ID_INTEL_QAT_401XX 0x4942 +#define PCI_DEVICE_ID_INTEL_QAT_401XXIOV 0x4943 +#define PCI_DEVICE_ID_INTEL_QAT_402XX 0x4944 +#define PCI_DEVICE_ID_INTEL_QAT_402XXIOV 0x4945 +#define PCI_DEVICE_ID_INTEL_QAT_420XX 0x4946 +#define PCI_DEVICE_ID_INTEL_QAT_420XXIOV 0x4947#define ADF_DEVICE_FUSECTL_OFFSET 0x40#define ADF_DEVICE_LEGFUSE_OFFSET 0x4C#define ADF_DEVICE_FUSECTL_MASK 0x80000000
drivers/crypto/intel/qat/qat_common/qat_hal.c +5 -5
@@ -694,16 +694,16 @@ static int qat_hal_chip_init(struct icp_qat_fw_loader_handle *handle, handle->pci_dev = pci_info->pci_dev;switch (handle->pci_dev->device) { -case ADF_4XXX_PCI_DEVICE_ID : -case ADF_401XX_PCI_DEVICE_ID : -case ADF_402XX_PCI_DEVICE_ID : -case ADF_420XX_PCI_DEVICE_ID : +case PCI_DEVICE_ID_INTEL_QAT_4XXX : +case PCI_DEVICE_ID_INTEL_QAT_401XX : +case PCI_DEVICE_ID_INTEL_QAT_402XX : +case PCI_DEVICE_ID_INTEL_QAT_420XX : handle->chip_info->mmp_sram_size =0 ; handle->chip_info->nn = false; handle->chip_info->lm2lm3 = true; handle->chip_info->lm_size =ICP_QAT_UCLO_MAX_LMEM_REG_2X ; handle->chip_info->icp_rst_csr =ICP_RESET_CPP0 ; -if (handle->pci_dev->device ==ADF_420XX_PCI_DEVICE_ID ) +if (handle->pci_dev->device ==PCI_DEVICE_ID_INTEL_QAT_420XX ) handle->chip_info->icp_rst_mask =0x100155 ;else handle->chip_info->icp_rst_mask =0x100015 ;
drivers/crypto/intel/qat/qat_common/qat_uclo.c +4 -4
@@ -732,10 +732,10 @@ qat_uclo_get_dev_type(struct icp_qat_fw_loader_handle *handle)return ICP_QAT_AC_C62X_DEV_TYPE ;case PCI_DEVICE_ID_INTEL_QAT_C3XXX :return ICP_QAT_AC_C3XXX_DEV_TYPE ; -case ADF_4XXX_PCI_DEVICE_ID : -case ADF_401XX_PCI_DEVICE_ID : -case ADF_402XX_PCI_DEVICE_ID : -case ADF_420XX_PCI_DEVICE_ID : +case PCI_DEVICE_ID_INTEL_QAT_4XXX : +case PCI_DEVICE_ID_INTEL_QAT_401XX : +case PCI_DEVICE_ID_INTEL_QAT_402XX : +case PCI_DEVICE_ID_INTEL_QAT_420XX :return ICP_QAT_AC_4XXX_A_DEV_TYPE ;default : pr_err("QAT: unsupported device 0x%x\n",
base-commit: fa6e29c73cccd2afa7f9c1873fc9d47e2330e465
Signature · 1 line
2.49.0
Herbert Xu
maintainerQuoted 11 lines · Giovanni Cabiddu
Update the names of the defines for PCI IDs to follow the standard naming convention
PCI_DEVICE_ID_<DEVICE NAME>.Also drop the unnecessary inner comma from the
pci_device_idtables that use these definitions.This does not introduce any functional change.
Signed-off-by Giovanni Cabiddu <[email protected]>Suggested-by Andy Shevchenko <[email protected]>Reviewed-by Andy Shevchenko <[email protected]>
Quoted 8 lines
--- drivers/crypto/intel/qat/qat_420xx/adf_drv.c | 2 +- .../crypto/intel/qat/qat_4xxx/adf_4xxx_hw_data.c | 4 ++-- drivers/crypto/intel/qat/qat_4xxx/adf_drv.c | 6 +++--- .../intel/qat/qat_common/adf_accel_devices.h | 16 ++++++++-------- drivers/crypto/intel/qat/qat_common/qat_hal.c | 10 +++++----- drivers/crypto/intel/qat/qat_common/qat_uclo.c | 8 ++++---- 6 files changed, 23 insertions(+), 23 deletions(-)
Patch applied. Thanks.
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt