* [PATCH net-next 3/6] net: stmmac: intel-plat: use dwmac_set_tx_clk_gmii()
@ 2023-09-11 15:28 Russell King (Oracle)
0 siblings, 0 replies; 3+ messages in thread
From: Russell King (Oracle) @ 2023-09-11 15:28 UTC (permalink / raw)
To: Alexandre Torgue, Jose Abreu
Cc: Alexei Starovoitov, bpf, Daniel Borkmann, David S. Miller,
Emil Renner Berthing, Eric Dumazet, Fabio Estevam, Jakub Kicinski,
Jesper Dangaard Brouer, John Fastabend, linux-arm-kernel,
linux-stm32, Maxime Coquelin, netdev, NXP Linux Team, Paolo Abeni,
Pengutronix Kernel Team, Samin Guo, Sascha Hauer, Shawn Guo
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
---
.../stmicro/stmmac/dwmac-intel-plat.c | 35 +++++--------------
1 file changed, 9 insertions(+), 26 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c
index d352a14f9d48..8cc22f11072e 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c
@@ -14,6 +14,7 @@
#include "dwmac4.h"
#include "stmmac.h"
#include "stmmac_platform.h"
+#include "stmmac_plat_lib.h"
struct intel_dwmac {
struct device *dev;
@@ -31,32 +32,14 @@ struct intel_dwmac_data {
static void kmb_eth_fix_mac_speed(void *priv, unsigned int speed, unsigned int mode)
{
struct intel_dwmac *dwmac = priv;
- unsigned long rate;
- int ret;
-
- rate = clk_get_rate(dwmac->tx_clk);
-
- switch (speed) {
- case SPEED_1000:
- rate = 125000000;
- break;
-
- case SPEED_100:
- rate = 25000000;
- break;
-
- case SPEED_10:
- rate = 2500000;
- break;
-
- default:
- dev_err(dwmac->dev, "Invalid speed\n");
- break;
- }
-
- ret = clk_set_rate(dwmac->tx_clk, rate);
- if (ret)
- dev_err(dwmac->dev, "Failed to configure tx clock rate\n");
+ int err;
+
+ err = dwmac_set_tx_clk_gmii(dwmac->tx_clk, speed);
+ if (err == -ENOTSUPP)
+ dev_err(dwmac->dev, "invalid speed %dMbps\n", speed);
+ else if (err)
+ dev_err(dwmac->dev, "failed to set tx rate for speed %dMbps: %pe\n",
+ speed, ERR_PTR(err));
}
static const struct intel_dwmac_data kmb_data = {
--
2.30.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH net-next 3/6] net: stmmac: intel-plat: use dwmac_set_tx_clk_gmii()
2023-09-11 15:28 [PATCH net-next 0/6] net: stmmac: add and use library for setting clock Russell King (Oracle)
@ 2023-09-11 15:29 ` Russell King (Oracle)
2023-09-14 12:06 ` Serge Semin
0 siblings, 1 reply; 3+ messages in thread
From: Russell King (Oracle) @ 2023-09-11 15:29 UTC (permalink / raw)
To: Alexandre Torgue, Jose Abreu
Cc: Alexei Starovoitov, bpf, Daniel Borkmann, David S. Miller,
Emil Renner Berthing, Eric Dumazet, Fabio Estevam, Jakub Kicinski,
Jesper Dangaard Brouer, John Fastabend, linux-arm-kernel,
linux-stm32, Maxime Coquelin, netdev, NXP Linux Team, Paolo Abeni,
Pengutronix Kernel Team, Samin Guo, Sascha Hauer, Shawn Guo
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
---
.../stmicro/stmmac/dwmac-intel-plat.c | 35 +++++--------------
1 file changed, 9 insertions(+), 26 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c
index d352a14f9d48..8cc22f11072e 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c
@@ -14,6 +14,7 @@
#include "dwmac4.h"
#include "stmmac.h"
#include "stmmac_platform.h"
+#include "stmmac_plat_lib.h"
struct intel_dwmac {
struct device *dev;
@@ -31,32 +32,14 @@ struct intel_dwmac_data {
static void kmb_eth_fix_mac_speed(void *priv, unsigned int speed, unsigned int mode)
{
struct intel_dwmac *dwmac = priv;
- unsigned long rate;
- int ret;
-
- rate = clk_get_rate(dwmac->tx_clk);
-
- switch (speed) {
- case SPEED_1000:
- rate = 125000000;
- break;
-
- case SPEED_100:
- rate = 25000000;
- break;
-
- case SPEED_10:
- rate = 2500000;
- break;
-
- default:
- dev_err(dwmac->dev, "Invalid speed\n");
- break;
- }
-
- ret = clk_set_rate(dwmac->tx_clk, rate);
- if (ret)
- dev_err(dwmac->dev, "Failed to configure tx clock rate\n");
+ int err;
+
+ err = dwmac_set_tx_clk_gmii(dwmac->tx_clk, speed);
+ if (err == -ENOTSUPP)
+ dev_err(dwmac->dev, "invalid speed %dMbps\n", speed);
+ else if (err)
+ dev_err(dwmac->dev, "failed to set tx rate for speed %dMbps: %pe\n",
+ speed, ERR_PTR(err));
}
static const struct intel_dwmac_data kmb_data = {
--
2.30.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net-next 3/6] net: stmmac: intel-plat: use dwmac_set_tx_clk_gmii()
2023-09-11 15:29 ` [PATCH net-next 3/6] net: stmmac: intel-plat: use dwmac_set_tx_clk_gmii() Russell King (Oracle)
@ 2023-09-14 12:06 ` Serge Semin
0 siblings, 0 replies; 3+ messages in thread
From: Serge Semin @ 2023-09-14 12:06 UTC (permalink / raw)
To: Russell King (Oracle)
Cc: Alexandre Torgue, Jose Abreu, Alexei Starovoitov, bpf,
Daniel Borkmann, David S. Miller, Emil Renner Berthing,
Eric Dumazet, Fabio Estevam, Jakub Kicinski,
Jesper Dangaard Brouer, John Fastabend, linux-arm-kernel,
linux-stm32, Maxime Coquelin, netdev, NXP Linux Team, Paolo Abeni,
Pengutronix Kernel Team, Samin Guo, Sascha Hauer, Shawn Guo
On Mon, Sep 11, 2023 at 04:29:21PM +0100, Russell King (Oracle) wrote:
> Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
> ---
> .../stmicro/stmmac/dwmac-intel-plat.c | 35 +++++--------------
> 1 file changed, 9 insertions(+), 26 deletions(-)
>
> diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c
> index d352a14f9d48..8cc22f11072e 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c
> @@ -14,6 +14,7 @@
> #include "dwmac4.h"
> #include "stmmac.h"
> #include "stmmac_platform.h"
> +#include "stmmac_plat_lib.h"
>
> struct intel_dwmac {
> struct device *dev;
> @@ -31,32 +32,14 @@ struct intel_dwmac_data {
> static void kmb_eth_fix_mac_speed(void *priv, unsigned int speed, unsigned int mode)
> {
> struct intel_dwmac *dwmac = priv;
> - unsigned long rate;
> - int ret;
> -
> - rate = clk_get_rate(dwmac->tx_clk);
> -
> - switch (speed) {
> - case SPEED_1000:
> - rate = 125000000;
> - break;
> -
> - case SPEED_100:
> - rate = 25000000;
> - break;
> -
> - case SPEED_10:
> - rate = 2500000;
> - break;
> -
> - default:
> - dev_err(dwmac->dev, "Invalid speed\n");
> - break;
> - }
> -
> - ret = clk_set_rate(dwmac->tx_clk, rate);
> - if (ret)
> - dev_err(dwmac->dev, "Failed to configure tx clock rate\n");
> + int err;
> +
> + err = dwmac_set_tx_clk_gmii(dwmac->tx_clk, speed);
> + if (err == -ENOTSUPP)
> + dev_err(dwmac->dev, "invalid speed %dMbps\n", speed);
'%u'?
> + else if (err)
> + dev_err(dwmac->dev, "failed to set tx rate for speed %dMbps: %pe\n",
ditto
-Serge(y)
> + speed, ERR_PTR(err));
> }
>
> static const struct intel_dwmac_data kmb_data = {
> --
> 2.30.2
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-09-14 12:07 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-11 15:28 [PATCH net-next 3/6] net: stmmac: intel-plat: use dwmac_set_tx_clk_gmii() Russell King (Oracle)
-- strict thread matches above, loose matches on Subject: below --
2023-09-11 15:28 [PATCH net-next 0/6] net: stmmac: add and use library for setting clock Russell King (Oracle)
2023-09-11 15:29 ` [PATCH net-next 3/6] net: stmmac: intel-plat: use dwmac_set_tx_clk_gmii() Russell King (Oracle)
2023-09-14 12:06 ` Serge Semin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox