net: hns: add the support to add/remove the ucast entry to/from table

This patch adds the support to add or remove the unicast entries
to the table and remove from the table.

Reported-by: Daode Huang <huangdaode@hisilicon.com>
Signed-off-by: Kejian Yan <yankejian@huawei.com>
Reviewed-by: Yisen Zhuang <yisen.zhuang@huawei.com>
Signed-off-by: Salil Mehta <salil.mehta@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/hisilicon/hns/hnae.h b/drivers/net/ethernet/hisilicon/hns/hnae.h
index 55c0334270bb3dd61610df347fb401279daab608..09602f1187f5493b34d9525b108d7582d16f25f3 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns/hnae.h
+++ b/drivers/net/ethernet/hisilicon/hns/hnae.h
@@ -430,6 +430,10 @@ enum hnae_media_type {
  *   clear mcast tcam table
  * set_mc_addr()
  *   set multicast mode
+ * add_uc_addr()
+ *   add ucast address
+ * rm_uc_addr()
+ *   remove ucast address
  * set_mtu()
  *   set mtu
  * update_stats()
@@ -490,6 +494,10 @@ struct hnae_ae_ops {
        void (*set_promisc_mode)(struct hnae_handle *handle, u32 en);
        int (*get_mac_addr)(struct hnae_handle *handle, void **p);
        int (*set_mac_addr)(struct hnae_handle *handle, void *p);
+       int (*add_uc_addr)(struct hnae_handle *handle,
+                          const unsigned char *addr);
+       int (*rm_uc_addr)(struct hnae_handle *handle,
+                         const unsigned char *addr);
        int (*clr_mc_addr)(struct hnae_handle *handle);
        int (*set_mc_addr)(struct hnae_handle *handle, void *addr);
        int (*set_mtu)(struct hnae_handle *handle, int new_mtu);

diff --git a/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c b/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c
index 366b25b29ca8b6d3afd683944c4f5aa50bffe894..0a9cdf00b31afa9608414a4ad3de3089e4f61d04 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c
@@ -199,6 +199,28 @@ static int hns_ae_set_mac_address(struct hnae_handle *handle, void *p)
        return 0;
 }
 
+static int hns_ae_add_uc_address(struct hnae_handle *handle,
+                                const unsigned char *addr)
+{
+       struct hns_mac_cb *mac_cb = hns_get_mac_cb(handle);
+
+       if (mac_cb->mac_type != HNAE_PORT_SERVICE)
+               return -ENOSPC;
+
+       return hns_mac_add_uc_addr(mac_cb, handle->vf_id, addr);
+}
+
+static int hns_ae_rm_uc_address(struct hnae_handle *handle,
+                               const unsigned char *addr)
+{
+       struct hns_mac_cb *mac_cb = hns_get_mac_cb(handle);
+
+       if (mac_cb->mac_type != HNAE_PORT_SERVICE)
+               return -ENOSPC;
+
+       return hns_mac_rm_uc_addr(mac_cb, handle->vf_id, addr);
+}
+
 static int hns_ae_set_multicast_one(struct hnae_handle *handle, void *addr)
 {
        int ret;
@@ -830,6 +852,8 @@ static struct hnae_ae_ops hns_dsaf_ops = {
        .get_coalesce_range = hns_ae_get_coalesce_range,
        .set_promisc_mode = hns_ae_set_promisc_mode,
        .set_mac_addr = hns_ae_set_mac_address,
+       .add_uc_addr = hns_ae_add_uc_address,
+       .rm_uc_addr = hns_ae_rm_uc_address,
        .set_mc_addr = hns_ae_set_multicast_one,
        .clr_mc_addr = hns_ae_clr_multicast,
        .set_mtu = hns_ae_set_mtu,

diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c
index 266417db2b706941afe9c4be65267db21fcb4da5..3239d27143b935dc0056490b32f700093163c74a 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c
@@ -263,6 +263,46 @@ int hns_mac_change_vf_addr(struct hns_mac_cb *mac_cb,
        return 0;
 }
 
+int hns_mac_add_uc_addr(struct hns_mac_cb *mac_cb, u8 vf_id,
+                       const unsigned char *addr)
+{
+       struct dsaf_device *dsaf_dev = mac_cb->dsaf_dev;
+       struct dsaf_drv_mac_single_dest_entry mac_entry;
+       int ret;
+
+       if (HNS_DSAF_IS_DEBUG(dsaf_dev))
+               return -ENOSPC;
+
+       memset(&mac_entry, 0, sizeof(mac_entry));
+       memcpy(mac_entry.addr, addr, sizeof(mac_entry.addr));
+       mac_entry.in_port_num = mac_cb->mac_id;
+       ret = hns_mac_get_inner_port_num(mac_cb, vf_id, &mac_entry.port_num);
+       if (ret)
+               return ret;
+
+       return hns_dsaf_set_mac_uc_entry(dsaf_dev, &mac_entry);
+}
+
+int hns_mac_rm_uc_addr(struct hns_mac_cb *mac_cb, u8 vf_id,
+                      const unsigned char *addr)
+{
+       struct dsaf_device *dsaf_dev = mac_cb->dsaf_dev;
+       struct dsaf_drv_mac_single_dest_entry mac_entry;
+       int ret;
+
+       if (HNS_DSAF_IS_DEBUG(dsaf_dev))
+               return -ENOSPC;
+
+       memset(&mac_entry, 0, sizeof(mac_entry));
+       memcpy(mac_entry.addr, addr, sizeof(mac_entry.addr));
+       mac_entry.in_port_num = mac_cb->mac_id;
+       ret = hns_mac_get_inner_port_num(mac_cb, vf_id, &mac_entry.port_num);
+       if (ret)
+               return ret;
+
+       return hns_dsaf_rm_mac_addr(dsaf_dev, &mac_entry);
+}
+
 int hns_mac_set_multi(struct hns_mac_cb *mac_cb,
                      u32 port_num, char *addr, bool enable)
 {

diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h
index d8964527a028fa17e29922e6251d272d22454842..2bb3d1e93c64a315c92f0e493573add3e5f1e023 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h
@@ -461,6 +461,10 @@ int hns_cpld_led_set_id(struct hns_mac_cb *mac_cb,
 void hns_mac_set_promisc(struct hns_mac_cb *mac_cb, u8 en);
 int hns_mac_get_inner_port_num(struct hns_mac_cb *mac_cb,
                               u8 vmid, u8 *port_num);
+int hns_mac_add_uc_addr(struct hns_mac_cb *mac_cb, u8 vf_id,
+                       const unsigned char *addr);
+int hns_mac_rm_uc_addr(struct hns_mac_cb *mac_cb, u8 vf_id,
+                      const unsigned char *addr);
 int hns_mac_clr_multicast(struct hns_mac_cb *mac_cb, int vfn);
 
 #endif /* _HNS_DSAF_MAC_H */

diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c
index ebecbed20ea27e131e32f3d91422f5e3c149aac2..90dbda7926144a41120d18c28a2c7d033f245f8c 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c
@@ -1598,6 +1598,55 @@ int hns_dsaf_set_mac_uc_entry(
        return 0;
 }
 
+int hns_dsaf_rm_mac_addr(
+       struct dsaf_device *dsaf_dev,
+       struct dsaf_drv_mac_single_dest_entry *mac_entry)
+{
+       u16 entry_index = DSAF_INVALID_ENTRY_IDX;
+       struct dsaf_tbl_tcam_ucast_cfg mac_data;
+       struct dsaf_drv_tbl_tcam_key mac_key;
+
+       /* mac addr check */
+       if (!is_valid_ether_addr(mac_entry->addr)) {
+               dev_err(dsaf_dev->dev, "rm_uc_addr %s Mac %pM err!\n",
+                       dsaf_dev->ae_dev.name, mac_entry->addr);
+               return -EINVAL;
+       }
+
+       /* config key */
+       hns_dsaf_set_mac_key(dsaf_dev, &mac_key, mac_entry->in_vlan_id,
+                            mac_entry->in_port_num, mac_entry->addr);
+
+       entry_index = hns_dsaf_find_soft_mac_entry(dsaf_dev, &mac_key);
+       if (entry_index == DSAF_INVALID_ENTRY_IDX) {
+               /* can not find the tcam entry, return 0 */
+               dev_info(dsaf_dev->dev,
+                        "rm_uc_addr no tcam, %s Mac key(%#x:%#x)\n",
+                        dsaf_dev->ae_dev.name,
+                        mac_key.high.val, mac_key.low.val);
+               return 0;
+       }
+
+       dev_dbg(dsaf_dev->dev,
+               "rm_uc_addr, %s Mac key(%#x:%#x) entry_index%d\n",
+               dsaf_dev->ae_dev.name, mac_key.high.val,
+               mac_key.low.val, entry_index);
+
+       hns_dsaf_tcam_uc_get(
+                       dsaf_dev, entry_index,
+                       (struct dsaf_tbl_tcam_data *)&mac_key,
+                       &mac_data);
+
+       /* unicast entry not used locally should not clear */
+       if (mac_entry->port_num != mac_data.tbl_ucast_out_port)
+               return -EFAULT;
+
+       return hns_dsaf_del_mac_entry(dsaf_dev,
+                                     mac_entry->in_vlan_id,
+                                     mac_entry->in_port_num,
+                                     mac_entry->addr);
+}
+
 /**
  * hns_dsaf_set_mac_mc_entry - set mac mc-entry
  * @dsaf_dev: dsa fabric device struct pointer

diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h
index 901037c49a789de47f62ca7f4630297b3fadfe4a..cef6bf46ae9309bf84c9f5ff466982d59d8bed93 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h
@@ -468,6 +468,10 @@ void hns_dsaf_get_rx_mac_pause_en(struct dsaf_device *dsaf_dev, int mac_id,
                                  u32 *en);
 int hns_dsaf_set_rx_mac_pause_en(struct dsaf_device *dsaf_dev, int mac_id,
                                 u32 en);
+int hns_dsaf_rm_mac_addr(
+       struct dsaf_device *dsaf_dev,
+       struct dsaf_drv_mac_single_dest_entry *mac_entry);
+
 int hns_dsaf_clr_mac_mc_port(struct dsaf_device *dsaf_dev,
                             u8 mac_id, u8 port_num);
 

diff --git a/drivers/net/ethernet/hisilicon/hns/hns_enet.c b/drivers/net/ethernet/hisilicon/hns/hns_enet.c
index d22a39e7ddb03634094ef30e78e9bc1c48c26141..776d81e785d8c72555d183e7b13100bfc1f9b2a3 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns/hns_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_enet.c
@@ -1493,6 +1493,29 @@ static netdev_features_t hns_nic_fix_features(
        return features;
 }
 
+static int hns_nic_uc_sync(struct net_device *netdev, const unsigned char *addr)
+{
+       struct hns_nic_priv *priv = netdev_priv(netdev);
+       struct hnae_handle *h = priv->ae_handle;
+
+       if (h->dev->ops->add_uc_addr)
+               return h->dev->ops->add_uc_addr(h, addr);
+
+       return 0;
+}
+
+static int hns_nic_uc_unsync(struct net_device *netdev,
+                            const unsigned char *addr)
+{
+       struct hns_nic_priv *priv = netdev_priv(netdev);
+       struct hnae_handle *h = priv->ae_handle;
+
+       if (h->dev->ops->rm_uc_addr)
+               return h->dev->ops->rm_uc_addr(h, addr);
+
+       return 0;
+}
+
 /**
  * nic_set_multicast_list - set mutl mac address
  * @netdev: net device
@@ -1535,6 +1558,9 @@ void hns_nic_set_rx_mode(struct net_device *ndev)
        }
 
        hns_set_multicast_list(ndev);
+
+       if (__dev_uc_sync(ndev, hns_nic_uc_sync, hns_nic_uc_unsync))
+               netdev_err(ndev, "sync uc address fail\n");
 }
 
 struct rtnl_link_stats64 *hns_nic_get_stats64(struct net_device *ndev,