crypto: qat - replace check based on DID
authorJack Xu <jack.xu@intel.com>
Fri, 6 Nov 2020 11:27:55 +0000 (19:27 +0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Fri, 13 Nov 2020 09:38:51 +0000 (20:38 +1100)
Modify condition in qat_uclo_wr_mimage() to use a capability of the
device (sram_visible), rather than the device ID, so the check is not
specific to devices of the same type.

Signed-off-by: Jack Xu <jack.xu@intel.com>
Co-developed-by: Wojciech Ziemba <wojciech.ziemba@intel.com>
Signed-off-by: Wojciech Ziemba <wojciech.ziemba@intel.com>
Reviewed-by: Giovanni Cabiddu <giovanni.cabiddu@intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
drivers/crypto/qat/qat_common/qat_uclo.c

index 1533981..5774916 100644 (file)
@@ -1410,9 +1410,11 @@ int qat_uclo_wr_mimage(struct icp_qat_fw_loader_handle *handle,
                        status = qat_uclo_auth_fw(handle, desc);
                qat_uclo_ummap_auth_fw(handle, &desc);
        } else {
-               if (handle->pci_dev->device == PCI_DEVICE_ID_INTEL_QAT_C3XXX) {
-                       pr_err("QAT: C3XXX doesn't support unsigned MMP\n");
-                       return -EINVAL;
+               if (!handle->chip_info->sram_visible) {
+                       dev_dbg(&handle->pci_dev->dev,
+                               "QAT MMP fw not loaded for device 0x%x",
+                               handle->pci_dev->device);
+                       return status;
                }
                qat_uclo_wr_sram_by_words(handle, 0, addr_ptr, mem_size);
        }