Re: [PATCH] net: zynq_gem: Update the MDC clock divisor in the probe function

2023-09-26 Thread Michal Simek 




On 9/22/23 06:50, Venkatesh Yadav Abbarapu wrote:

MDC clock change needs to be done when the driver probe function
is called as mdio is enabled at probe and not when the ethernet starts.
Setup the MDC clock at the probe itself.

Signed-off-by: Venkatesh Yadav Abbarapu 
---
  drivers/net/zynq_gem.c | 73 +++---
  1 file changed, 40 insertions(+), 33 deletions(-)

diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c
index f3cdfb0275..f7a7897d9c 100644
--- a/drivers/net/zynq_gem.c
+++ b/drivers/net/zynq_gem.c
@@ -321,11 +321,38 @@ static int zynq_gem_setup_mac(struct udevice *dev)
return 0;
  }
  
+static u32 gem_mdc_clk_div(struct zynq_gem_priv *priv)

+{
+   u32 config;
+   unsigned long pclk_hz;
+
+   pclk_hz = clk_get_rate(&priv->pclk);
+   if (pclk_hz <= 2000)
+   config = GEM_MDC_SET(GEM_CLK_DIV8);
+   else if (pclk_hz <= 4000)
+   config = GEM_MDC_SET(GEM_CLK_DIV16);
+   else if (pclk_hz <= 8000)
+   config = GEM_MDC_SET(GEM_CLK_DIV32);
+   else if (pclk_hz <= 12000)
+   config = GEM_MDC_SET(GEM_CLK_DIV48);
+   else if (pclk_hz <= 16000)
+   config = GEM_MDC_SET(GEM_CLK_DIV64);
+   else if (pclk_hz <= 24000)
+   config = GEM_MDC_SET(GEM_CLK_DIV96);
+   else if (pclk_hz <= 32000)
+   config = GEM_MDC_SET(GEM_CLK_DIV128);
+   else
+   config = GEM_MDC_SET(GEM_CLK_DIV224);
+
+   return config;
+}
+
  static int zynq_phy_init(struct udevice *dev)
  {
-   int ret;
+   int ret, val;
struct zynq_gem_priv *priv = dev_get_priv(dev);
struct zynq_gem_regs *regs_mdio = priv->mdiobase;
+   struct zynq_gem_regs *regs = priv->iobase;
const u32 supported = SUPPORTED_10baseT_Half |
SUPPORTED_10baseT_Full |
SUPPORTED_100baseT_Half |
@@ -333,6 +360,10 @@ static int zynq_phy_init(struct udevice *dev)
SUPPORTED_1000baseT_Half |
SUPPORTED_1000baseT_Full;
  
+	val = gem_mdc_clk_div(priv);

+   if (val)
+   writel(val, ®s->nwcfg);
+
/* Enable only MDIO bus */
writel(ZYNQ_GEM_NWCTRL_MDEN_MASK, ®s_mdio->nwctrl);
  
@@ -360,35 +391,10 @@ static int zynq_phy_init(struct udevice *dev)

return phy_config(priv->phydev);
  }
  
-static u32 gem_mdc_clk_div(struct zynq_gem_priv *priv)

-{
-   u32 config;
-   unsigned long pclk_hz;
-
-   pclk_hz = clk_get_rate(&priv->pclk);
-   if (pclk_hz <= 2000)
-   config = GEM_MDC_SET(GEM_CLK_DIV8);
-   else if (pclk_hz <= 4000)
-   config = GEM_MDC_SET(GEM_CLK_DIV16);
-   else if (pclk_hz <= 8000)
-   config = GEM_MDC_SET(GEM_CLK_DIV32);
-   else if (pclk_hz <= 12000)
-   config = GEM_MDC_SET(GEM_CLK_DIV48);
-   else if (pclk_hz <= 16000)
-   config = GEM_MDC_SET(GEM_CLK_DIV64);
-   else if (pclk_hz <= 24000)
-   config = GEM_MDC_SET(GEM_CLK_DIV96);
-   else if (pclk_hz <= 32000)
-   config = GEM_MDC_SET(GEM_CLK_DIV128);
-   else
-   config = GEM_MDC_SET(GEM_CLK_DIV224);
-
-   return config;
-}
  
  static int zynq_gem_init(struct udevice *dev)

  {
-   u32 i, nwconfig;
+   u32 i, nwconfig, nwcfg;
int ret;
unsigned long clk_rate = 0;
struct zynq_gem_priv *priv = dev_get_priv(dev);
@@ -494,8 +500,7 @@ static int zynq_gem_init(struct udevice *dev)
return -1;
}
  
-	nwconfig = gem_mdc_clk_div(priv);

-   nwconfig |= ZYNQ_GEM_NWCFG_INIT;
+   nwconfig = ZYNQ_GEM_NWCFG_INIT;
  
  	/*

 * Set SGMII enable PCS selection only if internal PCS/PMA
@@ -509,19 +514,21 @@ static int zynq_gem_init(struct udevice *dev)
  
  	switch (priv->phydev->speed) {

case SPEED_1000:
-   writel(nwconfig | ZYNQ_GEM_NWCFG_SPEED1000,
-  ®s->nwcfg);
+   nwconfig |= ZYNQ_GEM_NWCFG_SPEED1000;
clk_rate = ZYNQ_GEM_FREQUENCY_1000;
break;
case SPEED_100:
-   writel(nwconfig | ZYNQ_GEM_NWCFG_SPEED100,
-  ®s->nwcfg);
+   nwconfig |= ZYNQ_GEM_NWCFG_SPEED100;
clk_rate = ZYNQ_GEM_FREQUENCY_100;
break;
case SPEED_10:
clk_rate = ZYNQ_GEM_FREQUENCY_10;
break;
}
+   nwcfg = readl(®s->nwcfg);
+   nwcfg |= nwconfig;
+   if (nwcfg)
+   writel(nwcfg, ®s->nwcfg);
  
  #ifdef CONFIG_ARM64

if (priv->interface == PHY_INTERFACE_MODE_SGMII &&


Applied.
M

[PATCH] net: zynq_gem: Update the MDC clock divisor in the probe function

2023-09-21 Thread Venkatesh Yadav Abbarapu 
MDC clock change needs to be done when the driver probe function
is called as mdio is enabled at probe and not when the ethernet starts.
Setup the MDC clock at the probe itself.

Signed-off-by: Venkatesh Yadav Abbarapu 
---
 drivers/net/zynq_gem.c | 73 +++---
 1 file changed, 40 insertions(+), 33 deletions(-)

diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c
index f3cdfb0275..f7a7897d9c 100644
--- a/drivers/net/zynq_gem.c
+++ b/drivers/net/zynq_gem.c
@@ -321,11 +321,38 @@ static int zynq_gem_setup_mac(struct udevice *dev)
return 0;
 }
 
+static u32 gem_mdc_clk_div(struct zynq_gem_priv *priv)
+{
+   u32 config;
+   unsigned long pclk_hz;
+
+   pclk_hz = clk_get_rate(&priv->pclk);
+   if (pclk_hz <= 2000)
+   config = GEM_MDC_SET(GEM_CLK_DIV8);
+   else if (pclk_hz <= 4000)
+   config = GEM_MDC_SET(GEM_CLK_DIV16);
+   else if (pclk_hz <= 8000)
+   config = GEM_MDC_SET(GEM_CLK_DIV32);
+   else if (pclk_hz <= 12000)
+   config = GEM_MDC_SET(GEM_CLK_DIV48);
+   else if (pclk_hz <= 16000)
+   config = GEM_MDC_SET(GEM_CLK_DIV64);
+   else if (pclk_hz <= 24000)
+   config = GEM_MDC_SET(GEM_CLK_DIV96);
+   else if (pclk_hz <= 32000)
+   config = GEM_MDC_SET(GEM_CLK_DIV128);
+   else
+   config = GEM_MDC_SET(GEM_CLK_DIV224);
+
+   return config;
+}
+
 static int zynq_phy_init(struct udevice *dev)
 {
-   int ret;
+   int ret, val;
struct zynq_gem_priv *priv = dev_get_priv(dev);
struct zynq_gem_regs *regs_mdio = priv->mdiobase;
+   struct zynq_gem_regs *regs = priv->iobase;
const u32 supported = SUPPORTED_10baseT_Half |
SUPPORTED_10baseT_Full |
SUPPORTED_100baseT_Half |
@@ -333,6 +360,10 @@ static int zynq_phy_init(struct udevice *dev)
SUPPORTED_1000baseT_Half |
SUPPORTED_1000baseT_Full;
 
+   val = gem_mdc_clk_div(priv);
+   if (val)
+   writel(val, ®s->nwcfg);
+
/* Enable only MDIO bus */
writel(ZYNQ_GEM_NWCTRL_MDEN_MASK, ®s_mdio->nwctrl);
 
@@ -360,35 +391,10 @@ static int zynq_phy_init(struct udevice *dev)
return phy_config(priv->phydev);
 }
 
-static u32 gem_mdc_clk_div(struct zynq_gem_priv *priv)
-{
-   u32 config;
-   unsigned long pclk_hz;
-
-   pclk_hz = clk_get_rate(&priv->pclk);
-   if (pclk_hz <= 2000)
-   config = GEM_MDC_SET(GEM_CLK_DIV8);
-   else if (pclk_hz <= 4000)
-   config = GEM_MDC_SET(GEM_CLK_DIV16);
-   else if (pclk_hz <= 8000)
-   config = GEM_MDC_SET(GEM_CLK_DIV32);
-   else if (pclk_hz <= 12000)
-   config = GEM_MDC_SET(GEM_CLK_DIV48);
-   else if (pclk_hz <= 16000)
-   config = GEM_MDC_SET(GEM_CLK_DIV64);
-   else if (pclk_hz <= 24000)
-   config = GEM_MDC_SET(GEM_CLK_DIV96);
-   else if (pclk_hz <= 32000)
-   config = GEM_MDC_SET(GEM_CLK_DIV128);
-   else
-   config = GEM_MDC_SET(GEM_CLK_DIV224);
-
-   return config;
-}
 
 static int zynq_gem_init(struct udevice *dev)
 {
-   u32 i, nwconfig;
+   u32 i, nwconfig, nwcfg;
int ret;
unsigned long clk_rate = 0;
struct zynq_gem_priv *priv = dev_get_priv(dev);
@@ -494,8 +500,7 @@ static int zynq_gem_init(struct udevice *dev)
return -1;
}
 
-   nwconfig = gem_mdc_clk_div(priv);
-   nwconfig |= ZYNQ_GEM_NWCFG_INIT;
+   nwconfig = ZYNQ_GEM_NWCFG_INIT;
 
/*
 * Set SGMII enable PCS selection only if internal PCS/PMA
@@ -509,19 +514,21 @@ static int zynq_gem_init(struct udevice *dev)
 
switch (priv->phydev->speed) {
case SPEED_1000:
-   writel(nwconfig | ZYNQ_GEM_NWCFG_SPEED1000,
-  ®s->nwcfg);
+   nwconfig |= ZYNQ_GEM_NWCFG_SPEED1000;
clk_rate = ZYNQ_GEM_FREQUENCY_1000;
break;
case SPEED_100:
-   writel(nwconfig | ZYNQ_GEM_NWCFG_SPEED100,
-  ®s->nwcfg);
+   nwconfig |= ZYNQ_GEM_NWCFG_SPEED100;
clk_rate = ZYNQ_GEM_FREQUENCY_100;
break;
case SPEED_10:
clk_rate = ZYNQ_GEM_FREQUENCY_10;
break;
}
+   nwcfg = readl(®s->nwcfg);
+   nwcfg |= nwconfig;
+   if (nwcfg)
+   writel(nwcfg, ®s->nwcfg);
 
 #ifdef CONFIG_ARM64
if (priv->interface == PHY_INTERFACE_MODE_SGMII &&
-- 
2.17.1