lkml.org 
[lkml]   [2020]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 547/639] net: hns3: fix error VF index when setting VLAN offload
    Date
    From: Jian Shen <shenjian15@huawei.com>

    [ Upstream commit d9c0f2756a33833b2653f7a3612814fa5f52a568 ]

    In original codes, the VF index used incorrectly in function
    hclge_set_vlan_rx_offload_cfg() and hclge_set_vlan_rx_offload_cfg().
    When VF id is greater than 8, for example 9, it will set the
    same bit with VF id 1.

    This patch fixes it by using vport->vport_id % HCLGE_VF_NUM_PER_CMD /
    HCLGE_VF_NUM_PER_BYTE as the array index, instead of vport->vport_id /
    HCLGE_VF_NUM_PER_CMD.

    Fixes: 052ece6dc19c ("net: hns3: add ethtool related offload command")
    Signed-off-by: Jian Shen <shenjian15@huawei.com>
    Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 14 ++++++++++----
    1 file changed, 10 insertions(+), 4 deletions(-)

    diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
    index 4b9f898a1620c..d575dd9a329d9 100644
    --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
    +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
    @@ -4833,6 +4833,7 @@ static int hclge_set_vlan_tx_offload_cfg(struct hclge_vport *vport)
    struct hclge_vport_vtag_tx_cfg_cmd *req;
    struct hclge_dev *hdev = vport->back;
    struct hclge_desc desc;
    + u16 bmap_index;
    int status;

    hclge_cmd_setup_basic_desc(&desc, HCLGE_OPC_VLAN_PORT_TX_CFG, false);
    @@ -4855,8 +4856,10 @@ static int hclge_set_vlan_tx_offload_cfg(struct hclge_vport *vport)
    hnae3_set_bit(req->vport_vlan_cfg, HCLGE_CFG_NIC_ROCE_SEL_B, 0);

    req->vf_offset = vport->vport_id / HCLGE_VF_NUM_PER_CMD;
    - req->vf_bitmap[req->vf_offset] =
    - 1 << (vport->vport_id % HCLGE_VF_NUM_PER_BYTE);
    + bmap_index = vport->vport_id % HCLGE_VF_NUM_PER_CMD /
    + HCLGE_VF_NUM_PER_BYTE;
    + req->vf_bitmap[bmap_index] =
    + 1U << (vport->vport_id % HCLGE_VF_NUM_PER_BYTE);

    status = hclge_cmd_send(&hdev->hw, &desc, 1);
    if (status)
    @@ -4873,6 +4876,7 @@ static int hclge_set_vlan_rx_offload_cfg(struct hclge_vport *vport)
    struct hclge_vport_vtag_rx_cfg_cmd *req;
    struct hclge_dev *hdev = vport->back;
    struct hclge_desc desc;
    + u16 bmap_index;
    int status;

    hclge_cmd_setup_basic_desc(&desc, HCLGE_OPC_VLAN_PORT_RX_CFG, false);
    @@ -4888,8 +4892,10 @@ static int hclge_set_vlan_rx_offload_cfg(struct hclge_vport *vport)
    vcfg->vlan2_vlan_prionly ? 1 : 0);

    req->vf_offset = vport->vport_id / HCLGE_VF_NUM_PER_CMD;
    - req->vf_bitmap[req->vf_offset] =
    - 1 << (vport->vport_id % HCLGE_VF_NUM_PER_BYTE);
    + bmap_index = vport->vport_id % HCLGE_VF_NUM_PER_CMD /
    + HCLGE_VF_NUM_PER_BYTE;
    + req->vf_bitmap[bmap_index] =
    + 1U << (vport->vport_id % HCLGE_VF_NUM_PER_BYTE);

    status = hclge_cmd_send(&hdev->hw, &desc, 1);
    if (status)
    --
    2.20.1


    \
     
     \ /
      Last update: 2020-01-24 12:31    [W:2.368 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site