From nobody Mon Dec 1 22:03:57 2025 Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) (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 05C892E6CAB for ; Fri, 28 Nov 2025 08:06:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764317207; cv=none; b=pNG0pnjU46l7qgf2jxzyMcpwvPaDhJZYrHuB9F4PYifr87Wdn7CsyWEvMKuOfVPPKo6Q2Ph26DxMsmn8+jlCfS6EIN5oV+Grb2zrc8COrW/lyKS3hgYYdMoNJbEU7Z1rSJNFHd4DI2VYq6hrrnSAuk9CP7AHiJ7rRn69hvjqgQE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764317207; c=relaxed/simple; bh=Nmo8ZLI6199XNiEIlcuBZ0RadcL5ViBUVaQFBDqqlDE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FGQx4RQ15ICIaJaYxJrSTcelFAPd2eV+SRuxbnhp3IqfelsbrjqoGwKxSGFu6//LvcctADoRRP9SpzhbEuHunaT5VmKaqht3Yg9hVTcfLODnLwg7T613QXGv4VZyZzFAz8iFvG3n9R/t5FmiwgQKubiqtT6zpUX0QSuWFdY32hA= 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=Oh+GuvW3; arc=none smtp.client-ip=209.85.218.54 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="Oh+GuvW3" Received: by mail-ej1-f54.google.com with SMTP id a640c23a62f3a-b73b24f1784so319363866b.0 for ; Fri, 28 Nov 2025 00:06:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764317204; x=1764922004; 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=sjZRXDSVub8tCCZ0/UK52o25z1qku925qGRpjMBIfdg=; b=Oh+GuvW3usITTb3LD+ry4tuXAC0Ahr9+L+3pDRQyPUj62j5SHnBH3INKjx1ANxHeaI 3RqINr9ZH4U4S6BtwC1KwmlhbfBjW216W09CZec54YZLH5cjNyys3kQbhGSJisTdCOhC tiH/MNjBATfv9b8ezwk3qKNO8xXqviO31cOjpdzmX1xtsCKETUb/Dh2ZzN/x9OfR2aik 15iM1RSApirk5FtapJNoRdRDNrZh9NBdPYWxZctvMChSIMg/O1kceyPGRTmHGr0/k9Eq t/sb0LZ6JPw1E1GWQQY7crP6lMdrtNaxMgmnEv40LDj5icIOH4/UVxjIn4N/8nagsXub mLWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764317204; x=1764922004; 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=sjZRXDSVub8tCCZ0/UK52o25z1qku925qGRpjMBIfdg=; b=uyFyJ5PC64UOJ1ORfA+eqVfO4dXNPV4xdqkEeio4n7dFxwu5wMv3HxrNJZrvEXRzIr IIZPTsrC7g/qlAn5/x+cLsnFavZryz62pETc95qFhXXRz5TDYSaRCzkMKq0uFMi8KzIT tby5cTWfq6fGgLkzAeIyVYapa9ee47AvJnA18PxRD4YntRSAlP3TnoT1fHqrWDFeBLnR 9wFmzjcsInS8m5qiTCybkoDz482xTq5wX7Ro6+zcazQWqmCcbJxKB5y2JZF5KWmqvXDL rXgsUc64KK54d5bi2+GU8khPkkN40dPMfFdjA1GbVeL4upiTGNgN+ESaqub/IvUU+tgp IF2g== X-Forwarded-Encrypted: i=1; AJvYcCVsK/YOk7bazpWcSNne6LlQ4NpyN6oerJSsqL57rTY+MM57LCvtJ4k5YbHf5nfNCifllXKLJnwzCNUE4aQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yxj6x8rPpnTeHe5jk+UQmv6RA8rwZbOM7k9K2QKd+PG1LQrSO4M i3rGBehUJjyk5Ia16arWGleuJqLZTojKGxmB23XRyPptFrUdZ3jPWaSE X-Gm-Gg: ASbGncv8cPY4/y54vjHKkieHqAhbGrxu96XIp+32nE1Id1rfQDeVjzl7SMnIMVuM+Z1 9RjCOxJhPkWu6TAu6c7rpIqI+g+uSAk4jR3SzUxyijLb8hkA4CaCOVp8VFhToRvLoE9toX6hS5D Ftgn4VDNaUdx7VO+ykWKRBB/KgGbbN4Jn7LRcmHtyv82UntJfXlbb/R5SV1xiSKJiItDjADbPD0 M6BWzvJOg6fbGf/HfSxAaFAI1Hi4rQHGjhNHnXbK54RucS8wFJt42Eeb3Zeh1UCJQFgFrCwx9Zp F4rjCxhFfjcpyzkB32EFb6kKSUVPHn/M3T6xsS20JxsndXS5XRdqxjpJkCRv7N95htE6nYe90kA CwJ8wVMMEJdKei2UJDoM59GAPHLLwEoaY5ow7m5AjVMTxzNpijvV1bJwpekLOEMl7lbk62GJKiK ygW93OeVzf33IsCqITvrbTOUVR6fTclrC/7Zs0tzBWRZC1qSlrH0lqhZuRtvOrHYqH9kfyw3FsG zvi9g== X-Google-Smtp-Source: AGHT+IFY96duyv+vlqfHIde+gmVNd358OanngOWZcQh7EoB022qco1Ij8kgMJjkeZmtUB8/w1LJTSw== X-Received: by 2002:a17:906:c10a:b0:b6d:6650:c3cd with SMTP id a640c23a62f3a-b76572b24cbmr3170973366b.21.1764317204124; Fri, 28 Nov 2025 00:06:44 -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-64751062261sm4215612a12.33.2025.11.28.00.06.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Nov 2025 00:06:43 -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 v2 4/7] net: dsa: b53: fix CPU port unicast ARL entries for BCM5325/65 Date: Fri, 28 Nov 2025 09:06:22 +0100 Message-ID: <20251128080625.27181-5-jonas.gorski@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251128080625.27181-1-jonas.gorski@gmail.com> References: <20251128080625.27181-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" On BCM5325 and BCM5365, unicast ARL entries use 8 as the value for the CPU port, so we need to translate it to/from 5 as used for the CPU port at most other places. Fixes: c45655386e53 ("net: dsa: b53: add support for FDB operations on 5325= /5365") Signed-off-by: Jonas Gorski Reviewed-by: Florian Fainelli --- v1 -> v2: * use is_unicast_ether_addr() instead of !is_multicast_ether_addr() drivers/net/dsa/b53/b53_priv.h | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/net/dsa/b53/b53_priv.h b/drivers/net/dsa/b53/b53_priv.h index 3b22e817fb28..ae2c615c088e 100644 --- a/drivers/net/dsa/b53/b53_priv.h +++ b/drivers/net/dsa/b53/b53_priv.h @@ -344,12 +344,14 @@ static inline void b53_arl_to_entry_25(struct b53_arl= _entry *ent, u64 mac_vid) { memset(ent, 0, sizeof(*ent)); - ent->port =3D (mac_vid >> ARLTBL_DATA_PORT_ID_S_25) & - ARLTBL_DATA_PORT_ID_MASK_25; 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->port =3D (mac_vid >> ARLTBL_DATA_PORT_ID_S_25) & + ARLTBL_DATA_PORT_ID_MASK_25; + if (is_unicast_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; } =20 @@ -383,8 +385,11 @@ static inline void b53_arl_from_entry_25(u64 *mac_vid, const struct b53_arl_entry *ent) { *mac_vid =3D ether_addr_to_u64(ent->mac); - *mac_vid |=3D (u64)(ent->port & ARLTBL_DATA_PORT_ID_MASK_25) << - ARLTBL_DATA_PORT_ID_S_25; + if (is_unicast_ether_addr(ent->mac) && ent->port =3D=3D B53_CPU_PORT_25) + *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->vid & ARLTBL_VID_MASK_25) << ARLTBL_VID_S_65; if (ent->is_valid) --=20 2.43.0