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 F183118FDA3; Tue, 10 Sep 2024 10:31:36 +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=1725964297; cv=none; b=jnwI0vHdS4Z8rmvvwsxn74mZXH7MhcnsSOSmn7ICSvMMFOVTt5X/M/D0tJtE2ExOVqGRz2elgKX+egIrmBNW7yk01r9Kh+Hc1YaNoRszrh1OIk7rdj7PTwm2bbhSFS1XkOtaIJtJx3j9KHygBvtix1YA24964BaRdaduYMzoyuU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725964297; c=relaxed/simple; bh=/7m3Qpw1+wxJydJkwUzv/Jm4T7qbR90/N/C5EQXSMsM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kNwLFmAo9enwXAOtFIhEDYp3OOAb7i3T05GSUTZL4UzGFj78o9NLLV596u2ylujp8/gNK7S/XItdSr4mYsADhiFjg0yh3IsAXwCiRPbflZrRuIMUe0jR/W79QCUsbFA/xKuu2Zrq9bheYY6M091cGyNBZtiy6eb+byTLwv5lmCA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=A42nvrtC; 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="A42nvrtC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 77D12C4CEC3; Tue, 10 Sep 2024 10:31:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1725964296; bh=/7m3Qpw1+wxJydJkwUzv/Jm4T7qbR90/N/C5EQXSMsM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=A42nvrtCqudDUqDFPvRSNA68ufooXnyQOa2Vto8DVZ4/XEyBGzRDwWRFB1u6e/S08 4sYahqPf/bUwePUDd+j3bc9NvvyNIb4L6jZpBtsL+3/Dd4XtZDhjOfTb03ECagiM7n zffVNJ0H6gFBztZ6AWEu1QQoIKmwh6eFYxIyCu0c= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Pawel Dembicki , Florian Fainelli , Paolo Abeni , Sasha Levin Subject: [PATCH 6.6 135/269] net: dsa: vsc73xx: fix possible subblocks range of CAPT block Date: Tue, 10 Sep 2024 11:32:02 +0200 Message-ID: <20240910092613.023787070@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240910092608.225137854@linuxfoundation.org> References: <20240910092608.225137854@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Pawel Dembicki [ Upstream commit 8e69c96df771ab469cec278edb47009351de4da6 ] CAPT block (CPU Capture Buffer) have 7 sublocks: 0-3, 4, 6, 7. Function 'vsc73xx_is_addr_valid' allows to use only block 0 at this moment. This patch fix it. Fixes: 05bd97fc559d ("net: dsa: Add Vitesse VSC73xx DSA router driver") Signed-off-by: Pawel Dembicki Reviewed-by: Florian Fainelli Link: https://patch.msgid.link/20240903203340.1518789-1-paweldembicki@gmail.com Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- drivers/net/dsa/vitesse-vsc73xx-core.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/net/dsa/vitesse-vsc73xx-core.c b/drivers/net/dsa/vitesse-vsc73xx-core.c index 23bd8b3f8993..a28bf5433ea7 100644 --- a/drivers/net/dsa/vitesse-vsc73xx-core.c +++ b/drivers/net/dsa/vitesse-vsc73xx-core.c @@ -34,7 +34,7 @@ #define VSC73XX_BLOCK_ANALYZER 0x2 /* Only subblock 0 */ #define VSC73XX_BLOCK_MII 0x3 /* Subblocks 0 and 1 */ #define VSC73XX_BLOCK_MEMINIT 0x3 /* Only subblock 2 */ -#define VSC73XX_BLOCK_CAPTURE 0x4 /* Only subblock 2 */ +#define VSC73XX_BLOCK_CAPTURE 0x4 /* Subblocks 0-4, 6, 7 */ #define VSC73XX_BLOCK_ARBITER 0x5 /* Only subblock 0 */ #define VSC73XX_BLOCK_SYSTEM 0x7 /* Only subblock 0 */ @@ -370,13 +370,19 @@ int vsc73xx_is_addr_valid(u8 block, u8 subblock) break; case VSC73XX_BLOCK_MII: - case VSC73XX_BLOCK_CAPTURE: case VSC73XX_BLOCK_ARBITER: switch (subblock) { case 0 ... 1: return 1; } break; + case VSC73XX_BLOCK_CAPTURE: + switch (subblock) { + case 0 ... 4: + case 6 ... 7: + return 1; + } + break; } return 0; -- 2.43.0