Skip to content

Commit a014c35

Browse files
Russell King (Oracle)kuba-moo
Russell King (Oracle)
authored and
kuba-moo
committed
net: stmmac: clarify difference between "interface" and "phy_interface"
Clarify the difference between "interface" and "phy_interface" in struct plat_stmmacenet_data, both by adding a comment, and also renaming "interface" to be "mac_interface". The difference between these are: MAC ----- optional PCS ----- SerDes ----- optional PHY ----- Media ^ ^ mac_interface phy_interface Note that phylink currently only deals with phy_interface. Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> Link: https://lore.kernel.org/r/E1qZq83-005tts-6K@rmk-PC.armlinux.org.uk Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 72f93a3 commit a014c35

12 files changed

Lines changed: 52 additions & 37 deletions

File tree

‎drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ static int imx8mp_set_intf_mode(struct plat_stmmacenet_data *plat_dat)
7070
struct imx_priv_data *dwmac = plat_dat->bsp_priv;
7171
int val;
7272

73-
switch (plat_dat->interface) {
73+
switch (plat_dat->mac_interface) {
7474
case PHY_INTERFACE_MODE_MII:
7575
val = GPR_ENET_QOS_INTF_SEL_MII;
7676
break;
@@ -87,7 +87,7 @@ static int imx8mp_set_intf_mode(struct plat_stmmacenet_data *plat_dat)
8787
break;
8888
default:
8989
pr_debug("imx dwmac doesn't support %d interface\n",
90-
plat_dat->interface);
90+
plat_dat->mac_interface);
9191
return -EINVAL;
9292
}
9393

@@ -110,7 +110,7 @@ static int imx93_set_intf_mode(struct plat_stmmacenet_data *plat_dat)
110110
struct imx_priv_data *dwmac = plat_dat->bsp_priv;
111111
int val;
112112

113-
switch (plat_dat->interface) {
113+
switch (plat_dat->mac_interface) {
114114
case PHY_INTERFACE_MODE_MII:
115115
val = MX93_GPR_ENET_QOS_INTF_SEL_MII;
116116
break;
@@ -125,7 +125,7 @@ static int imx93_set_intf_mode(struct plat_stmmacenet_data *plat_dat)
125125
break;
126126
default:
127127
dev_dbg(dwmac->dev, "imx dwmac doesn't support %d interface\n",
128-
plat_dat->interface);
128+
plat_dat->mac_interface);
129129
return -EINVAL;
130130
}
131131

@@ -192,8 +192,8 @@ static void imx_dwmac_fix_speed(void *priv, unsigned int speed, unsigned int mod
192192
plat_dat = dwmac->plat_dat;
193193

194194
if (dwmac->ops->mac_rgmii_txclk_auto_adj ||
195-
(plat_dat->interface == PHY_INTERFACE_MODE_RMII) ||
196-
(plat_dat->interface == PHY_INTERFACE_MODE_MII))
195+
(plat_dat->mac_interface == PHY_INTERFACE_MODE_RMII) ||
196+
(plat_dat->mac_interface == PHY_INTERFACE_MODE_MII))
197197
return;
198198

199199
switch (speed) {
@@ -260,7 +260,7 @@ static int imx_dwmac_mx93_reset(void *priv, void __iomem *ioaddr)
260260
value |= DMA_BUS_MODE_SFT_RESET;
261261
writel(value, ioaddr + DMA_BUS_MODE);
262262

263-
if (plat_dat->interface == PHY_INTERFACE_MODE_RMII) {
263+
if (plat_dat->mac_interface == PHY_INTERFACE_MODE_RMII) {
264264
usleep_range(100, 200);
265265
writel(RMII_RESET_SPEED, ioaddr + MAC_CTRL_REG);
266266
}

‎drivers/net/ethernet/stmicro/stmmac/dwmac-ingenic.c‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ static int jz4775_mac_set_mode(struct plat_stmmacenet_data *plat_dat)
8989
struct ingenic_mac *mac = plat_dat->bsp_priv;
9090
unsigned int val;
9191

92-
switch (plat_dat->interface) {
92+
switch (plat_dat->mac_interface) {
9393
case PHY_INTERFACE_MODE_MII:
9494
val = FIELD_PREP(MACPHYC_TXCLK_SEL_MASK, MACPHYC_TXCLK_SEL_INPUT) |
9595
FIELD_PREP(MACPHYC_PHY_INFT_MASK, MACPHYC_PHY_INFT_MII);
@@ -118,7 +118,7 @@ static int jz4775_mac_set_mode(struct plat_stmmacenet_data *plat_dat)
118118
break;
119119

120120
default:
121-
dev_err(mac->dev, "Unsupported interface %d", plat_dat->interface);
121+
dev_err(mac->dev, "Unsupported interface %d", plat_dat->mac_interface);
122122
return -EINVAL;
123123
}
124124

@@ -130,13 +130,13 @@ static int x1000_mac_set_mode(struct plat_stmmacenet_data *plat_dat)
130130
{
131131
struct ingenic_mac *mac = plat_dat->bsp_priv;
132132

133-
switch (plat_dat->interface) {
133+
switch (plat_dat->mac_interface) {
134134
case PHY_INTERFACE_MODE_RMII:
135135
dev_dbg(mac->dev, "MAC PHY Control Register: PHY_INTERFACE_MODE_RMII\n");
136136
break;
137137

138138
default:
139-
dev_err(mac->dev, "Unsupported interface %d", plat_dat->interface);
139+
dev_err(mac->dev, "Unsupported interface %d", plat_dat->mac_interface);
140140
return -EINVAL;
141141
}
142142

@@ -149,14 +149,14 @@ static int x1600_mac_set_mode(struct plat_stmmacenet_data *plat_dat)
149149
struct ingenic_mac *mac = plat_dat->bsp_priv;
150150
unsigned int val;
151151

152-
switch (plat_dat->interface) {
152+
switch (plat_dat->mac_interface) {
153153
case PHY_INTERFACE_MODE_RMII:
154154
val = FIELD_PREP(MACPHYC_PHY_INFT_MASK, MACPHYC_PHY_INFT_RMII);
155155
dev_dbg(mac->dev, "MAC PHY Control Register: PHY_INTERFACE_MODE_RMII\n");
156156
break;
157157

158158
default:
159-
dev_err(mac->dev, "Unsupported interface %d", plat_dat->interface);
159+
dev_err(mac->dev, "Unsupported interface %d", plat_dat->mac_interface);
160160
return -EINVAL;
161161
}
162162

@@ -169,15 +169,15 @@ static int x1830_mac_set_mode(struct plat_stmmacenet_data *plat_dat)
169169
struct ingenic_mac *mac = plat_dat->bsp_priv;
170170
unsigned int val;
171171

172-
switch (plat_dat->interface) {
172+
switch (plat_dat->mac_interface) {
173173
case PHY_INTERFACE_MODE_RMII:
174174
val = FIELD_PREP(MACPHYC_MODE_SEL_MASK, MACPHYC_MODE_SEL_RMII) |
175175
FIELD_PREP(MACPHYC_PHY_INFT_MASK, MACPHYC_PHY_INFT_RMII);
176176
dev_dbg(mac->dev, "MAC PHY Control Register: PHY_INTERFACE_MODE_RMII\n");
177177
break;
178178

179179
default:
180-
dev_err(mac->dev, "Unsupported interface %d", plat_dat->interface);
180+
dev_err(mac->dev, "Unsupported interface %d", plat_dat->mac_interface);
181181
return -EINVAL;
182182
}
183183

@@ -190,7 +190,7 @@ static int x2000_mac_set_mode(struct plat_stmmacenet_data *plat_dat)
190190
struct ingenic_mac *mac = plat_dat->bsp_priv;
191191
unsigned int val;
192192

193-
switch (plat_dat->interface) {
193+
switch (plat_dat->mac_interface) {
194194
case PHY_INTERFACE_MODE_RMII:
195195
val = FIELD_PREP(MACPHYC_TX_SEL_MASK, MACPHYC_TX_SEL_ORIGIN) |
196196
FIELD_PREP(MACPHYC_RX_SEL_MASK, MACPHYC_RX_SEL_ORIGIN) |
@@ -220,7 +220,7 @@ static int x2000_mac_set_mode(struct plat_stmmacenet_data *plat_dat)
220220
break;
221221

222222
default:
223-
dev_err(mac->dev, "Unsupported interface %d", plat_dat->interface);
223+
dev_err(mac->dev, "Unsupported interface %d", plat_dat->mac_interface);
224224
return -EINVAL;
225225
}
226226

‎drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_id
117117
}
118118

119119
plat->phy_interface = phy_mode;
120-
plat->interface = PHY_INTERFACE_MODE_GMII;
120+
plat->mac_interface = PHY_INTERFACE_MODE_GMII;
121121

122122
pci_set_master(pdev);
123123

‎drivers/net/ethernet/stmicro/stmmac/dwmac-lpc18xx.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ static int lpc18xx_dwmac_probe(struct platform_device *pdev)
5050
goto err_remove_config_dt;
5151
}
5252

53-
if (plat_dat->interface == PHY_INTERFACE_MODE_MII) {
53+
if (plat_dat->mac_interface == PHY_INTERFACE_MODE_MII) {
5454
ethmode = LPC18XX_CREG_CREG6_ETHMODE_MII;
55-
} else if (plat_dat->interface == PHY_INTERFACE_MODE_RMII) {
55+
} else if (plat_dat->mac_interface == PHY_INTERFACE_MODE_RMII) {
5656
ethmode = LPC18XX_CREG_CREG6_ETHMODE_RMII;
5757
} else {
5858
dev_err(&pdev->dev, "Only MII and RMII mode supported\n");

‎drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -587,7 +587,7 @@ static int mediatek_dwmac_common_data(struct platform_device *pdev,
587587
{
588588
int i;
589589

590-
plat->interface = priv_plat->phy_mode;
590+
plat->mac_interface = priv_plat->phy_mode;
591591
if (priv_plat->mac_wol)
592592
plat->flags |= STMMAC_FLAG_USE_PHY_WOL;
593593
else

‎drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ static int socfpga_get_plat_phymode(struct socfpga_dwmac *dwmac)
236236
struct net_device *ndev = dev_get_drvdata(dwmac->dev);
237237
struct stmmac_priv *priv = netdev_priv(ndev);
238238

239-
return priv->plat->interface;
239+
return priv->plat->mac_interface;
240240
}
241241

242242
static void socfpga_sgmii_config(struct socfpga_dwmac *dwmac, bool enable)

‎drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ static int starfive_dwmac_set_mode(struct plat_stmmacenet_data *plat_dat)
6060
unsigned int mode;
6161
int err;
6262

63-
switch (plat_dat->interface) {
63+
switch (plat_dat->mac_interface) {
6464
case PHY_INTERFACE_MODE_RMII:
6565
mode = STARFIVE_DWMAC_PHY_INFT_RMII;
6666
break;
@@ -72,7 +72,7 @@ static int starfive_dwmac_set_mode(struct plat_stmmacenet_data *plat_dat)
7272

7373
default:
7474
dev_err(dwmac->dev, "unsupported interface %d\n",
75-
plat_dat->interface);
75+
plat_dat->mac_interface);
7676
return -EINVAL;
7777
}
7878

‎drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ static int stm32mp1_set_mode(struct plat_stmmacenet_data *plat_dat)
171171

172172
clk_rate = clk_get_rate(dwmac->clk_eth_ck);
173173
dwmac->enable_eth_ck = false;
174-
switch (plat_dat->interface) {
174+
switch (plat_dat->mac_interface) {
175175
case PHY_INTERFACE_MODE_MII:
176176
if (clk_rate == ETH_CK_F_25M && dwmac->ext_phyclk)
177177
dwmac->enable_eth_ck = true;
@@ -210,7 +210,7 @@ static int stm32mp1_set_mode(struct plat_stmmacenet_data *plat_dat)
210210
break;
211211
default:
212212
pr_debug("SYSCFG init : Do not manage %d interface\n",
213-
plat_dat->interface);
213+
plat_dat->mac_interface);
214214
/* Do not manage others interfaces */
215215
return -EINVAL;
216216
}
@@ -230,7 +230,7 @@ static int stm32mcu_set_mode(struct plat_stmmacenet_data *plat_dat)
230230
u32 reg = dwmac->mode_reg;
231231
int val;
232232

233-
switch (plat_dat->interface) {
233+
switch (plat_dat->mac_interface) {
234234
case PHY_INTERFACE_MODE_MII:
235235
val = SYSCFG_MCU_ETH_SEL_MII;
236236
pr_debug("SYSCFG init : PHY_INTERFACE_MODE_MII\n");
@@ -241,7 +241,7 @@ static int stm32mcu_set_mode(struct plat_stmmacenet_data *plat_dat)
241241
break;
242242
default:
243243
pr_debug("SYSCFG init : Do not manage %d interface\n",
244-
plat_dat->interface);
244+
plat_dat->mac_interface);
245245
/* Do not manage others interfaces */
246246
return -EINVAL;
247247
}

‎drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1016,7 +1016,7 @@ static int sun8i_dwmac_set_syscon(struct device *dev,
10161016
if (gmac->variant->support_rmii)
10171017
reg &= ~SYSCON_RMII_EN;
10181018

1019-
switch (plat->interface) {
1019+
switch (plat->mac_interface) {
10201020
case PHY_INTERFACE_MODE_MII:
10211021
/* default */
10221022
break;
@@ -1031,7 +1031,7 @@ static int sun8i_dwmac_set_syscon(struct device *dev,
10311031
break;
10321032
default:
10331033
dev_err(dev, "Unsupported interface mode: %s",
1034-
phy_modes(plat->interface));
1034+
phy_modes(plat->mac_interface));
10351035
return -EINVAL;
10361036
}
10371037

@@ -1231,7 +1231,7 @@ static int sun8i_dwmac_probe(struct platform_device *pdev)
12311231
/* platform data specifying hardware features and callbacks.
12321232
* hardware features were copied from Allwinner drivers.
12331233
*/
1234-
plat_dat->interface = interface;
1234+
plat_dat->mac_interface = interface;
12351235
plat_dat->rx_coe = STMMAC_RX_COE_TYPE2;
12361236
plat_dat->tx_coe = 1;
12371237
plat_dat->flags |= STMMAC_FLAG_HAS_SUN8I;

‎drivers/net/ethernet/stmicro/stmmac/stmmac_main.c‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1119,7 +1119,7 @@ static const struct phylink_mac_ops stmmac_phylink_mac_ops = {
11191119
*/
11201120
static void stmmac_check_pcs_mode(struct stmmac_priv *priv)
11211121
{
1122-
int interface = priv->plat->interface;
1122+
int interface = priv->plat->mac_interface;
11231123

11241124
if (priv->dma_cap.pcs) {
11251125
if ((interface == PHY_INTERFACE_MODE_RGMII) ||
@@ -1214,7 +1214,9 @@ static int stmmac_phy_setup(struct stmmac_priv *priv)
12141214
priv->phylink_config.ovr_an_inband =
12151215
mdio_bus_data->xpcs_an_inband;
12161216

1217-
/* Set the platform/firmware specified interface mode */
1217+
/* Set the platform/firmware specified interface mode. Note, phylink
1218+
* deals with the PHY interface mode, not the MAC interface mode.
1219+
*/
12181220
__set_bit(mode, priv->phylink_config.supported_interfaces);
12191221

12201222
/* If we have an xpcs, it defines which PHY interfaces are supported. */

0 commit comments

Comments
 (0)