Commit 92db3198 authored by Giovanni Cabiddu's avatar Giovanni Cabiddu Committed by Herbert Xu
Browse files

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: default avatarGiovanni Cabiddu <giovanni.cabiddu@intel.com>
Reviewed-by: default avatarFiona Trahe <fiona.trahe@intel.com>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 2baace5f

drivers/crypto/qat/qat_c3xxx/adf_drv.c

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

drivers/crypto/qat/qat_c3xxxvf/adf_drv.c

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

drivers/crypto/qat/qat_c62x/adf_drv.c

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

drivers/crypto/qat/qat_c62xvf/adf_drv.c

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

drivers/crypto/qat/qat_common/adf_accel_devices.h

+0 −6
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE