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=-13.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, 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 DA0A8C433EB for ; Tue, 14 Jul 2020 19:07:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AE6C522B30 for ; Tue, 14 Jul 2020 19:07:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594753662; bh=WRyhUMy+DWXzjQWDgtrpaPvNdPpvSXErZPea/B5SiX0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=lr7mwnlLR3CiYXMEkgnNnwrZXyWp4sP7qzamQ01hD9Qt7mRgX60bWZRKQQN7rqr7I j9O/ntsJ9xyTGJvPoD4tTdhph+xd3O9/e5CRS1uWEx02hh4tv8ZhbAExqP8Fjmth1H 1bUcMzHeMCXv7ajSQ3R99QfUuFQNBj/Ny0tgHbPY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729966AbgGNSvl (ORCPT ); Tue, 14 Jul 2020 14:51:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:48168 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730414AbgGNSvk (ORCPT ); Tue, 14 Jul 2020 14:51:40 -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 37DFC22B2A; Tue, 14 Jul 2020 18:51:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594752699; bh=WRyhUMy+DWXzjQWDgtrpaPvNdPpvSXErZPea/B5SiX0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P1h6bfhPBmpXXMMyQ7kBsGUNt7QGxgzM1RCeilLGyzVC6pyLGYz6eXo0fsL+pRb4v rFmlxZpx7xC026XkOb65v7ibhpVZ3nBjc6mSXOdrqiJS+PcLpyDmheXgLEbPCxiP30 vVaBJZtCGCOWe1eCTY+TQEWX+kvCGzsG55XkAubQ= 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" , Sasha Levin Subject: [PATCH 5.4 046/109] net: dsa: microchip: set the correct number of ports Date: Tue, 14 Jul 2020 20:43:49 +0200 Message-Id: <20200714184107.727844251@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200714184105.507384017@linuxfoundation.org> References: <20200714184105.507384017@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: Sasha Levin --- drivers/net/dsa/microchip/ksz8795.c | 3 +++ drivers/net/dsa/microchip/ksz9477.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/drivers/net/dsa/microchip/ksz8795.c b/drivers/net/dsa/microchip/ksz8795.c index 24a5e99f7fd5b..84c4319e3b31f 100644 --- a/drivers/net/dsa/microchip/ksz8795.c +++ b/drivers/net/dsa/microchip/ksz8795.c @@ -1267,6 +1267,9 @@ static int ksz8795_switch_init(struct ksz_device *dev) return -ENOMEM; } + /* set the real number of ports */ + dev->ds->num_ports = dev->port_cnt; + return 0; } diff --git a/drivers/net/dsa/microchip/ksz9477.c b/drivers/net/dsa/microchip/ksz9477.c index 50ffc63d62319..3afb596d8e43f 100644 --- a/drivers/net/dsa/microchip/ksz9477.c +++ b/drivers/net/dsa/microchip/ksz9477.c @@ -1587,6 +1587,9 @@ static int ksz9477_switch_init(struct ksz_device *dev) return -ENOMEM; } + /* set the real number of ports */ + dev->ds->num_ports = dev->port_cnt; + return 0; } -- 2.25.1