diff mbox series

[v7,2/2] net: stmmac: dwc-qos: Add FSD EQoS support

Message ID 20250220043712.31966-3-swathi.ks@samsung.com (mailing list archive)
State New
Headers show
Series [v7,1/2] dt-bindings: net: Add FSD EQoS device tree bindings | expand

Commit Message

Swathi K S Feb. 20, 2025, 4:37 a.m. UTC
The FSD SoC contains two instance of the Synopsys DWC ethernet QOS IP core.
The binding that it uses is slightly different from existing ones because
of the integration (clocks, resets).

Signed-off-by: Swathi K S <swathi.ks@samsung.com>
---
 .../stmicro/stmmac/dwmac-dwc-qos-eth.c        | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

Comments

Russell King (Oracle) Feb. 20, 2025, 12:39 p.m. UTC | #1
On Thu, Feb 20, 2025 at 10:07:12AM +0530, Swathi K S wrote:
> +static int fsd_eqos_probe(struct platform_device *pdev,
> +			  struct plat_stmmacenet_data *data,
> +			  struct stmmac_resources *res)
> +{
> +	struct clk *clk_rx1 = NULL;
> +	struct clk *clk_rx2 = NULL;
> +
> +	for (int i = 0; i < data->num_clks; i++) {
> +		if (strcmp(data->clks[i].id, "slave_bus") == 0)
> +			data->stmmac_clk = data->clks[i].clk;
> +		else if (strcmp(data->clks[i].id, "eqos_rxclk_mux") == 0)
> +			clk_rx1 = data->clks[i].clk;
> +		else if (strcmp(data->clks[i].id, "eqos_phyrxclk") == 0)
> +			clk_rx2 = data->clks[i].clk;
> +	}
> +
> +	/* Eth0 RX clock doesn't support MUX */
> +	if (clk_rx1)
> +		clk_set_parent(clk_rx1, clk_rx2);

Isn't there support in DT for automatically setting the clock tree?
See
https://github.com/devicetree-org/dt-schema/blob/main/dtschema/schemas/clock/clock.yaml#L24

Also, I think a cleanup like the below (sorry, it's on top of other
patches I'm working on at the moment but could be rebased) would
make sense.

With both of these, this should mean that your changes amount to:

1. making data->probe optional
2. providing a dwc_eth_dwmac_data structure that has .stmmac_clk_name
   filled in
3. adding your compatible to the match data with a pointer to the
   above structure.

In other words, support for your device becomes just a matter of adding
data structures rather than a chunk of extra code.

Thanks.

8<====
From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
Subject: [PATCH net-next] net: stmmac: clean up clock initialisation

Clean up the clock initialisation by providing a helper to find a
named clock in the bulk clocks, and provide the name of the stmmac
clock in match data so we can locate the stmmac clock in generic
code.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
---
 .../stmicro/stmmac/dwmac-dwc-qos-eth.c        | 32 +++++++++++--------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c
index 581c0b40db57..8e343ab7a7e2 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c
@@ -34,6 +34,16 @@ struct tegra_eqos {
 	struct gpio_desc *reset;
 };
 
+static struct clk *dwc_eth_find_clk(struct plat_stmmacenet_data *plat_dat,
+				    const char *name)
+{
+	for (int i = 0; i < plat_dat->num_clks; i++)
+		if (strcmp(plat_dat->clks[i].id, name) == 0)
+			return plat_dat->clks[i].clk;
+
+	return 0;
+}
+
 static int dwc_eth_dwmac_config_dt(struct platform_device *pdev,
 				   struct plat_stmmacenet_data *plat_dat)
 {
@@ -120,12 +130,7 @@ static int dwc_qos_probe(struct platform_device *pdev,
 			 struct plat_stmmacenet_data *plat_dat,
 			 struct stmmac_resources *stmmac_res)
 {
-	for (int i = 0; i < plat_dat->num_clks; i++) {
-		if (strcmp(plat_dat->clks[i].id, "apb_pclk") == 0)
-			plat_dat->stmmac_clk = plat_dat->clks[i].clk;
-		else if (strcmp(plat_dat->clks[i].id, "phy_ref_clk") == 0)
-			plat_dat->pclk = plat_dat->clks[i].clk;
-	}
+	plat_dat->pclk = dwc_eth_find_clk(plat_dat, "phy_ref_clk");
 
 	return 0;
 }
@@ -230,18 +235,12 @@ static int tegra_eqos_probe(struct platform_device *pdev,
 
 	eqos->dev = &pdev->dev;
 	eqos->regs = res->addr;
+	eqos->clk_slave = data->stmmac_clk;
 
 	if (!is_of_node(dev->fwnode))
 		goto bypass_clk_reset_gpio;
 
-	for (int i = 0; i < data->num_clks; i++) {
-		if (strcmp(data->clks[i].id, "slave_bus") == 0) {
-			eqos->clk_slave = data->clks[i].clk;
-			data->stmmac_clk = eqos->clk_slave;
-		} else if (strcmp(data->clks[i].id, "tx") == 0) {
-			data->clk_tx_i = data->clks[i].clk;
-		}
-	}
+	data->clk_tx_i = dwc_eth_find_clk(data, "tx");
 
 	eqos->reset = devm_gpiod_get(&pdev->dev, "phy-reset", GPIOD_OUT_HIGH);
 	if (IS_ERR(eqos->reset)) {
@@ -306,15 +305,18 @@ struct dwc_eth_dwmac_data {
 		     struct plat_stmmacenet_data *data,
 		     struct stmmac_resources *res);
 	void (*remove)(struct platform_device *pdev);
+	const char *stmmac_clk_name;
 };
 
 static const struct dwc_eth_dwmac_data dwc_qos_data = {
 	.probe = dwc_qos_probe,
+	.stmmac_clk_name = "apb_pclk",
 };
 
 static const struct dwc_eth_dwmac_data tegra_eqos_data = {
 	.probe = tegra_eqos_probe,
 	.remove = tegra_eqos_remove,
+	.stmmac_clk_name = "slave_bus",
 };
 
 static int dwc_eth_dwmac_probe(struct platform_device *pdev)
@@ -354,6 +356,8 @@ static int dwc_eth_dwmac_probe(struct platform_device *pdev)
 	if (ret)
 		return dev_err_probe(&pdev->dev, ret, "Failed to enable clocks\n");
 
+	data->stmmac_clk = dwc_eth_find_clk(plat_dat, data->stmmac_clk_name);
+
 	ret = data->probe(pdev, plat_dat, &stmmac_res);
 	if (ret < 0) {
 		dev_err_probe(&pdev->dev, ret, "failed to probe subdriver\n");
Swathi K S Feb. 21, 2025, 10:34 a.m. UTC | #2
> -----Original Message-----
> From: Russell King (Oracle) <linux@armlinux.org.uk>
> Sent: 20 February 2025 18:10
> To: Swathi K S <swathi.ks@samsung.com>
> Cc: krzk+dt@kernel.org; andrew+netdev@lunn.ch; davem@davemloft.net;
> edumazet@google.com; kuba@kernel.org; pabeni@redhat.com;
> robh@kernel.org; conor+dt@kernel.org; richardcochran@gmail.com;
> mcoquelin.stm32@gmail.com; alexandre.torgue@foss.st.com;
> netdev@vger.kernel.org; devicetree@vger.kernel.org; linux-stm32@st-md-
> mailman.stormreply.com; linux-arm-kernel@lists.infradead.org; linux-
> kernel@vger.kernel.org; pankaj.dubey@samsung.com;
> ravi.patel@samsung.com; gost.dev@samsung.com
> Subject: Re: [PATCH v7 2/2] net: stmmac: dwc-qos: Add FSD EQoS support
> 
> On Thu, Feb 20, 2025 at 10:07:12AM +0530, Swathi K S wrote:
> > +static int fsd_eqos_probe(struct platform_device *pdev,
> > +			  struct plat_stmmacenet_data *data,
> > +			  struct stmmac_resources *res)
> > +{
> > +	struct clk *clk_rx1 = NULL;
> > +	struct clk *clk_rx2 = NULL;
> > +
> > +	for (int i = 0; i < data->num_clks; i++) {
> > +		if (strcmp(data->clks[i].id, "slave_bus") == 0)
> > +			data->stmmac_clk = data->clks[i].clk;
> > +		else if (strcmp(data->clks[i].id, "eqos_rxclk_mux") == 0)
> > +			clk_rx1 = data->clks[i].clk;
> > +		else if (strcmp(data->clks[i].id, "eqos_phyrxclk") == 0)
> > +			clk_rx2 = data->clks[i].clk;
> > +	}
> > +
> > +	/* Eth0 RX clock doesn't support MUX */
> > +	if (clk_rx1)
> > +		clk_set_parent(clk_rx1, clk_rx2);
> 
> Isn't there support in DT for automatically setting the clock tree?
> See
> https://protect2.fireeye.com/v1/url?k=f0089f78-90ea0225-f0091437-
> 000babd9f1ba-cf835b8b94ccd94a&q=1&e=4ae794ec-f443-4d77-aee4-
> 449f53a3a1a4&u=https%3A%2F%2Fgithub.com%2Fdevicetree-org%2Fdt-
> schema%2Fblob%2Fmain%2Fdtschema%2Fschemas%2Fclock%2Fclock.yaml
> %23L24
> 
> Also, I think a cleanup like the below (sorry, it's on top of other
patches I'm
> working on at the moment but could be rebased) would make sense.
> 
> With both of these, this should mean that your changes amount to:
> 
> 1. making data->probe optional
> 2. providing a dwc_eth_dwmac_data structure that has .stmmac_clk_name
>    filled in
> 3. adding your compatible to the match data with a pointer to the
>    above structure.

Hi Russell, 
Thanks for your input.
Will implement this in v8.
But I could not find your patch 'net: stmmac: clean up clock initialisation'
in mailing list
Could you point me to that?
Or do you want me to integrate the below changes into my patch series and
post?

Please let me know

- Swathi

> 
> In other words, support for your device becomes just a matter of adding
data
> structures rather than a chunk of extra code.
> 
> Thanks.
> 
> 8<====
> From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
> Subject: [PATCH net-next] net: stmmac: clean up clock initialisation
> 
> Clean up the clock initialisation by providing a helper to find a named
clock in
> the bulk clocks, and provide the name of the stmmac clock in match data so
> we can locate the stmmac clock in generic code.
> 
> Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
> ---
>  .../stmicro/stmmac/dwmac-dwc-qos-eth.c        | 32 +++++++++++--------
>  1 file changed, 18 insertions(+), 14 deletions(-)
> 
> diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c
> b/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c
> index 581c0b40db57..8e343ab7a7e2 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c
> @@ -34,6 +34,16 @@ struct tegra_eqos {
>  	struct gpio_desc *reset;
>  };
> 
> +static struct clk *dwc_eth_find_clk(struct plat_stmmacenet_data
*plat_dat,
> +				    const char *name)
> +{
> +	for (int i = 0; i < plat_dat->num_clks; i++)
> +		if (strcmp(plat_dat->clks[i].id, name) == 0)
> +			return plat_dat->clks[i].clk;
> +
> +	return 0;
> +}
> +
>  static int dwc_eth_dwmac_config_dt(struct platform_device *pdev,
>  				   struct plat_stmmacenet_data *plat_dat)  {
> @@ -120,12 +130,7 @@ static int dwc_qos_probe(struct platform_device
> *pdev,
>  			 struct plat_stmmacenet_data *plat_dat,
>  			 struct stmmac_resources *stmmac_res)  {
> -	for (int i = 0; i < plat_dat->num_clks; i++) {
> -		if (strcmp(plat_dat->clks[i].id, "apb_pclk") == 0)
> -			plat_dat->stmmac_clk = plat_dat->clks[i].clk;
> -		else if (strcmp(plat_dat->clks[i].id, "phy_ref_clk") == 0)
> -			plat_dat->pclk = plat_dat->clks[i].clk;
> -	}
> +	plat_dat->pclk = dwc_eth_find_clk(plat_dat, "phy_ref_clk");
> 
>  	return 0;
>  }
> @@ -230,18 +235,12 @@ static int tegra_eqos_probe(struct platform_device
> *pdev,
> 
>  	eqos->dev = &pdev->dev;
>  	eqos->regs = res->addr;
> +	eqos->clk_slave = data->stmmac_clk;
> 
>  	if (!is_of_node(dev->fwnode))
>  		goto bypass_clk_reset_gpio;
> 
> -	for (int i = 0; i < data->num_clks; i++) {
> -		if (strcmp(data->clks[i].id, "slave_bus") == 0) {
> -			eqos->clk_slave = data->clks[i].clk;
> -			data->stmmac_clk = eqos->clk_slave;
> -		} else if (strcmp(data->clks[i].id, "tx") == 0) {
> -			data->clk_tx_i = data->clks[i].clk;
> -		}
> -	}
> +	data->clk_tx_i = dwc_eth_find_clk(data, "tx");
> 
>  	eqos->reset = devm_gpiod_get(&pdev->dev, "phy-reset",
> GPIOD_OUT_HIGH);
>  	if (IS_ERR(eqos->reset)) {
> @@ -306,15 +305,18 @@ struct dwc_eth_dwmac_data {
>  		     struct plat_stmmacenet_data *data,
>  		     struct stmmac_resources *res);
>  	void (*remove)(struct platform_device *pdev);
> +	const char *stmmac_clk_name;
>  };
> 
>  static const struct dwc_eth_dwmac_data dwc_qos_data = {
>  	.probe = dwc_qos_probe,
> +	.stmmac_clk_name = "apb_pclk",
>  };
> 
>  static const struct dwc_eth_dwmac_data tegra_eqos_data = {
>  	.probe = tegra_eqos_probe,
>  	.remove = tegra_eqos_remove,
> +	.stmmac_clk_name = "slave_bus",
>  };
> 
>  static int dwc_eth_dwmac_probe(struct platform_device *pdev) @@ -354,6
> +356,8 @@ static int dwc_eth_dwmac_probe(struct platform_device *pdev)
>  	if (ret)
>  		return dev_err_probe(&pdev->dev, ret, "Failed to enable
> clocks\n");
> 
> +	data->stmmac_clk = dwc_eth_find_clk(plat_dat, data-
> >stmmac_clk_name);
> +
>  	ret = data->probe(pdev, plat_dat, &stmmac_res);
>  	if (ret < 0) {
>  		dev_err_probe(&pdev->dev, ret, "failed to probe
> subdriver\n");
> --
> 2.30.2
> 
> 
> --
> RMK's Patch system: https://protect2.fireeye.com/v1/url?k=bd23955d-
> ddc10800-bd221e12-000babd9f1ba-890d84739eaced1c&q=1&e=4ae794ec-
> f443-4d77-aee4-
> 449f53a3a1a4&u=https%3A%2F%2Fwww.armlinux.org.uk%2Fdeveloper%2F
> patches%2F
> FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!
Russell King (Oracle) Feb. 21, 2025, 11:49 a.m. UTC | #3
On Fri, Feb 21, 2025 at 04:04:25PM +0530, Swathi K S wrote:
> 
> 
> > -----Original Message-----
> > From: Russell King (Oracle) <linux@armlinux.org.uk>
> > Sent: 20 February 2025 18:10
> > To: Swathi K S <swathi.ks@samsung.com>
> > Cc: krzk+dt@kernel.org; andrew+netdev@lunn.ch; davem@davemloft.net;
> > edumazet@google.com; kuba@kernel.org; pabeni@redhat.com;
> > robh@kernel.org; conor+dt@kernel.org; richardcochran@gmail.com;
> > mcoquelin.stm32@gmail.com; alexandre.torgue@foss.st.com;
> > netdev@vger.kernel.org; devicetree@vger.kernel.org; linux-stm32@st-md-
> > mailman.stormreply.com; linux-arm-kernel@lists.infradead.org; linux-
> > kernel@vger.kernel.org; pankaj.dubey@samsung.com;
> > ravi.patel@samsung.com; gost.dev@samsung.com
> > Subject: Re: [PATCH v7 2/2] net: stmmac: dwc-qos: Add FSD EQoS support
> > 
> > On Thu, Feb 20, 2025 at 10:07:12AM +0530, Swathi K S wrote:
> > > +static int fsd_eqos_probe(struct platform_device *pdev,
> > > +			  struct plat_stmmacenet_data *data,
> > > +			  struct stmmac_resources *res)
> > > +{
> > > +	struct clk *clk_rx1 = NULL;
> > > +	struct clk *clk_rx2 = NULL;
> > > +
> > > +	for (int i = 0; i < data->num_clks; i++) {
> > > +		if (strcmp(data->clks[i].id, "slave_bus") == 0)
> > > +			data->stmmac_clk = data->clks[i].clk;
> > > +		else if (strcmp(data->clks[i].id, "eqos_rxclk_mux") == 0)
> > > +			clk_rx1 = data->clks[i].clk;
> > > +		else if (strcmp(data->clks[i].id, "eqos_phyrxclk") == 0)
> > > +			clk_rx2 = data->clks[i].clk;
> > > +	}
> > > +
> > > +	/* Eth0 RX clock doesn't support MUX */
> > > +	if (clk_rx1)
> > > +		clk_set_parent(clk_rx1, clk_rx2);
> > 
> > Isn't there support in DT for automatically setting the clock tree?
> > See
> > https://protect2.fireeye.com/v1/url?k=f0089f78-90ea0225-f0091437-
> > 000babd9f1ba-cf835b8b94ccd94a&q=1&e=4ae794ec-f443-4d77-aee4-
> > 449f53a3a1a4&u=https%3A%2F%2Fgithub.com%2Fdevicetree-org%2Fdt-
> > schema%2Fblob%2Fmain%2Fdtschema%2Fschemas%2Fclock%2Fclock.yaml
> > %23L24
> > 
> > Also, I think a cleanup like the below (sorry, it's on top of other
> patches I'm
> > working on at the moment but could be rebased) would make sense.
> > 
> > With both of these, this should mean that your changes amount to:
> > 
> > 1. making data->probe optional
> > 2. providing a dwc_eth_dwmac_data structure that has .stmmac_clk_name
> >    filled in
> > 3. adding your compatible to the match data with a pointer to the
> >    above structure.
> 
> Hi Russell, 
> Thanks for your input.
> Will implement this in v8.
> But I could not find your patch 'net: stmmac: clean up clock initialisation'
> in mailing list
> Could you point me to that?
> Or do you want me to integrate the below changes into my patch series and
> post?
> 
> Please let me know

Please have patience - I'm a volunteer here, and I included the patch in
the email for you. You're not the only one whom I'm addressing issues in
the stmmac driver for. Since Sunday, I have a total of 16 new stmmac
patches plus been debugging a regression someone has reported.

Coincidentally, I just sent out the patch as a stand-alone patch, it
should be quicker to get it into net-next rather than trying to get all
the other patches I'd *already* had queued up in first.

https://lore.kernel.org/r/E1tlRMP-004Vt5-W1@rmk-PC.armlinux.org.uk

However, I'm expecting someone to say that dwc_eth_find_clk() should be
moved into the stmmac platform code, and the other platforms need to be
converted to use it... so it may be some time before we're at a stage
where you can proceed.

Please be patient.
Swathi K S Feb. 21, 2025, 12:56 p.m. UTC | #4
> -----Original Message-----
> From: Russell King (Oracle) <linux@armlinux.org.uk>
> Sent: 21 February 2025 17:20
> To: Swathi K S <swathi.ks@samsung.com>
> Cc: krzk+dt@kernel.org; andrew+netdev@lunn.ch; davem@davemloft.net;
> edumazet@google.com; kuba@kernel.org; pabeni@redhat.com;
> robh@kernel.org; conor+dt@kernel.org; richardcochran@gmail.com;
> mcoquelin.stm32@gmail.com; alexandre.torgue@foss.st.com;
> netdev@vger.kernel.org; devicetree@vger.kernel.org; linux-stm32@st-md-
> mailman.stormreply.com; linux-arm-kernel@lists.infradead.org; linux-
> kernel@vger.kernel.org; pankaj.dubey@samsung.com;
> ravi.patel@samsung.com; gost.dev@samsung.com
> Subject: Re: [PATCH v7 2/2] net: stmmac: dwc-qos: Add FSD EQoS support
> 
> On Fri, Feb 21, 2025 at 04:04:25PM +0530, Swathi K S wrote:
> >
> >
> > > -----Original Message-----
> > > From: Russell King (Oracle) <linux@armlinux.org.uk>
> > > Sent: 20 February 2025 18:10
> > > To: Swathi K S <swathi.ks@samsung.com>
> > > Cc: krzk+dt@kernel.org; andrew+netdev@lunn.ch;
> davem@davemloft.net;
> > > edumazet@google.com; kuba@kernel.org; pabeni@redhat.com;
> > > robh@kernel.org; conor+dt@kernel.org; richardcochran@gmail.com;
> > > mcoquelin.stm32@gmail.com; alexandre.torgue@foss.st.com;
> > > netdev@vger.kernel.org; devicetree@vger.kernel.org;
> > > linux-stm32@st-md- mailman.stormreply.com;
> > > linux-arm-kernel@lists.infradead.org; linux- kernel@vger.kernel.org;
> > > pankaj.dubey@samsung.com; ravi.patel@samsung.com;
> > > gost.dev@samsung.com
> > > Subject: Re: [PATCH v7 2/2] net: stmmac: dwc-qos: Add FSD EQoS
> > > support
> > >
> > > On Thu, Feb 20, 2025 at 10:07:12AM +0530, Swathi K S wrote:
> > > > +static int fsd_eqos_probe(struct platform_device *pdev,
> > > > +			  struct plat_stmmacenet_data *data,
> > > > +			  struct stmmac_resources *res) {
> > > > +	struct clk *clk_rx1 = NULL;
> > > > +	struct clk *clk_rx2 = NULL;
> > > > +
> > > > +	for (int i = 0; i < data->num_clks; i++) {
> > > > +		if (strcmp(data->clks[i].id, "slave_bus") == 0)
> > > > +			data->stmmac_clk = data->clks[i].clk;
> > > > +		else if (strcmp(data->clks[i].id, "eqos_rxclk_mux")
== 0)
> > > > +			clk_rx1 = data->clks[i].clk;
> > > > +		else if (strcmp(data->clks[i].id, "eqos_phyrxclk")
== 0)
> > > > +			clk_rx2 = data->clks[i].clk;
> > > > +	}
> > > > +
> > > > +	/* Eth0 RX clock doesn't support MUX */
> > > > +	if (clk_rx1)
> > > > +		clk_set_parent(clk_rx1, clk_rx2);
> > >
> > > Isn't there support in DT for automatically setting the clock tree?
> > > See
> > > https://protect2.fireeye.com/v1/url?k=f0089f78-90ea0225-f0091437-
> > > 000babd9f1ba-cf835b8b94ccd94a&q=1&e=4ae794ec-f443-4d77-aee4-
> > > 449f53a3a1a4&u=https%3A%2F%2Fgithub.com%2Fdevicetree-org%2Fdt-
> > >
> schema%2Fblob%2Fmain%2Fdtschema%2Fschemas%2Fclock%2Fclock.yaml
> > > %23L24
> > >
> > > Also, I think a cleanup like the below (sorry, it's on top of other
> > patches I'm
> > > working on at the moment but could be rebased) would make sense.
> > >
> > > With both of these, this should mean that your changes amount to:
> > >
> > > 1. making data->probe optional
> > > 2. providing a dwc_eth_dwmac_data structure that has
> .stmmac_clk_name
> > >    filled in
> > > 3. adding your compatible to the match data with a pointer to the
> > >    above structure.
> >
> > Hi Russell,
> > Thanks for your input.
> > Will implement this in v8.
> > But I could not find your patch 'net: stmmac: clean up clock
initialisation'
> > in mailing list
> > Could you point me to that?
> > Or do you want me to integrate the below changes into my patch series
> > and post?
> >
> > Please let me know
> 
> Please have patience - I'm a volunteer here, and I included the patch in
the
> email for you. You're not the only one whom I'm addressing issues in the
> stmmac driver for. Since Sunday, I have a total of 16 new stmmac patches
> plus been debugging a regression someone has reported.

I understand your concern and thanks for improving the code.

> 
> Coincidentally, I just sent out the patch as a stand-alone patch, it
should be
> quicker to get it into net-next rather than trying to get all the other
patches
> I'd *already* had queued up in first.
> 
> https://lore.kernel.org/r/E1tlRMP-004Vt5-W1@rmk-PC.armlinux.org.uk

Will test your patch on FSD platform.

- Swathi

> 
> However, I'm expecting someone to say that dwc_eth_find_clk() should be
> moved into the stmmac platform code, and the other platforms need to be
> converted to use it... so it may be some time before we're at a stage
where
> you can proceed.
> 
> Please be patient.
> 
> --
> RMK's Patch system: https://protect2.fireeye.com/v1/url?k=9539722c-
> f442d8a5-9538f963-74fe48600034-5bc44de329219ee1&q=1&e=0bc950e5-
> 2fde-481e-bce0-
> 534d0f94352b&u=https%3A%2F%2Fwww.armlinux.org.uk%2Fdeveloper%2F
> patches%2F
> FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!
diff mbox series

Patch

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c
index 1fadb8ba1d2f..22a263664f0a 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c
@@ -307,6 +307,29 @@  static void tegra_eqos_remove(struct platform_device *pdev)
 	gpiod_set_value(eqos->reset, 1);
 }
 
+static int fsd_eqos_probe(struct platform_device *pdev,
+			  struct plat_stmmacenet_data *data,
+			  struct stmmac_resources *res)
+{
+	struct clk *clk_rx1 = NULL;
+	struct clk *clk_rx2 = NULL;
+
+	for (int i = 0; i < data->num_clks; i++) {
+		if (strcmp(data->clks[i].id, "slave_bus") == 0)
+			data->stmmac_clk = data->clks[i].clk;
+		else if (strcmp(data->clks[i].id, "eqos_rxclk_mux") == 0)
+			clk_rx1 = data->clks[i].clk;
+		else if (strcmp(data->clks[i].id, "eqos_phyrxclk") == 0)
+			clk_rx2 = data->clks[i].clk;
+	}
+
+	/* Eth0 RX clock doesn't support MUX */
+	if (clk_rx1)
+		clk_set_parent(clk_rx1, clk_rx2);
+
+	return 0;
+}
+
 struct dwc_eth_dwmac_data {
 	int (*probe)(struct platform_device *pdev,
 		     struct plat_stmmacenet_data *data,
@@ -323,6 +346,10 @@  static const struct dwc_eth_dwmac_data tegra_eqos_data = {
 	.remove = tegra_eqos_remove,
 };
 
+static const struct dwc_eth_dwmac_data fsd_eqos_data = {
+	.probe = fsd_eqos_probe,
+};
+
 static int dwc_eth_dwmac_probe(struct platform_device *pdev)
 {
 	const struct dwc_eth_dwmac_data *data;
@@ -401,6 +428,7 @@  static void dwc_eth_dwmac_remove(struct platform_device *pdev)
 static const struct of_device_id dwc_eth_dwmac_match[] = {
 	{ .compatible = "snps,dwc-qos-ethernet-4.10", .data = &dwc_qos_data },
 	{ .compatible = "nvidia,tegra186-eqos", .data = &tegra_eqos_data },
+	{ .compatible = "tesla,fsd-ethqos", .data = &fsd_eqos_data },
 	{ }
 };
 MODULE_DEVICE_TABLE(of, dwc_eth_dwmac_match);