From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=66.163.188.146 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794125585; b=us21kDqLRO+2Hxca8Rs73JOTo0CFKGaX8+En76+76REke6VZriDGFtokz2/ZgnXbNz6N QNkStWsffUdAki4OWMyAWExd3UfSoUKJj+b9S9KBE4ppnz2BFJM9t92DovnhmHh1bvMrK 3012tK62wok/x1hxYxCwcJnA+5XxbRxP6XinQk3cCsHZYLJG1vHse3TsujEUfLEUPyl1L JpIJtcgDCscf/mHUDpf1P28bXcC15B0y3vS5eaplmHGTkeAUQgO64ctPd25Rd6sNxKusN lkBuDYxc3oAoxO7Mcaq0ivcN03SKGDEmdRAr3cE8cuRPPfhdRppBML8RO7OukJ6pZ1Q== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794125585; h=DMARC-Filter:DKIM-Signature:X-SONIC-DKIM-SIGN:X-YMail-OSG:X-Sonic-MF: X-Sonic-ID:Received:Received:Message-ID:Date:MIME-Version:User-Agent: Subject:From:To:References:Content-Language:In-Reply-To:Content-Type: Content-Transfer-Encoding:X-Mailer; bh=VKZPw3PdL4DToakBq6PoPnlb/GRz2mwbvd3jp7FWMUo=; b=pQOM+ZppxSLRm5kU/QvnyO5pIN822BHXCOTKsVCZ7t/yhyIv54vGc0Vvp1Uy4NStypaN xFKbqO8BkJ6qQ0Mt2Zs4uJ/78oMOUiDTs0pQZvxn74uP/RGxF3BgZ0uyWbRCWmGVdzgxI wQHMP1AHu3LMzNdTniwrstCM6eugS21GEEDa9SXI4glGaJXtdr9uaAE7AFhE4qFIvodod y6PCXLjZ5//MDy1kNQfVqZGPphmt7p+t4o8CU9wjk+CsKonkvdwgEAvrN5LSwbUxELYuA 12NU40bMC2qDeYW7CXYBT0BTQgEqBLe1yaGzhYRo9m/ZpW/71caTr7f/KjiVf3TfYRw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=yahoo.com; spf=pass smtp.mailfrom=yahoo.com; dkim=pass header.d=yahoo.com header.i=@yahoo.com header.a=rsa-sha256 header.s=s2048 header.b=qVnrPS+V; arc=none smtp.remote-ip=66.163.188.146 Received: from sonic303-20.consmr.mail.ne1.yahoo.com (sonic303-20.consmr.mail.ne1.yahoo.com [66.163.188.146]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8595B606A320 for ; Sun, 8 Nov 2026 08:13:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 8595B606A320 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=yahoo.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=yahoo.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=yahoo.com header.i=@yahoo.com header.a=rsa-sha256 header.s=s2048 header.b=qVnrPS+V DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1794125583; bh=VKZPw3PdL4DToakBq6PoPnlb/GRz2mwbvd3jp7FWMUo=; h=Date:Subject:From:To:References:In-Reply-To:From:Subject:Reply-To; b=qVnrPS+V8PfB16eiMCPa4/Nq7YcaSMJ8/0cYq7/COt9Y8fsUO3NDJlgqjl7DyZDAcoHUfyqeJiILepCeSdKJRrLU3niL9ZWjuzTwxnzf4GGFBshiG1LtNLDXYbd85KPcZsBO9KwxKBe/PgemZm5HnvfVtmOkqhBccMP41QZfxC4jAJlwLXcqizvRMGrrghkeeGuw5G4isvf4SxJGhuOl3up/Ogh13pZOD4t4aUjAFZE/cvNmWRmCqowzlvgyugQeG34a7LOij26svaquROgqGcevY7nzfsWzKrUqU7OtxFHvCfgEaPasFqUSTNOru8RByzM3m6ilVAEd8RCySpuFHQ== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1794125583; bh=Pukz0OrCQUbLKnjQWpgeRc4lP8HWyvAKBuiU2usNgt/=; h=X-Sonic-MF:Date:Subject:From:To:From:Subject; b=rZFwi/qHNIwzuDzXDZkbC/OXWpJcFj0hybofgFSyJKmn0256sjR0CKfw+4mQIZ0oQXMDeD3jVPGv3rueXcp5CRFU5YVaik4U9ZA49riufVGAtYxIjDuEpZ0YPhimqvCIJGKhWwPSpCzPnWMdQ/bLh0AMDh2bxpMnCPVH2R5GqGVsRtuR5QdnXdTa1JilTVbe5G5bJibDyVsP0ExsnzrpY97/nO4Er3rTjJntWrIGFHvLBpRZ5wyk7vWcL4rVIIdxuql2fRBAcARbFIRYUs/Ye6K+g0bkOJZdwyeaBqvyuR7xHPcEXX7IVtTqJMYOjTLCuUyXk0T0kGlqL+Pgi6lafg== X-YMail-OSG: mLIBDYwVM1mcbSk9yZsDiBk0XmLlIFru24_K3LIuK93o5fLi0w0qN7OywGPhtj1 Aq62VE40mU6GJGgTqUlQnTwXzDIKc.k.6X79uHLi27LC8PzQ3y0sEIP.VYY20jKIZQJGZcOoLTKf RCBEcDunCJAcqG59TC63yUByWW0kXWZxuX_b0NZ9Kchy_OGnhVvyGRu4KPP04O7iZo2izHohszeW h8f4S5G4llb61sBSgLAuNqWg5gi3t_MRFa52Z7cuD1JcynHrztRLmr2Sg.n3z1O3YlouYlyLe.yI ltAvsRujPWL0enV5j3_ABaIZW09WdsQLlZ3ZVOgPUbjXLOJB3T0Q96qrIhnACQMZUr4p1G7VC1ii IL25G9PQeURR0t4zoj2VCt2vHUAzwxqyttVK6XT3bSS9S.Hme4wiAL.b269riMlbeiw6YSjLKhYZ vAjpwj5GnEXtzTbEcCx3heE9JyAbbilVXVRd9KbJOToKkEI0KqzWVVrue6PnRbdO_KuHs1CGZ9Q4 DOTCce3PkBH328nt.pfsYhm5OmN_tPRQJcVfmjyCBOLHc6_hyLHSUwwLtmLCV9RPcmPMiLHaU0xW nQonrJv4Cxa0S4EFqoUQAVgWQgzBGMdXeGFW9paeZv8MwV5F1N5CZFBS863BMNeOgGB2F3SVvXAh 4QYfPYH4cB8z5YuPvvk5BMTVINuN_77UXTL7ORY.zHJ_C8cqWYlgAPCuCPgB2C3plBpy5WVpm_5d YF.9jR1F6aI29IyvLoAQKgF.Q1s1K.jqMKBu3zF4a0hrzlMuuin6LkxXh2GDY3iq34dLnw3LI0NC 1JyF5rVfOVqElAodY_g6L8lVolDaShTSwXsBJV5QpVl1snuC28EX3IIkwqWpcPniEKJfHIGNbWGW KJfKWKLsicrFjjY0_L6Ybix_3YAEsXLF_tjTnvlWiDQigwco_vWT7p7whcZu18t1Puy8GgYvthHm hooWGVcjq_pCIDaa92BEABBhyptZRKZSpVlP5af.CaGdQIcdr77zLWYGalQQMiTex3v5L584WPao pbYVADVVZwstP3Omlqi1W.HpXxnoJVmK_YnaXTAFzjdlKJzQMPg_M4Ft7QslHYzr4EAq6uvWbKjU FQAaMX9uQQpALnhU93S_XbetxuSY_8XQF7OOS8VoWoxA6nTSDfT0EckITi6a6RYYGcra7VaGyl.U OEHcppY5pQkT.FUruj.YTjewb5e8pVzuxHW7n7UKtCYhpmCjnNbM2yLbRKcsKONDELdPkCJkzKEe k__MkkhU_AYAF.pD3dMR8AFaXvmR9hFerQZ8XJRXnGb4OnGy4qrSTcGuFcw5lVh_nthnfM_OfSvF f_n6w7TmQdHiFe96wAoozmn_z0tnWqpu.6crrGjOGa1AKBFUaqCRwXcmE8CvL7c5ATo01dX55J1Z VncdokL7F_er08eLgu1kqhO_sb1Q.EHiebZLzgMMpiRLi7aPrfx0WUkP4qfoCHg58jWZBLvVg1mV 9QNX_1DKf4NEqIEbgB0k5coXH3kJ5A7sx5.f58HCmt1Abam2_LjBejoBjGLM2Agf9WZiaQvV_Loo CYodLPZknxcxB7I7Mfm7xo33A9cf8WTJE76ss2w9BC4mb7g7cCMLDFToLkgvfIS2fl9bdMub003A mf0G20feH4BqhTiYER2ypzOcypFfUHJocOvg5Y8lhGdSbwsSEh2NeSWl.RjfySMiH3A9M2ye3VV. CMqxXsEJxiGTMSDnKCu5W7poxQI6G6UJdVjslU1cc8pjkIHSofpUQS0nMhUHueOGhF_w25huxO6F lJpLlTVEWrHX6BocgdN8uGylQCpmOpqNemUT96lnob22hbtDje7AisgB5VCK.DswS8Z5MHQjVk.a .NWCKk.2Pne1sVD5eFvnrcNi0VZNrzqOCAYniXnytegg2TWy.nOwzoa3S1tVhBm6zrzabyJWtFbS Abr29johJvUp78pAZCo3pqnCf545f3rqRlpCDTpKj8L9YmOFy79ifbbzBrd5t6ehTCqjl3mUXPzn 1GidETL9jdL_6qyEoEbHlAqa4AW7krw8AqfJxGUGDPbInF6nXshkPh6BCLf9fljxazw9ti6WoCFq ON7SI78W62ldko0ndlIyz4TxhpBILQwLFj2BGNj_iAkEmkZntW._0HqQWHjKd2aNdQC997cfUrxz 9WeltB6ypSuHAaC8MHBSqWuLfOgdR2_MbOPWwyy1bU5sMYLWuwpUhxmUz1V73bF3CMt27gLgPmIk STvjgigbL_iJCvH0sWoHFK16FX6H6OYtxnE_zflSCqJkaedIBIxLPkvnDH0Rz68VdiFq9U9RNOT3 GLFJRQVSl.JG9rV5noJ6P5_H.gX6tx3BvFEUbAKAV X-Sonic-MF: X-Sonic-ID: f5f0acfd-3067-4c72-ab78-b7ab0faa017d Received: from sonic.gate.mail.ne1.yahoo.com by sonic303.consmr.mail.ne1.yahoo.com with HTTP; Sun, 8 Nov 2026 08:13:03 +0000 Received: by hermes--production-ir2-5dd9bf4598-fvbwk (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID a583a7bb1feee86a904272f2be5c0bc9; Sun, 08 Nov 2026 08:12:58 +0000 (UTC) Message-ID: Date: Sun, 8 Nov 2026 09:12:55 +0100 X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH net-next v9 09/11] net: dsa: realtek: rtl8365mb: refactor L2 MAC handling From: Mieczyslaw Nalewaj To: linusw@kernel.org, andrew@lunn.ch, olteanv@gmail.com, kuba@kernel.org, davem@davemloft.net, edumazet@google.com, pabeni@redhat.com, linux@armlinux.org.uk, luizluca@gmail.com, maxime.chevallier@bootlin.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, alvin.sipraga@analog.com, gusfmora@gmail.com, kuncy7@gmail.com, fabianotassotti@gmail.com, gabonpivovich@gmail.com, contact@c127.dev References: <9b73858d-fc09-4988-8bab-fd7b88db9412@yahoo.com> Content-Language: pl In-Reply-To: <9b73858d-fc09-4988-8bab-fd7b88db9412@yahoo.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Mailer: WebService/1.1.26943 mail.backend.jedi.jws.acl:role.jedi.acl.token.atz.jws.hermes.yahoo Add L2 MAC pack/unpack helpers and use them in the family C serializers instead of open-coding the byte packing, since the layout of the MAC address words is the same for both families. The now unused per-field MAC masks are dropped. Rename the family C serializers to rtl8365mb_c_l2_*(), export them and reach them through function pointers in struct rtl8365mb_family_info, so that a following patch can add the family D layout without touching the family C code again. No functional change. Tested-by: Gustavo Foletto Mora Tested-by: Stanislaw Pal Signed-off-by: Mieczyslaw Nalewaj --- drivers/net/dsa/realtek/rtl8365mb.h | 7 ++ drivers/net/dsa/realtek/rtl8365mb_l2.c | 125 +++++++++++------------ drivers/net/dsa/realtek/rtl8365mb_l2.h | 12 +++ drivers/net/dsa/realtek/rtl8365mb_main.c | 5 + 4 files changed, 83 insertions(+), 66 deletions(-) diff --git a/drivers/net/dsa/realtek/rtl8365mb.h b/drivers/net/dsa/realtek/rtl8365mb.h index daa8f0b..cb8486a 100644 --- a/drivers/net/dsa/realtek/rtl8365mb.h +++ b/drivers/net/dsa/realtek/rtl8365mb.h @@ -10,12 +10,19 @@ enum rtl8365mb_family { }; struct rtl8365mb_jam_tbl_entry; +struct rtl8365mb_l2_uc; +struct rtl8365mb_l2_mc; struct rtl8365mb_family_info { enum rtl8365mb_family family; unsigned int num_ports; const struct rtl8365mb_jam_tbl_entry *jam_table; size_t jam_size; + size_t l2_entry_size; + void (*l2_data_to_uc)(const u16 *data, struct rtl8365mb_l2_uc *uc); + void (*l2_uc_to_data)(const struct rtl8365mb_l2_uc *uc, u16 *data); + void (*l2_data_to_mc)(const u16 *data, struct rtl8365mb_l2_mc *mc); + void (*l2_mc_to_data)(const struct rtl8365mb_l2_mc *mc, u16 *data); }; const struct rtl8365mb_family_info * diff --git a/drivers/net/dsa/realtek/rtl8365mb_l2.c b/drivers/net/dsa/realtek/rtl8365mb_l2.c index 0494d8a..cd5b333 100644 --- a/drivers/net/dsa/realtek/rtl8365mb_l2.c +++ b/drivers/net/dsa/realtek/rtl8365mb_l2.c @@ -6,18 +6,11 @@ #include +#include "rtl8365mb.h" #include "rtl8365mb_l2.h" #include "rtl8365mb_table.h" #include -#define RTL8365MB_L2_ENTRY_SIZE 6 - -#define RTL8365MB_L2_UC_D0_MAC5_MSK GENMASK(7, 0) -#define RTL8365MB_L2_UC_D0_MAC4_MSK GENMASK(15, 8) -#define RTL8365MB_L2_UC_D1_MAC3_MSK GENMASK(7, 0) -#define RTL8365MB_L2_UC_D1_MAC2_MSK GENMASK(15, 8) -#define RTL8365MB_L2_UC_D2_MAC1_MSK GENMASK(7, 0) -#define RTL8365MB_L2_UC_D2_MAC0_MSK GENMASK(15, 8) #define RTL8365MB_L2_UC_D3_VID_MSK GENMASK(11, 0) #define RTL8365MB_L2_UC_D3_IVL_MSK GENMASK(13, 13) #define RTL8365MB_L2_UC_D3_PORT_EXT_MSK GENMASK(15, 15) @@ -36,12 +29,6 @@ #define RTL8365MB_L2_UC_D5_FWD_PRI_MSK GENMASK(4, 4) #define RTL8365MB_L2_UC_D5_STATIC_MSK GENMASK(5, 5) -#define RTL8365MB_L2_MC_D0_MAC5_MSK GENMASK(7, 0) -#define RTL8365MB_L2_MC_D0_MAC4_MSK GENMASK(15, 8) -#define RTL8365MB_L2_MC_D1_MAC3_MSK GENMASK(7, 0) -#define RTL8365MB_L2_MC_D1_MAC2_MSK GENMASK(15, 8) -#define RTL8365MB_L2_MC_D2_MAC1_MSK GENMASK(7, 0) -#define RTL8365MB_L2_MC_D2_MAC0_MSK GENMASK(15, 8) #define RTL8365MB_L2_MC_D3_VID_MSK GENMASK(11, 0) #define RTL8365MB_L2_MC_D3_IVL_MSK GENMASK(13, 13) #define RTL8365MB_L2_MC_D3_MBR_HI1_MSK GENMASK(15, 14) @@ -131,16 +118,29 @@ struct rtl8365mb_l2_mc { bool igmp_asic; }; -static void rtl8365mb_l2_data_to_uc(const u16 *data, struct rtl8365mb_l2_uc *uc) +static void rtl8365mb_l2_mac_to_data(const u8 *m, u16 *data) +{ + data[0] = (m[4] << 8) | m[5]; + data[1] = (m[2] << 8) | m[3]; + data[2] = (m[0] << 8) | m[1]; +} + +static void rtl8365mb_l2_data_to_mac(const u16 *data, u8 *m) +{ + m[5] = data[0] & 0xff; + m[4] = data[0] >> 8; + m[3] = data[1] & 0xff; + m[2] = data[1] >> 8; + m[1] = data[2] & 0xff; + m[0] = data[2] >> 8; +} + +void rtl8365mb_c_l2_data_to_uc(const u16 *data, + struct rtl8365mb_l2_uc *uc) { u32 val; - uc->key.mac_addr[5] = FIELD_GET(RTL8365MB_L2_UC_D0_MAC5_MSK, data[0]); - uc->key.mac_addr[4] = FIELD_GET(RTL8365MB_L2_UC_D0_MAC4_MSK, data[0]); - uc->key.mac_addr[3] = FIELD_GET(RTL8365MB_L2_UC_D1_MAC3_MSK, data[1]); - uc->key.mac_addr[2] = FIELD_GET(RTL8365MB_L2_UC_D1_MAC2_MSK, data[1]); - uc->key.mac_addr[1] = FIELD_GET(RTL8365MB_L2_UC_D2_MAC1_MSK, data[2]); - uc->key.mac_addr[0] = FIELD_GET(RTL8365MB_L2_UC_D2_MAC0_MSK, data[2]); + rtl8365mb_l2_data_to_mac(data, uc->key.mac_addr); uc->key.efid = FIELD_GET(RTL8365MB_L2_UC_D4_EFID_MSK, data[4]); uc->key.vid = FIELD_GET(RTL8365MB_L2_UC_D3_VID_MSK, data[3]); uc->key.ivl = FIELD_GET(RTL8365MB_L2_UC_D3_IVL_MSK, data[3]); @@ -161,23 +161,13 @@ static void rtl8365mb_l2_data_to_uc(const u16 *data, struct rtl8365mb_l2_uc *uc) uc->is_static = FIELD_GET(RTL8365MB_L2_UC_D5_STATIC_MSK, data[5]); } -static void rtl8365mb_l2_uc_to_data(const struct rtl8365mb_l2_uc *uc, u16 *data) +void rtl8365mb_c_l2_uc_to_data(const struct rtl8365mb_l2_uc *uc, + u16 *data) { u32 val; - memset(data, 0, RTL8365MB_L2_ENTRY_SIZE * 2); - data[0] |= - FIELD_PREP(RTL8365MB_L2_UC_D0_MAC5_MSK, uc->key.mac_addr[5]); - data[0] |= - FIELD_PREP(RTL8365MB_L2_UC_D0_MAC4_MSK, uc->key.mac_addr[4]); - data[1] |= - FIELD_PREP(RTL8365MB_L2_UC_D1_MAC3_MSK, uc->key.mac_addr[3]); - data[1] |= - FIELD_PREP(RTL8365MB_L2_UC_D1_MAC2_MSK, uc->key.mac_addr[2]); - data[2] |= - FIELD_PREP(RTL8365MB_L2_UC_D2_MAC1_MSK, uc->key.mac_addr[1]); - data[2] |= - FIELD_PREP(RTL8365MB_L2_UC_D2_MAC0_MSK, uc->key.mac_addr[0]); + memset(data, 0, RTL8365MB_C_L2_ENTRY_SIZE * 2); + rtl8365mb_l2_mac_to_data(uc->key.mac_addr, data); data[3] |= FIELD_PREP(RTL8365MB_L2_UC_D3_VID_MSK, uc->key.vid); data[3] |= FIELD_PREP(RTL8365MB_L2_UC_D3_IVL_MSK, uc->key.ivl); @@ -200,16 +190,12 @@ static void rtl8365mb_l2_uc_to_data(const struct rtl8365mb_l2_uc *uc, u16 *data) data[5] |= FIELD_PREP(RTL8365MB_L2_UC_D5_STATIC_MSK, uc->is_static); } -static void rtl8365mb_l2_data_to_mc(const u16 *data, struct rtl8365mb_l2_mc *mc) +void rtl8365mb_c_l2_data_to_mc(const u16 *data, + struct rtl8365mb_l2_mc *mc) { u32 val; - mc->key.mac_addr[5] = FIELD_GET(RTL8365MB_L2_MC_D0_MAC5_MSK, data[0]); - mc->key.mac_addr[4] = FIELD_GET(RTL8365MB_L2_MC_D0_MAC4_MSK, data[0]); - mc->key.mac_addr[3] = FIELD_GET(RTL8365MB_L2_MC_D1_MAC3_MSK, data[1]); - mc->key.mac_addr[2] = FIELD_GET(RTL8365MB_L2_MC_D1_MAC2_MSK, data[1]); - mc->key.mac_addr[1] = FIELD_GET(RTL8365MB_L2_MC_D2_MAC1_MSK, data[2]); - mc->key.mac_addr[0] = FIELD_GET(RTL8365MB_L2_MC_D2_MAC0_MSK, data[2]); + rtl8365mb_l2_data_to_mac(data, mc->key.mac_addr); /* key.vid,key.fid shares the same memory space */ mc->key.vid = FIELD_GET(RTL8365MB_L2_MC_D3_VID_MSK, data[3]); mc->key.ivl = FIELD_GET(RTL8365MB_L2_MC_D3_IVL_MSK, data[3]); @@ -228,17 +214,13 @@ static void rtl8365mb_l2_data_to_mc(const u16 *data, struct rtl8365mb_l2_mc *mc) mc->igmp_asic = FIELD_GET(RTL8365MB_L2_MC_D5_IGMP_ASIC_MSK, data[5]); } -static void rtl8365mb_l2_mc_to_data(const struct rtl8365mb_l2_mc *mc, u16 *data) +void rtl8365mb_c_l2_mc_to_data(const struct rtl8365mb_l2_mc *mc, + u16 *data) { u32 val; - memset(data, 0, RTL8365MB_L2_ENTRY_SIZE * 2); - data[0] |= FIELD_PREP(RTL8365MB_L2_MC_D0_MAC5_MSK, mc->key.mac_addr[5]); - data[0] |= FIELD_PREP(RTL8365MB_L2_MC_D0_MAC4_MSK, mc->key.mac_addr[4]); - data[1] |= FIELD_PREP(RTL8365MB_L2_MC_D1_MAC3_MSK, mc->key.mac_addr[3]); - data[1] |= FIELD_PREP(RTL8365MB_L2_MC_D1_MAC2_MSK, mc->key.mac_addr[2]); - data[2] |= FIELD_PREP(RTL8365MB_L2_MC_D2_MAC1_MSK, mc->key.mac_addr[1]); - data[2] |= FIELD_PREP(RTL8365MB_L2_MC_D2_MAC0_MSK, mc->key.mac_addr[0]); + memset(data, 0, RTL8365MB_C_L2_ENTRY_SIZE * 2); + rtl8365mb_l2_mac_to_data(mc->key.mac_addr, data); data[3] |= FIELD_PREP(RTL8365MB_L2_MC_D3_VID_MSK, mc->key.vid); data[3] |= FIELD_PREP(RTL8365MB_L2_MC_D3_IVL_MSK, mc->key.ivl); @@ -283,17 +265,20 @@ int rtl8365mb_l2_get_next_uc(struct realtek_priv *priv, u16 *addr, int port, struct realtek_fdb_entry *entry) { u16 data[RTL8365MB_L2_ENTRY_SIZE] = { 0 }; + const struct rtl8365mb_family_info *fi; struct rtl8365mb_l2_uc uc; int ret; + fi = rtl8365mb_get_family_info(priv); + ret = rtl8365mb_table_query(priv, RTL8365MB_TABLE_L2, RTL8365MB_TABLE_OP_READ, addr, RTL8365MB_TABLE_L2_METHOD_ADDR_NEXT_UC_PORT, - port, data, RTL8365MB_L2_ENTRY_SIZE); + port, data, fi->l2_entry_size); if (ret) return ret; - rtl8365mb_l2_data_to_uc(data, &uc); + fi->l2_data_to_uc(data, &uc); ether_addr_copy(entry->mac_addr, uc.key.mac_addr); entry->vid = uc.key.vid; @@ -307,6 +292,7 @@ int rtl8365mb_l2_add_uc(struct realtek_priv *priv, int port, u16 efid, u16 vid) { u16 data[RTL8365MB_L2_ENTRY_SIZE] = { 0 }; + const struct rtl8365mb_family_info *fi; struct rtl8365mb_l2_uc uc = { 0 }; u16 addr; int ret; @@ -326,13 +312,14 @@ int rtl8365mb_l2_add_uc(struct realtek_priv *priv, int port, uc.is_static = true; /* age greater than 0 adds/updates entries */ uc.age = 1; - rtl8365mb_l2_uc_to_data(&uc, data); + fi = rtl8365mb_get_family_info(priv); + fi->l2_uc_to_data(&uc, data); /* add the new entry or update an existing one */ ret = rtl8365mb_table_query(priv, RTL8365MB_TABLE_L2, RTL8365MB_TABLE_OP_WRITE, &addr, 0, 0, - data, RTL8365MB_L2_ENTRY_SIZE); + data, fi->l2_entry_size); /* Assume the missing new entry as the table is full */ if (ret == -ENOENT) @@ -347,6 +334,7 @@ int rtl8365mb_l2_del_uc(struct realtek_priv *priv, int port, u16 efid, u16 vid) { u16 data[RTL8365MB_L2_ENTRY_SIZE] = { 0 }; + const struct rtl8365mb_family_info *fi; struct rtl8365mb_l2_uc uc = { 0 }; u16 addr; int ret; @@ -358,7 +346,8 @@ int rtl8365mb_l2_del_uc(struct realtek_priv *priv, int port, uc.key.vid = vid; /* age 0 deletes the entry */ uc.age = 0; - rtl8365mb_l2_uc_to_data(&uc, data); + fi = rtl8365mb_get_family_info(priv); + fi->l2_uc_to_data(&uc, data); /* it looks like the switch will always add/update the entry, * even when age is 0 or uc.key did not match an existing entry, @@ -368,7 +357,7 @@ int rtl8365mb_l2_del_uc(struct realtek_priv *priv, int port, ret = rtl8365mb_table_query(priv, RTL8365MB_TABLE_L2, RTL8365MB_TABLE_OP_WRITE, &addr, 0, 0, - data, RTL8365MB_L2_ENTRY_SIZE); + data, fi->l2_entry_size); if (ret == -ENOENT) { dev_dbg(priv->dev, "%s: %pM vid=%d efid=%d missing\n", @@ -451,6 +440,7 @@ int rtl8365mb_l2_add_mc(struct realtek_priv *priv, int port, u16 vid) { u16 data[RTL8365MB_L2_ENTRY_SIZE] = { 0 }; + const struct rtl8365mb_family_info *fi; struct rtl8365mb_l2_mc mc = { 0 }; u16 addr; int ret; @@ -463,16 +453,17 @@ int rtl8365mb_l2_add_mc(struct realtek_priv *priv, int port, */ mc.member |= BIT(port); mc.is_static = 1; - rtl8365mb_l2_mc_to_data(&mc, data); + fi = rtl8365mb_get_family_info(priv); + fi->l2_mc_to_data(&mc, data); /* First look for an existing entry (to get existing port members) */ ret = rtl8365mb_table_query(priv, RTL8365MB_TABLE_L2, RTL8365MB_TABLE_OP_READ, &addr, RTL8365MB_TABLE_L2_METHOD_MAC, 0, - data, RTL8365MB_L2_ENTRY_SIZE); + data, fi->l2_entry_size); if (!ret) { /* There is already an entry... */ - rtl8365mb_l2_data_to_mc(data, &mc); + fi->l2_data_to_mc(data, &mc); dev_dbg(priv->dev, "%s: found %pM addr=%d member=0x%x igmpidx=0x%x %s\n", __func__, mac_addr, addr, mc.member, mc.igmpidx, @@ -487,7 +478,7 @@ int rtl8365mb_l2_add_mc(struct realtek_priv *priv, int port, mc.is_static = 1; } - rtl8365mb_l2_mc_to_data(&mc, data); + fi->l2_mc_to_data(&mc, data); } else if (ret == -ENOENT) { /* New entry, no need to update data again as it already * includes the member. @@ -508,7 +499,7 @@ int rtl8365mb_l2_add_mc(struct realtek_priv *priv, int port, ret = rtl8365mb_table_query(priv, RTL8365MB_TABLE_L2, RTL8365MB_TABLE_OP_WRITE, &addr, 0, 0, - data, RTL8365MB_L2_ENTRY_SIZE); + data, fi->l2_entry_size); /* Assume the missing new entry as the table is full */ if (ret == -ENOENT) @@ -522,6 +513,7 @@ int rtl8365mb_l2_del_mc(struct realtek_priv *priv, int port, u16 vid) { u16 data[RTL8365MB_L2_ENTRY_SIZE] = { 0 }; + const struct rtl8365mb_family_info *fi; struct rtl8365mb_l2_mc mc = { 0 }; u16 addr; int ret; @@ -529,13 +521,14 @@ int rtl8365mb_l2_del_mc(struct realtek_priv *priv, int port, memcpy(mc.key.mac_addr, mac_addr, ETH_ALEN); mc.key.vid = vid; mc.key.ivl = true; - rtl8365mb_l2_mc_to_data(&mc, data); + fi = rtl8365mb_get_family_info(priv); + fi->l2_mc_to_data(&mc, data); /* First look for an existing entry (to get existing port members) */ ret = rtl8365mb_table_query(priv, RTL8365MB_TABLE_L2, RTL8365MB_TABLE_OP_READ, &addr, RTL8365MB_TABLE_L2_METHOD_MAC, 0, - data, RTL8365MB_L2_ENTRY_SIZE); + data, fi->l2_entry_size); if (ret == -ENOENT) { dev_dbg(priv->dev, "%s: %pM vid=%d missing\n", __func__, mac_addr, vid); @@ -547,7 +540,7 @@ int rtl8365mb_l2_del_mc(struct realtek_priv *priv, int port, /* Return on any other error */ return ret; - rtl8365mb_l2_data_to_mc(data, &mc); + fi->l2_data_to_mc(data, &mc); dev_dbg(priv->dev, "%s: found %pM addr=%d member=0x%x igmpidx=0x%x %s\n", __func__, mac_addr, addr, mc.member, mc.igmpidx, @@ -565,12 +558,12 @@ int rtl8365mb_l2_del_mc(struct realtek_priv *priv, int port, mc.fwd_pri = 0; mc.igmp_asic = 0; } - rtl8365mb_l2_mc_to_data(&mc, data); + fi->l2_mc_to_data(&mc, data); /* update the existing entry. */ ret = rtl8365mb_table_query(priv, RTL8365MB_TABLE_L2, RTL8365MB_TABLE_OP_WRITE, &addr, 0, 0, - data, RTL8365MB_L2_ENTRY_SIZE); + data, fi->l2_entry_size); return ret; } diff --git a/drivers/net/dsa/realtek/rtl8365mb_l2.h b/drivers/net/dsa/realtek/rtl8365mb_l2.h index 9470cf0..a9f9ae4 100644 --- a/drivers/net/dsa/realtek/rtl8365mb_l2.h +++ b/drivers/net/dsa/realtek/rtl8365mb_l2.h @@ -12,6 +12,18 @@ #include "realtek.h" +#define RTL8365MB_C_L2_ENTRY_SIZE 6 +/* Highest L2 entry size of any supported chip, used for sizing */ +#define RTL8365MB_L2_ENTRY_SIZE RTL8365MB_C_L2_ENTRY_SIZE + +struct rtl8365mb_l2_uc; +struct rtl8365mb_l2_mc; + +void rtl8365mb_c_l2_data_to_uc(const u16 *data, struct rtl8365mb_l2_uc *uc); +void rtl8365mb_c_l2_uc_to_data(const struct rtl8365mb_l2_uc *uc, u16 *data); +void rtl8365mb_c_l2_data_to_mc(const u16 *data, struct rtl8365mb_l2_mc *mc); +void rtl8365mb_c_l2_mc_to_data(const struct rtl8365mb_l2_mc *mc, u16 *data); + int rtl8365mb_l2_get_next_uc(struct realtek_priv *priv, u16 *addr, int port, struct realtek_fdb_entry *entry); int rtl8365mb_l2_add_uc(struct realtek_priv *priv, int port, diff --git a/drivers/net/dsa/realtek/rtl8365mb_main.c b/drivers/net/dsa/realtek/rtl8365mb_main.c index 96b15dc..e9aac7e 100644 --- a/drivers/net/dsa/realtek/rtl8365mb_main.c +++ b/drivers/net/dsa/realtek/rtl8365mb_main.c @@ -811,6 +811,11 @@ static const struct rtl8365mb_family_info rtl8365mb_family_c = { .num_ports = RTL8365MB_C_MAX_NUM_PORTS, .jam_table = rtl8365mb_init_jam_8365mb_vc, .jam_size = ARRAY_SIZE(rtl8365mb_init_jam_8365mb_vc), + .l2_entry_size = RTL8365MB_C_L2_ENTRY_SIZE, + .l2_data_to_uc = rtl8365mb_c_l2_data_to_uc, + .l2_uc_to_data = rtl8365mb_c_l2_uc_to_data, + .l2_data_to_mc = rtl8365mb_c_l2_data_to_mc, + .l2_mc_to_data = rtl8365mb_c_l2_mc_to_data, }; /** -- 2.53.0