From nobody Tue Dec 2 00:25:47 2025 Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com [209.85.208.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CE5E52D9EC4 for ; Tue, 25 Nov 2025 07:52:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764057131; cv=none; b=p/bIAhvRYzZq4lFbM1yG2D0MBFi7nwBFcfMd9EwU97uMR13NRIooaAy+OaZuz8yaLlmjoV0mSKEV+rGJFwcHhaVGZ5ndFle9MoJIs8Bwe2342VwetyeHn0MCHuH2Kis3LaMnYoUXOcE8Mi9D6Z59lKmowXqPnctp/ZBzU1KWwNA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764057131; c=relaxed/simple; bh=Nvfu7MM5pHEDLKIO/mlFFCj+GO54Sm9aobXGKhtPtE8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ac4w/Vx78pRSSAM/LSUf/9kpx0fDkKW4aYZROfVFPnVMnpwuvEHSzCeEwZm57BtbBf6NIyU39/urndwrcOZ4IdcRqNpnXfsEV6uMXbi4owbN9d/Rtw/9Cu370ukwpl0NyMaOEBP+Bb+9rCVMykgokyQQLAOKE7OSmXD5W0/r7WQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=EHALn+Bb; arc=none smtp.client-ip=209.85.208.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="EHALn+Bb" Received: by mail-ed1-f44.google.com with SMTP id 4fb4d7f45d1cf-640a3317b89so7679389a12.0 for ; Mon, 24 Nov 2025 23:52:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764057128; x=1764661928; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+cLF6OW+2TrUATylsfca7SRjZ4XkxUire7MR3XBf0nc=; b=EHALn+BbgPfKg8yjgyzLBLA7SfWKDsd+nm6mfuldWcgYSaZ11kO+Q6iiA24vYBh5eH ol+qcwlPlQP0lduPceSrkl3e1rvglZ+LvPknuv39Pc23an2e0TZjDnhktWVn8nT94B3k xROqQnYp8FtHO8OPPTD8gC8psV0JJQRqRbutlhI3pwMNTUJ+VVw3U28nbZN23mHcl4vt JWrHT8V3++qHk7Su8JLxe18CP0jAdpnq48Ned9XW3Pz5/safCnNARuDI6bT+SOkWHLdD SGuaZbJi/KjOjHdG6jXFPP8spd5uoX9HtqLT0P+5COn+tYsAuV4oKoXowVBFkIo8Hm/Q depA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764057128; x=1764661928; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=+cLF6OW+2TrUATylsfca7SRjZ4XkxUire7MR3XBf0nc=; b=JEqusu0kmt0NReMMpeUUjDmmhPxuPfSpMxGbD1PycnCQKrP8fHfnudoq5bhO7fptYf YVK0g0RK68JSCepdBstRLC+X4kZNz8KHlfLvdvA0FAfCirhGPWsIl2Cj8UW9zjZqJIKF 5W38NFm2B0W0RD513FMRFcGJMrdv1SV4cLueHeQx6AxexrMyd6+9RJlKLCUviO2HKR2T xMzZ9CvCQ6Dt4K5R3PMTxkZ0b8ScC42O8tUoaxq4yaAxKxQTixlMABMi/zR5XpDZ+7i1 ObA9/c7N8OqM7sgEAsHMTfCyTXToBOaF9ZZidZpcdVabvw7R5/kdpAourivkH2GpXIN7 r7Hg== X-Forwarded-Encrypted: i=1; AJvYcCUEnaCxmz++SZRJkoyf1fHBNdrhiEpoFp1XH0K8/SwZZsya7aVAQiqX9jbK/YKBLXHr2SxFQRPmgmUIFzw=@vger.kernel.org X-Gm-Message-State: AOJu0YxkyuaGna93m01u2ZXafZT3+kMu05x0ahWJvqj5v2RwQ9jx30lv IiMft/b53DBsxCNxNyWhDa6F/LLRSP+3pt/O9oEWUO1AbWazEcIN5w0B X-Gm-Gg: ASbGncuPgDNPemJZbUpmNLuEImyPFyt6YftrMQ9mNXoAnJJoAJ2t6pjOZCQy8BhGW+I nau3nUgDvh7AOn+G89bR0FhsfgGGe0zh4UKFXx7oGDTkna/D7F2bqELgPTStusLiPmg8PexT3PJ +HtWVOuNN5/ibwGieDRoNAl8p9VFuWE8TSIEvrrP8Rt6v9aNCW4TzUy/djOHMriHAcIFXMtEJfi 6jNvePOtwI4rkoq0DOHBSW/ED2UrMxxdGLNK27s6az2O1gWJC4kcLf8cTPnxvuITYtGLVNlkV9F ER0YeSrTCiitKYTFDJPUeJ6Sca6zaHEz+0h69LCG0TfERYT7xFn5wj1Nt74A5U+LD5aMFgPpkCy yW99cwB2CgGgXbFstWQ6frvVQjSsBxC6SdxNwyhb5R+urPt2O+fXfmQIIdIV4FmDA+VeaASWEIv bZU8AbQ4ZAMuSJS/EoUBqeA8Lm9wN1bIidig+hNmQIIexSTPdAoqMb8kLAYUxyNSt067U= X-Google-Smtp-Source: AGHT+IGyoTxPMMJ9r04O6fUQyypFHVb2CsZTh5pjSnqd6/53xcOrWoq/NvrC4HH7fZ1Tgl32q5x1UQ== X-Received: by 2002:a05:6402:2348:b0:640:80cc:f08e with SMTP id 4fb4d7f45d1cf-645eb78686cmr1637901a12.26.1764057127790; Mon, 24 Nov 2025 23:52:07 -0800 (PST) Received: from localhost (dslb-002-205-018-238.002.205.pools.vodafone-ip.de. [2.205.18.238]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-6453642d307sm14469110a12.19.2025.11.24.23.52.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Nov 2025 23:52:07 -0800 (PST) From: Jonas Gorski To: Florian Fainelli , Andrew Lunn , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Cc: Florian Fainelli , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 5/7] net: dsa: b53: fix BCM5325/65 ARL entry multicast port masks Date: Tue, 25 Nov 2025 08:51:48 +0100 Message-ID: <20251125075150.13879-6-jonas.gorski@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251125075150.13879-1-jonas.gorski@gmail.com> References: <20251125075150.13879-1-jonas.gorski@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" We currently use the mask 0xf for writing and reading b53_entry::port, but this is only correct for unicast ARL entries. Multicast ARL entries use a bitmask, and 0xf is not enough space for ports > 3, which includes the CPU port. So extend the mask accordingly to also fit port 4 (bit 4) and MII (bit 5). According to the datasheet the multicast port mask is [60:48], making it 12 bit wide, but bits 60-55 are reserved anyway, and collide with the priority field at [60:59], so I am not sure if this is valid. Therefore leave it at the actual used range, [53:48]. The ARL search result register differs a bit, and there the mask is only [52:48], so only spanning the user ports. The MII port bit is contained in the Search Result Extension register. So create a separate search result parse function that properly handles this. Fixes: c45655386e53 ("net: dsa: b53: add support for FDB operations on 5325= /5365") Signed-off-by: Jonas Gorski Reviewed-by: Florian Fainelli --- drivers/net/dsa/b53/b53_common.c | 4 +++- drivers/net/dsa/b53/b53_priv.h | 25 +++++++++++++++++++++---- drivers/net/dsa/b53/b53_regs.h | 8 +++++++- 3 files changed, 31 insertions(+), 6 deletions(-) diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_com= mon.c index 91b0b4de475f..09a64812cd84 100644 --- a/drivers/net/dsa/b53/b53_common.c +++ b/drivers/net/dsa/b53/b53_common.c @@ -2119,10 +2119,12 @@ static void b53_arl_search_read_25(struct b53_devic= e *dev, u8 idx, struct b53_arl_entry *ent) { u64 mac_vid; + u8 ext; =20 + b53_read8(dev, B53_ARLIO_PAGE, B53_ARL_SRCH_RSLT_EXT_25, &ext); b53_read64(dev, B53_ARLIO_PAGE, B53_ARL_SRCH_RSTL_0_MACVID_25, &mac_vid); - b53_arl_to_entry_25(ent, mac_vid); + b53_arl_search_to_entry_25(ent, mac_vid, ext); } =20 static void b53_arl_search_read_89(struct b53_device *dev, u8 idx, diff --git a/drivers/net/dsa/b53/b53_priv.h b/drivers/net/dsa/b53/b53_priv.h index bd821d60ac90..24df3ab64395 100644 --- a/drivers/net/dsa/b53/b53_priv.h +++ b/drivers/net/dsa/b53/b53_priv.h @@ -348,8 +348,8 @@ static inline void b53_arl_to_entry_25(struct b53_arl_e= ntry *ent, ent->is_age =3D !!(mac_vid & ARLTBL_AGE_25); ent->is_static =3D !!(mac_vid & ARLTBL_STATIC_25); u64_to_ether_addr(mac_vid, ent->mac); - ent->port =3D (mac_vid >> ARLTBL_DATA_PORT_ID_S_25) & - ARLTBL_DATA_PORT_ID_MASK_25; + ent->port =3D (mac_vid & ARLTBL_DATA_PORT_ID_MASK_25) >> + ARLTBL_DATA_PORT_ID_S_25; if (!is_multicast_ether_addr(ent->mac) && ent->port =3D=3D B53_CPU_PORT) ent->port =3D B53_CPU_PORT_25; ent->vid =3D (mac_vid >> ARLTBL_VID_S_65) & ARLTBL_VID_MASK_25; @@ -388,8 +388,8 @@ static inline void b53_arl_from_entry_25(u64 *mac_vid, if (!is_multicast_ether_addr(ent->mac) && ent->port =3D=3D B53_CPU_PORT_2= 5) *mac_vid |=3D (u64)B53_CPU_PORT << ARLTBL_DATA_PORT_ID_S_25; else - *mac_vid |=3D (u64)(ent->port & ARLTBL_DATA_PORT_ID_MASK_25) << - ARLTBL_DATA_PORT_ID_S_25; + *mac_vid |=3D ((u64)ent->port << ARLTBL_DATA_PORT_ID_S_25) & + ARLTBL_DATA_PORT_ID_MASK_25; *mac_vid |=3D (u64)(ent->vid & ARLTBL_VID_MASK_25) << ARLTBL_VID_S_65; if (ent->is_valid) @@ -414,6 +414,23 @@ static inline void b53_arl_from_entry_89(u64 *mac_vid,= u32 *fwd_entry, *fwd_entry |=3D ARLTBL_AGE_89; } =20 +static inline void b53_arl_search_to_entry_25(struct b53_arl_entry *ent, + u64 mac_vid, u8 ext) +{ + memset(ent, 0, sizeof(*ent)); + ent->is_valid =3D !!(mac_vid & ARLTBL_VALID_25); + ent->is_age =3D !!(mac_vid & ARLTBL_AGE_25); + ent->is_static =3D !!(mac_vid & ARLTBL_STATIC_25); + u64_to_ether_addr(mac_vid, ent->mac); + ent->vid =3D (mac_vid >> ARLTBL_VID_S_65) & ARLTBL_VID_MASK_25; + ent->port =3D (mac_vid & ARL_SRCH_RSLT_PORT_ID_MASK_25) >> + ARL_SRCH_RSLT_PORT_ID_S_25; + if (is_multicast_ether_addr(ent->mac) && (ext & ARL_SRCH_RSLT_EXT_MC_MII)) + ent->port |=3D BIT(B53_CPU_PORT_25); + else if (!is_multicast_ether_addr(ent->mac) && ent->port =3D=3D B53_CPU_P= ORT) + ent->port =3D B53_CPU_PORT_25; +} + static inline void b53_arl_search_to_entry_63xx(struct b53_arl_entry *ent, u64 mac_vid, u16 fwd_entry) { diff --git a/drivers/net/dsa/b53/b53_regs.h b/drivers/net/dsa/b53/b53_regs.h index 505979102ed5..54b1016eb7eb 100644 --- a/drivers/net/dsa/b53/b53_regs.h +++ b/drivers/net/dsa/b53/b53_regs.h @@ -332,7 +332,7 @@ #define ARLTBL_VID_MASK_25 0xff #define ARLTBL_VID_MASK 0xfff #define ARLTBL_DATA_PORT_ID_S_25 48 -#define ARLTBL_DATA_PORT_ID_MASK_25 0xf +#define ARLTBL_DATA_PORT_ID_MASK_25 GENMASK_ULL(53, 48) #define ARLTBL_VID_S_65 53 #define ARLTBL_AGE_25 BIT_ULL(61) #define ARLTBL_STATIC_25 BIT_ULL(62) @@ -378,6 +378,12 @@ =20 /* Single register search result on 5325/5365 */ #define B53_ARL_SRCH_RSTL_0_MACVID_25 0x24 +#define ARL_SRCH_RSLT_PORT_ID_S_25 48 +#define ARL_SRCH_RSLT_PORT_ID_MASK_25 GENMASK_ULL(52, 48) + +/* BCM5325/5365 Search result extend register (8 bit) */ +#define B53_ARL_SRCH_RSLT_EXT_25 0x2c +#define ARL_SRCH_RSLT_EXT_MC_MII BIT(2) =20 /* ARL Search Data Result (32 bit) */ #define B53_ARL_SRCH_RSTL_0 0x68 --=20 2.43.0