mirror of
https://github.com/torvalds/linux.git
synced 2024-12-05 18:41:23 +00:00
crypto: qat - replace device ids defines
Replace device ids defined in the QAT drivers with the ones in include/linux/pci_ids.h. Signed-off-by: Giovanni Cabiddu <giovanni.cabiddu@intel.com> Reviewed-by: Fiona Trahe <fiona.trahe@intel.com> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
parent
2baace5feb
commit
92db319899
@ -22,7 +22,7 @@
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, device_id)}
|
||||
|
||||
static const struct pci_device_id adf_pci_tbl[] = {
|
||||
ADF_SYSTEM_DEVICE(ADF_C3XXX_PCI_DEVICE_ID),
|
||||
ADF_SYSTEM_DEVICE(PCI_DEVICE_ID_INTEL_QAT_C3XXX),
|
||||
{0,}
|
||||
};
|
||||
MODULE_DEVICE_TABLE(pci, adf_pci_tbl);
|
||||
@ -58,7 +58,7 @@ static void adf_cleanup_accel(struct adf_accel_dev *accel_dev)
|
||||
|
||||
if (accel_dev->hw_device) {
|
||||
switch (accel_pci_dev->pci_dev->device) {
|
||||
case ADF_C3XXX_PCI_DEVICE_ID:
|
||||
case PCI_DEVICE_ID_INTEL_QAT_C3XXX:
|
||||
adf_clean_hw_data_c3xxx(accel_dev->hw_device);
|
||||
break;
|
||||
default:
|
||||
@ -83,7 +83,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
||||
int ret;
|
||||
|
||||
switch (ent->device) {
|
||||
case ADF_C3XXX_PCI_DEVICE_ID:
|
||||
case PCI_DEVICE_ID_INTEL_QAT_C3XXX:
|
||||
break;
|
||||
default:
|
||||
dev_err(&pdev->dev, "Invalid device 0x%x.\n", ent->device);
|
||||
|
@ -22,7 +22,7 @@
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, device_id)}
|
||||
|
||||
static const struct pci_device_id adf_pci_tbl[] = {
|
||||
ADF_SYSTEM_DEVICE(ADF_C3XXXIOV_PCI_DEVICE_ID),
|
||||
ADF_SYSTEM_DEVICE(PCI_DEVICE_ID_INTEL_QAT_C3XXX_VF),
|
||||
{0,}
|
||||
};
|
||||
MODULE_DEVICE_TABLE(pci, adf_pci_tbl);
|
||||
@ -58,7 +58,7 @@ static void adf_cleanup_accel(struct adf_accel_dev *accel_dev)
|
||||
|
||||
if (accel_dev->hw_device) {
|
||||
switch (accel_pci_dev->pci_dev->device) {
|
||||
case ADF_C3XXXIOV_PCI_DEVICE_ID:
|
||||
case PCI_DEVICE_ID_INTEL_QAT_C3XXX_VF:
|
||||
adf_clean_hw_data_c3xxxiov(accel_dev->hw_device);
|
||||
break;
|
||||
default:
|
||||
@ -85,7 +85,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
||||
int ret;
|
||||
|
||||
switch (ent->device) {
|
||||
case ADF_C3XXXIOV_PCI_DEVICE_ID:
|
||||
case PCI_DEVICE_ID_INTEL_QAT_C3XXX_VF:
|
||||
break;
|
||||
default:
|
||||
dev_err(&pdev->dev, "Invalid device 0x%x.\n", ent->device);
|
||||
|
@ -22,7 +22,7 @@
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, device_id)}
|
||||
|
||||
static const struct pci_device_id adf_pci_tbl[] = {
|
||||
ADF_SYSTEM_DEVICE(ADF_C62X_PCI_DEVICE_ID),
|
||||
ADF_SYSTEM_DEVICE(PCI_DEVICE_ID_INTEL_QAT_C62X),
|
||||
{0,}
|
||||
};
|
||||
MODULE_DEVICE_TABLE(pci, adf_pci_tbl);
|
||||
@ -58,7 +58,7 @@ static void adf_cleanup_accel(struct adf_accel_dev *accel_dev)
|
||||
|
||||
if (accel_dev->hw_device) {
|
||||
switch (accel_pci_dev->pci_dev->device) {
|
||||
case ADF_C62X_PCI_DEVICE_ID:
|
||||
case PCI_DEVICE_ID_INTEL_QAT_C62X:
|
||||
adf_clean_hw_data_c62x(accel_dev->hw_device);
|
||||
break;
|
||||
default:
|
||||
@ -83,7 +83,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
||||
int ret;
|
||||
|
||||
switch (ent->device) {
|
||||
case ADF_C62X_PCI_DEVICE_ID:
|
||||
case PCI_DEVICE_ID_INTEL_QAT_C62X:
|
||||
break;
|
||||
default:
|
||||
dev_err(&pdev->dev, "Invalid device 0x%x.\n", ent->device);
|
||||
|
@ -22,7 +22,7 @@
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, device_id)}
|
||||
|
||||
static const struct pci_device_id adf_pci_tbl[] = {
|
||||
ADF_SYSTEM_DEVICE(ADF_C62XIOV_PCI_DEVICE_ID),
|
||||
ADF_SYSTEM_DEVICE(PCI_DEVICE_ID_INTEL_QAT_C62X_VF),
|
||||
{0,}
|
||||
};
|
||||
MODULE_DEVICE_TABLE(pci, adf_pci_tbl);
|
||||
@ -58,7 +58,7 @@ static void adf_cleanup_accel(struct adf_accel_dev *accel_dev)
|
||||
|
||||
if (accel_dev->hw_device) {
|
||||
switch (accel_pci_dev->pci_dev->device) {
|
||||
case ADF_C62XIOV_PCI_DEVICE_ID:
|
||||
case PCI_DEVICE_ID_INTEL_QAT_C62X_VF:
|
||||
adf_clean_hw_data_c62xiov(accel_dev->hw_device);
|
||||
break;
|
||||
default:
|
||||
@ -85,7 +85,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
||||
int ret;
|
||||
|
||||
switch (ent->device) {
|
||||
case ADF_C62XIOV_PCI_DEVICE_ID:
|
||||
case PCI_DEVICE_ID_INTEL_QAT_C62X_VF:
|
||||
break;
|
||||
default:
|
||||
dev_err(&pdev->dev, "Invalid device 0x%x.\n", ent->device);
|
||||
|
@ -15,12 +15,6 @@
|
||||
#define ADF_C62XVF_DEVICE_NAME "c6xxvf"
|
||||
#define ADF_C3XXX_DEVICE_NAME "c3xxx"
|
||||
#define ADF_C3XXXVF_DEVICE_NAME "c3xxxvf"
|
||||
#define ADF_DH895XCC_PCI_DEVICE_ID 0x435
|
||||
#define ADF_DH895XCCIOV_PCI_DEVICE_ID 0x443
|
||||
#define ADF_C62X_PCI_DEVICE_ID 0x37c8
|
||||
#define ADF_C62XIOV_PCI_DEVICE_ID 0x37c9
|
||||
#define ADF_C3XXX_PCI_DEVICE_ID 0x19e2
|
||||
#define ADF_C3XXXIOV_PCI_DEVICE_ID 0x19e3
|
||||
#define ADF_ERRSOU3 (0x3A000 + 0x0C)
|
||||
#define ADF_ERRSOU5 (0x3A000 + 0xD8)
|
||||
#define ADF_DEVICE_FUSECTL_OFFSET 0x40
|
||||
|
@ -2,6 +2,7 @@
|
||||
/* Copyright(c) 2014 - 2020 Intel Corporation */
|
||||
#include <linux/slab.h>
|
||||
#include <linux/delay.h>
|
||||
#include <linux/pci_ids.h>
|
||||
|
||||
#include "adf_accel_devices.h"
|
||||
#include "adf_common_drv.h"
|
||||
@ -412,7 +413,7 @@ static int qat_hal_init_esram(struct icp_qat_fw_loader_handle *handle)
|
||||
unsigned int csr_val;
|
||||
int times = 30;
|
||||
|
||||
if (handle->pci_dev->device != ADF_DH895XCC_PCI_DEVICE_ID)
|
||||
if (handle->pci_dev->device != PCI_DEVICE_ID_INTEL_QAT_DH895XCC)
|
||||
return 0;
|
||||
|
||||
csr_val = ADF_CSR_RD(csr_addr, 0);
|
||||
@ -672,13 +673,13 @@ int qat_hal_init(struct adf_accel_dev *accel_dev)
|
||||
(void __iomem *)((uintptr_t)handle->hal_cap_ae_xfer_csr_addr_v +
|
||||
LOCAL_TO_XFER_REG_OFFSET);
|
||||
handle->pci_dev = pci_info->pci_dev;
|
||||
if (handle->pci_dev->device == ADF_DH895XCC_PCI_DEVICE_ID) {
|
||||
if (handle->pci_dev->device == PCI_DEVICE_ID_INTEL_QAT_DH895XCC) {
|
||||
sram_bar =
|
||||
&pci_info->pci_bars[hw_data->get_sram_bar_id(hw_data)];
|
||||
handle->hal_sram_addr_v = sram_bar->virt_addr;
|
||||
}
|
||||
handle->fw_auth = (handle->pci_dev->device ==
|
||||
ADF_DH895XCC_PCI_DEVICE_ID) ? false : true;
|
||||
PCI_DEVICE_ID_INTEL_QAT_DH895XCC) ? false : true;
|
||||
handle->hal_handle = kzalloc(sizeof(*handle->hal_handle), GFP_KERNEL);
|
||||
if (!handle->hal_handle)
|
||||
goto out_hal_handle;
|
||||
|
@ -4,6 +4,7 @@
|
||||
#include <linux/ctype.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/delay.h>
|
||||
#include <linux/pci_ids.h>
|
||||
#include "adf_accel_devices.h"
|
||||
#include "adf_common_drv.h"
|
||||
#include "icp_qat_uclo.h"
|
||||
@ -711,11 +712,11 @@ static unsigned int
|
||||
qat_uclo_get_dev_type(struct icp_qat_fw_loader_handle *handle)
|
||||
{
|
||||
switch (handle->pci_dev->device) {
|
||||
case ADF_DH895XCC_PCI_DEVICE_ID:
|
||||
case PCI_DEVICE_ID_INTEL_QAT_DH895XCC:
|
||||
return ICP_QAT_AC_895XCC_DEV_TYPE;
|
||||
case ADF_C62X_PCI_DEVICE_ID:
|
||||
case PCI_DEVICE_ID_INTEL_QAT_C62X:
|
||||
return ICP_QAT_AC_C62X_DEV_TYPE;
|
||||
case ADF_C3XXX_PCI_DEVICE_ID:
|
||||
case PCI_DEVICE_ID_INTEL_QAT_C3XXX:
|
||||
return ICP_QAT_AC_C3XXX_DEV_TYPE;
|
||||
default:
|
||||
pr_err("QAT: unsupported device 0x%x\n",
|
||||
@ -1391,7 +1392,7 @@ int qat_uclo_wr_mimage(struct icp_qat_fw_loader_handle *handle,
|
||||
status = qat_uclo_auth_fw(handle, desc);
|
||||
qat_uclo_ummap_auth_fw(handle, &desc);
|
||||
} else {
|
||||
if (handle->pci_dev->device == ADF_C3XXX_PCI_DEVICE_ID) {
|
||||
if (handle->pci_dev->device == PCI_DEVICE_ID_INTEL_QAT_C3XXX) {
|
||||
pr_err("QAT: C3XXX doesn't support unsigned MMP\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
@ -22,7 +22,7 @@
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, device_id)}
|
||||
|
||||
static const struct pci_device_id adf_pci_tbl[] = {
|
||||
ADF_SYSTEM_DEVICE(ADF_DH895XCC_PCI_DEVICE_ID),
|
||||
ADF_SYSTEM_DEVICE(PCI_DEVICE_ID_INTEL_QAT_DH895XCC),
|
||||
{0,}
|
||||
};
|
||||
MODULE_DEVICE_TABLE(pci, adf_pci_tbl);
|
||||
@ -58,7 +58,7 @@ static void adf_cleanup_accel(struct adf_accel_dev *accel_dev)
|
||||
|
||||
if (accel_dev->hw_device) {
|
||||
switch (accel_pci_dev->pci_dev->device) {
|
||||
case ADF_DH895XCC_PCI_DEVICE_ID:
|
||||
case PCI_DEVICE_ID_INTEL_QAT_DH895XCC:
|
||||
adf_clean_hw_data_dh895xcc(accel_dev->hw_device);
|
||||
break;
|
||||
default:
|
||||
@ -83,7 +83,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
||||
int ret;
|
||||
|
||||
switch (ent->device) {
|
||||
case ADF_DH895XCC_PCI_DEVICE_ID:
|
||||
case PCI_DEVICE_ID_INTEL_QAT_DH895XCC:
|
||||
break;
|
||||
default:
|
||||
dev_err(&pdev->dev, "Invalid device 0x%x.\n", ent->device);
|
||||
|
@ -22,7 +22,7 @@
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, device_id)}
|
||||
|
||||
static const struct pci_device_id adf_pci_tbl[] = {
|
||||
ADF_SYSTEM_DEVICE(ADF_DH895XCCIOV_PCI_DEVICE_ID),
|
||||
ADF_SYSTEM_DEVICE(PCI_DEVICE_ID_INTEL_QAT_DH895XCC_VF),
|
||||
{0,}
|
||||
};
|
||||
MODULE_DEVICE_TABLE(pci, adf_pci_tbl);
|
||||
@ -58,7 +58,7 @@ static void adf_cleanup_accel(struct adf_accel_dev *accel_dev)
|
||||
|
||||
if (accel_dev->hw_device) {
|
||||
switch (accel_pci_dev->pci_dev->device) {
|
||||
case ADF_DH895XCCIOV_PCI_DEVICE_ID:
|
||||
case PCI_DEVICE_ID_INTEL_QAT_DH895XCC_VF:
|
||||
adf_clean_hw_data_dh895xcciov(accel_dev->hw_device);
|
||||
break;
|
||||
default:
|
||||
@ -85,7 +85,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
||||
int ret;
|
||||
|
||||
switch (ent->device) {
|
||||
case ADF_DH895XCCIOV_PCI_DEVICE_ID:
|
||||
case PCI_DEVICE_ID_INTEL_QAT_DH895XCC_VF:
|
||||
break;
|
||||
default:
|
||||
dev_err(&pdev->dev, "Invalid device 0x%x.\n", ent->device);
|
||||
|
Loading…
Reference in New Issue
Block a user