| Message ID | E1qfir2-007TPt-Uw@rmk-PC.armlinux.org.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | net: stmmac: add and use library for setting clock | expand |
On Mon, Sep 11, 2023 at 04:29:36PM +0100, Russell King (Oracle) wrote: > Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> > --- > .../stmicro/stmmac/dwmac-dwc-qos-eth.c | 37 ++++++------------- > 1 file changed, 11 insertions(+), 26 deletions(-) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c > index 61ebf36da13d..a8fae37b9858 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c > +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c > @@ -22,6 +22,7 @@ > #include <linux/stmmac.h> > > #include "stmmac_platform.h" > +#include "stmmac_plat_lib.h" > #include "dwmac4.h" > > struct tegra_eqos { > @@ -181,32 +182,10 @@ static void dwc_qos_remove(struct platform_device *pdev) > static void tegra_eqos_fix_speed(void *priv, unsigned int speed, unsigned int mode) > { > struct tegra_eqos *eqos = priv; > - unsigned long rate = 125000000; > - bool needs_calibration = false; > u32 value; > int err; > > - switch (speed) { > - case SPEED_1000: > - needs_calibration = true; > - rate = 125000000; > - break; > - > - case SPEED_100: > - needs_calibration = true; > - rate = 25000000; > - break; > - > - case SPEED_10: > - rate = 2500000; > - break; > - > - default: > - dev_err(eqos->dev, "invalid speed %u\n", speed); > - break; > - } > - > - if (needs_calibration) { > + if (speed == SPEED_1000 || speed == SPEED_100) { > /* calibrate */ > value = readl(eqos->regs + SDMEMCOMPPADCTRL); > value |= SDMEMCOMPPADCTRL_PAD_E_INPUT_OR_E_PWRD; > @@ -246,9 +225,15 @@ static void tegra_eqos_fix_speed(void *priv, unsigned int speed, unsigned int mo > writel(value, eqos->regs + AUTO_CAL_CONFIG); > } > > - err = clk_set_rate(eqos->clk_tx, rate); > - if (err < 0) > - dev_err(eqos->dev, "failed to set TX rate: %d\n", err); > + err = dwmac_set_tx_clk_gmii(eqos->clk_tx, speed); > + if (err == -ENOTSUPP) { > + dev_err(eqos->dev, "invalid speed %dMbps\n", speed); %u? > + err = dwmac_set_tx_clk_gmii(eqos->clk_tx, SPEED_1000); > + } else if (err) { > + dev_err(eqos->dev, > + "failed to set tx rate for speed %dMbps: %pe\n", ditto -Serge(y) > + speed, ERR_PTR(err)); > + } > } > > static int tegra_eqos_init(struct platform_device *pdev, void *priv) > -- > 2.30.2 > >
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c index 61ebf36da13d..a8fae37b9858 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c @@ -22,6 +22,7 @@ #include <linux/stmmac.h> #include "stmmac_platform.h" +#include "stmmac_plat_lib.h" #include "dwmac4.h" struct tegra_eqos { @@ -181,32 +182,10 @@ static void dwc_qos_remove(struct platform_device *pdev) static void tegra_eqos_fix_speed(void *priv, unsigned int speed, unsigned int mode) { struct tegra_eqos *eqos = priv; - unsigned long rate = 125000000; - bool needs_calibration = false; u32 value; int err; - switch (speed) { - case SPEED_1000: - needs_calibration = true; - rate = 125000000; - break; - - case SPEED_100: - needs_calibration = true; - rate = 25000000; - break; - - case SPEED_10: - rate = 2500000; - break; - - default: - dev_err(eqos->dev, "invalid speed %u\n", speed); - break; - } - - if (needs_calibration) { + if (speed == SPEED_1000 || speed == SPEED_100) { /* calibrate */ value = readl(eqos->regs + SDMEMCOMPPADCTRL); value |= SDMEMCOMPPADCTRL_PAD_E_INPUT_OR_E_PWRD; @@ -246,9 +225,15 @@ static void tegra_eqos_fix_speed(void *priv, unsigned int speed, unsigned int mo writel(value, eqos->regs + AUTO_CAL_CONFIG); } - err = clk_set_rate(eqos->clk_tx, rate); - if (err < 0) - dev_err(eqos->dev, "failed to set TX rate: %d\n", err); + err = dwmac_set_tx_clk_gmii(eqos->clk_tx, speed); + if (err == -ENOTSUPP) { + dev_err(eqos->dev, "invalid speed %dMbps\n", speed); + err = dwmac_set_tx_clk_gmii(eqos->clk_tx, SPEED_1000); + } else if (err) { + dev_err(eqos->dev, + "failed to set tx rate for speed %dMbps: %pe\n", + speed, ERR_PTR(err)); + } } static int tegra_eqos_init(struct platform_device *pdev, void *priv)
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> --- .../stmicro/stmmac/dwmac-dwc-qos-eth.c | 37 ++++++------------- 1 file changed, 11 insertions(+), 26 deletions(-)