* [PATCH] crypto: qat - remove to call get_sram_bar_id for qat_c3xxx
@ 2016-01-06 9:56 Yang Pingchao
2016-01-15 18:28 ` Tadeusz Struk
0 siblings, 1 reply; 3+ messages in thread
From: Yang Pingchao @ 2016-01-06 9:56 UTC (permalink / raw)
To: herbert; +Cc: tadeusz.struk, linux-crypto, qat-linux, Pingchao Yang
From: Pingchao Yang <pingchao.yang@intel.com>
Reported-by : Struk, Tadeusz <tadeusz.struk@intel.com>
Signed-off-by: Yang Pingchao <pingchao.yang@intel.com>
---
drivers/crypto/qat/qat_common/qat_hal.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/crypto/qat/qat_common/qat_hal.c b/drivers/crypto/qat/qat_common/qat_hal.c
index 0d0b5ed..bcb39b0 100644
--- a/drivers/crypto/qat/qat_common/qat_hal.c
+++ b/drivers/crypto/qat/qat_common/qat_hal.c
@@ -693,14 +693,12 @@ int qat_hal_init(struct adf_accel_dev *accel_dev)
struct adf_hw_device_data *hw_data = accel_dev->hw_device;
struct adf_bar *misc_bar =
&pci_info->pci_bars[hw_data->get_misc_bar_id(hw_data)];
- struct adf_bar *sram_bar =
- &pci_info->pci_bars[hw_data->get_sram_bar_id(hw_data)];
+ struct adf_bar *sram_bar;
handle = kzalloc(sizeof(*handle), GFP_KERNEL);
if (!handle)
return -ENOMEM;
- handle->hal_sram_addr_v = sram_bar->virt_addr;
handle->hal_cap_g_ctl_csr_addr_v =
(void __iomem *)((uintptr_t)misc_bar->virt_addr +
ICP_QAT_CAP_OFFSET);
@@ -714,6 +712,11 @@ int qat_hal_init(struct adf_accel_dev *accel_dev)
(void __iomem *)((uintptr_t)handle->hal_cap_ae_xfer_csr_addr_v +
LOCAL_TO_XFER_REG_OFFSET);
handle->pci_dev = pci_info->pci_dev;
+ if (handle->pci_dev->device != ADF_C3XXX_PCI_DEVICE_ID) {
+ sram_bar =
+ &pci_info->pci_bars[hw_data->get_sram_bar_id(hw_data)];
+ handle->hal_sram_addr_v = sram_bar->virt_addr;
+ }
handle->fw_auth = (handle->pci_dev->device ==
ADF_DH895XCC_PCI_DEVICE_ID) ? false : true;
handle->hal_handle = kzalloc(sizeof(*handle->hal_handle), GFP_KERNEL);
--
2.6.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: crypto: qat - remove to call get_sram_bar_id for qat_c3xxx
2016-01-06 9:56 [PATCH] crypto: qat - remove to call get_sram_bar_id for qat_c3xxx Yang Pingchao
@ 2016-01-15 18:28 ` Tadeusz Struk
2016-01-18 15:22 ` Herbert Xu
0 siblings, 1 reply; 3+ messages in thread
From: Tadeusz Struk @ 2016-01-15 18:28 UTC (permalink / raw)
To: herbert; +Cc: Pingchao Yang, linux-crypto, qat-linux
On 01/06/2016 01:56 AM, Pingchao Yang wrote:
> From: Pingchao Yang <pingchao.yang@intel.com>
>
> Reported-by : Struk, Tadeusz <tadeusz.struk@intel.com>
> Signed-off-by: Yang Pingchao <pingchao.yang@intel.com>
>
> ---
> drivers/crypto/qat/qat_common/qat_hal.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/crypto/qat/qat_common/qat_hal.c b/drivers/crypto/qat/qat_common/qat_hal.c
> index 0d0b5ed..bcb39b0 100644
> --- a/drivers/crypto/qat/qat_common/qat_hal.c
> +++ b/drivers/crypto/qat/qat_common/qat_hal.c
> @@ -693,14 +693,12 @@ int qat_hal_init(struct adf_accel_dev *accel_dev)
> struct adf_hw_device_data *hw_data = accel_dev->hw_device;
> struct adf_bar *misc_bar =
> &pci_info->pci_bars[hw_data->get_misc_bar_id(hw_data)];
> - struct adf_bar *sram_bar =
> - &pci_info->pci_bars[hw_data->get_sram_bar_id(hw_data)];
> + struct adf_bar *sram_bar;
>
> handle = kzalloc(sizeof(*handle), GFP_KERNEL);
> if (!handle)
> return -ENOMEM;
>
> - handle->hal_sram_addr_v = sram_bar->virt_addr;
> handle->hal_cap_g_ctl_csr_addr_v =
> (void __iomem *)((uintptr_t)misc_bar->virt_addr +
> ICP_QAT_CAP_OFFSET);
> @@ -714,6 +712,11 @@ int qat_hal_init(struct adf_accel_dev *accel_dev)
> (void __iomem *)((uintptr_t)handle->hal_cap_ae_xfer_csr_addr_v +
> LOCAL_TO_XFER_REG_OFFSET);
> handle->pci_dev = pci_info->pci_dev;
> + if (handle->pci_dev->device != ADF_C3XXX_PCI_DEVICE_ID) {
> + sram_bar =
> + &pci_info->pci_bars[hw_data->get_sram_bar_id(hw_data)];
> + handle->hal_sram_addr_v = sram_bar->virt_addr;
> + }
> handle->fw_auth = (handle->pci_dev->device ==
> ADF_DH895XCC_PCI_DEVICE_ID) ? false : true;
> handle->hal_handle = kzalloc(sizeof(*handle->hal_handle), GFP_KERNEL);
>
Herbert,
This fixes issue related to invalid BAR mapping on C3XXX device,
which leads to memory corruption and kernel oops.
Please include this fix into 4.5.
Thanks,
--
TS
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: crypto: qat - remove to call get_sram_bar_id for qat_c3xxx
2016-01-15 18:28 ` Tadeusz Struk
@ 2016-01-18 15:22 ` Herbert Xu
0 siblings, 0 replies; 3+ messages in thread
From: Herbert Xu @ 2016-01-18 15:22 UTC (permalink / raw)
To: Tadeusz Struk; +Cc: Pingchao Yang, linux-crypto, qat-linux
On Fri, Jan 15, 2016 at 10:28:51AM -0800, Tadeusz Struk wrote:
> On 01/06/2016 01:56 AM, Pingchao Yang wrote:
> > From: Pingchao Yang <pingchao.yang@intel.com>
> >
> > Reported-by : Struk, Tadeusz <tadeusz.struk@intel.com>
> > Signed-off-by: Yang Pingchao <pingchao.yang@intel.com>
Patch applied. Thanks!
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-01-18 15:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-06 9:56 [PATCH] crypto: qat - remove to call get_sram_bar_id for qat_c3xxx Yang Pingchao
2016-01-15 18:28 ` Tadeusz Struk
2016-01-18 15:22 ` Herbert Xu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).