lkml.org 
[lkml]   [2020]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 249/477] RDMA/efa: Fix setting of wrong bit in get/set_feature commands
    Date
    From: Gal Pressman <galpress@amazon.com>

    [ Upstream commit cc8a635e24acf2793605f243c913c51b8c3702ab ]

    When using a control buffer the ctrl_data bit should be set in order to
    indicate the control buffer address is valid, not ctrl_data_indirect
    which is used when the control buffer itself is indirect.

    Fixes: e9c6c5373088 ("RDMA/efa: Add common command handlers")
    Link: https://lore.kernel.org/r/20200512152204.93091-2-galpress@amazon.com
    Reviewed-by: Firas JahJah <firasj@amazon.com>
    Reviewed-by: Yossi Leybovich <sleybo@amazon.com>
    Signed-off-by: Gal Pressman <galpress@amazon.com>
    Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/infiniband/hw/efa/efa_com_cmd.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/infiniband/hw/efa/efa_com_cmd.c b/drivers/infiniband/hw/efa/efa_com_cmd.c
    index eea5574a62e84..69f842c92ff64 100644
    --- a/drivers/infiniband/hw/efa/efa_com_cmd.c
    +++ b/drivers/infiniband/hw/efa/efa_com_cmd.c
    @@ -388,7 +388,7 @@ static int efa_com_get_feature_ex(struct efa_com_dev *edev,

    if (control_buff_size)
    EFA_SET(&get_cmd.aq_common_descriptor.flags,
    - EFA_ADMIN_AQ_COMMON_DESC_CTRL_DATA_INDIRECT, 1);
    + EFA_ADMIN_AQ_COMMON_DESC_CTRL_DATA, 1);

    efa_com_set_dma_addr(control_buf_dma_addr,
    &get_cmd.control_buffer.address.mem_addr_high,
    @@ -540,7 +540,7 @@ static int efa_com_set_feature_ex(struct efa_com_dev *edev,
    if (control_buff_size) {
    set_cmd->aq_common_descriptor.flags = 0;
    EFA_SET(&set_cmd->aq_common_descriptor.flags,
    - EFA_ADMIN_AQ_COMMON_DESC_CTRL_DATA_INDIRECT, 1);
    + EFA_ADMIN_AQ_COMMON_DESC_CTRL_DATA, 1);
    efa_com_set_dma_addr(control_buf_dma_addr,
    &set_cmd->control_buffer.address.mem_addr_high,
    &set_cmd->control_buffer.address.mem_addr_low);
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-06-23 23:35    [W:4.078 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site