lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-ID: <7vhtvd25qswsju34lgqi4em5v3utsxlvi3lltyt5yqqecddpyh@c5yvk7t5k5zz> Date: Thu, 14 Sep 2023 17:37:13 +0300 From: Serge Semin <fancer.lancer@...il.com> To: "Russell King (Oracle)" <rmk+kernel@...linux.org.uk> Cc: Alexandre Torgue <alexandre.torgue@...s.st.com>, Jose Abreu <joabreu@...opsys.com>, Alexei Starovoitov <ast@...nel.org>, bpf@...r.kernel.org, Daniel Borkmann <daniel@...earbox.net>, "David S. Miller" <davem@...emloft.net>, Emil Renner Berthing <kernel@...il.dk>, Eric Dumazet <edumazet@...gle.com>, Fabio Estevam <festevam@...il.com>, Jakub Kicinski <kuba@...nel.org>, Jesper Dangaard Brouer <hawk@...nel.org>, John Fastabend <john.fastabend@...il.com>, linux-arm-kernel@...ts.infradead.org, linux-stm32@...md-mailman.stormreply.com, Maxime Coquelin <mcoquelin.stm32@...il.com>, netdev@...r.kernel.org, NXP Linux Team <linux-imx@....com>, Paolo Abeni <pabeni@...hat.com>, Pengutronix Kernel Team <kernel@...gutronix.de>, Samin Guo <samin.guo@...rfivetech.com>, Sascha Hauer <s.hauer@...gutronix.de>, Shawn Guo <shawnguo@...nel.org> Subject: Re: [PATCH net-next 4/6] net: stmmac: rk: use stmmac_set_tx_clk_gmii() On Thu, Sep 14, 2023 at 02:51:35PM +0100, Russell King (Oracle) wrote: > Use stmmac_set_tx_clk_gmii(). > > Signed-off-by: Russell King (Oracle) <rmk+kernel@...linux.org.uk> > --- > .../net/ethernet/stmicro/stmmac/dwmac-rk.c | 60 +++++-------------- > 1 file changed, 16 insertions(+), 44 deletions(-) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c > index d920a50dd16c..5731a73466eb 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c > +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c > @@ -1081,28 +1081,14 @@ static void rk3568_set_gmac_speed(struct rk_priv_data *bsp_priv, int speed) > { > struct clk *clk_mac_speed = bsp_priv->clks[RK_CLK_MAC_SPEED].clk; > struct device *dev = &bsp_priv->pdev->dev; > - unsigned long rate; > - int ret; > - > - switch (speed) { > - case 10: > - rate = 2500000; > - break; > - case 100: > - rate = 25000000; > - break; > - case 1000: > - rate = 125000000; > - break; > - default: > - dev_err(dev, "unknown speed value for GMAC speed=%d", speed); > - return; > - } > - > - ret = clk_set_rate(clk_mac_speed, rate); > - if (ret) > - dev_err(dev, "%s: set clk_mac_speed rate %ld failed %d\n", > - __func__, rate, ret); > + int err; > + > + err = stmmac_set_tx_clk_gmii(clk_mac_speed, speed); > + if (err == -ENOTSUPP) > + dev_err(dev, "invalid speed %uMbps\n", speed); > + else if (err) > + dev_err(dev, "failed to set tx rate for speed %uMbps: %pe\n", These type specifiers should have been '%d' since the speed variable is of the signed integer type here. -Serge(y) > + speed, ERR_PTR(err)); > } > > static const struct rk_gmac_ops rk3568_ops = { > @@ -1387,28 +1373,14 @@ static void rv1126_set_rgmii_speed(struct rk_priv_data *bsp_priv, int speed) > { > struct clk *clk_mac_speed = bsp_priv->clks[RK_CLK_MAC_SPEED].clk; > struct device *dev = &bsp_priv->pdev->dev; > - unsigned long rate; > - int ret; > - > - switch (speed) { > - case 10: > - rate = 2500000; > - break; > - case 100: > - rate = 25000000; > - break; > - case 1000: > - rate = 125000000; > - break; > - default: > - dev_err(dev, "unknown speed value for RGMII speed=%d", speed); > - return; > - } > - > - ret = clk_set_rate(clk_mac_speed, rate); > - if (ret) > - dev_err(dev, "%s: set clk_mac_speed rate %ld failed %d\n", > - __func__, rate, ret); > + int err; > + > + err = stmmac_set_tx_clk_gmii(clk_mac_speed, speed); > + if (err == -ENOTSUPP) > + dev_err(dev, "invalid speed %dMbps\n", speed); > + else if (err) > + dev_err(dev, "failed to set tx rate for speed %dMbps: %pe\n", > + speed, ERR_PTR(err)); > } > > static void rv1126_set_rmii_speed(struct rk_priv_data *bsp_priv, int speed) > -- > 2.30.2 > >
Powered by blists - more mailing lists