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

net: stmmac: replace ioaddr with stmmac_priv for pcs_set_ane() method 



Pass the stmmac_priv structure into the pcs_set_ane() MAC method rather
than having callers dereferencing this structure for the IO address.

Tested-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> # sa8775p-ride-r3
Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Link: https://patch.msgid.link/E1uRqbQ-004djP-1l@rmk-PC.armlinux.org.uk


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

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

+1 −1
Original line number Diff line number Diff line
@@ -624,7 +624,7 @@ static void ethqos_set_serdes_speed(struct qcom_ethqos *ethqos, int speed) 


static void ethqos_pcs_set_inband(struct stmmac_priv *priv, bool enable)

{

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

	stmmac_pcs_ctrl_ane(priv, enable, 0, 0);

}



/* On interface toggle MAC registers gets reset.

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

+3 −3
Original line number Diff line number Diff line
@@ -393,10 +393,10 @@ static void dwmac1000_set_eee_timer(struct mac_device_info *hw, int ls, int tw) 
	writel(value, ioaddr + LPI_TIMER_CTRL);

}



static void dwmac1000_ctrl_ane(void __iomem *ioaddr, bool ane, bool srgmi_ral,

			       bool loopback)

static void dwmac1000_ctrl_ane(struct stmmac_priv *priv, bool ane,

			       bool srgmi_ral, bool loopback)

{

	dwmac_ctrl_ane(ioaddr, GMAC_PCS_BASE, ane, srgmi_ral, loopback);

	dwmac_ctrl_ane(priv->ioaddr, GMAC_PCS_BASE, ane, srgmi_ral, loopback);

}



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

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

+2 −2
Original line number Diff line number Diff line
@@ -583,10 +583,10 @@ static void dwmac4_flow_ctrl(struct mac_device_info *hw, unsigned int duplex, 
	}

}



static void dwmac4_ctrl_ane(void __iomem *ioaddr, bool ane, bool srgmi_ral,

static void dwmac4_ctrl_ane(struct stmmac_priv *priv, bool ane, bool srgmi_ral,

			    bool loopback)

{

	dwmac_ctrl_ane(ioaddr, GMAC_PCS_BASE, ane, srgmi_ral, loopback);

	dwmac_ctrl_ane(priv->ioaddr, GMAC_PCS_BASE, ane, srgmi_ral, loopback);

}



/* RGMII or SMII interface */

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

+2 −2
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ struct stmmac_ops { 
		      struct stmmac_extra_stats *x, u32 rx_queues,

		      u32 tx_queues);

	/* PCS calls */

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

	void (*pcs_ctrl_ane)(struct stmmac_priv *priv, bool ane, bool srgmi_ral,

			     bool loopback);

	/* Safety Features */

	int (*safety_feat_config)(void __iomem *ioaddr, unsigned int asp,
@@ -464,7 +464,7 @@ struct stmmac_ops { 
#define stmmac_mac_debug(__priv, __args...) \

	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)

	stmmac_do_void_callback(__priv, mac, pcs_ctrl_ane, __priv, __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

+1 −1
Original line number Diff line number Diff line
@@ -380,7 +380,7 @@ stmmac_ethtool_set_link_ksettings(struct net_device *dev, 
			return -EINVAL;



		mutex_lock(&priv->lock);

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

		stmmac_pcs_ctrl_ane(priv, 1, priv->hw->ps, 0);

		mutex_unlock(&priv->lock);



		return 0;