From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0E64CC433E1 for ; Mon, 20 Jul 2020 16:33:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D7D7A2070A for ; Mon, 20 Jul 2020 16:33:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595262815; bh=8IS0wPSXyfonc+mkSfCnzdKuEA7ELdlkzM5ZhZEL40U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=kXktDX6hVsQ97b8qGaaGiTuOos8lSMddCD5dqYn8IZbD9k/kJmSBbPXYQM+1yZun/ 7VxW94Dha/KrK3bm4MGYNi7xZU96ffFXKuirbab1RGic0EdU4bSoXqoGItUWplIdkE mj3jj8HRl1pQQcRBbhE+8sf3DZm6ocxYuvr57Ihs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731453AbgGTQde (ORCPT ); Mon, 20 Jul 2020 12:33:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:55364 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731743AbgGTP4B (ORCPT ); Mon, 20 Jul 2020 11:56:01 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 C2AB12065E; Mon, 20 Jul 2020 15:55:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595260560; bh=8IS0wPSXyfonc+mkSfCnzdKuEA7ELdlkzM5ZhZEL40U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ViY7AeqCbHDC0Rw4HN1xbU+L0nUpEToDZ9qMNniYZg+j5LqM/1eVyaKFckdi1i8mB o0tnZoEk3xqm9PTsshOeDT+eUaf7QH9pgd2rYzBP7JnSfwEdXd1KMn41RUxXgEzZQT okSmxI3RXTllARhoLhouhLKDlpjMAskSxpWO/6fQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Codrin Ciubotariu , Andrew Lunn , "David S. Miller" Subject: [PATCH 5.4 013/215] net: dsa: microchip: set the correct number of ports Date: Mon, 20 Jul 2020 17:34:55 +0200 Message-Id: <20200720152820.797983621@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200720152820.122442056@linuxfoundation.org> References: <20200720152820.122442056@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Codrin Ciubotariu [ Upstream commit af199a1a9cb02ec0194804bd46c174b6db262075 ] The number of ports is incorrectly set to the maximum available for a DSA switch. Even if the extra ports are not used, this causes some functions to be called later, like port_disable() and port_stp_state_set(). If the driver doesn't check the port index, it will end up modifying unknown registers. Fixes: b987e98e50ab ("dsa: add DSA switch driver for Microchip KSZ9477") Signed-off-by: Codrin Ciubotariu Reviewed-by: Andrew Lunn Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/dsa/microchip/ksz8795.c | 3 +++ drivers/net/dsa/microchip/ksz9477.c | 3 +++ 2 files changed, 6 insertions(+) --- a/drivers/net/dsa/microchip/ksz8795.c +++ b/drivers/net/dsa/microchip/ksz8795.c @@ -1270,6 +1270,9 @@ static int ksz8795_switch_init(struct ks /* set the real number of ports */ dev->ds->num_ports = dev->port_cnt; + /* set the real number of ports */ + dev->ds->num_ports = dev->port_cnt; + return 0; } --- a/drivers/net/dsa/microchip/ksz9477.c +++ b/drivers/net/dsa/microchip/ksz9477.c @@ -515,6 +515,9 @@ static int ksz9477_port_vlan_filtering(s PORT_VLAN_LOOKUP_VID_0, false); } + /* set the real number of ports */ + dev->ds->num_ports = dev->port_cnt; + return 0; }