lkml.org 
[lkml]   [2019]   [Dec]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.4 329/350] crypto: sun4i-ss - Fix 64-bit size_t warnings
    Date
    From: Herbert Xu <herbert@gondor.apana.org.au>

    [ Upstream commit d6e9da21ee8246b5e556b3b153401ab045adb986 ]

    If you try to compile this driver on a 64-bit platform then you
    will get warnings because it mixes size_t with unsigned int which
    only works on 32-bit.

    This patch fixes all of the warnings.

    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Acked-by: Corentin Labbe <clabbe.montjoie@gmail.com>
    Tested-by: Corentin Labbe <clabbe.montjoie@gmail.com>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/crypto/sunxi-ss/sun4i-ss-cipher.c | 22 ++++++++++++++--------
    1 file changed, 14 insertions(+), 8 deletions(-)

    diff --git a/drivers/crypto/sunxi-ss/sun4i-ss-cipher.c b/drivers/crypto/sunxi-ss/sun4i-ss-cipher.c
    index 6536fd4bee657..7e5e092a23b3c 100644
    --- a/drivers/crypto/sunxi-ss/sun4i-ss-cipher.c
    +++ b/drivers/crypto/sunxi-ss/sun4i-ss-cipher.c
    @@ -72,7 +72,8 @@ static int noinline_for_stack sun4i_ss_opti_poll(struct skcipher_request *areq)
    oi = 0;
    oo = 0;
    do {
    - todo = min3(rx_cnt, ileft, (mi.length - oi) / 4);
    + todo = min(rx_cnt, ileft);
    + todo = min_t(size_t, todo, (mi.length - oi) / 4);
    if (todo) {
    ileft -= todo;
    writesl(ss->base + SS_RXFIFO, mi.addr + oi, todo);
    @@ -87,7 +88,8 @@ static int noinline_for_stack sun4i_ss_opti_poll(struct skcipher_request *areq)
    rx_cnt = SS_RXFIFO_SPACES(spaces);
    tx_cnt = SS_TXFIFO_SPACES(spaces);

    - todo = min3(tx_cnt, oleft, (mo.length - oo) / 4);
    + todo = min(tx_cnt, oleft);
    + todo = min_t(size_t, todo, (mo.length - oo) / 4);
    if (todo) {
    oleft -= todo;
    readsl(ss->base + SS_TXFIFO, mo.addr + oo, todo);
    @@ -239,7 +241,8 @@ static int sun4i_ss_cipher_poll(struct skcipher_request *areq)
    * todo is the number of consecutive 4byte word that we
    * can read from current SG
    */
    - todo = min3(rx_cnt, ileft / 4, (mi.length - oi) / 4);
    + todo = min(rx_cnt, ileft / 4);
    + todo = min_t(size_t, todo, (mi.length - oi) / 4);
    if (todo && !ob) {
    writesl(ss->base + SS_RXFIFO, mi.addr + oi,
    todo);
    @@ -253,8 +256,8 @@ static int sun4i_ss_cipher_poll(struct skcipher_request *areq)
    * we need to be able to write all buf in one
    * pass, so it is why we min() with rx_cnt
    */
    - todo = min3(rx_cnt * 4 - ob, ileft,
    - mi.length - oi);
    + todo = min(rx_cnt * 4 - ob, ileft);
    + todo = min_t(size_t, todo, mi.length - oi);
    memcpy(buf + ob, mi.addr + oi, todo);
    ileft -= todo;
    oi += todo;
    @@ -274,7 +277,8 @@ static int sun4i_ss_cipher_poll(struct skcipher_request *areq)
    spaces = readl(ss->base + SS_FCSR);
    rx_cnt = SS_RXFIFO_SPACES(spaces);
    tx_cnt = SS_TXFIFO_SPACES(spaces);
    - dev_dbg(ss->dev, "%x %u/%u %u/%u cnt=%u %u/%u %u/%u cnt=%u %u\n",
    + dev_dbg(ss->dev,
    + "%x %u/%zu %u/%u cnt=%u %u/%zu %u/%u cnt=%u %u\n",
    mode,
    oi, mi.length, ileft, areq->cryptlen, rx_cnt,
    oo, mo.length, oleft, areq->cryptlen, tx_cnt, ob);
    @@ -282,7 +286,8 @@ static int sun4i_ss_cipher_poll(struct skcipher_request *areq)
    if (!tx_cnt)
    continue;
    /* todo in 4bytes word */
    - todo = min3(tx_cnt, oleft / 4, (mo.length - oo) / 4);
    + todo = min(tx_cnt, oleft / 4);
    + todo = min_t(size_t, todo, (mo.length - oo) / 4);
    if (todo) {
    readsl(ss->base + SS_TXFIFO, mo.addr + oo, todo);
    oleft -= todo * 4;
    @@ -308,7 +313,8 @@ static int sun4i_ss_cipher_poll(struct skcipher_request *areq)
    * no more than remaining buffer
    * no need to test against oleft
    */
    - todo = min(mo.length - oo, obl - obo);
    + todo = min_t(size_t,
    + mo.length - oo, obl - obo);
    memcpy(mo.addr + oo, bufo + obo, todo);
    oleft -= todo;
    obo += todo;
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-12-10 22:16    [W:8.059 / U:2.388 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site