Commit aedf2dc4 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-stmmac-cleanups' 

Russell King says:

====================
net: stmmac: cleanups

This series removes various redundant items in the stmmac driver:

- the unused TBI and RTBI PCS flags
- the NULL pointer initialisations for PCS methods in dwxgmac2
- the stmmac_pcs_rane() method which is never called, and it's
  associated implementations
- the redundant netif_carrier_off()s

Finally, it replaces asm/io.h with the preferred linux/io.h.
====================

Link: https://lore.kernel.org/r/Zlbp7xdUZAXblOZJ@shell.armlinux.org.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents a79d8fe2 7efc7065

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

+0 −2
Original line number Diff line number Diff line
@@ -271,8 +271,6 @@ struct stmmac_safety_stats { 
/* PCS defines */

#define STMMAC_PCS_RGMII	(1 << 0)

#define STMMAC_PCS_SGMII	(1 << 1)

#define STMMAC_PCS_TBI		(1 << 2)

#define STMMAC_PCS_RTBI		(1 << 3)



#define SF_DMA_MODE 1		/* DMA STORE-AND-FORWARD Operation Mode */

drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c

+12 −12
Original line number Diff line number Diff line
@@ -605,6 +605,14 @@ static int ethqos_configure_rgmii(struct qcom_ethqos *ethqos) 
	return 0;

}



static void ethqos_set_serdes_speed(struct qcom_ethqos *ethqos, int speed)

{

	if (ethqos->serdes_speed != speed) {

		phy_set_speed(ethqos->serdes_phy, speed);

		ethqos->serdes_speed = speed;

	}

}



/* On interface toggle MAC registers gets reset.

 * Configure MAC block for SGMII on ethernet phy link up

 */
@@ -622,9 +630,7 @@ static int ethqos_configure_sgmii(struct qcom_ethqos *ethqos) 
		rgmii_updatel(ethqos, RGMII_CONFIG2_RGMII_CLK_SEL_CFG,

			      RGMII_CONFIG2_RGMII_CLK_SEL_CFG,

			      RGMII_IO_MACRO_CONFIG2);

		if (ethqos->serdes_speed != SPEED_2500)

			phy_set_speed(ethqos->serdes_phy, SPEED_2500);

		ethqos->serdes_speed = SPEED_2500;

		ethqos_set_serdes_speed(ethqos, SPEED_2500);

		stmmac_pcs_ctrl_ane(priv, priv->ioaddr, 0, 0, 0);

		break;

	case SPEED_1000:
@@ -632,16 +638,12 @@ static int ethqos_configure_sgmii(struct qcom_ethqos *ethqos) 
		rgmii_updatel(ethqos, RGMII_CONFIG2_RGMII_CLK_SEL_CFG,

			      RGMII_CONFIG2_RGMII_CLK_SEL_CFG,

			      RGMII_IO_MACRO_CONFIG2);

		if (ethqos->serdes_speed != SPEED_1000)

			phy_set_speed(ethqos->serdes_phy, SPEED_1000);

		ethqos->serdes_speed = SPEED_1000;

		ethqos_set_serdes_speed(ethqos, SPEED_1000);

		stmmac_pcs_ctrl_ane(priv, priv->ioaddr, 1, 0, 0);

		break;

	case SPEED_100:

		val |= ETHQOS_MAC_CTRL_PORT_SEL | ETHQOS_MAC_CTRL_SPEED_MODE;

		if (ethqos->serdes_speed != SPEED_1000)

			phy_set_speed(ethqos->serdes_phy, SPEED_1000);

		ethqos->serdes_speed = SPEED_1000;

		ethqos_set_serdes_speed(ethqos, SPEED_1000);

		stmmac_pcs_ctrl_ane(priv, priv->ioaddr, 1, 0, 0);

		break;

	case SPEED_10:
@@ -651,9 +653,7 @@ static int ethqos_configure_sgmii(struct qcom_ethqos *ethqos) 
			      FIELD_PREP(RGMII_CONFIG_SGMII_CLK_DVDR,

					 SGMII_10M_RX_CLK_DVDR),

			      RGMII_IO_MACRO_CONFIG);

		if (ethqos->serdes_speed != SPEED_1000)

			phy_set_speed(ethqos->serdes_phy, ethqos->speed);

		ethqos->serdes_speed = SPEED_1000;

		ethqos_set_serdes_speed(ethqos, SPEED_1000);

		stmmac_pcs_ctrl_ane(priv, priv->ioaddr, 1, 0, 0);

		break;

	}

drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c

+1 −7
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#include <linux/crc32.h>

#include <linux/slab.h>

#include <linux/ethtool.h>

#include <asm/io.h>

#include <linux/io.h>

#include "stmmac.h"

#include "stmmac_pcs.h"

#include "dwmac1000.h"
@@ -404,11 +404,6 @@ static void dwmac1000_ctrl_ane(void __iomem *ioaddr, bool ane, bool srgmi_ral, 
	dwmac_ctrl_ane(ioaddr, GMAC_PCS_BASE, ane, srgmi_ral, loopback);

}



static void dwmac1000_rane(void __iomem *ioaddr, bool restart)

{

	dwmac_rane(ioaddr, GMAC_PCS_BASE, restart);

}



static void dwmac1000_get_adv_lp(void __iomem *ioaddr, struct rgmii_adv *adv)

{

	dwmac_get_adv_lp(ioaddr, GMAC_PCS_BASE, adv);
@@ -519,7 +514,6 @@ const struct stmmac_ops dwmac1000_ops = { 
	.set_eee_pls = dwmac1000_set_eee_pls,

	.debug = dwmac1000_debug,

	.pcs_ctrl_ane = dwmac1000_ctrl_ane,

	.pcs_rane = dwmac1000_rane,

	.pcs_get_adv_lp = dwmac1000_get_adv_lp,

	.set_mac_loopback = dwmac1000_set_mac_loopback,

};

drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
  Author: Giuseppe Cavallaro <peppe.cavallaro@st.com>

*******************************************************************************/



#include <asm/io.h>

#include <linux/io.h>

#include "dwmac1000.h"

#include "dwmac_dma.h"

drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
*******************************************************************************/



#include <linux/crc32.h>

#include <asm/io.h>

#include <linux/io.h>

#include "stmmac.h"

#include "dwmac100.h"