From ae1f5043e2595bf29d348f2b4633fca5e930d3e3 Mon Sep 17 00:00:00 2001

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

Date: Thu, 12 Aug 2021 09:18:14 +0100

Subject: [PATCH] crypto: qat - set DMA mask to 48 bits for Gen2

Git-commit: ae1f5043e2595bf29d348f2b4633fca5e930d3e3

Patch-mainline: v5.15-rc1

References: jsc#PED-1073

Change the DMA mask from 64 to 48 for Gen2 devices as they cannot handle

addresses greater than 48 bits.

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

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

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

---

 drivers/crypto/qat/qat_c3xxx/adf_drv.c      | 2 +-

 drivers/crypto/qat/qat_c3xxxvf/adf_drv.c    | 2 +-

 drivers/crypto/qat/qat_c62x/adf_drv.c       | 2 +-

 drivers/crypto/qat/qat_c62xvf/adf_drv.c     | 2 +-

 drivers/crypto/qat/qat_dh895xcc/adf_drv.c   | 2 +-

 drivers/crypto/qat/qat_dh895xccvf/adf_drv.c | 2 +-

 6 files changed, 6 insertions(+), 6 deletions(-)

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

index b561851cf9557..2df26643dbc97 100644

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

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

@@ -159,7 +159,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

 	}

 	/* set dma identifier */

-	ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));

+	ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(48));

 	if (ret) {

 		dev_err(&pdev->dev, "No usable DMA configuration\n");

 		goto out_err_disable;

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

index 5095ee30c6a05..7ef5a5185d292 100644

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

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

@@ -141,7 +141,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

 	}

 	/* set dma identifier */

-	ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));

+	ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(48));

 	if (ret) {

 		dev_err(&pdev->dev, "No usable DMA configuration\n");

 		goto out_err_disable;

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

index f3ac4cda75e9d..efdba841d720c 100644

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

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

@@ -159,7 +159,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

 	}

 	/* set dma identifier */

-	ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));

+	ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(48));

 	if (ret) {

 		dev_err(&pdev->dev, "No usable DMA configuration\n");

 		goto out_err_disable;

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

index 7bd23438bceea..c91beedd267c5 100644

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

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

@@ -141,7 +141,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

 	}

 	/* set dma identifier */

-	ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));

+	ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(48));

 	if (ret) {

 		dev_err(&pdev->dev, "No usable DMA configuration\n");

 		goto out_err_disable;

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

index cc300a2662d57..e1c167507157c 100644

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

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

@@ -159,7 +159,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

 	}

 	/* set dma identifier */

-	ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));

+	ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(48));

 	if (ret) {

 		dev_err(&pdev->dev, "No usable DMA configuration\n");

 		goto out_err_disable;

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

index da9c7434628ca..d332b68795f2c 100644

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

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

@@ -141,7 +141,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

 	}

 	/* set dma identifier */

-	ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));

+	ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(48));

 	if (ret) {

 		dev_err(&pdev->dev, "No usable DMA configuration\n");

 		goto out_err_disable;

-- 

2.35.3