lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 101/717] RDMa/mthca: Work around -Wenum-conversion warning
    Date
    From: Arnd Bergmann <arnd@arndb.de>

    [ Upstream commit fbb7dc5db6dee553b5a07c27e86364a5223e244c ]

    gcc points out a suspicious mixing of enum types in a function that
    converts from MTHCA_OPCODE_* values to IB_WC_* values:

    drivers/infiniband/hw/mthca/mthca_cq.c: In function 'mthca_poll_one':
    drivers/infiniband/hw/mthca/mthca_cq.c:607:21: warning: implicit conversion from 'enum <anonymous>' to 'enum ib_wc_opcode' [-Wenum-conversion]
    607 | entry->opcode = MTHCA_OPCODE_INVALID;

    Nothing seems to ever check for MTHCA_OPCODE_INVALID again, no idea if
    this is meaningful, but it seems harmless as it deals with an invalid
    input.

    Remove MTHCA_OPCODE_INVALID and set the ib_wc_opcode to 0xFF, which is
    still bogus, but at least doesn't make compiler warnings.

    Fixes: 2a4443a69934 ("[PATCH] IB/mthca: fill in opcode field for send completions")
    Link: https://lore.kernel.org/r/20201026211311.3887003-1-arnd@kernel.org
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/infiniband/hw/mthca/mthca_cq.c | 2 +-
    drivers/infiniband/hw/mthca/mthca_dev.h | 1 -
    2 files changed, 1 insertion(+), 2 deletions(-)

    diff --git a/drivers/infiniband/hw/mthca/mthca_cq.c b/drivers/infiniband/hw/mthca/mthca_cq.c
    index 119b2573c9a08..26c3408dcacae 100644
    --- a/drivers/infiniband/hw/mthca/mthca_cq.c
    +++ b/drivers/infiniband/hw/mthca/mthca_cq.c
    @@ -604,7 +604,7 @@ static inline int mthca_poll_one(struct mthca_dev *dev,
    entry->byte_len = MTHCA_ATOMIC_BYTE_LEN;
    break;
    default:
    - entry->opcode = MTHCA_OPCODE_INVALID;
    + entry->opcode = 0xFF;
    break;
    }
    } else {
    diff --git a/drivers/infiniband/hw/mthca/mthca_dev.h b/drivers/infiniband/hw/mthca/mthca_dev.h
    index 9dbbf4d16796a..a445160de3e16 100644
    --- a/drivers/infiniband/hw/mthca/mthca_dev.h
    +++ b/drivers/infiniband/hw/mthca/mthca_dev.h
    @@ -105,7 +105,6 @@ enum {
    MTHCA_OPCODE_ATOMIC_CS = 0x11,
    MTHCA_OPCODE_ATOMIC_FA = 0x12,
    MTHCA_OPCODE_BIND_MW = 0x18,
    - MTHCA_OPCODE_INVALID = 0xff
    };

    enum {
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-28 16:19    [W:2.350 / U:0.260 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site