| Message ID | AM9PR04MB850628457377A486554D718AE2BD2@AM9PR04MB8506.eurprd04.prod.outlook.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add support for Synopsis DWMAC IP on NXP Automotive SoCs | expand |
> #define STMMAC_CSR_20_35M 0x2 /* MDC = clk_scr_i/16 */ > #define STMMAC_CSR_35_60M 0x3 /* MDC = clk_scr_i/26 */ > #define STMMAC_CSR_150_250M 0x4 /* MDC = clk_scr_i/102 */ > -#define STMMAC_CSR_250_300M 0x5 /* MDC = clk_scr_i/122 */ > +#define STMMAC_CSR_250_300M 0x5 /* MDC = clk_scr_i/124 */ That should probably be called out in the commit message. It is not a fix as such, since it is just a comment, but as a reviewer i had a double take when i noticed this., Andrew --- pw-bot: cr
Hi Andrew On Mon, Aug 05, 2024 at 01:11:16AM +0200, Andrew Lunn wrote: > > #define STMMAC_CSR_20_35M 0x2 /* MDC = clk_scr_i/16 */ > > #define STMMAC_CSR_35_60M 0x3 /* MDC = clk_scr_i/26 */ > > #define STMMAC_CSR_150_250M 0x4 /* MDC = clk_scr_i/102 */ > > -#define STMMAC_CSR_250_300M 0x5 /* MDC = clk_scr_i/122 */ > > +#define STMMAC_CSR_250_300M 0x5 /* MDC = clk_scr_i/124 */ > > That should probably be called out in the commit message. It is not a > fix as such, since it is just a comment, but as a reviewer i had a > double take when i noticed this., Yes, this seems like a typo. I've checked the divider semantic in the DW GMAC 3.50a/3.73a and DW QoS Eth 5.10a HW databooks. Both of them expect the clk_scr_i ref clock being divided by 124. So the 122 value was incorrect. -Serge(y) > > > Andrew > > --- > pw-bot: cr >
> -----Original Message----- > From: Andrew Lunn <andrew@lunn.ch> > Sent: Monday, 5 August, 2024 1:11 > To: Jan Petrous (OSS) <jan.petrous@oss.nxp.com> > Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>; Alexandre Torgue > <alexandre.torgue@foss.st.com>; dl-S32 <S32@nxp.com>; linux- > kernel@vger.kernel.org; linux-stm32@st-md-mailman.stormreply.com; linux- > arm-kernel@lists.infradead.org; Claudiu Manoil <claudiu.manoil@nxp.com>; > netdev@vger.kernel.org > Subject: Re: [PATCH 1/6] net: driver: stmmac: extend CSR calc support > > > #define STMMAC_CSR_20_35M 0x2 /* MDC = clk_scr_i/16 */ > > #define STMMAC_CSR_35_60M 0x3 /* MDC = clk_scr_i/26 */ > > #define STMMAC_CSR_150_250M 0x4 /* MDC = > clk_scr_i/102 */ > > -#define STMMAC_CSR_250_300M 0x5 /* MDC = > clk_scr_i/122 */ > > +#define STMMAC_CSR_250_300M 0x5 /* MDC = > clk_scr_i/124 */ > > That should probably be called out in the commit message. It is not a > fix as such, since it is just a comment, but as a reviewer i had a > double take when i noticed this., > Will add the note to the commit message in v2. /Jan
diff --git a/drivers/net/ethernet/stmicro/stmmac/common.h b/drivers/net/ethernet/stmicro/stmmac/common.h index cd36ff4da68c..e90d3c5ac917 100644 --- a/drivers/net/ethernet/stmicro/stmmac/common.h +++ b/drivers/net/ethernet/stmicro/stmmac/common.h @@ -256,6 +256,8 @@ struct stmmac_safety_stats { #define CSR_F_150M 150000000 #define CSR_F_250M 250000000 #define CSR_F_300M 300000000 +#define CSR_F_500M 500000000 +#define CSR_F_800M 800000000 #define MAC_CSR_H_FRQ_MASK 0x20 diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index f3a1b179aaea..ac80d8a2b743 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -324,6 +324,10 @@ static void stmmac_clk_csr_set(struct stmmac_priv *priv) priv->clk_csr = STMMAC_CSR_150_250M; else if ((clk_rate >= CSR_F_250M) && (clk_rate <= CSR_F_300M)) priv->clk_csr = STMMAC_CSR_250_300M; + else if ((clk_rate >= CSR_F_300M) && (clk_rate < CSR_F_500M)) + priv->clk_csr = STMMAC_CSR_300_500M; + else if ((clk_rate >= CSR_F_500M) && (clk_rate < CSR_F_800M)) + priv->clk_csr = STMMAC_CSR_500_800M; } if (priv->plat->flags & STMMAC_FLAG_HAS_SUN8I) { diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h index 84e13bd5df28..7caaa5ae6674 100644 --- a/include/linux/stmmac.h +++ b/include/linux/stmmac.h @@ -33,7 +33,9 @@ #define STMMAC_CSR_20_35M 0x2 /* MDC = clk_scr_i/16 */ #define STMMAC_CSR_35_60M 0x3 /* MDC = clk_scr_i/26 */ #define STMMAC_CSR_150_250M 0x4 /* MDC = clk_scr_i/102 */ -#define STMMAC_CSR_250_300M 0x5 /* MDC = clk_scr_i/122 */ +#define STMMAC_CSR_250_300M 0x5 /* MDC = clk_scr_i/124 */ +#define STMMAC_CSR_300_500M 0x6 /* MDC = clk_scr_i/204 */ +#define STMMAC_CSR_500_800M 0x7 /* MDC = clk_scr_i/324 */ /* MTL algorithms identifiers */ #define MTL_TX_ALGORITHM_WRR 0x0
Add support for CSR clock range up to 800 MHz. Signed-off-by: Jan Petrous (OSS) <jan.petrous@oss.nxp.com> --- drivers/net/ethernet/stmicro/stmmac/common.h | 2 ++ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 ++++ include/linux/stmmac.h | 4 +++- 3 files changed, 9 insertions(+), 1 deletion(-)