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

Path	csiph.com!goblin3!goblin1!goblin.stu.neva.ru!news.panservice.it!bofh.it!news.nic.it!robomod
From	Thierry Reding <thierry.reding@gmail.com>
Newsgroups	linux.kernel
Subject	[PATCH 2/3] net: stmmac: Restore DT backwards-compatibility
Date	Tue, 21 Mar 2017 16:30:03 +0100
Message-ID	<tntTr-5b0-3@gated-at.bofh.it> (permalink)
References	<tntJM-55L-11@gated-at.bofh.it>
X-Original-To	"David S . Miller" <davem@davemloft.net>
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=9+uvuyZ18JH0aMuSF3sBrPKbU44DXufk5lOy+UDddkM=; b=JJDfUNjY3Br9zLh6swncFROWG7/GcQNyrWl6pk7snc1lokOeV+gaT676nFFxjtEWtL MVe+FtJy68R1L0LnmndGSFHo2TtJcG/kISJVTO885zHUMtl82S8dZppIYFDYjBbaxwsA 7SFXHV4ATZzwztmb87vq6W41rIXZ+qAYyHtiw7Wh8a2Xh1z61g21n3XY6Kr6iRZmAAaE NekELuYUY0GAFP7+JNh4FtR9c6fGebiOql+c1yLUkVoPBirz8Y9is9pD4HXASYqeZGfA rAZE8fYq4gYhyAR64oM/IFZSF1wcaLl7yJMEdmim2kCnaJpLtT9NxWTVNaP7yjof+WVB yyvA==
X-Google-Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=9+uvuyZ18JH0aMuSF3sBrPKbU44DXufk5lOy+UDddkM=; b=rOaNHp9GaTpXh0+zwjFv+JWmHYop0a+CKTPfZsLI6DZHidZjaPEstLYsKfZ9ZZ2kU8 ydE5H21HGehdmXctkYWU4SFlNxRIY0612OIwFjc2rZcIzuwjXy5Ie9yRNcrCOL3/2bjl OO6gR63d/gIe7ZNhuDBLAlGsuNrWNvAUn4CIwE9jAWVvNtfKGSivNsKljoc1j208nzr9 CNOFTWPccaV4sJcgZVylzY9aeJKtfpQyVl40ym+vNhUCLZPuSrII5gPV2WKt4cSPDkmo XOkJhuI5eNCzJIe2O3NhNYZq7ueEPtHbnsnmeyGuLwngEV2FTT5HGBNXTJrSUOEb/8bI zUZg==
X-Gm-Message-State	AFeK/H0m4uXJE8pP5RGEl8VL7G+gMiftYYzdF1zYZNlFBPSg/yy4GuLj+90TmTQw2WvXEw==
X-Received	by 10.223.145.97 with SMTP id j88mr30534856wrj.178.1490109134103; Tue, 21 Mar 2017 08:12:14 -0700 (PDT)
X-Mailer	git-send-email 2.12.0
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	34
Organization	linux.* mail to news gateway
X-Original-Cc	Giuseppe Cavallaro <peppe.cavallaro@st.com>, Alexandre Torgue <alexandre.torgue@st.com>, Joao Pinto <Joao.Pinto@synopsys.com>, LABBE Corentin <clabbe.montjoie@gmail.com>, netdev@vger.kernel.org, linux-kernel@vger.kernel.org
X-Original-Date	Tue, 21 Mar 2017 16:12:10 +0100
X-Original-Message-ID	<20170321151211.31841-2-thierry.reding@gmail.com>
X-Original-References	<20170321151211.31841-1-thierry.reding@gmail.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1605728

Show key headers only | View raw

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

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[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

csiph-web