devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jiangfeng Xiao <xiaojiangfeng@huawei.com>
To: davem@davemloft.net, robh+dt@kernel.org, yisen.zhuang@huawei.com,
	salil.mehta@huawei.com, mark.rutland@arm.com,
	dingtianhong@huawei.com, xiaojiangfeng@huawei.com
Cc: netdev@vger.kernel.org, devicetree@vger.kernel.org,
	linux-kernel@vger.kernel.org, leeyou.li@huawei.com,
	nixiaoming@huawei.com, jianping.liu@huawei.com,
	xiekunxun@huawei.com
Subject: [PATCH v2 09/10] net: hisilicon: Add an rx_desc to adapt HI13X1_GMAC
Date: Tue, 9 Jul 2019 11:31:10 +0800	[thread overview]
Message-ID: <1562643071-46811-10-git-send-email-xiaojiangfeng@huawei.com> (raw)
In-Reply-To: <1562643071-46811-1-git-send-email-xiaojiangfeng@huawei.com>

HI13X1 changed the offsets and bitmaps for rx_desc
registers in the same peripheral device on different
models of the hip04_eth.

Signed-off-by: Jiangfeng Xiao <xiaojiangfeng@huawei.com>
---
 drivers/net/ethernet/hisilicon/hip04_eth.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/drivers/net/ethernet/hisilicon/hip04_eth.c b/drivers/net/ethernet/hisilicon/hip04_eth.c
index c578934..780fc46 100644
--- a/drivers/net/ethernet/hisilicon/hip04_eth.c
+++ b/drivers/net/ethernet/hisilicon/hip04_eth.c
@@ -171,11 +171,20 @@ struct tx_desc {
 } __aligned(64);
 
 struct rx_desc {
+#if defined(CONFIG_HI13X1_GMAC)
+	u32 reserved1[3];
+	u16 pkt_len;
+	u16 reserved_16;
+	u32 reserved2[6];
+	u32 pkt_err;
+	u32 reserved3[5];
+#else
 	u16 reserved_16;
 	u16 pkt_len;
 	u32 reserve1[3];
 	u32 pkt_err;
 	u32 reserve2[4];
+#endif
 };
 
 struct hip04_priv {
-- 
1.8.5.6

  parent reply	other threads:[~2019-07-09  3:31 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-09  3:31 [PATCH v2 00/10] net: hisilicon: Add support for HI13X1 to hip04_eth Jiangfeng Xiao
2019-07-09  3:31 ` [PATCH v2 01/10] " Jiangfeng Xiao
2019-07-09  3:31 ` [PATCH v2 02/10] net: hisilicon: Cleanup for got restricted __be32 Jiangfeng Xiao
2019-07-09  3:31 ` [PATCH v2 03/10] net: hisilicon: Cleanup for cast to " Jiangfeng Xiao
2019-07-09  3:31 ` [PATCH v2 04/10] net: hisilicon: HI13X1_GMAX skip write LOCAL_PAGE_REG Jiangfeng Xiao
2019-07-09  3:31 ` [PATCH v2 05/10] net: hisilicon: HI13X1_GMAX need dreq reset at first Jiangfeng Xiao
2019-07-09  9:35   ` Sergei Shtylyov
2019-07-09 13:48     ` Jiangfeng Xiao
2019-07-10  5:05       ` Jiangfeng Xiao
2019-07-09  3:31 ` [PATCH v2 06/10] net: hisilicon: dt-bindings: Add an field of port-handle Jiangfeng Xiao
2019-07-09  3:31 ` [PATCH v2 07/10] net: hisilicon: Add group field to adapt HI13X1_GMAC Jiangfeng Xiao
2019-07-09  3:31 ` [PATCH v2 08/10] net: hisilicon: Offset buf address " Jiangfeng Xiao
2019-07-09  3:31 ` Jiangfeng Xiao [this message]
2019-07-09  3:31 ` [PATCH v2 10/10] net: hisilicon: Add an tx_desc " Jiangfeng Xiao
2019-07-09 21:29 ` [PATCH v2 00/10] net: hisilicon: Add support for HI13X1 to hip04_eth 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=1562643071-46811-10-git-send-email-xiaojiangfeng@huawei.com \
    --to=xiaojiangfeng@huawei.com \
    --cc=davem@davemloft.net \
    --cc=devicetree@vger.kernel.org \
    --cc=dingtianhong@huawei.com \
    --cc=jianping.liu@huawei.com \
    --cc=leeyou.li@huawei.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=netdev@vger.kernel.org \
    --cc=nixiaoming@huawei.com \
    --cc=robh+dt@kernel.org \
    --cc=salil.mehta@huawei.com \
    --cc=xiekunxun@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;
as well as URLs for NNTP newsgroup(s).