]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
net: hns: modify tcam table of mac uc-entry
authorQianqian Xie <xieqianqian@huawei.com>
Wed, 9 Nov 2016 18:13:55 +0000 (18:13 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 10 Nov 2016 16:45:37 +0000 (11:45 -0500)
The current definition of mac_uc_entry is only suitable for
Little-endian. Thus it needs to modify tcam table of mac uc-entry
to support both Little-endian and Big-endian.

Signed-off-by: Qianqian Xie <xieqianqian@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>
drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c

index db23eef1996b3678b99bfeeceb6e5702492cf3cb..1713f8d835a2893fe7701fbe78b30a9222ba5120 100644 (file)
@@ -1532,6 +1532,7 @@ int hns_dsaf_set_mac_uc_entry(
        struct dsaf_drv_priv *priv =
            (struct dsaf_drv_priv *)hns_dsaf_dev_priv(dsaf_dev);
        struct dsaf_drv_soft_mac_tbl *soft_mac_entry = priv->soft_mac_tbl;
+       struct dsaf_tbl_tcam_data tcam_data;
 
        /* mac addr check */
        if (MAC_IS_ALL_ZEROS(mac_entry->addr) ||
@@ -1573,9 +1574,10 @@ int hns_dsaf_set_mac_uc_entry(
        /* default config dvc to 0 */
        mac_data.tbl_ucast_dvc = 0;
        mac_data.tbl_ucast_out_port = mac_entry->port_num;
-       hns_dsaf_tcam_uc_cfg(
-               dsaf_dev, entry_index,
-               (struct dsaf_tbl_tcam_data *)(&mac_key), &mac_data);
+       tcam_data.tbl_tcam_data_high = cpu_to_le32(mac_key.high.val);
+       tcam_data.tbl_tcam_data_low = cpu_to_le32(mac_key.low.val);
+
+       hns_dsaf_tcam_uc_cfg(dsaf_dev, entry_index, &tcam_data, &mac_data);
 
        /* config software entry */
        soft_mac_entry += entry_index;
@@ -1950,6 +1952,7 @@ int hns_dsaf_get_mac_uc_entry(struct dsaf_device *dsaf_dev,
        struct dsaf_drv_tbl_tcam_key mac_key;
 
        struct dsaf_tbl_tcam_ucast_cfg mac_data;
+       struct dsaf_tbl_tcam_data tcam_data;
 
        /* check macaddr */
        if (MAC_IS_ALL_ZEROS(mac_entry->addr) ||
@@ -1978,9 +1981,12 @@ int hns_dsaf_get_mac_uc_entry(struct dsaf_device *dsaf_dev,
                dsaf_dev->ae_dev.name, mac_key.high.val,
                mac_key.low.val, entry_index);
 
-       /*read entry*/
-       hns_dsaf_tcam_uc_get(dsaf_dev, entry_index,
-                            (struct dsaf_tbl_tcam_data *)&mac_key, &mac_data);
+       /* read entry */
+       hns_dsaf_tcam_uc_get(dsaf_dev, entry_index, &tcam_data, &mac_data);
+
+       mac_key.high.val = le32_to_cpu(tcam_data.tbl_tcam_data_high);
+       mac_key.low.val = le32_to_cpu(tcam_data.tbl_tcam_data_low);
+
        mac_entry->port_num = mac_data.tbl_ucast_out_port;
 
        return 0;