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

net: stmmac: remove pcs_get_adv_lp() support 



It appears that the GMAC_ANE_ADV and GMAC_ANE_LPA registers are only
available for TBI and RTBI PHY interfaces. In commit 482b3c3b
("net: stmmac: Drop TBI/RTBI PCS flags") support for these was dropped,
and thus it no longer makes sense to access these registers.

Remove the *_get_adv_lp() functions, and the now redundant struct
rgmii_adv and STMMAC_PCS_* definitions.

Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Link: https://patch.msgid.link/E1uPkbT-004EyG-OQ@rmk-PC.armlinux.org.uk


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

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

+0 −11
Original line number Diff line number Diff line
@@ -396,17 +396,6 @@ enum request_irq_err { 


#define CORE_IRQ_MTL_RX_OVERFLOW	BIT(8)



/* Physical Coding Sublayer */

struct rgmii_adv {

	unsigned int pause;

	unsigned int duplex;

	unsigned int lp_pause;

	unsigned int lp_duplex;

};



#define STMMAC_PCS_PAUSE	1

#define STMMAC_PCS_ASYM_PAUSE	2



/* DMA HW capabilities */

struct dma_features {

	unsigned int mbps_10_100;

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

+0 −6
Original line number Diff line number Diff line
@@ -399,11 +399,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_get_adv_lp(void __iomem *ioaddr, struct rgmii_adv *adv)

{

	dwmac_get_adv_lp(ioaddr, GMAC_PCS_BASE, adv);

}



static void dwmac1000_debug(struct stmmac_priv *priv, void __iomem *ioaddr,

			    struct stmmac_extra_stats *x,

			    u32 rx_queues, u32 tx_queues)
@@ -508,7 +503,6 @@ const struct stmmac_ops dwmac1000_ops = { 
	.set_eee_pls = dwmac1000_set_eee_pls,

	.debug = dwmac1000_debug,

	.pcs_ctrl_ane = dwmac1000_ctrl_ane,

	.pcs_get_adv_lp = dwmac1000_get_adv_lp,

	.set_mac_loopback = dwmac1000_set_mac_loopback,

};

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

+0 −8
Original line number Diff line number Diff line
@@ -589,11 +589,6 @@ static void dwmac4_ctrl_ane(void __iomem *ioaddr, bool ane, bool srgmi_ral, 
	dwmac_ctrl_ane(ioaddr, GMAC_PCS_BASE, ane, srgmi_ral, loopback);

}



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

{

	dwmac_get_adv_lp(ioaddr, GMAC_PCS_BASE, adv);

}



/* RGMII or SMII interface */

static void dwmac4_phystatus(void __iomem *ioaddr, struct stmmac_extra_stats *x)

{
@@ -958,7 +953,6 @@ const struct stmmac_ops dwmac4_ops = { 
	.set_eee_timer = dwmac4_set_eee_timer,

	.set_eee_pls = dwmac4_set_eee_pls,

	.pcs_ctrl_ane = dwmac4_ctrl_ane,

	.pcs_get_adv_lp = dwmac4_get_adv_lp,

	.debug = dwmac4_debug,

	.set_filter = dwmac4_set_filter,

	.set_mac_loopback = dwmac4_set_mac_loopback,
@@ -993,7 +987,6 @@ const struct stmmac_ops dwmac410_ops = { 
	.set_eee_timer = dwmac4_set_eee_timer,

	.set_eee_pls = dwmac4_set_eee_pls,

	.pcs_ctrl_ane = dwmac4_ctrl_ane,

	.pcs_get_adv_lp = dwmac4_get_adv_lp,

	.debug = dwmac4_debug,

	.set_filter = dwmac4_set_filter,

	.flex_pps_config = dwmac5_flex_pps_config,
@@ -1030,7 +1023,6 @@ const struct stmmac_ops dwmac510_ops = { 
	.set_eee_timer = dwmac4_set_eee_timer,

	.set_eee_pls = dwmac4_set_eee_pls,

	.pcs_ctrl_ane = dwmac4_ctrl_ane,

	.pcs_get_adv_lp = dwmac4_get_adv_lp,

	.debug = dwmac4_debug,

	.set_filter = dwmac4_set_filter,

	.safety_feat_config = dwmac5_safety_feat_config,

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

+0 −4
Original line number Diff line number Diff line
@@ -300,7 +300,6 @@ struct stmmac_dma_ops { 


struct mac_device_info;

struct net_device;

struct rgmii_adv;

struct stmmac_tc_entry;

struct stmmac_pps_cfg;

struct stmmac_rss;
@@ -377,7 +376,6 @@ struct stmmac_ops { 
	/* PCS calls */

	void (*pcs_ctrl_ane)(void __iomem *ioaddr, bool ane, bool srgmi_ral,

			     bool loopback);

	void (*pcs_get_adv_lp)(void __iomem *ioaddr, struct rgmii_adv *adv);

	/* Safety Features */

	int (*safety_feat_config)(void __iomem *ioaddr, unsigned int asp,

				  struct stmmac_safety_feature_cfg *safety_cfg);
@@ -467,8 +465,6 @@ struct stmmac_ops { 
	stmmac_do_void_callback(__priv, mac, debug, __priv, __args)

#define stmmac_pcs_ctrl_ane(__priv, __args...) \

	stmmac_do_void_callback(__priv, mac, pcs_ctrl_ane, __args)

#define stmmac_pcs_get_adv_lp(__priv, __args...) \

	stmmac_do_void_callback(__priv, mac, pcs_get_adv_lp, __args)

#define stmmac_safety_feat_config(__priv, __args...) \

	stmmac_do_callback(__priv, mac, safety_feat_config, __args)

#define stmmac_safety_feat_irq_status(__priv, __args...) \

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

+2 −45
Original line number Diff line number Diff line
@@ -325,7 +325,6 @@ static int stmmac_ethtool_get_link_ksettings(struct net_device *dev, 
	if (!(priv->plat->flags & STMMAC_FLAG_HAS_INTEGRATED_PCS) &&

	    (priv->hw->pcs & STMMAC_PCS_RGMII ||

	     priv->hw->pcs & STMMAC_PCS_SGMII)) {

		struct rgmii_adv adv;

		u32 supported, advertising, lp_advertising;



		if (!priv->xstats.pcs_link) {
@@ -337,10 +336,6 @@ static int stmmac_ethtool_get_link_ksettings(struct net_device *dev, 


		cmd->base.speed = priv->xstats.pcs_speed;



		/* Get and convert ADV/LP_ADV from the HW AN registers */

		if (stmmac_pcs_get_adv_lp(priv, priv->ioaddr, &adv))

			return -EOPNOTSUPP;	/* should never happen indeed */



		/* Encoding of PSE bits is defined in 802.3z, 37.2.1.4 */



		ethtool_convert_link_mode_to_legacy_u32(
@@ -350,44 +345,12 @@ static int stmmac_ethtool_get_link_ksettings(struct net_device *dev, 
		ethtool_convert_link_mode_to_legacy_u32(

			&lp_advertising, cmd->link_modes.lp_advertising);



		if (adv.pause & STMMAC_PCS_PAUSE)

			advertising |= ADVERTISED_Pause;

		if (adv.pause & STMMAC_PCS_ASYM_PAUSE)

			advertising |= ADVERTISED_Asym_Pause;

		if (adv.lp_pause & STMMAC_PCS_PAUSE)

			lp_advertising |= ADVERTISED_Pause;

		if (adv.lp_pause & STMMAC_PCS_ASYM_PAUSE)

			lp_advertising |= ADVERTISED_Asym_Pause;



		/* Reg49[3] always set because ANE is always supported */

		cmd->base.autoneg = ADVERTISED_Autoneg;

		supported |= SUPPORTED_Autoneg;

		advertising |= ADVERTISED_Autoneg;

		lp_advertising |= ADVERTISED_Autoneg;



		if (adv.duplex) {

			supported |= (SUPPORTED_1000baseT_Full |

				      SUPPORTED_100baseT_Full |

				      SUPPORTED_10baseT_Full);

			advertising |= (ADVERTISED_1000baseT_Full |

					ADVERTISED_100baseT_Full |

					ADVERTISED_10baseT_Full);

		} else {

			supported |= (SUPPORTED_1000baseT_Half |

				      SUPPORTED_100baseT_Half |

				      SUPPORTED_10baseT_Half);

			advertising |= (ADVERTISED_1000baseT_Half |

					ADVERTISED_100baseT_Half |

					ADVERTISED_10baseT_Half);

		}

		if (adv.lp_duplex)

			lp_advertising |= (ADVERTISED_1000baseT_Full |

					   ADVERTISED_100baseT_Full |

					   ADVERTISED_10baseT_Full);

		else

			lp_advertising |= (ADVERTISED_1000baseT_Half |

					   ADVERTISED_100baseT_Half |

					   ADVERTISED_10baseT_Half);

		cmd->base.port = PORT_OTHER;



		ethtool_convert_legacy_u32_to_link_mode(
@@ -515,12 +478,9 @@ stmmac_get_pauseparam(struct net_device *netdev, 
		      struct ethtool_pauseparam *pause)

{

	struct stmmac_priv *priv = netdev_priv(netdev);

	struct rgmii_adv adv_lp;



	if (priv->hw->pcs && !stmmac_pcs_get_adv_lp(priv, priv->ioaddr, &adv_lp)) {

	if (priv->hw->pcs) {

		pause->autoneg = 1;

		if (!adv_lp.pause)

			return;

	} else {

		phylink_ethtool_get_pauseparam(priv->phylink, pause);

	}
@@ -531,12 +491,9 @@ stmmac_set_pauseparam(struct net_device *netdev, 
		      struct ethtool_pauseparam *pause)

{

	struct stmmac_priv *priv = netdev_priv(netdev);

	struct rgmii_adv adv_lp;



	if (priv->hw->pcs && !stmmac_pcs_get_adv_lp(priv, priv->ioaddr, &adv_lp)) {

	if (priv->hw->pcs) {

		pause->autoneg = 1;

		if (!adv_lp.pause)

			return -EOPNOTSUPP;

		return 0;

	} else {

		return phylink_ethtool_set_pauseparam(priv->phylink, pause);