From: Tadeusz Struk <tadeusz.struk@intel.com>
To: herbert@gondor.apana.org.au
Cc: Pingchao Yang <pingchao.yang@intel.com>,
linux-crypto@vger.kernel.org, qat-linux@intel.com
Subject: Re: [V3] crypto: qat - fix timeout issues
Date: Fri, 15 Jan 2016 10:29:01 -0800 [thread overview]
Message-ID: <56993A6D.4060901@intel.com> (raw)
In-Reply-To: <1452130786-147187-1-git-send-email-pingchao.yang@intel.com>
On 01/06/2016 05:39 PM, Pingchao Yang wrote:
> Change the variable times data type and timeout conditon since the value
> of times should be -1 after loop.
>
> Signed-off-by: Yang Pingchao <pingchao.yang@intel.com>
>
> ---
> drivers/crypto/qat/qat_common/qat_hal.c | 11 ++++++-----
> 1 file changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/crypto/qat/qat_common/qat_hal.c b/drivers/crypto/qat/qat_common/qat_hal.c
> index 0ac0ba8..7786e6e 100644
> --- a/drivers/crypto/qat/qat_common/qat_hal.c
> +++ b/drivers/crypto/qat/qat_common/qat_hal.c
> @@ -389,7 +389,7 @@ static int qat_hal_check_ae_alive(struct icp_qat_fw_loader_handle *handle)
> {
> unsigned int base_cnt, cur_cnt;
> unsigned char ae;
> - unsigned int times = MAX_RETRY_TIMES;
> + int times = MAX_RETRY_TIMES;
>
> for (ae = 0; ae < handle->hal_handle->ae_max_num; ae++) {
> qat_hal_rd_ae_csr(handle, ae, PROFILE_COUNT,
> @@ -402,7 +402,7 @@ static int qat_hal_check_ae_alive(struct icp_qat_fw_loader_handle *handle)
> cur_cnt &= 0xffff;
> } while (times-- && (cur_cnt == base_cnt));
>
> - if (!times) {
> + if (times < 0) {
> pr_err("QAT: AE%d is inactive!!\n", ae);
> return -EFAULT;
> }
> @@ -453,7 +453,8 @@ static int qat_hal_init_esram(struct icp_qat_fw_loader_handle *handle)
> void __iomem *csr_addr =
> (void __iomem *)((uintptr_t)handle->hal_ep_csr_addr_v +
> ESRAM_AUTO_INIT_CSR_OFFSET);
> - unsigned int csr_val, times = 30;
> + unsigned int csr_val;
> + int times = 30;
>
> csr_val = ADF_CSR_RD(csr_addr, 0);
> if ((csr_val & ESRAM_AUTO_TINIT) && (csr_val & ESRAM_AUTO_TINIT_DONE))
> @@ -467,7 +468,7 @@ static int qat_hal_init_esram(struct icp_qat_fw_loader_handle *handle)
> qat_hal_wait_cycles(handle, 0, ESRAM_AUTO_INIT_USED_CYCLES, 0);
> csr_val = ADF_CSR_RD(csr_addr, 0);
> } while (!(csr_val & ESRAM_AUTO_TINIT_DONE) && times--);
> - if ((!times)) {
> + if ((times < 0)) {
> pr_err("QAT: Fail to init eSram!\n");
> return -EFAULT;
> }
> @@ -658,7 +659,7 @@ static int qat_hal_clear_gpr(struct icp_qat_fw_loader_handle *handle)
> ret = qat_hal_wait_cycles(handle, ae, 20, 1);
> } while (ret && times--);
>
> - if (!times) {
> + if (times < 0) {
> pr_err("QAT: clear GPR of AE %d failed", ae);
> return -EINVAL;
> }
>
Herbert,
This fixes integer overflow issue around csr initialization.
Please include this fix into 4.5.
Thanks,
--
TS
next prev parent reply other threads:[~2016-01-15 18:32 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-07 1:39 [PATCH V3] crypto: qat - fix timeout issues Yang Pingchao
2016-01-15 18:29 ` Tadeusz Struk [this message]
2016-01-18 15:22 ` [V3] " Herbert Xu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=56993A6D.4060901@intel.com \
--to=tadeusz.struk@intel.com \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
--cc=pingchao.yang@intel.com \
--cc=qat-linux@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).