| Message ID | 1452277194-4804-1-git-send-email-tadeusz.struk@intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Herbert Xu |
| Headers | show |
On 01/08/2016 10:19 AM, Tadeusz Struk wrote: > There is no esram on C3xxx devices so we don't need to wait for > it to initialize. > > Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com> > --- > drivers/crypto/qat/qat_common/qat_hal.c | 3 +++ > 1 file changed, 3 insertions(+) Hi Herbert, This one is generated on top of Pingchao's patch "crypto: qat - fix timeout issues" https://patchwork.kernel.org/patch/7972981/ Thanks
On 01/08/2016 10:19 AM, Tadeusz Struk wrote: > There is no esram on C3xxx devices so we don't need to wait for > it to initialize. > > Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com> > > --- > drivers/crypto/qat/qat_common/qat_hal.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/crypto/qat/qat_common/qat_hal.c b/drivers/crypto/qat/qat_common/qat_hal.c > index 7786e6e..daecd71 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; > Herbert, This fixes another BAR related issue on C3XXX device, which prevents C3XXX device from being initialized. Please include this fix into 4.5. The patch is created on top of the "[V3] crypto: qat - fix timeout issues" Thanks,
On Fri, Jan 15, 2016 at 10:29:12AM -0800, Tadeusz Struk wrote: > On 01/08/2016 10:19 AM, Tadeusz Struk wrote: > > There is no esram on C3xxx devices so we don't need to wait for > > it to initialize. > > > > Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com> Patch applied. Thanks!
diff --git a/drivers/crypto/qat/qat_common/qat_hal.c b/drivers/crypto/qat/qat_common/qat_hal.c index 7786e6e..daecd71 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;
There is no esram on C3xxx devices so we don't need to wait for it to initialize. Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com> --- drivers/crypto/qat/qat_common/qat_hal.c | 3 +++ 1 file changed, 3 insertions(+)