2 files changed, 33 insertions, 0 deletions

diff --git a/recipes-extended/qat/files/qat17_4.7.0-00006-crypto-qat-adf_aer-Remove-pci_cleanup_aer_uncorrect_.patch b/recipes-extended/qat/files/qat17_4.7.0-00006-crypto-qat-adf_aer-Remove-pci_cleanup_aer_uncorrect_.patch
new file mode 100644
index 0000000..dc8a53d
--- /dev/null
+++ b/recipes-extended/qat/files/qat17_4.7.0-00006-crypto-qat-adf_aer-Remove-pci_cleanup_aer_uncorrect_.patch
@@ -0,0 +1,32 @@
+From db44bce60b322754e6a8b96d93218135db00b46a Mon Sep 17 00:00:00 2001
+From: Yongxin Liu <yongxin.liu@windriver.com>
+Date: Sun, 31 May 2020 10:56:27 +0800
+Subject: [PATCH] crypto: qat/adf_aer - Remove
+ pci_cleanup_aer_uncorrect_error_status()
+
+In kernel upstream commit 62b36c3ea664 ("PCI/AER: Remove
+pci_cleanup_aer_uncorrect_error_status() calls"), AER interfaces
+to clear error status registers were removed from device dirver.
+
+Upstream-Status: Inappropriate [Code released in tarball form only]
+
+Signed-off-by: Yongxin Liu <yongxin.liu@windriver.com>
+---
+ quickassist/qat/drivers/crypto/qat/qat_common/adf_aer.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/quickassist/qat/drivers/crypto/qat/qat_common/adf_aer.c b/quickassist/qat/drivers/crypto/qat/qat_common/adf_aer.c
+index 5e98b70..3935d77 100644
+--- a/quickassist/qat/drivers/crypto/qat/qat_common/adf_aer.c
++++ b/quickassist/qat/drivers/crypto/qat/qat_common/adf_aer.c
+@@ -281,7 +281,6 @@ static pci_ers_result_t adf_slot_reset(struct pci_dev *pdev)
+                pr_err("QAT: Can't find acceleration device\n");
+                return PCI_ERS_RESULT_DISCONNECT;
+        }
+-       pci_cleanup_aer_uncorrect_error_status(pdev);
+        if (adf_dev_aer_schedule_reset(accel_dev, ADF_DEV_RESET_SYNC))
+                return PCI_ERS_RESULT_DISCONNECT;
+ 
+-- 
+2.14.4
+
diff --git a/recipes-extended/qat/qat17_4.7.0-00006.bb b/recipes-extended/qat/qat17_4.7.0-00006.bb
index 1d34ce2..640525b 100644
--- a/recipes-extended/qat/qat17_4.7.0-00006.bb
+++ b/recipes-extended/qat/qat17_4.7.0-00006.bb
@@ -23,6 +23,7 @@ SRC_URI = "https://01.org/sites/default/files/downloads/qat1.7.l.4.7.0-00006.tar
            file://qat17_4.7.0-00006-Drop-pr_warning-definition.patch \
            file://qat17_4.7.0-00006-Switch-to-skcipher-API.patch;apply=0 \
            file://qat17_4.7.0-00006-make-it-compatible-with-kernel-5.6.patch;apply=0 \
+           file://qat17_4.7.0-00006-crypto-qat-adf_aer-Remove-pci_cleanup_aer_uncorrect_.patch \
           "
 
 do_fetch[depends] += "virtual/kernel:do_shared_workdir"