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 12/17] net: hns: modify table index to get mac entry
Date: Wed, 9 Nov 2016 18:13:56 +0000 [thread overview]
Message-ID: <20161109181401.913728-13-salil.mehta@huawei.com> (raw)
In-Reply-To: <20161109181401.913728-1-salil.mehta@huawei.com>
From: Qianqian Xie <xieqianqian@huawei.com>
Big-endian is not supported by the current definition of table index to get
mac entry. It needs to be modified 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>
---
drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c
index 1713f8d..bd6e5b0 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c
@@ -2054,6 +2054,7 @@ int hns_dsaf_get_mac_entry_by_index(
struct dsaf_tbl_tcam_mcast_cfg mac_data;
struct dsaf_tbl_tcam_ucast_cfg mac_uc_data;
+ struct dsaf_tbl_tcam_data tcam_data;
char mac_addr[ETH_ALEN] = {0};
if (entry_index >= dsaf_dev->tcam_max_num) {
@@ -2064,8 +2065,10 @@ int hns_dsaf_get_mac_entry_by_index(
}
/* mc entry, do read opt */
- hns_dsaf_tcam_mc_get(dsaf_dev, entry_index,
- (struct dsaf_tbl_tcam_data *)&mac_key, &mac_data);
+ hns_dsaf_tcam_mc_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_mask[0] = mac_data.tbl_mcast_port_msk[0] & 0x3F;
@@ -2082,9 +2085,12 @@ int hns_dsaf_get_mac_entry_by_index(
/**mc donot do*/
} else {
/*is not mc, just uc... */
- hns_dsaf_tcam_uc_get(dsaf_dev, entry_index,
- (struct dsaf_tbl_tcam_data *)&mac_key,
+ hns_dsaf_tcam_uc_get(dsaf_dev, entry_index, &tcam_data,
&mac_uc_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_mask[0] = (1 << mac_uc_data.tbl_ucast_out_port);
}
--
1.7.9.5
next prev parent reply other threads:[~2016-11-09 18:13 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 ` Salil Mehta [this message]
2016-11-09 18:13 ` [PATCH net-next 13/17] net: hns: modify tcam table of mac mc-port Salil Mehta
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-13-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