Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp2693288ybg; Mon, 28 Oct 2019 00:21:54 -0700 (PDT) X-Google-Smtp-Source: APXvYqwMDLgbRbIFOoRS9AN2IRjtMNbWPiBwgvSiRo71RbUhEwlZ6BloATT8FLeudETHmPjPcfrg X-Received: by 2002:a50:a695:: with SMTP id e21mr4752527edc.39.1572247314069; Mon, 28 Oct 2019 00:21:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572247314; cv=none; d=google.com; s=arc-20160816; b=XLbJNwPFGL5eeMsMUuBU9QhQTVlcWgglYk9Gdj5okLNCgeQr8FhzyM3qjX1j12IVxU 5M1f4j2CL4lvzDDoYm0REHJ2w0BauCVhuhfEETN/1VOGWEb3prP1i85Nu2kAg1AMMx/j 8NfmznQl0zXotM0NxjjPyEa5G7cOErqqfrxfEDSt9712rBIEqHrM/FNN6GuX56vzg32A Fg9r0a57coM+p7sBsapRC8zCR38yxO3pZxL8O22Fo2/Zcuc2jOQnXlfh3JEKqTLiXd7p uT4ZVzDcEUdP3a94BkjJiuZww9uht5Hg5MCaknRDGuKDi7Dyu8Zpx73reoOQo2rhuLvI RUuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=lBfZkxbmZogE6yx8zCb/F/1jDyBsZ0uAoOWl8tdPaG8=; b=0t7SweUIxmjuAcYvTb7poBsT4fFLkOZuCCghAZTT/vxSPG7sCGoPxWtrUkiJnqUJ8f mLAYX+QqgN98Mqmyg9RkTnmBYsEPvAzs4c3FJh6VOB6itvOm4LfY3u3g7oyJn2UakQKZ t8XGh4Auq2xHGA6S3rzzjtLwVLdJh9HGA+a6I6Ms3NytHkQVuD+Mq0e87WGk624R5qII abLdw2raN7sIRPcJr7F3MDHSltlfxmqH0XyuqSHu6bM5GTfyHBjQULlLp3Ay6y3/UNGF JKevFeMsI1R7Q5IED2UMFtU1qLmeA9cE2zQ8S8mpjH99+UVi0PboheE0jIIiJg5hygw2 702Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=yHznHaJA; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 8si6094195ejc.104.2019.10.28.00.21.30; Mon, 28 Oct 2019 00:21:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=yHznHaJA; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730643AbfJ0VSW (ORCPT + 99 others); Sun, 27 Oct 2019 17:18:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:38328 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731233AbfJ0VSM (ORCPT ); Sun, 27 Oct 2019 17:18:12 -0400 Received: from localhost (100.50.158.77.rev.sfr.net [77.158.50.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 54A4B2070B; Sun, 27 Oct 2019 21:18:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572211091; bh=zIlZVvdHLLJf6SDPQHGEbS5UB30AKnm7WoGDkbwPZ/0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yHznHaJAsqbwzG9qcTGak9PKF52J7a527NFycWQWYpqa6AztpSG9h0puIlvRbrHpC TrmXNEvk6AIQXtcHlLGdBLWiwn5e/UFIeJdM/grwMhmbKtO4cZPbRtBubsLWFsGT8N RSvJ+TVqJcjf8fgchvuaV51xkI/KOFaGhjOjXA0U= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?UTF-8?q?Michal=20Vok=C3=A1=C4=8D?= , Andrew Lunn , "David S. Miller" , Sasha Levin Subject: [PATCH 5.3 029/197] net: dsa: qca8k: Use up to 7 ports for all operations Date: Sun, 27 Oct 2019 21:59:07 +0100 Message-Id: <20191027203353.311138072@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191027203351.684916567@linuxfoundation.org> References: <20191027203351.684916567@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Michal Vokáč [ Upstream commit 7ae6d93c8f052b7a77ba56ed0f654e22a2876739 ] The QCA8K family supports up to 7 ports. So use the existing QCA8K_NUM_PORTS define to allocate the switch structure and limit all operations with the switch ports. This was not an issue until commit 0394a63acfe2 ("net: dsa: enable and disable all ports") disabled all unused ports. Since the unused ports 7-11 are outside of the correct register range on this switch some registers were rewritten with invalid content. Fixes: 6b93fb46480a ("net-next: dsa: add new driver for qca8xxx family") Fixes: a0c02161ecfc ("net: dsa: variable number of ports") Fixes: 0394a63acfe2 ("net: dsa: enable and disable all ports") Signed-off-by: Michal Vokáč Reviewed-by: Andrew Lunn Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/dsa/qca8k.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c index 16f15c93a102c..bbeeb8618c80c 100644 --- a/drivers/net/dsa/qca8k.c +++ b/drivers/net/dsa/qca8k.c @@ -705,7 +705,7 @@ qca8k_setup(struct dsa_switch *ds) BIT(0) << QCA8K_GLOBAL_FW_CTRL1_UC_DP_S); /* Setup connection between CPU port & user ports */ - for (i = 0; i < DSA_MAX_PORTS; i++) { + for (i = 0; i < QCA8K_NUM_PORTS; i++) { /* CPU port gets connected to all user ports of the switch */ if (dsa_is_cpu_port(ds, i)) { qca8k_rmw(priv, QCA8K_PORT_LOOKUP_CTRL(QCA8K_CPU_PORT), @@ -1074,7 +1074,7 @@ qca8k_sw_probe(struct mdio_device *mdiodev) if (id != QCA8K_ID_QCA8337) return -ENODEV; - priv->ds = dsa_switch_alloc(&mdiodev->dev, DSA_MAX_PORTS); + priv->ds = dsa_switch_alloc(&mdiodev->dev, QCA8K_NUM_PORTS); if (!priv->ds) return -ENOMEM; -- 2.20.1