Skip to content

Commit

Permalink
net: hns3: Add support for IFF_ALLMULTI flag
Browse files Browse the repository at this point in the history 
This patch adds support for IFF_ALLMULTI flag to HNS3 PF and VF
driver.

Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Salil Mehta <salil.mehta@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Peng Li authored and David S. Miller committed Jun 1, 2018
1 parent 6c25171 commit 3b75c3d
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 12 deletions.
3 changes: 2 additions & 1 deletion drivers/net/ethernet/hisilicon/hns3/hnae3.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,8 @@ struct hnae3_ae_ops {
int (*set_loopback)(struct hnae3_handle *handle,
enum hnae3_loop loop_mode, bool en);

void (*set_promisc_mode)(struct hnae3_handle *handle, u32 en);
void (*set_promisc_mode)(struct hnae3_handle *handle, bool en_uc_pmc,
bool en_mc_pmc);
int (*set_mtu)(struct hnae3_handle *handle, int new_mtu);

void (*get_pauseparam)(struct hnae3_handle *handle,
Expand Down
6 changes: 4 additions & 2 deletions drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -415,9 +415,11 @@ static void hns3_nic_set_rx_mode(struct net_device *netdev)

if (h->ae_algo->ops->set_promisc_mode) {
if (netdev->flags & IFF_PROMISC)
h->ae_algo->ops->set_promisc_mode(h, 1);
h->ae_algo->ops->set_promisc_mode(h, true, true);
else if (netdev->flags & IFF_ALLMULTI)
h->ae_algo->ops->set_promisc_mode(h, false, true);
else
h->ae_algo->ops->set_promisc_mode(h, 0);
h->ae_algo->ops->set_promisc_mode(h, false, false);
}
if (__dev_uc_sync(netdev, hns3_nic_uc_sync, hns3_nic_uc_unsync))
netdev_err(netdev, "sync uc address fail\n");
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ static int hns3_lp_setup(struct net_device *ndev, enum hnae3_loop loop, bool en)
if (ret)
return ret;

h->ae_algo->ops->set_promisc_mode(h, en);
h->ae_algo->ops->set_promisc_mode(h, en, en);

return ret;
}
Expand Down
6 changes: 4 additions & 2 deletions drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3580,13 +3580,15 @@ void hclge_promisc_param_init(struct hclge_promisc_param *param, bool en_uc,
param->vf_id = vport_id;
}

static void hclge_set_promisc_mode(struct hnae3_handle *handle, u32 en)
static void hclge_set_promisc_mode(struct hnae3_handle *handle, bool en_uc_pmc,
bool en_mc_pmc)
{
struct hclge_vport *vport = hclge_get_vport(handle);
struct hclge_dev *hdev = vport->back;
struct hclge_promisc_param param;

hclge_promisc_param_init(&param, en, en, true, vport->vport_id);
hclge_promisc_param_init(&param, en_uc_pmc, en_mc_pmc, true,
vport->vport_id);
hclge_cmd_set_promisc_mode(hdev, &param);
}

Expand Down
5 changes: 3 additions & 2 deletions drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,11 +190,12 @@ static int hclge_map_unmap_ring_to_vf_vector(struct hclge_vport *vport, bool en,
static int hclge_set_vf_promisc_mode(struct hclge_vport *vport,
struct hclge_mbx_vf_to_pf_cmd *req)
{
bool en = req->msg[1] ? true : false;
bool en_uc = req->msg[1] ? true : false;
bool en_mc = req->msg[2] ? true : false;
struct hclge_promisc_param param;

/* always enable broadcast promisc bit */
hclge_promisc_param_init(&param, en, en, true, vport->vport_id);
hclge_promisc_param_init(&param, en_uc, en_mc, true, vport->vport_id);
return hclge_cmd_set_promisc_mode(vport->back, &param);
}

Expand Down
11 changes: 7 additions & 4 deletions drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -654,7 +654,8 @@ static int hclgevf_put_vector(struct hnae3_handle *handle, int vector)
return 0;
}

static int hclgevf_cmd_set_promisc_mode(struct hclgevf_dev *hdev, u32 en)
static int hclgevf_cmd_set_promisc_mode(struct hclgevf_dev *hdev,
bool en_uc_pmc, bool en_mc_pmc)
{
struct hclge_mbx_vf_to_pf_cmd *req;
struct hclgevf_desc desc;
Expand All @@ -664,7 +665,8 @@ static int hclgevf_cmd_set_promisc_mode(struct hclgevf_dev *hdev, u32 en)

hclgevf_cmd_setup_basic_desc(&desc, HCLGEVF_OPC_MBX_VF_TO_PF, false);
req->msg[0] = HCLGE_MBX_SET_PROMISC_MODE;
req->msg[1] = en;
req->msg[1] = en_uc_pmc ? 1 : 0;
req->msg[2] = en_mc_pmc ? 1 : 0;

status = hclgevf_cmd_send(&hdev->hw, &desc, 1);
if (status)
Expand All @@ -674,11 +676,12 @@ static int hclgevf_cmd_set_promisc_mode(struct hclgevf_dev *hdev, u32 en)
return status;
}

static void hclgevf_set_promisc_mode(struct hnae3_handle *handle, u32 en)
static void hclgevf_set_promisc_mode(struct hnae3_handle *handle,
bool en_uc_pmc, bool en_mc_pmc)
{
struct hclgevf_dev *hdev = hclgevf_ae_get_hdev(handle);

hclgevf_cmd_set_promisc_mode(hdev, en);
hclgevf_cmd_set_promisc_mode(hdev, en_uc_pmc, en_mc_pmc);
}

static int hclgevf_tqp_enable(struct hclgevf_dev *hdev, int tqp_id,
Expand Down

0 comments on commit 3b75c3d

Please sign in to comment.