linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 09/10] net: hisilicon: Add an rx_desc to adapt HI13X1_GMAC
@ 2019-07-05  6:12 Jiangfeng Xiao
  0 siblings, 0 replies; only message in thread
From: Jiangfeng Xiao @ 2019-07-05  6:12 UTC (permalink / raw)
  To: yisen.zhuang, salil.mehta, dingtianhong, xiaojiangfeng
  Cc: davem, robh+dt, mark.rutland, netdev, devicetree, linux-kernel,
	leeyou.li, xiekunxun, jianping.liu, nixiaoming

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


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2019-07-05  6:12 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-05  6:12 [PATCH 09/10] net: hisilicon: Add an rx_desc to adapt HI13X1_GMAC Jiangfeng Xiao

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).