Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1605728 > unrolled thread

[PATCH 2/3] net: stmmac: Restore DT backwards-compatibility

Started byThierry Reding <thierry.reding@gmail.com>
First post2017-03-21 16:30 +0100
Last post2017-03-22 20:20 +0100
Articles 3 — 3 participants

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.


Contents

  [PATCH 2/3] net: stmmac: Restore DT backwards-compatibility Thierry Reding <thierry.reding@gmail.com> - 2017-03-21 16:30 +0100
    Re: [PATCH 2/3] net: stmmac: Restore DT backwards-compatibility Corentin Labbe <clabbe.montjoie@gmail.com> - 2017-03-22 13:40 +0100
    Re: [PATCH 2/3] net: stmmac: Restore DT backwards-compatibility David Miller <davem@davemloft.net> - 2017-03-22 20:20 +0100

#1605728 — [PATCH 2/3] net: stmmac: Restore DT backwards-compatibility

FromThierry Reding <thierry.reding@gmail.com>
Date2017-03-21 16:30 +0100
Subject[PATCH 2/3] net: stmmac: Restore DT backwards-compatibility
Message-ID<tntTr-5b0-3@gated-at.bofh.it>
From: Thierry Reding <treding@nvidia.com>

Recent changes to support multiple queues in the device tree bindings
resulted in the number of RX and TX queues to be initialized to zero for
device trees not adhering to the new bindings.

Restore backwards-compatibility with those device trees by falling back
to a single RX and TX queues each.

Signed-off-by: Thierry Reding <treding@nvidia.com>
---
 drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index 37f550ae76a5..74b0aff79b25 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -143,6 +143,13 @@ static void stmmac_mtl_setup(struct platform_device *pdev,
 	struct device_node *tx_node;
 	u8 queue = 0;
 
+	/* For backwards-compatibility with device trees that don't have any
+	 * snps,mtl-rx-config or snps,mtl-tx-config properties, we fall back
+	 * to one RX and TX queues each.
+	 */
+	plat->rx_queues_to_use = 1;
+	plat->tx_queues_to_use = 1;
+
 	rx_node = of_parse_phandle(pdev->dev.of_node, "snps,mtl-rx-config", 0);
 	if (!rx_node)
 		return;
-- 
2.12.0

[toc] | [next] | [standalone]


#1606421

FromCorentin Labbe <clabbe.montjoie@gmail.com>
Date2017-03-22 13:40 +0100
Message-ID<tnNIu-2p2-19@gated-at.bofh.it>
In reply to#1605728
On Tue, Mar 21, 2017 at 04:12:10PM +0100, Thierry Reding wrote:
> From: Thierry Reding <treding@nvidia.com>
> 
> Recent changes to support multiple queues in the device tree bindings
> resulted in the number of RX and TX queues to be initialized to zero for
> device trees not adhering to the new bindings.
> 
> Restore backwards-compatibility with those device trees by falling back
> to a single RX and TX queues each.
> 
> Signed-off-by: Thierry Reding <treding@nvidia.com>
> ---
>  drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
> index 37f550ae76a5..74b0aff79b25 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
> @@ -143,6 +143,13 @@ static void stmmac_mtl_setup(struct platform_device *pdev,
>  	struct device_node *tx_node;
>  	u8 queue = 0;
>  
> +	/* For backwards-compatibility with device trees that don't have any
> +	 * snps,mtl-rx-config or snps,mtl-tx-config properties, we fall back
> +	 * to one RX and TX queues each.
> +	 */
> +	plat->rx_queues_to_use = 1;
> +	plat->tx_queues_to_use = 1;
> +
>  	rx_node = of_parse_phandle(pdev->dev.of_node, "snps,mtl-rx-config", 0);
>  	if (!rx_node)
>  		return;
> -- 
> 2.12.0
> 

Tested-by: Corentin Labbe <clabbe.montjoie@gmail.com>

Fix one of the reported problem on dwmac-sunxi and dwmac-sun8i
Regards

[toc] | [prev] | [next] | [standalone]


#1606933

FromDavid Miller <davem@davemloft.net>
Date2017-03-22 20:20 +0100
Message-ID<tnTXA-7mv-21@gated-at.bofh.it>
In reply to#1605728
From: Thierry Reding <thierry.reding@gmail.com>
Date: Tue, 21 Mar 2017 16:12:10 +0100

> From: Thierry Reding <treding@nvidia.com>
> 
> Recent changes to support multiple queues in the device tree bindings
> resulted in the number of RX and TX queues to be initialized to zero for
> device trees not adhering to the new bindings.
> 
> Restore backwards-compatibility with those device trees by falling back
> to a single RX and TX queues each.
> 
> Signed-off-by: Thierry Reding <treding@nvidia.com>

Applied to net-next

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web