2023-07-04 10:12:54

by You Kangren

Subject: [PATCH v5] crypto: qat - Replace the if statement with min()

Mark UWORD_CPYBUF_SIZE with U suffix to make its type the same with
words_num and replace the if statement with min() in
qat_uclo_wr_uimage_raw_page() to make code shorter.

Fixes: b4b7e67c917f ("crypto: qat - Intel(R) QAT ucode part of fw loader")
Reviewed-by: Andy Shevchenko <[email protected]>
Signed-off-by: You Kangren <[email protected]>
---
Changelog:
v4->v5:
- Add the Fixes and Reviewed-by tags of the patch
- Add the version update information of the patch

v3->v4:
- Remove the header file <linux/minmax.h> in v3

v2->v3:
- Add a header file <linux/minmax.h>
- Mark UWORD_CPYBUF_SIZE with U suffix
- Change min_t() to min() in qat_uclo_wr_uimage_raw_page()

v1->v2:
- Change min() to min_t() in qat_uclo_wr_uimage_raw_page()

drivers/crypto/intel/qat/qat_common/qat_uclo.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/crypto/intel/qat/qat_common/qat_uclo.c b/drivers/crypto/intel/qat/qat_common/qat_uclo.c
index ce837bcc1cab..4bd150d1441a 100644
--- a/drivers/crypto/intel/qat/qat_common/qat_uclo.c
+++ b/drivers/crypto/intel/qat/qat_common/qat_uclo.c
@@ -11,7 +11,7 @@
#include "icp_qat_hal.h"
#include "icp_qat_fw_loader_handle.h"

-#define UWORD_CPYBUF_SIZE 1024
+#define UWORD_CPYBUF_SIZE 1024U
#define INVLD_UWORD 0xffffffffffull
#define PID_MINOR_REV 0xf
#define PID_MAJOR_REV (0xf << 4)
@@ -1986,10 +1986,7 @@ static void qat_uclo_wr_uimage_raw_page(struct icp_qat_fw_loader_handle *handle,
uw_relative_addr = 0;
words_num = encap_page->micro_words_num;
while (words_num) {
- if (words_num < UWORD_CPYBUF_SIZE)
- cpylen = words_num;
- else
- cpylen = UWORD_CPYBUF_SIZE;
+ cpylen = min(words_num, UWORD_CPYBUF_SIZE);

/* load the buffer */
for (i = 0; i < cpylen; i++)
--
2.39.0

2023-07-04 10:59:12

by Cabiddu, Giovanni

Subject: Re: [PATCH v5] crypto: qat - Replace the if statement with min()

On Tue, Jul 04, 2023 at 05:42:07PM +0800, You Kangren wrote:
> Mark UWORD_CPYBUF_SIZE with U suffix to make its type the same with
> words_num and replace the if statement with min() in
I would separate this in two sentences.

> qat_uclo_wr_uimage_raw_page() to make code shorter.
>
> Fixes: b4b7e67c917f ("crypto: qat - Intel(R) QAT ucode part of fw loader")
Why is this a fix?

NIT. On the headline of the commit message. Lower case after `-`.
See
git log --pretty=oneline drivers/crypto/intel/qat/

BTW, you could reuse the commit message I proposed when I reworked the
same.

Regards,

--
Giovanni

> Reviewed-by: Andy Shevchenko <[email protected]>
> Signed-off-by: You Kangren <[email protected]>
> ---
> Changelog:
> v4->v5:
> - Add the Fixes and Reviewed-by tags of the patch
> - Add the version update information of the patch
>
> v3->v4:
> - Remove the header file <linux/minmax.h> in v3
>
> v2->v3:
> - Add a header file <linux/minmax.h>
> - Mark UWORD_CPYBUF_SIZE with U suffix
> - Change min_t() to min() in qat_uclo_wr_uimage_raw_page()
>
> v1->v2:
> - Change min() to min_t() in qat_uclo_wr_uimage_raw_page()
>
> drivers/crypto/intel/qat/qat_common/qat_uclo.c | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/crypto/intel/qat/qat_common/qat_uclo.c b/drivers/crypto/intel/qat/qat_common/qat_uclo.c
> index ce837bcc1cab..4bd150d1441a 100644
> --- a/drivers/crypto/intel/qat/qat_common/qat_uclo.c
> +++ b/drivers/crypto/intel/qat/qat_common/qat_uclo.c
> @@ -11,7 +11,7 @@
> #include "icp_qat_hal.h"
> #include "icp_qat_fw_loader_handle.h"
>
> -#define UWORD_CPYBUF_SIZE 1024
> +#define UWORD_CPYBUF_SIZE 1024U
> #define INVLD_UWORD 0xffffffffffull
> #define PID_MINOR_REV 0xf
> #define PID_MAJOR_REV (0xf << 4)
> @@ -1986,10 +1986,7 @@ static void qat_uclo_wr_uimage_raw_page(struct icp_qat_fw_loader_handle *handle,
> uw_relative_addr = 0;
> words_num = encap_page->micro_words_num;
> while (words_num) {
> - if (words_num < UWORD_CPYBUF_SIZE)
> - cpylen = words_num;
> - else
> - cpylen = UWORD_CPYBUF_SIZE;
> + cpylen = min(words_num, UWORD_CPYBUF_SIZE);
>
> /* load the buffer */
> for (i = 0; i < cpylen; i++)
> --
> 2.39.0
>