lkml.org 
[lkml]   [2020]   [Mar]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 93/99] hinic: fix a bug of setting hw_ioctxt
    Date
    From: Luo bin <luobin9@huawei.com>

    [ Upstream commit d2ed69ce9ed3477e2a9527e6b89fe4689d99510e ]

    a reserved field is used to signify prime physical function index
    in the latest firmware version, so we must assign a value to it
    correctly

    Signed-off-by: Luo bin <luobin9@huawei.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c | 1 +
    drivers/net/ethernet/huawei/hinic/hinic_hw_dev.h | 2 +-
    drivers/net/ethernet/huawei/hinic/hinic_hw_if.h | 1 +
    3 files changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c b/drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c
    index 79b5674470842..46aba02b8672b 100644
    --- a/drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c
    +++ b/drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c
    @@ -312,6 +312,7 @@ static int set_hw_ioctxt(struct hinic_hwdev *hwdev, unsigned int rq_depth,
    }

    hw_ioctxt.func_idx = HINIC_HWIF_FUNC_IDX(hwif);
    + hw_ioctxt.ppf_idx = HINIC_HWIF_PPF_IDX(hwif);

    hw_ioctxt.set_cmdq_depth = HW_IOCTXT_SET_CMDQ_DEPTH_DEFAULT;
    hw_ioctxt.cmdq_depth = 0;
    diff --git a/drivers/net/ethernet/huawei/hinic/hinic_hw_dev.h b/drivers/net/ethernet/huawei/hinic/hinic_hw_dev.h
    index 0f5563f3b7798..a011fd2d26270 100644
    --- a/drivers/net/ethernet/huawei/hinic/hinic_hw_dev.h
    +++ b/drivers/net/ethernet/huawei/hinic/hinic_hw_dev.h
    @@ -104,8 +104,8 @@ struct hinic_cmd_hw_ioctxt {

    u8 rsvd2;
    u8 rsvd3;
    + u8 ppf_idx;
    u8 rsvd4;
    - u8 rsvd5;

    u16 rq_depth;
    u16 rx_buf_sz_idx;
    diff --git a/drivers/net/ethernet/huawei/hinic/hinic_hw_if.h b/drivers/net/ethernet/huawei/hinic/hinic_hw_if.h
    index 5b4760c0e9f53..f683ccbdfca02 100644
    --- a/drivers/net/ethernet/huawei/hinic/hinic_hw_if.h
    +++ b/drivers/net/ethernet/huawei/hinic/hinic_hw_if.h
    @@ -146,6 +146,7 @@
    #define HINIC_HWIF_FUNC_IDX(hwif) ((hwif)->attr.func_idx)
    #define HINIC_HWIF_PCI_INTF(hwif) ((hwif)->attr.pci_intf_idx)
    #define HINIC_HWIF_PF_IDX(hwif) ((hwif)->attr.pf_idx)
    +#define HINIC_HWIF_PPF_IDX(hwif) ((hwif)->attr.ppf_idx)

    #define HINIC_FUNC_TYPE(hwif) ((hwif)->attr.func_type)
    #define HINIC_IS_PF(hwif) (HINIC_FUNC_TYPE(hwif) == HINIC_PF)
    --
    2.20.1


    \
     
     \ /
      Last update: 2020-03-19 14:18    [W:4.093 / U:0.144 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site