OpenWrt – Blame information for rev 3
?pathlinks?
Rev | Author | Line No. | Line |
---|---|---|---|
1 | office | 1 | From 1477bea9e6931f6be96f45b9d277690a26d0cd97 Mon Sep 17 00:00:00 2001 |
2 | From: Christian Lamparter <chunkeey@gmail.com> |
||
3 | Date: Wed, 20 Dec 2017 22:19:24 +0100 |
||
4 | Subject: [PATCH 2/3] net: ibm: emac: replace custom PHY_MODE_* macros |
||
5 | |||
6 | The ibm_emac driver predates the shared PHY_INTERFACE_MODE_ |
||
7 | enums provided by include/linux/phy.h by a few years. |
||
8 | |||
9 | And while the driver has been retrofitted to use the PHYLIB, |
||
10 | the old definitions have stuck around to this day. |
||
11 | |||
12 | Signed-off-by: Christian Lamparter <chunkeey@gmail.com> |
||
13 | --- |
||
14 | drivers/net/ethernet/ibm/emac/core.c | 20 ++++++++++---------- |
||
15 | drivers/net/ethernet/ibm/emac/emac.h | 13 ------------- |
||
16 | drivers/net/ethernet/ibm/emac/phy.c | 10 +++++----- |
||
17 | drivers/net/ethernet/ibm/emac/rgmii.c | 20 ++++++++++---------- |
||
18 | drivers/net/ethernet/ibm/emac/zmii.c | 34 +++++++++++++++++----------------- |
||
19 | 5 files changed, 42 insertions(+), 55 deletions(-) |
||
20 | |||
21 | --- a/drivers/net/ethernet/ibm/emac/core.c |
||
22 | +++ b/drivers/net/ethernet/ibm/emac/core.c |
||
23 | @@ -199,18 +199,18 @@ static void __emac_set_multicast_list(st |
||
24 | |||
25 | static inline int emac_phy_supports_gige(int phy_mode) |
||
26 | { |
||
27 | - return phy_mode == PHY_MODE_GMII || |
||
28 | - phy_mode == PHY_MODE_RGMII || |
||
29 | - phy_mode == PHY_MODE_SGMII || |
||
30 | - phy_mode == PHY_MODE_TBI || |
||
31 | - phy_mode == PHY_MODE_RTBI; |
||
32 | + return phy_mode == PHY_INTERFACE_MODE_GMII || |
||
33 | + phy_mode == PHY_INTERFACE_MODE_RGMII || |
||
34 | + phy_mode == PHY_INTERFACE_MODE_SGMII || |
||
35 | + phy_mode == PHY_INTERFACE_MODE_TBI || |
||
36 | + phy_mode == PHY_INTERFACE_MODE_RTBI; |
||
37 | } |
||
38 | |||
39 | static inline int emac_phy_gpcs(int phy_mode) |
||
40 | { |
||
41 | - return phy_mode == PHY_MODE_SGMII || |
||
42 | - phy_mode == PHY_MODE_TBI || |
||
43 | - phy_mode == PHY_MODE_RTBI; |
||
44 | + return phy_mode == PHY_INTERFACE_MODE_SGMII || |
||
45 | + phy_mode == PHY_INTERFACE_MODE_TBI || |
||
46 | + phy_mode == PHY_INTERFACE_MODE_RTBI; |
||
47 | } |
||
48 | |||
49 | static inline void emac_tx_enable(struct emac_instance *dev) |
||
3 | office | 50 | @@ -2865,7 +2865,7 @@ static int emac_init_config(struct emac_ |
1 | office | 51 | /* PHY mode needs some decoding */ |
52 | dev->phy_mode = of_get_phy_mode(np); |
||
53 | if (dev->phy_mode < 0) |
||
54 | - dev->phy_mode = PHY_MODE_NA; |
||
55 | + dev->phy_mode = PHY_INTERFACE_MODE_NA; |
||
56 | |||
57 | /* Check EMAC version */ |
||
58 | if (of_device_is_compatible(np, "ibm,emac4sync")) { |
||
3 | office | 59 | @@ -3168,7 +3168,7 @@ static int emac_probe(struct platform_de |
1 | office | 60 | printk(KERN_INFO "%s: EMAC-%d %pOF, MAC %pM\n", |
61 | ndev->name, dev->cell_index, np, ndev->dev_addr); |
||
62 | |||
63 | - if (dev->phy_mode == PHY_MODE_SGMII) |
||
64 | + if (dev->phy_mode == PHY_INTERFACE_MODE_SGMII) |
||
65 | printk(KERN_NOTICE "%s: in SGMII mode\n", ndev->name); |
||
66 | |||
67 | if (dev->phy.address >= 0) |
||
68 | --- a/drivers/net/ethernet/ibm/emac/emac.h |
||
69 | +++ b/drivers/net/ethernet/ibm/emac/emac.h |
||
70 | @@ -104,19 +104,6 @@ struct emac_regs { |
||
71 | } u1; |
||
72 | }; |
||
73 | |||
74 | -/* |
||
75 | - * PHY mode settings (EMAC <-> ZMII/RGMII bridge <-> PHY) |
||
76 | - */ |
||
77 | -#define PHY_MODE_NA PHY_INTERFACE_MODE_NA |
||
78 | -#define PHY_MODE_MII PHY_INTERFACE_MODE_MII |
||
79 | -#define PHY_MODE_RMII PHY_INTERFACE_MODE_RMII |
||
80 | -#define PHY_MODE_SMII PHY_INTERFACE_MODE_SMII |
||
81 | -#define PHY_MODE_RGMII PHY_INTERFACE_MODE_RGMII |
||
82 | -#define PHY_MODE_TBI PHY_INTERFACE_MODE_TBI |
||
83 | -#define PHY_MODE_GMII PHY_INTERFACE_MODE_GMII |
||
84 | -#define PHY_MODE_RTBI PHY_INTERFACE_MODE_RTBI |
||
85 | -#define PHY_MODE_SGMII PHY_INTERFACE_MODE_SGMII |
||
86 | - |
||
87 | /* EMACx_MR0 */ |
||
88 | #define EMAC_MR0_RXI 0x80000000 |
||
89 | #define EMAC_MR0_TXI 0x40000000 |
||
90 | --- a/drivers/net/ethernet/ibm/emac/phy.c |
||
91 | +++ b/drivers/net/ethernet/ibm/emac/phy.c |
||
92 | @@ -96,7 +96,7 @@ int emac_mii_reset_gpcs(struct mii_phy * |
||
93 | if ((val & BMCR_ISOLATE) && limit > 0) |
||
94 | gpcs_phy_write(phy, MII_BMCR, val & ~BMCR_ISOLATE); |
||
95 | |||
96 | - if (limit > 0 && phy->mode == PHY_MODE_SGMII) { |
||
97 | + if (limit > 0 && phy->mode == PHY_INTERFACE_MODE_SGMII) { |
||
98 | /* Configure GPCS interface to recommended setting for SGMII */ |
||
99 | gpcs_phy_write(phy, 0x04, 0x8120); /* AsymPause, FDX */ |
||
100 | gpcs_phy_write(phy, 0x07, 0x2801); /* msg_pg, toggle */ |
||
101 | @@ -313,16 +313,16 @@ static int cis8201_init(struct mii_phy * |
||
102 | epcr &= ~EPCR_MODE_MASK; |
||
103 | |||
104 | switch (phy->mode) { |
||
105 | - case PHY_MODE_TBI: |
||
106 | + case PHY_INTERFACE_MODE_TBI: |
||
107 | epcr |= EPCR_TBI_MODE; |
||
108 | break; |
||
109 | - case PHY_MODE_RTBI: |
||
110 | + case PHY_INTERFACE_MODE_RTBI: |
||
111 | epcr |= EPCR_RTBI_MODE; |
||
112 | break; |
||
113 | - case PHY_MODE_GMII: |
||
114 | + case PHY_INTERFACE_MODE_GMII: |
||
115 | epcr |= EPCR_GMII_MODE; |
||
116 | break; |
||
117 | - case PHY_MODE_RGMII: |
||
118 | + case PHY_INTERFACE_MODE_RGMII: |
||
119 | default: |
||
120 | epcr |= EPCR_RGMII_MODE; |
||
121 | } |
||
122 | --- a/drivers/net/ethernet/ibm/emac/rgmii.c |
||
123 | +++ b/drivers/net/ethernet/ibm/emac/rgmii.c |
||
124 | @@ -52,25 +52,25 @@ |
||
125 | /* RGMII bridge supports only GMII/TBI and RGMII/RTBI PHYs */ |
||
126 | static inline int rgmii_valid_mode(int phy_mode) |
||
127 | { |
||
128 | - return phy_mode == PHY_MODE_GMII || |
||
129 | - phy_mode == PHY_MODE_MII || |
||
130 | - phy_mode == PHY_MODE_RGMII || |
||
131 | - phy_mode == PHY_MODE_TBI || |
||
132 | - phy_mode == PHY_MODE_RTBI; |
||
133 | + return phy_mode == PHY_INTERFACE_MODE_GMII || |
||
134 | + phy_mode == PHY_INTERFACE_MODE_MII || |
||
135 | + phy_mode == PHY_INTERFACE_MODE_RGMII || |
||
136 | + phy_mode == PHY_INTERFACE_MODE_TBI || |
||
137 | + phy_mode == PHY_INTERFACE_MODE_RTBI; |
||
138 | } |
||
139 | |||
140 | static inline u32 rgmii_mode_mask(int mode, int input) |
||
141 | { |
||
142 | switch (mode) { |
||
143 | - case PHY_MODE_RGMII: |
||
144 | + case PHY_INTERFACE_MODE_RGMII: |
||
145 | return RGMII_FER_RGMII(input); |
||
146 | - case PHY_MODE_TBI: |
||
147 | + case PHY_INTERFACE_MODE_TBI: |
||
148 | return RGMII_FER_TBI(input); |
||
149 | - case PHY_MODE_GMII: |
||
150 | + case PHY_INTERFACE_MODE_GMII: |
||
151 | return RGMII_FER_GMII(input); |
||
152 | - case PHY_MODE_MII: |
||
153 | + case PHY_INTERFACE_MODE_MII: |
||
154 | return RGMII_FER_MII(input); |
||
155 | - case PHY_MODE_RTBI: |
||
156 | + case PHY_INTERFACE_MODE_RTBI: |
||
157 | return RGMII_FER_RTBI(input); |
||
158 | default: |
||
159 | BUG(); |
||
160 | --- a/drivers/net/ethernet/ibm/emac/zmii.c |
||
161 | +++ b/drivers/net/ethernet/ibm/emac/zmii.c |
||
162 | @@ -49,20 +49,20 @@ |
||
163 | */ |
||
164 | static inline int zmii_valid_mode(int mode) |
||
165 | { |
||
166 | - return mode == PHY_MODE_MII || |
||
167 | - mode == PHY_MODE_RMII || |
||
168 | - mode == PHY_MODE_SMII || |
||
169 | - mode == PHY_MODE_NA; |
||
170 | + return mode == PHY_INTERFACE_MODE_MII || |
||
171 | + mode == PHY_INTERFACE_MODE_RMII || |
||
172 | + mode == PHY_INTERFACE_MODE_SMII || |
||
173 | + mode == PHY_INTERFACE_MODE_NA; |
||
174 | } |
||
175 | |||
176 | static inline const char *zmii_mode_name(int mode) |
||
177 | { |
||
178 | switch (mode) { |
||
179 | - case PHY_MODE_MII: |
||
180 | + case PHY_INTERFACE_MODE_MII: |
||
181 | return "MII"; |
||
182 | - case PHY_MODE_RMII: |
||
183 | + case PHY_INTERFACE_MODE_RMII: |
||
184 | return "RMII"; |
||
185 | - case PHY_MODE_SMII: |
||
186 | + case PHY_INTERFACE_MODE_SMII: |
||
187 | return "SMII"; |
||
188 | default: |
||
189 | BUG(); |
||
190 | @@ -72,11 +72,11 @@ static inline const char *zmii_mode_name |
||
191 | static inline u32 zmii_mode_mask(int mode, int input) |
||
192 | { |
||
193 | switch (mode) { |
||
194 | - case PHY_MODE_MII: |
||
195 | + case PHY_INTERFACE_MODE_MII: |
||
196 | return ZMII_FER_MII(input); |
||
197 | - case PHY_MODE_RMII: |
||
198 | + case PHY_INTERFACE_MODE_RMII: |
||
199 | return ZMII_FER_RMII(input); |
||
200 | - case PHY_MODE_SMII: |
||
201 | + case PHY_INTERFACE_MODE_SMII: |
||
202 | return ZMII_FER_SMII(input); |
||
203 | default: |
||
204 | return 0; |
||
205 | @@ -106,18 +106,18 @@ int zmii_attach(struct platform_device * |
||
206 | * Please, always specify PHY mode in your board port to avoid |
||
207 | * any surprises. |
||
208 | */ |
||
209 | - if (dev->mode == PHY_MODE_NA) { |
||
210 | - if (*mode == PHY_MODE_NA) { |
||
211 | + if (dev->mode == PHY_INTERFACE_MODE_NA) { |
||
212 | + if (*mode == PHY_INTERFACE_MODE_NA) { |
||
213 | u32 r = dev->fer_save; |
||
214 | |||
215 | ZMII_DBG(dev, "autodetecting mode, FER = 0x%08x" NL, r); |
||
216 | |||
217 | if (r & (ZMII_FER_MII(0) | ZMII_FER_MII(1))) |
||
218 | - dev->mode = PHY_MODE_MII; |
||
219 | + dev->mode = PHY_INTERFACE_MODE_MII; |
||
220 | else if (r & (ZMII_FER_RMII(0) | ZMII_FER_RMII(1))) |
||
221 | - dev->mode = PHY_MODE_RMII; |
||
222 | + dev->mode = PHY_INTERFACE_MODE_RMII; |
||
223 | else |
||
224 | - dev->mode = PHY_MODE_SMII; |
||
225 | + dev->mode = PHY_INTERFACE_MODE_SMII; |
||
226 | } else |
||
227 | dev->mode = *mode; |
||
228 | |||
229 | @@ -126,7 +126,7 @@ int zmii_attach(struct platform_device * |
||
230 | zmii_mode_name(dev->mode)); |
||
231 | } else { |
||
232 | /* All inputs must use the same mode */ |
||
233 | - if (*mode != PHY_MODE_NA && *mode != dev->mode) { |
||
234 | + if (*mode != PHY_INTERFACE_MODE_NA && *mode != dev->mode) { |
||
235 | printk(KERN_ERR |
||
236 | "%pOF: invalid mode %d specified for input %d\n", |
||
237 | ofdev->dev.of_node, *mode, input); |
||
238 | @@ -246,7 +246,7 @@ static int zmii_probe(struct platform_de |
||
239 | |||
240 | mutex_init(&dev->lock); |
||
241 | dev->ofdev = ofdev; |
||
242 | - dev->mode = PHY_MODE_NA; |
||
243 | + dev->mode = PHY_INTERFACE_MODE_NA; |
||
244 | |||
245 | rc = -ENXIO; |
||
246 | if (of_address_to_resource(np, 0, ®s)) { |