From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A0FAE321F4F; Mon, 18 Aug 2025 13:31:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755523895; cv=none; b=dNdzzQlqKxR6bBkMiBcg1YiqMT2kyFWPqpyPO/7o1c32zQvoGU4xlZHv+a7LgkRjj56Ny6ayw4KbR80PO/PXwmUqx1JHBFx3E9VXutRBYfbBVQtMpxitu+WCXnVMSYTG5wBCQPwWGn+VjI03Vy7T5etR7B2quVceaRvhkKRoC1M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755523895; c=relaxed/simple; bh=1ODLFlbQSPf7nkhHubMoBHjHXjUWpgCfH+ymb4IZI28=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Jm4glPMwVbz3Af8hVmLAtV9H22dQ5Dh2K6kMdZlpryFINsFhUaPSGK9Rb6aM5QRI3R+tIlCu2IglzAU1sXKBBaHDWkZEFqU2aUS30Vwr/3TQYVb8W6A6GpktLHyPT/v6InGvuEhJez59KvrzqHNGfShIM5jAV5Vpf92c+3lVFEw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=bZPHg25w; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="bZPHg25w" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A6539C4CEEB; Mon, 18 Aug 2025 13:31:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1755523895; bh=1ODLFlbQSPf7nkhHubMoBHjHXjUWpgCfH+ymb4IZI28=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bZPHg25wj1be3eT57Etp4325UVsUMwc0E9Bp0ugwy/4p2UndiJpXXY/Vm7DB6GpGf 5HhL6k8vPOO3ghTey87OiJPwxCn+XzhvJsvDDiOqjaTYhwPa4hn36V9PAPJ6uXmoJ5 13+RXZeXhobIg68k7yy3yXtvQt3APDUM/IkURXc8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Florian Fainelli , =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.15 306/515] net: dsa: b53: prevent DIS_LEARNING access on BCM5325 Date: Mon, 18 Aug 2025 14:44:52 +0200 Message-ID: <20250818124510.219743025@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250818124458.334548733@linuxfoundation.org> References: <20250818124458.334548733@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Álvaro Fernández Rojas [ Upstream commit 800728abd9f83bda4de62a30ce62a8b41c242020 ] BCM5325 doesn't implement DIS_LEARNING register so we should avoid reading or writing it. Reviewed-by: Florian Fainelli Signed-off-by: Álvaro Fernández Rojas Link: https://patch.msgid.link/20250614080000.1884236-10-noltari@gmail.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/dsa/b53/b53_common.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c index 8abbcc588267..990d21fad939 100644 --- a/drivers/net/dsa/b53/b53_common.c +++ b/drivers/net/dsa/b53/b53_common.c @@ -583,6 +583,9 @@ static void b53_port_set_learning(struct b53_device *dev, int port, { u16 reg; + if (is5325(dev)) + return; + b53_read16(dev, B53_CTRL_PAGE, B53_DIS_LEARNING, ®); if (learning) reg &= ~BIT(port); @@ -2195,7 +2198,13 @@ int b53_br_flags_pre(struct dsa_switch *ds, int port, struct switchdev_brport_flags flags, struct netlink_ext_ack *extack) { - if (flags.mask & ~(BR_FLOOD | BR_MCAST_FLOOD | BR_LEARNING)) + struct b53_device *dev = ds->priv; + unsigned long mask = (BR_FLOOD | BR_MCAST_FLOOD); + + if (!is5325(dev)) + mask |= BR_LEARNING; + + if (flags.mask & ~mask) return -EINVAL; return 0; -- 2.39.5