From: Salil Mehta <salil.mehta@huawei.com>
To: <davem@davemloft.net>
Cc: <salil.mehta@huawei.com>, <yisen.zhuang@huawei.com>,
<mehta.salil.lnk@gmail.com>, <netdev@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <linuxarm@huawei.com>,
Qianqian Xie <xieqianqian@huawei.com>
Subject: [PATCH net-next 13/17] net: hns: modify tcam table of mac mc-port
Date: Wed, 9 Nov 2016 18:13:57 +0000 [thread overview]
Message-ID: <20161109181401.913728-14-salil.mehta@huawei.com> (raw)
In-Reply-To: <20161109181401.913728-1-salil.mehta@huawei.com>
From: Qianqian Xie <xieqianqian@huawei.com>
Little-endian is only supported by current tcam table to add
or delete mac mc-port. This patch makes it 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>
---
drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c
index bd6e5b0..27eb85c 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c
@@ -1688,6 +1688,7 @@ int hns_dsaf_add_mac_mc_port(struct dsaf_device *dsaf_dev,
struct dsaf_tbl_tcam_mcast_cfg mac_data;
struct dsaf_drv_priv *priv = hns_dsaf_dev_priv(dsaf_dev);
struct dsaf_drv_soft_mac_tbl *soft_mac_entry = priv->soft_mac_tbl;
+ struct dsaf_drv_tbl_tcam_key tmp_mac_key;
struct dsaf_tbl_tcam_data tcam_data;
u8 mc_addr[ETH_ALEN];
u8 *mc_mask;
@@ -1738,6 +1739,10 @@ int hns_dsaf_add_mac_mc_port(struct dsaf_device *dsaf_dev,
/* if exist, add in */
hns_dsaf_tcam_mc_get(dsaf_dev, entry_index, &tcam_data,
&mac_data);
+
+ tmp_mac_key.high.val =
+ le32_to_cpu(tcam_data.tbl_tcam_data_high);
+ tmp_mac_key.low.val = le32_to_cpu(tcam_data.tbl_tcam_data_low);
}
/* config hardware entry */
@@ -1762,8 +1767,8 @@ int hns_dsaf_add_mac_mc_port(struct dsaf_device *dsaf_dev,
dsaf_dev->ae_dev.name, mac_key.high.val,
mac_key.low.val, entry_index);
- tcam_data.tbl_tcam_data_high = mac_key.high.val;
- tcam_data.tbl_tcam_data_low = mac_key.low.val;
+ 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);
/* config mc entry with mask */
hns_dsaf_tcam_mc_cfg(dsaf_dev, entry_index, &tcam_data,
@@ -1847,7 +1852,7 @@ int hns_dsaf_del_mac_mc_port(struct dsaf_device *dsaf_dev,
struct dsaf_tbl_tcam_data tcam_data;
int mskid;
const u8 empty_msk[sizeof(mac_data.tbl_mcast_port_msk)] = {0};
- struct dsaf_drv_tbl_tcam_key mask_key;
+ struct dsaf_drv_tbl_tcam_key mask_key, tmp_mac_key;
struct dsaf_tbl_tcam_data *pmask_key = NULL;
u8 mc_addr[ETH_ALEN];
u8 *mc_mask;
@@ -1905,6 +1910,9 @@ int hns_dsaf_del_mac_mc_port(struct dsaf_device *dsaf_dev,
/* read entry */
hns_dsaf_tcam_mc_get(dsaf_dev, entry_index, &tcam_data, &mac_data);
+ tmp_mac_key.high.val = le32_to_cpu(tcam_data.tbl_tcam_data_high);
+ tmp_mac_key.low.val = le32_to_cpu(tcam_data.tbl_tcam_data_low);
+
/*del the port*/
if (mac_entry->port_num < DSAF_SERVICE_NW_NUM) {
mskid = mac_entry->port_num;
@@ -1929,8 +1937,8 @@ int hns_dsaf_del_mac_mc_port(struct dsaf_device *dsaf_dev,
soft_mac_entry += entry_index;
soft_mac_entry->index = DSAF_INVALID_ENTRY_IDX;
} else { /* not zero, just del port, update */
- tcam_data.tbl_tcam_data_high = mac_key.high.val;
- tcam_data.tbl_tcam_data_low = mac_key.low.val;
+ 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_mc_cfg(dsaf_dev, entry_index,
&tcam_data,
--
1.7.9.5
next prev parent reply other threads:[~2016-11-09 18:15 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-09 18:13 [PATCH net-next 00/17] Bug fixes & Code improvements in HNS driver Salil Mehta
2016-11-09 18:13 ` [PATCH net-next 01/17] Doc: hisi: hns adds mc-mac-mask property Salil Mehta
2016-11-09 18:13 ` [PATCH net-next 02/17] net: hns: add fuzzy match of tcam table for hns Salil Mehta
2016-11-09 18:13 ` [PATCH net-next 03/17] net: hns: fix for promisc mode in HNS driver Salil Mehta
2016-11-09 18:13 ` [PATCH net-next 04/17] net: hns: set default mac pause time to 0xffff Salil Mehta
2016-11-09 18:13 ` [PATCH net-next 05/17] net: hns: bug fix about restart auto-negotiation Salil Mehta
2016-11-09 18:13 ` [PATCH net-next 06/17] net: hns: delete redundant macro definition Salil Mehta
2016-11-09 18:13 ` [PATCH net-next 07/17] net: hns: modify ethtool statistics value error Salil Mehta
2016-11-09 18:13 ` [PATCH net-next 08/17] net: hns: fix to intimate the link-status change by adding LF/RF method Salil Mehta
2016-11-09 18:13 ` [PATCH net-next 09/17] net: hns: modify buffer format of cpu data to le64 Salil Mehta
2016-11-09 18:13 ` [PATCH net-next 10/17] net: hns: modify tcam table and set mac key Salil Mehta
2016-11-09 18:13 ` [PATCH net-next 11/17] net: hns: modify tcam table of mac uc-entry Salil Mehta
2016-11-09 18:13 ` [PATCH net-next 12/17] net: hns: modify table index to get mac entry Salil Mehta
2016-11-09 18:13 ` Salil Mehta [this message]
2016-11-09 18:13 ` [PATCH net-next 14/17] net: hns: modify tcam table of mac mc-entry Salil Mehta
2016-11-09 18:13 ` [PATCH net-next 15/17] net: hns: modify tcam table of mask_key Salil Mehta
2016-11-09 18:14 ` [PATCH net-next 16/17] net: hns: add multicast tcam table clear Salil Mehta
2016-11-09 18:14 ` [PATCH net-next 17/17] net: hns: add the support to add/remove the ucast entry to/from table Salil Mehta
2016-11-10 16:46 ` [PATCH net-next 00/17] Bug fixes & Code improvements in HNS driver David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161109181401.913728-14-salil.mehta@huawei.com \
--to=salil.mehta@huawei.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxarm@huawei.com \
--cc=mehta.salil.lnk@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=xieqianqian@huawei.com \
--cc=yisen.zhuang@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox