From fbdab61af2d02ebf9c015458c95e34b54dea9027 Mon Sep 17 00:00:00 2001

From: Giovanni Cabiddu <giovanni.cabiddu@intel.com>

Date: Tue, 10 May 2022 17:54:19 +0100

Subject: [PATCH] crypto: qat - add support for 401xx devices

Git-commit: fbdab61af2d02ebf9c015458c95e34b54dea9027

Patch-mainline: v5.19-rc1

References: jsc#PED-1073

QAT_401xx is a derivative of 4xxx. Add support for that device in the

qat_4xxx driver by including the DIDs (both PF and VF), extending the

probe and the firmware loader.

Signed-off-by: Giovanni Cabiddu <giovanni.cabiddu@intel.com>

Reviewed-by: Srinivas Kerekare <srinivas.kerekare@intel.com>

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

Signed-off-by: Torsten Duwe <duwe@suse.de>

---

 drivers/crypto/qat/qat_4xxx/adf_drv.c             | 1 +

 drivers/crypto/qat/qat_common/adf_accel_devices.h | 2 ++

 drivers/crypto/qat/qat_common/qat_hal.c           | 1 +

 drivers/crypto/qat/qat_common/qat_uclo.c          | 1 +

 4 files changed, 5 insertions(+)

diff --git a/drivers/crypto/qat/qat_4xxx/adf_drv.c b/drivers/crypto/qat/qat_4xxx/adf_drv.c

index a6c78b9c730bc..181fa1c8b3c78 100644

--- a/drivers/crypto/qat/qat_4xxx/adf_drv.c

+++ b/drivers/crypto/qat/qat_4xxx/adf_drv.c

@@ -14,6 +14,7 @@

 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), },

 	{ }

 };

 MODULE_DEVICE_TABLE(pci, adf_pci_tbl);

diff --git a/drivers/crypto/qat/qat_common/adf_accel_devices.h b/drivers/crypto/qat/qat_common/adf_accel_devices.h

index e927799a8e6c4..ede6458c9dbfd 100644

--- a/drivers/crypto/qat/qat_common/adf_accel_devices.h

+++ b/drivers/crypto/qat/qat_common/adf_accel_devices.h

@@ -19,6 +19,8 @@

 #define ADF_4XXX_DEVICE_NAME "4xxx"

 #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_DEVICE_FUSECTL_OFFSET 0x40

 #define ADF_DEVICE_LEGFUSE_OFFSET 0x4C

 #define ADF_DEVICE_FUSECTL_MASK 0x80000000

diff --git a/drivers/crypto/qat/qat_common/qat_hal.c b/drivers/crypto/qat/qat_common/qat_hal.c

index 4bfd8f3566f7a..7bba35280dacc 100644

--- a/drivers/crypto/qat/qat_common/qat_hal.c

+++ b/drivers/crypto/qat/qat_common/qat_hal.c

@@ -695,6 +695,7 @@ 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:

 		handle->chip_info->mmp_sram_size = 0;

 		handle->chip_info->nn = false;

 		handle->chip_info->lm2lm3 = true;

diff --git a/drivers/crypto/qat/qat_common/qat_uclo.c b/drivers/crypto/qat/qat_common/qat_uclo.c

index 4b6f37d6e85b5..0fe5a474aa452 100644

--- a/drivers/crypto/qat/qat_common/qat_uclo.c

+++ b/drivers/crypto/qat/qat_common/qat_uclo.c

@@ -731,6 +731,7 @@ qat_uclo_get_dev_type(struct icp_qat_fw_loader_handle *handle)

 	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:

 		return ICP_QAT_AC_4XXX_A_DEV_TYPE;

 	default:

 		pr_err("QAT: unsupported device 0x%x\n",

-- 

2.35.3