Commit a014c355 authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski
Browse files

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: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://lore.kernel.org/r/E1qZq83-005tts-6K@rmk-PC.armlinux.org.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 72f93a31

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

+7 −7
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ static int imx8mp_set_intf_mode(struct plat_stmmacenet_data *plat_dat) 
	struct imx_priv_data *dwmac = plat_dat->bsp_priv;

	int val;



	switch (plat_dat->interface) {

	switch (plat_dat->mac_interface) {

	case PHY_INTERFACE_MODE_MII:

		val = GPR_ENET_QOS_INTF_SEL_MII;

		break;
@@ -87,7 +87,7 @@ static int imx8mp_set_intf_mode(struct plat_stmmacenet_data *plat_dat) 
		break;

	default:

		pr_debug("imx dwmac doesn't support %d interface\n",

			 plat_dat->interface);

			 plat_dat->mac_interface);

		return -EINVAL;

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

	int val;



	switch (plat_dat->interface) {

	switch (plat_dat->mac_interface) {

	case PHY_INTERFACE_MODE_MII:

		val = MX93_GPR_ENET_QOS_INTF_SEL_MII;

		break;
@@ -125,7 +125,7 @@ static int imx93_set_intf_mode(struct plat_stmmacenet_data *plat_dat) 
		break;

	default:

		dev_dbg(dwmac->dev, "imx dwmac doesn't support %d interface\n",

			 plat_dat->interface);

			 plat_dat->mac_interface);

		return -EINVAL;

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



	if (dwmac->ops->mac_rgmii_txclk_auto_adj ||

	    (plat_dat->interface == PHY_INTERFACE_MODE_RMII) ||

	    (plat_dat->interface == PHY_INTERFACE_MODE_MII))

	    (plat_dat->mac_interface == PHY_INTERFACE_MODE_RMII) ||

	    (plat_dat->mac_interface == PHY_INTERFACE_MODE_MII))

		return;



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

	writel(value, ioaddr + DMA_BUS_MODE);



	if (plat_dat->interface == PHY_INTERFACE_MODE_RMII) {

	if (plat_dat->mac_interface == PHY_INTERFACE_MODE_RMII) {

		usleep_range(100, 200);

		writel(RMII_RESET_SPEED, ioaddr + MAC_CTRL_REG);

	}

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

+10 −10
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static int jz4775_mac_set_mode(struct plat_stmmacenet_data *plat_dat) 
	struct ingenic_mac *mac = plat_dat->bsp_priv;

	unsigned int val;



	switch (plat_dat->interface) {

	switch (plat_dat->mac_interface) {

	case PHY_INTERFACE_MODE_MII:

		val = FIELD_PREP(MACPHYC_TXCLK_SEL_MASK, MACPHYC_TXCLK_SEL_INPUT) |

			  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) 
		break;



	default:

		dev_err(mac->dev, "Unsupported interface %d", plat_dat->interface);

		dev_err(mac->dev, "Unsupported interface %d", plat_dat->mac_interface);

		return -EINVAL;

	}
@@ -130,13 +130,13 @@ static int x1000_mac_set_mode(struct plat_stmmacenet_data *plat_dat) 
{

	struct ingenic_mac *mac = plat_dat->bsp_priv;



	switch (plat_dat->interface) {

	switch (plat_dat->mac_interface) {

	case PHY_INTERFACE_MODE_RMII:

		dev_dbg(mac->dev, "MAC PHY Control Register: PHY_INTERFACE_MODE_RMII\n");

		break;



	default:

		dev_err(mac->dev, "Unsupported interface %d", plat_dat->interface);

		dev_err(mac->dev, "Unsupported interface %d", plat_dat->mac_interface);

		return -EINVAL;

	}
@@ -149,14 +149,14 @@ static int x1600_mac_set_mode(struct plat_stmmacenet_data *plat_dat) 
	struct ingenic_mac *mac = plat_dat->bsp_priv;

	unsigned int val;



	switch (plat_dat->interface) {

	switch (plat_dat->mac_interface) {

	case PHY_INTERFACE_MODE_RMII:

		val = FIELD_PREP(MACPHYC_PHY_INFT_MASK, MACPHYC_PHY_INFT_RMII);

		dev_dbg(mac->dev, "MAC PHY Control Register: PHY_INTERFACE_MODE_RMII\n");

		break;



	default:

		dev_err(mac->dev, "Unsupported interface %d", plat_dat->interface);

		dev_err(mac->dev, "Unsupported interface %d", plat_dat->mac_interface);

		return -EINVAL;

	}
@@ -169,7 +169,7 @@ static int x1830_mac_set_mode(struct plat_stmmacenet_data *plat_dat) 
	struct ingenic_mac *mac = plat_dat->bsp_priv;

	unsigned int val;



	switch (plat_dat->interface) {

	switch (plat_dat->mac_interface) {

	case PHY_INTERFACE_MODE_RMII:

		val = FIELD_PREP(MACPHYC_MODE_SEL_MASK, MACPHYC_MODE_SEL_RMII) |

			  FIELD_PREP(MACPHYC_PHY_INFT_MASK, MACPHYC_PHY_INFT_RMII);
@@ -177,7 +177,7 @@ static int x1830_mac_set_mode(struct plat_stmmacenet_data *plat_dat) 
		break;



	default:

		dev_err(mac->dev, "Unsupported interface %d", plat_dat->interface);

		dev_err(mac->dev, "Unsupported interface %d", plat_dat->mac_interface);

		return -EINVAL;

	}
@@ -190,7 +190,7 @@ static int x2000_mac_set_mode(struct plat_stmmacenet_data *plat_dat) 
	struct ingenic_mac *mac = plat_dat->bsp_priv;

	unsigned int val;



	switch (plat_dat->interface) {

	switch (plat_dat->mac_interface) {

	case PHY_INTERFACE_MODE_RMII:

		val = FIELD_PREP(MACPHYC_TX_SEL_MASK, MACPHYC_TX_SEL_ORIGIN) |

			  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) 
		break;



	default:

		dev_err(mac->dev, "Unsupported interface %d", plat_dat->interface);

		dev_err(mac->dev, "Unsupported interface %d", plat_dat->mac_interface);

		return -EINVAL;

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_id 
	}



	plat->phy_interface = phy_mode;

	plat->interface = PHY_INTERFACE_MODE_GMII;

	plat->mac_interface = PHY_INTERFACE_MODE_GMII;



	pci_set_master(pdev);

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

+2 −2
Original line number Diff line number Diff line
@@ -50,9 +50,9 @@ static int lpc18xx_dwmac_probe(struct platform_device *pdev) 
		goto err_remove_config_dt;

	}



	if (plat_dat->interface == PHY_INTERFACE_MODE_MII) {

	if (plat_dat->mac_interface == PHY_INTERFACE_MODE_MII) {

		ethmode = LPC18XX_CREG_CREG6_ETHMODE_MII;

	} else if (plat_dat->interface == PHY_INTERFACE_MODE_RMII) {

	} else if (plat_dat->mac_interface == PHY_INTERFACE_MODE_RMII) {

		ethmode = LPC18XX_CREG_CREG6_ETHMODE_RMII;

	} else {

		dev_err(&pdev->dev, "Only MII and RMII mode supported\n");

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

+1 −1
Original line number Diff line number Diff line
@@ -587,7 +587,7 @@ static int mediatek_dwmac_common_data(struct platform_device *pdev, 
{

	int i;



	plat->interface = priv_plat->phy_mode;

	plat->mac_interface = priv_plat->phy_mode;

	if (priv_plat->mac_wol)

		plat->flags |= STMMAC_FLAG_USE_PHY_WOL;

	else