From: Tadeusz Struk Date: Fri, 8 Jan 2016 18:19:54 +0000 (-0800) Subject: crypto: qat - update init_esram for C3xxx dev type X-Git-Tag: v4.5-rc1~19^2~12 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=70401f4edc331c3c8068fc13b93d784a72de053e;p=thirdparty%2Fkernel%2Flinux.git crypto: qat - update init_esram for C3xxx dev type There is no esram on C3xxx devices so we don't need to wait for it to initialize. Signed-off-by: Tadeusz Struk Signed-off-by: Herbert Xu --- diff --git a/drivers/crypto/qat/qat_common/qat_hal.c b/drivers/crypto/qat/qat_common/qat_hal.c index b202514712f4f..1e480f1406635 100644 --- a/drivers/crypto/qat/qat_common/qat_hal.c +++ b/drivers/crypto/qat/qat_common/qat_hal.c @@ -456,6 +456,9 @@ static int qat_hal_init_esram(struct icp_qat_fw_loader_handle *handle) unsigned int csr_val; int times = 30; + if (handle->pci_dev->device == ADF_C3XXX_PCI_DEVICE_ID) + return 0; + csr_val = ADF_CSR_RD(csr_addr, 0); if ((csr_val & ESRAM_AUTO_TINIT) && (csr_val & ESRAM_AUTO_TINIT_DONE)) return 0;