From patchwork Fri Apr 11 09:57:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Fang X-Patchwork-Id: 14048188 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 12EAAC369AC for ; Fri, 11 Apr 2025 11:19:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:MIME-Version:Content-Type: Content-Transfer-Encoding:References:In-Reply-To:Message-Id:Date:Subject:Cc: To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=7i8gNx9vzcfj6KkEixZFWViA1eY6AXKc4K8PHlGLiVs=; b=Wk1gDuD3xlQEBD1WWbIHjC0iDR nwKfSE2EMtEALmoCXkWK7pUxjeNd31CZMHkTeDg151eaxfhEdC2RIHxlLW33vErddbcqnJeDWjOxB /OJokG+oybXvkR4RUi8H3gJUr5IsAwCv0r3v3vrhtzl03Qfl31mXrreGWfPjIszHzlPn+yq+vQdLV +hrvUK0J3JHghyfNm0kV76C2k2mrECe8adAGF+ZSzgfbfjJCy7/H39+N+hywqhjwnEwfGXHIDeF3w LJxunWF/Po3FwUeM5dbzz04QjtmIUAeNB+TZeJTvV7Z00WzEj0mkLMkVnQH5Jje8L/znHoT2IHew8 x/uNFOqg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1u3CPc-0000000DUyR-3JWn; Fri, 11 Apr 2025 11:19:08 +0000 Received: from mail-am6eur05on2062e.outbound.protection.outlook.com ([2a01:111:f403:2612::62e] helo=EUR05-AM6-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1u3BSO-0000000DLkW-42aC for linux-arm-kernel@lists.infradead.org; Fri, 11 Apr 2025 10:17:58 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=fiJzZOD6pZs6j5kKVsW3Kf+m3kNUyOKPTADqAXBUDF2QpdqkdsRoF3vVfRgyKB0xX07hlwqvdWYix/0rZRwCJHCMIsAnW/+lfaFSZe0ZNa712nX6vYCNJ5khrMEuaMZlKi8lbWpG1YwsHDTZrKeXrGsC3VBJ9uPMhs/TNY73AoUPUGMPwqwh3aSjxVB21zOgssDURcVObunAQNVLEkn7Vi8uqhfPTgHpJdo0Z6isOrugQrnEVvkrKL6KjqEpBLCWQ6BrkhbGcbGLyrLZtNxXvCu2NKgJn8K/6RwXOQmfq7G0PD7Zxta3slAErLfmf++xjl6GrEY0qwcGR5XrLGMMiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=7i8gNx9vzcfj6KkEixZFWViA1eY6AXKc4K8PHlGLiVs=; b=y3ll5UJPkHMSXUN6mhlhGtGX2Fw63uLapRbAXBiELx5R8OF/hGcd5ljqZZllDRzF3pZ7CbPDUicRhbsbotpDcy6nRO+eAyKaCZyX9llO52L4h4wKQCexqUawqmI8tYWMJ4XY44N57AswUA+jeTu/rUScqxhmds8chZdfbNpdgEwXJzR009a0kf7ywBJkQrCF1moNi9mOjFAUlCMNA0OLk6T83Vc15p5S+jEQkqLMSIsXb8GmHW8YqqXht3MssiERXKwfDGbacCY3dXY8sOzQIh6hTo7YopL+D4d3pjgmYkymGt5IBBxxQG4f8QpLKTFD0dZMe8CgNHClgTXjrQigaA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7i8gNx9vzcfj6KkEixZFWViA1eY6AXKc4K8PHlGLiVs=; b=UACcK5KicS3uLzazR9HmkvTJYd4Rt8HtMDz876Y5mWXWB5rq7O0y48iUoDBCobCZppuWl5Eo5gOvNJhVO3KUa5aRkDHghnkZ8bU0SbBijMLCv2eYrnHS/ZeyTD9vWUamW4qYfQNepUaUMoILfJi3CdjujApYGZGNlP+tWusG1ziP/WaT7CptUz6CAS29HgJNqrPZ+ZgGgkih4vCzMgkHvgQLlHSr2bZy0zue04n1V9YLar3SlLbNlhDPj+Mj/JqoXHYiVfduuzWCfEMzJ5VJqullxWKfCb5gFRcbrvYkf6nk89zBmWPEK4+5d1HErZjAtxUk2ooIuiaiczLCYCQoBA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM9PR04MB8505.eurprd04.prod.outlook.com (2603:10a6:20b:40a::14) by AS8PR04MB8900.eurprd04.prod.outlook.com (2603:10a6:20b:42f::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8632.27; Fri, 11 Apr 2025 10:17:52 +0000 Received: from AM9PR04MB8505.eurprd04.prod.outlook.com ([fe80::bb21:d7c8:f7f7:7868]) by AM9PR04MB8505.eurprd04.prod.outlook.com ([fe80::bb21:d7c8:f7f7:7868%3]) with mapi id 15.20.8606.028; Fri, 11 Apr 2025 10:17:52 +0000 From: Wei Fang To: claudiu.manoil@nxp.com, vladimir.oltean@nxp.com, xiaoning.wang@nxp.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: christophe.leroy@csgroup.eu, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, linuxppc-dev@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v5 net-next 11/14] net: enetc: extract enetc_refresh_vlan_ht_filter() Date: Fri, 11 Apr 2025 17:57:49 +0800 Message-Id: <20250411095752.3072696-12-wei.fang@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250411095752.3072696-1-wei.fang@nxp.com> References: <20250411095752.3072696-1-wei.fang@nxp.com> X-ClientProxiedBy: SI2PR01CA0021.apcprd01.prod.exchangelabs.com (2603:1096:4:192::19) To AM9PR04MB8505.eurprd04.prod.outlook.com (2603:10a6:20b:40a::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM9PR04MB8505:EE_|AS8PR04MB8900:EE_ X-MS-Office365-Filtering-Correlation-Id: 248c26e3-7991-4466-aa17-08dd78e21e25 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|7416014|376014|1800799024|366016|38350700014; X-Microsoft-Antispam-Message-Info: 1DCCZNW42rVpS0SknAZiTnRATr9kVgPle2RXZ2rl5wDjoaD7wgGLkMqFNBj04cLHVusjO8usqqhCk/ddudQ1fS+NZytuwu7ANQDwMLZCcbpFt30W4gmiSfj+f/GcPXHcgfke+foFQpjMxseu1O3at2N/6pGarOdprpIfOSFQc3yyWIkXLHuNm5oNZnVXCCKVAEinpyvlCL+FNnkVxes6RtrwTnMgPUJ85CL59fAbTkRH6ZnR7vEDhNWBcvUFK+8lIUZ+BRKznEMkI73tA8RxhrKP9mznKYecAOnpGiqAI7nlc2SD9T4KrEGBgb3Cgpx/Vf5WCT8um6Og+sz1ZAnE0tYs2ZPxMk62iyVXP6nK1n0bkjud8LYR5gD2siqTp6TJRZQeSRtI3M4p+X6jdIh7OOyv6hRZcEjjo+6KapFiYr4Fe6VHjWv2dI+KvRC78r7DVZG04/AqPDHZwHjQDGXS1gpUM1u9xxi3RBpHs4cvWmZTd8nWwqojhKjPqSicAUsWypdYR9wdyMUWDLCnlKDArteeNVq4rNkXidndkhJAkDZsslEbF0noCGa/l5cYO30PiLjbVXHj7iKolAVcbD4fGXEP7HEUhnfpWneh6+FnQcmmEns41/ljLEIf2bcEMraBLg7I7LImx5H3XxXzBE+HFnXTijF+CNdHe3aHL9/l3XqRiDITReE4LVggGWa/tLuMXda5saJ23BLZ+blEN7kh3SaLqAlCPJnYGwGqSoJezQJgxinwmYqX0Gw56mYTCxeFCHtYTEQLxg/L/eVhsqUU+RDJQ3uAnnqyCKT8j2G62McTA7dFFYO7PDlG8Nc6MGzkVIBBx2vks1mXuWT+Skg5+1O0t5rJwH+/DNL3FBchoHVJISASfREFRdJdWx48O1qSK9rYbk5ZxNOfr+VGOLiugdGBm0O1CiNjKcJCZPMLKvNcm1AgFJW7HVLVn/5R+bYmJO0fFb0gPm/MLnNmSi20X+rBpymBwm/ipqrZXC9eTQg2kfRVAHuYCr3tTY41AyziDz832YoZuCFMcFvgoFMs/fNe08mUNZwaVg+L0ocSavkRrYOaaWkZNpOcjNhZGEzwwVsTJX9zdyig8NtiBlHN4J2UTpuf5tuQrpN4ARtgvkhoaydIqcLpOdKyyVExloEHQLCUtP0RA5RZA3qeC8hb2bAQtQeind0xuV+teCH0kdDSkkDoOEG6NM3UkuF1KuDKnL5Lghh6aOCfoQiX4po4eLUdOCG3945kgO9AXEoOwRG3dn2E5RA3qUMtg+VbzIIozt4UIHosqwAS1yrOYIGM688EIt/1/L5HMMk9HwNYnTwUePy/KIVZB67vo5Ft/1+8v/82PeivTOKQGtl9iWRrsnVq5kWEUgDyoVuVIwHWy23y+mIYKu5Tlqi4ft8NacLMLifCwzuYxaBemtHIwRojp32ufuUHeO82NG5tNLDODJ+O+1YaEwhw2/185VYdkWWvh3tykQbpDocbUMOD6IrVAA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM9PR04MB8505.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(52116014)(7416014)(376014)(1800799024)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9m2Qpt50wsTmptvHU2uVHCj1Bb30lAgs+8/Nwu+wAGbb83GwZS7Kb1OM3mduZxchrLqlCURiMl3HOelVuOa0a2UdYE6Hc0v8B4Y/8wCmpFFko6Wtr7XrNMkvJetE2Zodvp3E72fS3koxmj0NMd2IxbF06mISRU2bSu/d27S2isjyWCrZy7SRjxwpnQuQDRJmypDqF5RftOs7oiAPkWkiDRr8GZgYzo2WBWaUWeAOZ1seftRuuxgcjfbuCeFjUk+18SF4JQaX95zsMbwm7/62LuZdQvjLT65XRFzz+XcUd1+OGt2C4MdXAE+ul6O4g5P7LjME5XAhoIPLaVfVuddMLl3iN1OHohlumIuuxTBcY3+abZxAy1mRS9DdYU57D5tQIQJb6/SP8VU7se6k/uz7JpOjaHb3NBpFqunXU0AuA/Wl5xh3LLm3SNviU2CqLGMADeuH5IXPNa3LhoxnM1AugDkJ3R4KvLyDLfc8DOCqsGS95iP0f96hu/pXCqKIlq6tDBIUDg/QPHTru4j4egP95LgidQxZA9QBEFDXziOzsZToR2cK2p5zXTZsVcpvmQLDOt24vCCrZ4vs2KmyVaTEIljqN8awEvmCNsyYEUhfYmPi11Fo8gH3aYUNuY2xwsJi7KYQImo4k+v+Et8Vypq6NBy2lhGWQtJ0YQ9dmt3QGQ14T4JshFcnPr9WkkRzk7TQgZC01s7YPY3hu8Jnunw5VBuUIUAXft3+k1NxlegLbY8jYOcpxZlknZFOR6B6WS6RYqXMGFpTXylGfBKML8IxqPhbnfgB7Df3otoa5EiPLl3NtHdccFlpSIgW6P+i5U1SVyOpE/fvIthfL5fRjjVNFsbG6yWmLSgS0U/Saxu+cCmkrcSfupmxkNNFYBtqRcjIc9yH2MnaIMPD2qZoUjDCNZAi7NIAkTPBZZb0sxHkBPIGFRFfVU+LNAaHqjfhLCmn4kEfAVqmy9mZqRp3ULXNu72rQgnps+LWlEO+y2YvCH2o78g/j5TWMNLcqJloZqMJsxT4A78mP4ekMbPs3heFIp/4NKJyZKSlXV3SlJ7nLN79Xr1OJlltDgnV+3YJ4Cf5+xKAkgqIxjJCaS7woX3l1/l5U0mBhtBrb07hy3mKlugSBl73xb2nvF0tjhT9QOfoumnSJfbL4/7bw0JoFGOwVp/ne8lIckF0DVkZ7GAXqmVQ5+IufYL89ylqtwHbMRtBv46zszDartaUetJ7gabfTUjwHietnknLtye0/soAjg0MtFKP8C0blmuogQ8F/8ebCawdlBCL4slAFMP/G+MGWoX+Zt1cSlwk5OmA/3sc7mICmnE+BFzb5HhopcNtpQ7v+s7j+zjxsuoAfiWV+DWt37sfuQ30Pfl0FNQ25SXYKiwWvnoHCSpzxWyGEd1Yu4Y+xXscpDIkQHxyzSGohqtQN1xzHtpWZFPwrFFQot+hbhNyjP6/3aos20hwUHkdr34WvM0csd0MVHgaySAbQ/0wvcfnbf5HUzaVrrtOFrJHFTSDs4Aof8jHpemXjx3WqP3MZoYPSkjsvoTw2M2knZoiFaeq5sSrzuemIMXyDBez6eZqb/iaxCp6Ti1gpa1iGIia X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 248c26e3-7991-4466-aa17-08dd78e21e25 X-MS-Exchange-CrossTenant-AuthSource: AM9PR04MB8505.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Apr 2025 10:17:52.2548 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: je2cYJX/Cn1nKz6IgL3ZPdaWCHupgZYEgDqstEtVHMBhURAhB/lfCnkt1YbXMZSD/9aw1NXT+1LPkxLJPa3p+w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8900 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250411_031757_006537_5D4E9E06 X-CRM114-Status: GOOD ( 11.50 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Extract the common function enetc_refresh_vlan_ht_filter() from enetc_sync_vlan_ht_filter() so that it can be reused by the ENETC v4 PF and VF drivers in the future. Signed-off-by: Wei Fang --- v5 changes New patch --- .../net/ethernet/freescale/enetc/enetc_pf.c | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/drivers/net/ethernet/freescale/enetc/enetc_pf.c b/drivers/net/ethernet/freescale/enetc/enetc_pf.c index 8f2616fd83d2..ae2dbd159ab4 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc_pf.c +++ b/drivers/net/ethernet/freescale/enetc/enetc_pf.c @@ -234,21 +234,16 @@ static int enetc_vid_hash_idx(unsigned int vid) return res; } -static void enetc_sync_vlan_ht_filter(struct enetc_pf *pf, bool rehash) +static void enetc_refresh_vlan_ht_filter(struct enetc_pf *pf) { int i; - if (rehash) { - bitmap_zero(pf->vlan_ht_filter, ENETC_VLAN_HT_SIZE); + bitmap_zero(pf->vlan_ht_filter, ENETC_VLAN_HT_SIZE); + for_each_set_bit(i, pf->active_vlans, VLAN_N_VID) { + int hidx = enetc_vid_hash_idx(i); - for_each_set_bit(i, pf->active_vlans, VLAN_N_VID) { - int hidx = enetc_vid_hash_idx(i); - - __set_bit(hidx, pf->vlan_ht_filter); - } + __set_bit(hidx, pf->vlan_ht_filter); } - - enetc_set_vlan_ht_filter(&pf->si->hw, 0, *pf->vlan_ht_filter); } static int enetc_vlan_rx_add_vid(struct net_device *ndev, __be16 prot, u16 vid) @@ -261,7 +256,7 @@ static int enetc_vlan_rx_add_vid(struct net_device *ndev, __be16 prot, u16 vid) idx = enetc_vid_hash_idx(vid); if (!__test_and_set_bit(idx, pf->vlan_ht_filter)) - enetc_sync_vlan_ht_filter(pf, false); + enetc_set_vlan_ht_filter(&pf->si->hw, 0, *pf->vlan_ht_filter); return 0; } @@ -272,7 +267,8 @@ static int enetc_vlan_rx_del_vid(struct net_device *ndev, __be16 prot, u16 vid) struct enetc_pf *pf = enetc_si_priv(priv->si); __clear_bit(vid, pf->active_vlans); - enetc_sync_vlan_ht_filter(pf, true); + enetc_refresh_vlan_ht_filter(pf); + enetc_set_vlan_ht_filter(&pf->si->hw, 0, *pf->vlan_ht_filter); return 0; }