* [PATCH net-next 2/6] net: stmmac: imx: use dwmac_set_tx_clk_gmii()
@ 2023-09-11 15:28 Russell King (Oracle)
0 siblings, 0 replies; 4+ 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>
---
.../net/ethernet/stmicro/stmmac/dwmac-imx.c | 27 ++++++-------------
1 file changed, 8 insertions(+), 19 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c
index df34e34cc14f..d2569faf7cc3 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c
@@ -21,6 +21,7 @@
#include <linux/stmmac.h>
#include "stmmac_platform.h"
+#include "stmmac_plat_lib.h"
#define GPR_ENET_QOS_INTF_MODE_MASK GENMASK(21, 16)
#define GPR_ENET_QOS_INTF_SEL_MII (0x0 << 16)
@@ -186,7 +187,6 @@ static void imx_dwmac_fix_speed(void *priv, unsigned int speed, unsigned int mod
{
struct plat_stmmacenet_data *plat_dat;
struct imx_priv_data *dwmac = priv;
- unsigned long rate;
int err;
plat_dat = dwmac->plat_dat;
@@ -196,24 +196,13 @@ static void imx_dwmac_fix_speed(void *priv, unsigned int speed, unsigned int mod
(plat_dat->mac_interface == PHY_INTERFACE_MODE_MII))
return;
- 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 %u\n", speed);
- return;
- }
-
- err = clk_set_rate(dwmac->clk_tx, rate);
- if (err < 0)
- dev_err(dwmac->dev, "failed to set tx rate %lu\n", rate);
+ err = dwmac_set_tx_clk_gmii(dwmac->clk_tx, 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 void imx93_dwmac_fix_speed(void *priv, unsigned int speed, unsigned int mode)
--
2.30.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH net-next 0/6] net: stmmac: add and use library for setting clock
@ 2023-09-11 15:28 Russell King (Oracle)
2023-09-11 15:29 ` [PATCH net-next 2/6] net: stmmac: imx: use dwmac_set_tx_clk_gmii() Russell King (Oracle)
0 siblings, 1 reply; 4+ 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
Hi,
There is a common theme throughout several "bsps" in the stmmac driver
which all code up the same thing: for 10M, 100M and 1G, select the
appropriate 2.5MHz, 25MHz, or 125MHz clock.
Rather than having every BSP implement the same thing but slightly
differently, let's provide a single implementation which is passed
the struct clk and the speed, and have that do the speed to clock
rate decode.
Note: only build tested.
drivers/net/ethernet/stmicro/stmmac/Makefile | 2 +-
.../ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c | 37 ++++---------
drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c | 27 +++-------
.../net/ethernet/stmicro/stmmac/dwmac-intel-plat.c | 35 ++++---------
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 61 ++++++----------------
.../net/ethernet/stmicro/stmmac/dwmac-starfive.c | 29 +++-------
.../net/ethernet/stmicro/stmmac/stmmac_plat_lib.c | 29 ++++++++++
.../net/ethernet/stmicro/stmmac/stmmac_plat_lib.h | 8 +++
8 files changed, 91 insertions(+), 137 deletions(-)
create mode 100644 drivers/net/ethernet/stmicro/stmmac/stmmac_plat_lib.c
create mode 100644 drivers/net/ethernet/stmicro/stmmac/stmmac_plat_lib.h
--
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH net-next 2/6] net: stmmac: imx: 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:05 ` Serge Semin
2023-09-14 12:19 ` Serge Semin
0 siblings, 2 replies; 4+ 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>
---
.../net/ethernet/stmicro/stmmac/dwmac-imx.c | 27 ++++++-------------
1 file changed, 8 insertions(+), 19 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c
index df34e34cc14f..d2569faf7cc3 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c
@@ -21,6 +21,7 @@
#include <linux/stmmac.h>
#include "stmmac_platform.h"
+#include "stmmac_plat_lib.h"
#define GPR_ENET_QOS_INTF_MODE_MASK GENMASK(21, 16)
#define GPR_ENET_QOS_INTF_SEL_MII (0x0 << 16)
@@ -186,7 +187,6 @@ static void imx_dwmac_fix_speed(void *priv, unsigned int speed, unsigned int mod
{
struct plat_stmmacenet_data *plat_dat;
struct imx_priv_data *dwmac = priv;
- unsigned long rate;
int err;
plat_dat = dwmac->plat_dat;
@@ -196,24 +196,13 @@ static void imx_dwmac_fix_speed(void *priv, unsigned int speed, unsigned int mod
(plat_dat->mac_interface == PHY_INTERFACE_MODE_MII))
return;
- 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 %u\n", speed);
- return;
- }
-
- err = clk_set_rate(dwmac->clk_tx, rate);
- if (err < 0)
- dev_err(dwmac->dev, "failed to set tx rate %lu\n", rate);
+ err = dwmac_set_tx_clk_gmii(dwmac->clk_tx, 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 void imx93_dwmac_fix_speed(void *priv, unsigned int speed, unsigned int mode)
--
2.30.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH net-next 2/6] net: stmmac: imx: use dwmac_set_tx_clk_gmii()
2023-09-11 15:29 ` [PATCH net-next 2/6] net: stmmac: imx: use dwmac_set_tx_clk_gmii() Russell King (Oracle)
@ 2023-09-14 12:05 ` Serge Semin
2023-09-14 12:19 ` Serge Semin
1 sibling, 0 replies; 4+ messages in thread
From: Serge Semin @ 2023-09-14 12:05 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:16PM +0100, Russell King (Oracle) wrote:
> Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
> ---
> .../net/ethernet/stmicro/stmmac/dwmac-imx.c | 27 ++++++-------------
> 1 file changed, 8 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c
> index df34e34cc14f..d2569faf7cc3 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c
> @@ -21,6 +21,7 @@
> #include <linux/stmmac.h>
>
> #include "stmmac_platform.h"
> +#include "stmmac_plat_lib.h"
>
> #define GPR_ENET_QOS_INTF_MODE_MASK GENMASK(21, 16)
> #define GPR_ENET_QOS_INTF_SEL_MII (0x0 << 16)
> @@ -186,7 +187,6 @@ static void imx_dwmac_fix_speed(void *priv, unsigned int speed, unsigned int mod
> {
> struct plat_stmmacenet_data *plat_dat;
> struct imx_priv_data *dwmac = priv;
> - unsigned long rate;
> int err;
>
> plat_dat = dwmac->plat_dat;
> @@ -196,24 +196,13 @@ static void imx_dwmac_fix_speed(void *priv, unsigned int speed, unsigned int mod
> (plat_dat->mac_interface == PHY_INTERFACE_MODE_MII))
> return;
>
> - 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 %u\n", speed);
> - return;
> - }
> -
> - err = clk_set_rate(dwmac->clk_tx, rate);
> - if (err < 0)
> - dev_err(dwmac->dev, "failed to set tx rate %lu\n", rate);
> + err = dwmac_set_tx_clk_gmii(dwmac->clk_tx, speed);
> + if (err == -ENOTSUPP)
> + dev_err(dwmac->dev, "invalid speed %dMbps\n", speed);
The 'speed' variable is of the unsigned int type so the type qualifier is
supposed to be "%u" here.
> + 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 void imx93_dwmac_fix_speed(void *priv, unsigned int speed, unsigned int mode)
> --
> 2.30.2
>
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH net-next 2/6] net: stmmac: imx: use dwmac_set_tx_clk_gmii()
2023-09-11 15:29 ` [PATCH net-next 2/6] net: stmmac: imx: use dwmac_set_tx_clk_gmii() Russell King (Oracle)
2023-09-14 12:05 ` Serge Semin
@ 2023-09-14 12:19 ` Serge Semin
1 sibling, 0 replies; 4+ messages in thread
From: Serge Semin @ 2023-09-14 12:19 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:16PM +0100, Russell King (Oracle) wrote:
> Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
BTW I don't know whether it's ok to have an empty description in the
patches for the networking subsystem, but the kernel maintainers
mainly request to add at least some text with the change justification
especially seeing the submitting-patches.rst doc says the description
is mandatory.
-Serge(y)
> ---
> .../net/ethernet/stmicro/stmmac/dwmac-imx.c | 27 ++++++-------------
> 1 file changed, 8 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c
> index df34e34cc14f..d2569faf7cc3 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c
> @@ -21,6 +21,7 @@
> #include <linux/stmmac.h>
>
> #include "stmmac_platform.h"
> +#include "stmmac_plat_lib.h"
>
> #define GPR_ENET_QOS_INTF_MODE_MASK GENMASK(21, 16)
> #define GPR_ENET_QOS_INTF_SEL_MII (0x0 << 16)
> @@ -186,7 +187,6 @@ static void imx_dwmac_fix_speed(void *priv, unsigned int speed, unsigned int mod
> {
> struct plat_stmmacenet_data *plat_dat;
> struct imx_priv_data *dwmac = priv;
> - unsigned long rate;
> int err;
>
> plat_dat = dwmac->plat_dat;
> @@ -196,24 +196,13 @@ static void imx_dwmac_fix_speed(void *priv, unsigned int speed, unsigned int mod
> (plat_dat->mac_interface == PHY_INTERFACE_MODE_MII))
> return;
>
> - 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 %u\n", speed);
> - return;
> - }
> -
> - err = clk_set_rate(dwmac->clk_tx, rate);
> - if (err < 0)
> - dev_err(dwmac->dev, "failed to set tx rate %lu\n", rate);
> + err = dwmac_set_tx_clk_gmii(dwmac->clk_tx, 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 void imx93_dwmac_fix_speed(void *priv, unsigned int speed, unsigned int mode)
> --
> 2.30.2
>
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-09-14 12:19 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-11 15:28 [PATCH net-next 2/6] net: stmmac: imx: 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 2/6] net: stmmac: imx: use dwmac_set_tx_clk_gmii() Russell King (Oracle)
2023-09-14 12:05 ` Serge Semin
2023-09-14 12:19 ` Serge Semin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).