pkgdep/git: Bump QAT driver to latest available version
Also, drop parallel build as it's not a good fit for QAT's make structure - its recursive nature ends up failing on ocassion where some *.a libs cannot be found by targets that depend on it (one such pitfall is libosal.a built for the kernel space). Signed-off-by: Michal Berger <michal.berger@intel.com> Change-Id: I8c773c234d80fcfcad2c0991e3f5202dfb1d2018 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/16318 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Reviewed-by: Paul Luse <paul.e.luse@intel.com> Reviewed-by: Kamil Godzwon <kamilx.godzwon@intel.com>
This commit is contained in:
Michal Berger
Tomasz Zawadzki
parent
81fb0a4ee9
commit
daa9779cf6
@ -180,15 +180,7 @@ function install_qat() {
|
|||||||
|
|
||||||
tar -C "$GIT_REPOS/QAT" -xzof - < <(wget -O- "$DRIVER_LOCATION_QAT")
|
tar -C "$GIT_REPOS/QAT" -xzof - < <(wget -O- "$DRIVER_LOCATION_QAT")
|
||||||
|
|
||||||
if ge "$kernel_ver" 5.16.0; then
|
(cd "$GIT_REPOS/QAT" && sudo ./configure --enable-icp-sriov=host && sudo make install)
|
||||||
patch --dir="$GIT_REPOS/QAT" -p1
|
|
||||||
fi < "$rootdir/test/common/config/pkgdep/patches/qat/0001-dma-mask.patch"
|
|
||||||
|
|
||||||
if ge "$kernel_ver" 5.18.0; then
|
|
||||||
patch --dir="$GIT_REPOS/QAT" -p1
|
|
||||||
fi < "$rootdir/test/common/config/pkgdep/patches/qat/0001-default-groups.patch"
|
|
||||||
|
|
||||||
(cd "$GIT_REPOS/QAT" && sudo ./configure --enable-icp-sriov=host && sudo make -j$jobs install)
|
|
||||||
|
|
||||||
if ! sudo service qat_service start; then
|
if ! sudo service qat_service start; then
|
||||||
echo "failed to start the qat service. Something may be wrong with your device or package."
|
echo "failed to start the qat service. Something may be wrong with your device or package."
|
||||||
@ -626,7 +618,7 @@ export GIT_REPO_QEMU_VFIO
|
|||||||
export GIT_REPO_LIBISCSI
|
export GIT_REPO_LIBISCSI
|
||||||
: ${GIT_REPO_INTEL_IPSEC_MB=https://github.com/spdk/intel-ipsec-mb.git}
|
: ${GIT_REPO_INTEL_IPSEC_MB=https://github.com/spdk/intel-ipsec-mb.git}
|
||||||
export GIT_REPO_INTEL_IPSEC_MB
|
export GIT_REPO_INTEL_IPSEC_MB
|
||||||
: ${DRIVER_LOCATION_QAT=https://downloadmirror.intel.com/729932/QAT.L.4.18.0-00008.tar.gz}
|
: ${DRIVER_LOCATION_QAT=https://downloadmirror.intel.com/761891/QAT.L.4.20.0-00001.tar.gz}
|
||||||
export DRIVER_LOCATION_QAT
|
export DRIVER_LOCATION_QAT
|
||||||
: ${GIT_REPO_GIT=https://github.com/git/git/archive/v${GIT_VERSION}.tar.gz}
|
: ${GIT_REPO_GIT=https://github.com/git/git/archive/v${GIT_VERSION}.tar.gz}
|
||||||
export GIT_REPO_GIT
|
export GIT_REPO_GIT
|
||||||
|
|||||||
@ -1,52 +0,0 @@
|
|||||||
Replace use of default_attrs from the kobj_type with default_groups pointer.
|
|
||||||
The former was removed from the struct in the recent kernel versions (5.18).
|
|
||||||
|
|
||||||
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=cdb4f26a63c391317e335e6e683a614358e70aeb
|
|
||||||
|
|
||||||
---
|
|
||||||
.../qat/drivers/crypto/qat/qat_common/adf_uio_control.c | 7 +++++--
|
|
||||||
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/quickassist/qat/drivers/crypto/qat/qat_common/adf_uio_control.c b/quickassist/qat/drivers/crypto/qat/qat_common/adf_uio_control.c
|
|
||||||
index 088623e..b141c20 100644
|
|
||||||
--- a/quickassist/qat/drivers/crypto/qat/qat_common/adf_uio_control.c
|
|
||||||
+++ b/quickassist/qat/drivers/crypto/qat/qat_common/adf_uio_control.c
|
|
||||||
@@ -83,6 +83,7 @@ static struct attribute *accel_default_attrs[] = {
|
|
||||||
&accel_sku.attr,
|
|
||||||
NULL,
|
|
||||||
};
|
|
||||||
+ATTRIBUTE_GROUPS(accel_default);
|
|
||||||
|
|
||||||
static ssize_t accel_show(struct kobject *kobj, struct attribute *attr,
|
|
||||||
char *buf);
|
|
||||||
@@ -177,6 +178,7 @@ static struct attribute *bundle_default_attrs[] = {
|
|
||||||
&bundle_rings_reserved.attr,
|
|
||||||
NULL,
|
|
||||||
};
|
|
||||||
+ATTRIBUTE_GROUPS(bundle_default);
|
|
||||||
|
|
||||||
static ssize_t bundle_show(struct kobject *kobj, struct attribute *attr,
|
|
||||||
char *buf);
|
|
||||||
@@ -227,9 +229,10 @@ static void adf_uio_sysfs_cleanup(struct adf_accel_dev *accel_dev)
|
|
||||||
static struct kobj_type accel_ktype = {
|
|
||||||
.release = accel_kobject_free,
|
|
||||||
.sysfs_ops = &accel_sysfs_ops,
|
|
||||||
- .default_attrs = accel_default_attrs,
|
|
||||||
+ .default_groups = accel_default_groups,
|
|
||||||
};
|
|
||||||
|
|
||||||
+
|
|
||||||
int adf_uio_sysfs_create(struct adf_accel_dev *accel_dev)
|
|
||||||
{
|
|
||||||
struct kobject *dev_kobj;
|
|
||||||
@@ -280,7 +283,7 @@ int adf_uio_sysfs_create(struct adf_accel_dev *accel_dev)
|
|
||||||
static struct kobj_type bundle_ktype = {
|
|
||||||
.release = bundle_kobject_free,
|
|
||||||
.sysfs_ops = &bundle_sysfs_ops,
|
|
||||||
- .default_attrs = bundle_default_attrs,
|
|
||||||
+ .default_groups = bundle_default_groups,
|
|
||||||
};
|
|
||||||
|
|
||||||
int adf_uio_sysfs_bundle_create(struct pci_dev *pdev,
|
|
||||||
--
|
|
||||||
|
|
||||||
@ -1,334 +0,0 @@
|
|||||||
pci_set_dma_mask() and pci_set_consistent_dma_mask() got deprecated in
|
|
||||||
favor of dma_set_mask_and_coherent(). See:
|
|
||||||
|
|
||||||
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=c726c62db857d375800af7e82eb1c6f639e87631
|
|
||||||
|
|
||||||
---
|
|
||||||
quickassist/qat/drivers/crypto/qat/qat_200xx/adf_drv.c | 8 ++++----
|
|
||||||
quickassist/qat/drivers/crypto/qat/qat_200xxvf/adf_drv.c | 8 ++++----
|
|
||||||
quickassist/qat/drivers/crypto/qat/qat_c3xxx/adf_drv.c | 8 ++++----
|
|
||||||
quickassist/qat/drivers/crypto/qat/qat_c3xxxvf/adf_drv.c | 8 ++++----
|
|
||||||
quickassist/qat/drivers/crypto/qat/qat_c4xxx/adf_drv.c | 8 ++++----
|
|
||||||
quickassist/qat/drivers/crypto/qat/qat_c4xxxvf/adf_drv.c | 8 ++++----
|
|
||||||
quickassist/qat/drivers/crypto/qat/qat_c62x/adf_drv.c | 8 ++++----
|
|
||||||
quickassist/qat/drivers/crypto/qat/qat_c62xvf/adf_drv.c | 8 ++++----
|
|
||||||
quickassist/qat/drivers/crypto/qat/qat_d15xx/adf_drv.c | 8 ++++----
|
|
||||||
quickassist/qat/drivers/crypto/qat/qat_d15xxvf/adf_drv.c | 8 ++++----
|
|
||||||
quickassist/qat/drivers/crypto/qat/qat_dh895xcc/adf_drv.c | 8 ++++----
|
|
||||||
.../qat/drivers/crypto/qat/qat_dh895xccvf/adf_drv.c | 8 ++++----
|
|
||||||
12 files changed, 48 insertions(+), 48 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/quickassist/qat/drivers/crypto/qat/qat_200xx/adf_drv.c b/quickassist/qat/drivers/crypto/qat/qat_200xx/adf_drv.c
|
|
||||||
index 53cc328..d24f02a 100644
|
|
||||||
--- a/quickassist/qat/drivers/crypto/qat/qat_200xx/adf_drv.c
|
|
||||||
+++ b/quickassist/qat/drivers/crypto/qat/qat_200xx/adf_drv.c
|
|
||||||
@@ -187,17 +187,17 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|
||||||
}
|
|
||||||
|
|
||||||
/* set dma identifier */
|
|
||||||
- if (pci_set_dma_mask(pdev, DMA_BIT_MASK(48))) {
|
|
||||||
- if ((pci_set_dma_mask(pdev, DMA_BIT_MASK(32)))) {
|
|
||||||
+ if (dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(48))) {
|
|
||||||
+ if ((dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)))) {
|
|
||||||
dev_err(&pdev->dev, "No usable DMA configuration\n");
|
|
||||||
ret = -EFAULT;
|
|
||||||
goto out_err_disable;
|
|
||||||
} else {
|
|
||||||
- pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
|
|
||||||
+ dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
|
|
||||||
}
|
|
||||||
|
|
||||||
} else {
|
|
||||||
- pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(48));
|
|
||||||
+ dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(48));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (pci_request_regions(pdev, ADF_200XX_DEVICE_NAME)) {
|
|
||||||
diff --git a/quickassist/qat/drivers/crypto/qat/qat_200xxvf/adf_drv.c b/quickassist/qat/drivers/crypto/qat/qat_200xxvf/adf_drv.c
|
|
||||||
index e9c9012..cda5b53 100644
|
|
||||||
--- a/quickassist/qat/drivers/crypto/qat/qat_200xxvf/adf_drv.c
|
|
||||||
+++ b/quickassist/qat/drivers/crypto/qat/qat_200xxvf/adf_drv.c
|
|
||||||
@@ -158,17 +158,17 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|
||||||
}
|
|
||||||
|
|
||||||
/* set dma identifier */
|
|
||||||
- if (pci_set_dma_mask(pdev, DMA_BIT_MASK(48))) {
|
|
||||||
- if ((pci_set_dma_mask(pdev, DMA_BIT_MASK(32)))) {
|
|
||||||
+ if (dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(48))) {
|
|
||||||
+ if ((dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)))) {
|
|
||||||
dev_err(&pdev->dev, "No usable DMA configuration\n");
|
|
||||||
ret = -EFAULT;
|
|
||||||
goto out_err_disable;
|
|
||||||
} else {
|
|
||||||
- pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
|
|
||||||
+ dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
|
|
||||||
}
|
|
||||||
|
|
||||||
} else {
|
|
||||||
- pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(48));
|
|
||||||
+ dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(48));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (pci_request_regions(pdev, ADF_200XXVF_DEVICE_NAME)) {
|
|
||||||
diff --git a/quickassist/qat/drivers/crypto/qat/qat_c3xxx/adf_drv.c b/quickassist/qat/drivers/crypto/qat/qat_c3xxx/adf_drv.c
|
|
||||||
index 26d0485..f31dae6 100644
|
|
||||||
--- a/quickassist/qat/drivers/crypto/qat/qat_c3xxx/adf_drv.c
|
|
||||||
+++ b/quickassist/qat/drivers/crypto/qat/qat_c3xxx/adf_drv.c
|
|
||||||
@@ -190,17 +190,17 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|
||||||
}
|
|
||||||
|
|
||||||
/* set dma identifier */
|
|
||||||
- if (pci_set_dma_mask(pdev, DMA_BIT_MASK(48))) {
|
|
||||||
- if ((pci_set_dma_mask(pdev, DMA_BIT_MASK(32)))) {
|
|
||||||
+ if (dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(48))) {
|
|
||||||
+ if ((dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)))) {
|
|
||||||
dev_err(&pdev->dev, "No usable DMA configuration\n");
|
|
||||||
ret = -EFAULT;
|
|
||||||
goto out_err_disable;
|
|
||||||
} else {
|
|
||||||
- pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
|
|
||||||
+ dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
|
|
||||||
}
|
|
||||||
|
|
||||||
} else {
|
|
||||||
- pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(48));
|
|
||||||
+ dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(48));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (pci_request_regions(pdev, ADF_C3XXX_DEVICE_NAME)) {
|
|
||||||
diff --git a/quickassist/qat/drivers/crypto/qat/qat_c3xxxvf/adf_drv.c b/quickassist/qat/drivers/crypto/qat/qat_c3xxxvf/adf_drv.c
|
|
||||||
index 13e10eb..631adea 100644
|
|
||||||
--- a/quickassist/qat/drivers/crypto/qat/qat_c3xxxvf/adf_drv.c
|
|
||||||
+++ b/quickassist/qat/drivers/crypto/qat/qat_c3xxxvf/adf_drv.c
|
|
||||||
@@ -158,17 +158,17 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|
||||||
}
|
|
||||||
|
|
||||||
/* set dma identifier */
|
|
||||||
- if (pci_set_dma_mask(pdev, DMA_BIT_MASK(48))) {
|
|
||||||
- if ((pci_set_dma_mask(pdev, DMA_BIT_MASK(32)))) {
|
|
||||||
+ if (dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(48))) {
|
|
||||||
+ if ((dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)))) {
|
|
||||||
dev_err(&pdev->dev, "No usable DMA configuration\n");
|
|
||||||
ret = -EFAULT;
|
|
||||||
goto out_err_disable;
|
|
||||||
} else {
|
|
||||||
- pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
|
|
||||||
+ dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
|
|
||||||
}
|
|
||||||
|
|
||||||
} else {
|
|
||||||
- pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(48));
|
|
||||||
+ dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(48));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (pci_request_regions(pdev, ADF_C3XXXVF_DEVICE_NAME)) {
|
|
||||||
diff --git a/quickassist/qat/drivers/crypto/qat/qat_c4xxx/adf_drv.c b/quickassist/qat/drivers/crypto/qat/qat_c4xxx/adf_drv.c
|
|
||||||
index 0bd2e9b..ce9022c 100644
|
|
||||||
--- a/quickassist/qat/drivers/crypto/qat/qat_c4xxx/adf_drv.c
|
|
||||||
+++ b/quickassist/qat/drivers/crypto/qat/qat_c4xxx/adf_drv.c
|
|
||||||
@@ -178,17 +178,17 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|
||||||
}
|
|
||||||
|
|
||||||
/* set dma identifier */
|
|
||||||
- if (pci_set_dma_mask(pdev, DMA_BIT_MASK(48))) {
|
|
||||||
- if ((pci_set_dma_mask(pdev, DMA_BIT_MASK(32)))) {
|
|
||||||
+ if (dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(48))) {
|
|
||||||
+ if ((dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)))) {
|
|
||||||
dev_err(&pdev->dev, "No usable DMA configuration\n");
|
|
||||||
ret = -EFAULT;
|
|
||||||
goto out_err_disable;
|
|
||||||
} else {
|
|
||||||
- pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
|
|
||||||
+ dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
|
|
||||||
}
|
|
||||||
|
|
||||||
} else {
|
|
||||||
- pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(48));
|
|
||||||
+ dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(48));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (pci_request_regions(pdev, ADF_C4XXX_DEVICE_NAME)) {
|
|
||||||
diff --git a/quickassist/qat/drivers/crypto/qat/qat_c4xxxvf/adf_drv.c b/quickassist/qat/drivers/crypto/qat/qat_c4xxxvf/adf_drv.c
|
|
||||||
index b04da31..e95c624 100644
|
|
||||||
--- a/quickassist/qat/drivers/crypto/qat/qat_c4xxxvf/adf_drv.c
|
|
||||||
+++ b/quickassist/qat/drivers/crypto/qat/qat_c4xxxvf/adf_drv.c
|
|
||||||
@@ -157,17 +157,17 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|
||||||
}
|
|
||||||
|
|
||||||
/* set dma identifier */
|
|
||||||
- if (pci_set_dma_mask(pdev, DMA_BIT_MASK(48))) {
|
|
||||||
- if ((pci_set_dma_mask(pdev, DMA_BIT_MASK(32)))) {
|
|
||||||
+ if (dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(48))) {
|
|
||||||
+ if ((dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)))) {
|
|
||||||
dev_err(&pdev->dev, "No usable DMA configuration\n");
|
|
||||||
ret = -EFAULT;
|
|
||||||
goto out_err_disable;
|
|
||||||
} else {
|
|
||||||
- pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
|
|
||||||
+ dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
|
|
||||||
}
|
|
||||||
|
|
||||||
} else {
|
|
||||||
- pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(48));
|
|
||||||
+ dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(48));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (pci_request_regions(pdev, ADF_C4XXXVF_DEVICE_NAME)) {
|
|
||||||
diff --git a/quickassist/qat/drivers/crypto/qat/qat_c62x/adf_drv.c b/quickassist/qat/drivers/crypto/qat/qat_c62x/adf_drv.c
|
|
||||||
index 27481b8..c360365 100644
|
|
||||||
--- a/quickassist/qat/drivers/crypto/qat/qat_c62x/adf_drv.c
|
|
||||||
+++ b/quickassist/qat/drivers/crypto/qat/qat_c62x/adf_drv.c
|
|
||||||
@@ -181,17 +181,17 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|
||||||
}
|
|
||||||
|
|
||||||
/* set dma identifier */
|
|
||||||
- if (pci_set_dma_mask(pdev, DMA_BIT_MASK(48))) {
|
|
||||||
- if ((pci_set_dma_mask(pdev, DMA_BIT_MASK(32)))) {
|
|
||||||
+ if (dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(48))) {
|
|
||||||
+ if ((dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)))) {
|
|
||||||
dev_err(&pdev->dev, "No usable DMA configuration\n");
|
|
||||||
ret = -EFAULT;
|
|
||||||
goto out_err_disable;
|
|
||||||
} else {
|
|
||||||
- pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
|
|
||||||
+ dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
|
|
||||||
}
|
|
||||||
|
|
||||||
} else {
|
|
||||||
- pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(48));
|
|
||||||
+ dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(48));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (pci_request_regions(pdev, ADF_C62X_DEVICE_NAME)) {
|
|
||||||
diff --git a/quickassist/qat/drivers/crypto/qat/qat_c62xvf/adf_drv.c b/quickassist/qat/drivers/crypto/qat/qat_c62xvf/adf_drv.c
|
|
||||||
index a5de49b..2b70e52 100644
|
|
||||||
--- a/quickassist/qat/drivers/crypto/qat/qat_c62xvf/adf_drv.c
|
|
||||||
+++ b/quickassist/qat/drivers/crypto/qat/qat_c62xvf/adf_drv.c
|
|
||||||
@@ -163,17 +163,17 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|
||||||
}
|
|
||||||
|
|
||||||
/* set dma identifier */
|
|
||||||
- if (pci_set_dma_mask(pdev, DMA_BIT_MASK(48))) {
|
|
||||||
- if ((pci_set_dma_mask(pdev, DMA_BIT_MASK(32)))) {
|
|
||||||
+ if (dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(48))) {
|
|
||||||
+ if ((dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)))) {
|
|
||||||
dev_err(&pdev->dev, "No usable DMA configuration\n");
|
|
||||||
ret = -EFAULT;
|
|
||||||
goto out_err_disable;
|
|
||||||
} else {
|
|
||||||
- pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
|
|
||||||
+ dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
|
|
||||||
}
|
|
||||||
|
|
||||||
} else {
|
|
||||||
- pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(48));
|
|
||||||
+ dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(48));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (pci_request_regions(pdev, ADF_C62XVF_DEVICE_NAME)) {
|
|
||||||
diff --git a/quickassist/qat/drivers/crypto/qat/qat_d15xx/adf_drv.c b/quickassist/qat/drivers/crypto/qat/qat_d15xx/adf_drv.c
|
|
||||||
index 294f3f5..7ade965 100644
|
|
||||||
--- a/quickassist/qat/drivers/crypto/qat/qat_d15xx/adf_drv.c
|
|
||||||
+++ b/quickassist/qat/drivers/crypto/qat/qat_d15xx/adf_drv.c
|
|
||||||
@@ -176,17 +176,17 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|
||||||
}
|
|
||||||
|
|
||||||
/* set dma identifier */
|
|
||||||
- if (pci_set_dma_mask(pdev, DMA_BIT_MASK(48))) {
|
|
||||||
- if ((pci_set_dma_mask(pdev, DMA_BIT_MASK(32)))) {
|
|
||||||
+ if (dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(48))) {
|
|
||||||
+ if ((dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)))) {
|
|
||||||
dev_err(&pdev->dev, "No usable DMA configuration\n");
|
|
||||||
ret = -EFAULT;
|
|
||||||
goto out_err_disable;
|
|
||||||
} else {
|
|
||||||
- pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
|
|
||||||
+ dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
|
|
||||||
}
|
|
||||||
|
|
||||||
} else {
|
|
||||||
- pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(48));
|
|
||||||
+ dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(48));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (pci_request_regions(pdev, ADF_D15XX_DEVICE_NAME)) {
|
|
||||||
diff --git a/quickassist/qat/drivers/crypto/qat/qat_d15xxvf/adf_drv.c b/quickassist/qat/drivers/crypto/qat/qat_d15xxvf/adf_drv.c
|
|
||||||
index 00f8bf3..c3cb22d 100644
|
|
||||||
--- a/quickassist/qat/drivers/crypto/qat/qat_d15xxvf/adf_drv.c
|
|
||||||
+++ b/quickassist/qat/drivers/crypto/qat/qat_d15xxvf/adf_drv.c
|
|
||||||
@@ -158,17 +158,17 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|
||||||
}
|
|
||||||
|
|
||||||
/* set dma identifier */
|
|
||||||
- if (pci_set_dma_mask(pdev, DMA_BIT_MASK(48))) {
|
|
||||||
- if ((pci_set_dma_mask(pdev, DMA_BIT_MASK(32)))) {
|
|
||||||
+ if (dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(48))) {
|
|
||||||
+ if ((dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)))) {
|
|
||||||
dev_err(&pdev->dev, "No usable DMA configuration\n");
|
|
||||||
ret = -EFAULT;
|
|
||||||
goto out_err_disable;
|
|
||||||
} else {
|
|
||||||
- pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
|
|
||||||
+ dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
|
|
||||||
}
|
|
||||||
|
|
||||||
} else {
|
|
||||||
- pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(48));
|
|
||||||
+ dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(48));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (pci_request_regions(pdev, ADF_D15XXVF_DEVICE_NAME)) {
|
|
||||||
diff --git a/quickassist/qat/drivers/crypto/qat/qat_dh895xcc/adf_drv.c b/quickassist/qat/drivers/crypto/qat/qat_dh895xcc/adf_drv.c
|
|
||||||
index a93855e..314f8c2 100644
|
|
||||||
--- a/quickassist/qat/drivers/crypto/qat/qat_dh895xcc/adf_drv.c
|
|
||||||
+++ b/quickassist/qat/drivers/crypto/qat/qat_dh895xcc/adf_drv.c
|
|
||||||
@@ -176,17 +176,17 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|
||||||
}
|
|
||||||
|
|
||||||
/* set dma identifier */
|
|
||||||
- if (pci_set_dma_mask(pdev, DMA_BIT_MASK(48))) {
|
|
||||||
- if ((pci_set_dma_mask(pdev, DMA_BIT_MASK(32)))) {
|
|
||||||
+ if (dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(48))) {
|
|
||||||
+ if ((dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)))) {
|
|
||||||
dev_err(&pdev->dev, "No usable DMA configuration\n");
|
|
||||||
ret = -EFAULT;
|
|
||||||
goto out_err_disable;
|
|
||||||
} else {
|
|
||||||
- pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
|
|
||||||
+ dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
|
|
||||||
}
|
|
||||||
|
|
||||||
} else {
|
|
||||||
- pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(48));
|
|
||||||
+ dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(48));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (pci_request_regions(pdev, ADF_DH895XCC_DEVICE_NAME)) {
|
|
||||||
diff --git a/quickassist/qat/drivers/crypto/qat/qat_dh895xccvf/adf_drv.c b/quickassist/qat/drivers/crypto/qat/qat_dh895xccvf/adf_drv.c
|
|
||||||
index d17730d..8868ccf 100644
|
|
||||||
--- a/quickassist/qat/drivers/crypto/qat/qat_dh895xccvf/adf_drv.c
|
|
||||||
+++ b/quickassist/qat/drivers/crypto/qat/qat_dh895xccvf/adf_drv.c
|
|
||||||
@@ -156,17 +156,17 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|
||||||
}
|
|
||||||
|
|
||||||
/* set dma identifier */
|
|
||||||
- if (pci_set_dma_mask(pdev, DMA_BIT_MASK(48))) {
|
|
||||||
- if ((pci_set_dma_mask(pdev, DMA_BIT_MASK(32)))) {
|
|
||||||
+ if (dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(48))) {
|
|
||||||
+ if ((dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)))) {
|
|
||||||
dev_err(&pdev->dev, "No usable DMA configuration\n");
|
|
||||||
ret = -EFAULT;
|
|
||||||
goto out_err_disable;
|
|
||||||
} else {
|
|
||||||
- pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
|
|
||||||
+ dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
|
|
||||||
}
|
|
||||||
|
|
||||||
} else {
|
|
||||||
- pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(48));
|
|
||||||
+ dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(48));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (pci_request_regions(pdev, ADF_DH895XCCVF_DEVICE_NAME)) {
|
|
||||||
--
|
|
||||||
|
|
||||||
Loading…
Reference in New Issue
Block a user