net: dsa: vsc73xx: fix possible subblocks range of CAPT block

[ 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 <paweldembicki@gmail.com>
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
Link: https://patch.msgid.link/20240903203340.1518789-1-paweldembicki@gmail.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/dsa/vitesse-vsc73xx-core.c b/drivers/net/dsa/vitesse-vsc73xx-core.c
index 23bd8b3f899310162ffd3f93c6ffe70bb4d1f56d..a28bf5433ea7273cb98ff40beb1a71142d2080ff 100644 (file)
--- 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;