Skip to content

Commit 2142754

Browse files
joabreudavem330
authored andcommitted
net: stmmac: Add MAC related callbacks for XGMAC2
Add the MAC related callbacks for the new IP block XGMAC2. Signed-off-by: Jose Abreu <joabreu@synopsys.com> Cc: David S. Miller <davem@davemloft.net> Cc: Joao Pinto <jpinto@synopsys.com> Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com> Cc: Alexandre Torgue <alexandre.torgue@st.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 48ae555 commit 2142754

File tree

6 files changed

+519
-3
lines changed

6 files changed

+519
-3
lines changed

drivers/net/ethernet/stmicro/stmmac/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ stmmac-objs:= stmmac_main.o stmmac_ethtool.o stmmac_mdio.o ring_mode.o \
55
dwmac100_core.o dwmac100_dma.o enh_desc.o norm_desc.o \
66
mmc_core.o stmmac_hwtstamp.o stmmac_ptp.o dwmac4_descs.o \
77
dwmac4_dma.o dwmac4_lib.o dwmac4_core.o dwmac5.o hwif.o \
8-
stmmac_tc.o $(stmmac-y)
8+
stmmac_tc.o dwxgmac2_core.o $(stmmac-y)
99

1010
# Ordering matters. Generic driver must be last.
1111
obj-$(CONFIG_STMMAC_PLATFORM) += stmmac-platform.o

drivers/net/ethernet/stmicro/stmmac/common.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -400,6 +400,8 @@ struct mac_link {
400400
u32 speed10;
401401
u32 speed100;
402402
u32 speed1000;
403+
u32 speed2500;
404+
u32 speed10000;
403405
u32 duplex;
404406
};
405407

@@ -441,6 +443,7 @@ struct stmmac_rx_routing {
441443
int dwmac100_setup(struct stmmac_priv *priv);
442444
int dwmac1000_setup(struct stmmac_priv *priv);
443445
int dwmac4_setup(struct stmmac_priv *priv);
446+
int dwxgmac2_setup(struct stmmac_priv *priv);
444447

445448
void stmmac_set_mac_addr(void __iomem *ioaddr, u8 addr[6],
446449
unsigned int high, unsigned int low);
Lines changed: 141 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,141 @@
1+
// SPDX-License-Identifier: (GPL-2.0 OR MIT)
2+
/*
3+
* Copyright (c) 2018 Synopsys, Inc. and/or its affiliates.
4+
* stmmac XGMAC definitions.
5+
*/
6+
7+
#ifndef __STMMAC_DWXGMAC2_H__
8+
#define __STMMAC_DWXGMAC2_H__
9+
10+
#include "common.h"
11+
12+
/* Misc */
13+
#define XGMAC_JUMBO_LEN 16368
14+
15+
/* MAC Registers */
16+
#define XGMAC_TX_CONFIG 0x00000000
17+
#define XGMAC_CONFIG_SS_OFF 29
18+
#define XGMAC_CONFIG_SS_MASK GENMASK(30, 29)
19+
#define XGMAC_CONFIG_SS_10000 (0x0 << XGMAC_CONFIG_SS_OFF)
20+
#define XGMAC_CONFIG_SS_2500 (0x2 << XGMAC_CONFIG_SS_OFF)
21+
#define XGMAC_CONFIG_SS_1000 (0x3 << XGMAC_CONFIG_SS_OFF)
22+
#define XGMAC_CONFIG_SARC GENMASK(22, 20)
23+
#define XGMAC_CONFIG_SARC_SHIFT 20
24+
#define XGMAC_CONFIG_JD BIT(16)
25+
#define XGMAC_CONFIG_TE BIT(0)
26+
#define XGMAC_CORE_INIT_TX (XGMAC_CONFIG_JD)
27+
#define XGMAC_RX_CONFIG 0x00000004
28+
#define XGMAC_CONFIG_ARPEN BIT(31)
29+
#define XGMAC_CONFIG_GPSL GENMASK(29, 16)
30+
#define XGMAC_CONFIG_GPSL_SHIFT 16
31+
#define XGMAC_CONFIG_S2KP BIT(11)
32+
#define XGMAC_CONFIG_IPC BIT(9)
33+
#define XGMAC_CONFIG_JE BIT(8)
34+
#define XGMAC_CONFIG_WD BIT(7)
35+
#define XGMAC_CONFIG_GPSLCE BIT(6)
36+
#define XGMAC_CONFIG_CST BIT(2)
37+
#define XGMAC_CONFIG_ACS BIT(1)
38+
#define XGMAC_CONFIG_RE BIT(0)
39+
#define XGMAC_CORE_INIT_RX 0
40+
#define XGMAC_PACKET_FILTER 0x00000008
41+
#define XGMAC_FILTER_RA BIT(31)
42+
#define XGMAC_FILTER_PM BIT(4)
43+
#define XGMAC_FILTER_HMC BIT(2)
44+
#define XGMAC_FILTER_PR BIT(0)
45+
#define XGMAC_HASH_TABLE(x) (0x00000010 + (x) * 4)
46+
#define XGMAC_RXQ_CTRL0 0x000000a0
47+
#define XGMAC_RXQEN(x) GENMASK((x) * 2 + 1, (x) * 2)
48+
#define XGMAC_RXQEN_SHIFT(x) ((x) * 2)
49+
#define XGMAC_RXQ_CTRL2 0x000000a8
50+
#define XGMAC_RXQ_CTRL3 0x000000ac
51+
#define XGMAC_PSRQ(x) GENMASK((x) * 8 + 7, (x) * 8)
52+
#define XGMAC_PSRQ_SHIFT(x) ((x) * 8)
53+
#define XGMAC_INT_STATUS 0x000000b0
54+
#define XGMAC_PMTIS BIT(4)
55+
#define XGMAC_INT_EN 0x000000b4
56+
#define XGMAC_TSIE BIT(12)
57+
#define XGMAC_LPIIE BIT(5)
58+
#define XGMAC_PMTIE BIT(4)
59+
#define XGMAC_INT_DEFAULT_EN (XGMAC_LPIIE | XGMAC_PMTIE | XGMAC_TSIE)
60+
#define XGMAC_Qx_TX_FLOW_CTRL(x) (0x00000070 + (x) * 4)
61+
#define XGMAC_PT GENMASK(31, 16)
62+
#define XGMAC_PT_SHIFT 16
63+
#define XGMAC_TFE BIT(1)
64+
#define XGMAC_RX_FLOW_CTRL 0x00000090
65+
#define XGMAC_RFE BIT(0)
66+
#define XGMAC_PMT 0x000000c0
67+
#define XGMAC_GLBLUCAST BIT(9)
68+
#define XGMAC_RWKPKTEN BIT(2)
69+
#define XGMAC_MGKPKTEN BIT(1)
70+
#define XGMAC_PWRDWN BIT(0)
71+
#define XGMAC_HW_FEATURE0 0x0000011c
72+
#define XGMAC_HWFEAT_SAVLANINS BIT(27)
73+
#define XGMAC_HWFEAT_RXCOESEL BIT(16)
74+
#define XGMAC_HWFEAT_TXCOESEL BIT(14)
75+
#define XGMAC_HWFEAT_TSSEL BIT(12)
76+
#define XGMAC_HWFEAT_AVSEL BIT(11)
77+
#define XGMAC_HWFEAT_RAVSEL BIT(10)
78+
#define XGMAC_HWFEAT_ARPOFFSEL BIT(9)
79+
#define XGMAC_HWFEAT_MGKSEL BIT(7)
80+
#define XGMAC_HWFEAT_RWKSEL BIT(6)
81+
#define XGMAC_HWFEAT_GMIISEL BIT(1)
82+
#define XGMAC_HW_FEATURE1 0x00000120
83+
#define XGMAC_HWFEAT_TSOEN BIT(18)
84+
#define XGMAC_HWFEAT_TXFIFOSIZE GENMASK(10, 6)
85+
#define XGMAC_HWFEAT_RXFIFOSIZE GENMASK(4, 0)
86+
#define XGMAC_HW_FEATURE2 0x00000124
87+
#define XGMAC_HWFEAT_PPSOUTNUM GENMASK(26, 24)
88+
#define XGMAC_HWFEAT_TXCHCNT GENMASK(21, 18)
89+
#define XGMAC_HWFEAT_RXCHCNT GENMASK(15, 12)
90+
#define XGMAC_HWFEAT_TXQCNT GENMASK(9, 6)
91+
#define XGMAC_HWFEAT_RXQCNT GENMASK(3, 0)
92+
#define XGMAC_MDIO_ADDR 0x00000200
93+
#define XGMAC_MDIO_DATA 0x00000204
94+
#define XGMAC_MDIO_C22P 0x00000220
95+
#define XGMAC_ADDR0_HIGH 0x00000300
96+
#define XGMAC_AE BIT(31)
97+
#define XGMAC_DCS GENMASK(19, 16)
98+
#define XGMAC_DCS_SHIFT 16
99+
#define XGMAC_ADDR0_LOW 0x00000304
100+
#define XGMAC_ARP_ADDR 0x00000c10
101+
#define XGMAC_TIMESTAMP_STATUS 0x00000d20
102+
#define XGMAC_TXTSC BIT(15)
103+
#define XGMAC_TXTIMESTAMP_NSEC 0x00000d30
104+
#define XGMAC_TXTSSTSLO GENMASK(30, 0)
105+
#define XGMAC_TXTIMESTAMP_SEC 0x00000d34
106+
107+
/* MTL Registers */
108+
#define XGMAC_MTL_OPMODE 0x00001000
109+
#define XGMAC_ETSALG GENMASK(6, 5)
110+
#define XGMAC_WRR (0x0 << 5)
111+
#define XGMAC_WFQ (0x1 << 5)
112+
#define XGMAC_DWRR (0x2 << 5)
113+
#define XGMAC_RAA BIT(2)
114+
#define XGMAC_MTL_INT_STATUS 0x00001020
115+
#define XGMAC_MTL_RXQ_DMA_MAP0 0x00001030
116+
#define XGMAC_MTL_RXQ_DMA_MAP1 0x00001034
117+
#define XGMAC_QxMDMACH(x) GENMASK((x) * 8 + 3, (x) * 8)
118+
#define XGMAC_QxMDMACH_SHIFT(x) ((x) * 8)
119+
#define XGMAC_MTL_TXQ_OPMODE(x) (0x00001100 + (0x80 * (x)))
120+
#define XGMAC_TQS GENMASK(25, 16)
121+
#define XGMAC_TQS_SHIFT 16
122+
#define XGMAC_TTC GENMASK(6, 4)
123+
#define XGMAC_TTC_SHIFT 4
124+
#define XGMAC_TXQEN GENMASK(3, 2)
125+
#define XGMAC_TXQEN_SHIFT 2
126+
#define XGMAC_TSF BIT(1)
127+
#define XGMAC_MTL_RXQ_OPMODE(x) (0x00001140 + (0x80 * (x)))
128+
#define XGMAC_RQS GENMASK(25, 16)
129+
#define XGMAC_RQS_SHIFT 16
130+
#define XGMAC_EHFC BIT(7)
131+
#define XGMAC_RSF BIT(5)
132+
#define XGMAC_RTC GENMASK(1, 0)
133+
#define XGMAC_RTC_SHIFT 0
134+
#define XGMAC_MTL_QINTEN(x) (0x00001170 + (0x80 * (x)))
135+
#define XGMAC_RXOIE BIT(16)
136+
#define XGMAC_MTL_QINT_STATUS(x) (0x00001174 + (0x80 * (x)))
137+
#define XGMAC_RXOVFIS BIT(16)
138+
#define XGMAC_ABPSIS BIT(1)
139+
#define XGMAC_TXUNFIS BIT(0)
140+
141+
#endif /* __STMMAC_DWXGMAC2_H__ */

0 commit comments

Comments
 (0)