From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3B5873EDACE; Tue, 10 Mar 2026 11:29:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773142141; cv=none; b=DrZRSQs1L0VARXtBmVqGST8wZa8NT/azR7IC0Yg9DG/qTymbYUBM9jZAQopcD7dxhZekEeImaTRA9DgZpCjltSxk2QOeOVaPnjJJV/DzGzyh+ltwfTHD/bNdsXhVi9KASFIjFw6seH1GkcWdQHtU0o2jd4kA3SUgW+gE+VX4lzk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773142141; c=relaxed/simple; bh=GEWxTgbk7EYBmfb4J/m1OWd+DaSUlMPIEiSbE8aWgqY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Gp9IwkL/ni/e4X0KY73XdqrDnkVbtMW7TrdD2D2xZI2EpkhH3d7x9uSctaN0V5Es8OMwx7mMCiIXL1dNc3g145S3JNIpiF9Zcd2RGkt83BAfCsdSku2eVWUyzcQiMY2I7sMtSuqr1I6tzakGlNpds4pyiRU5Oz0z2IEdW291Ka8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=fbsAUcyZ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="fbsAUcyZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 662E5C2BC86; Tue, 10 Mar 2026 11:29:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773142141; bh=GEWxTgbk7EYBmfb4J/m1OWd+DaSUlMPIEiSbE8aWgqY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fbsAUcyZwNh3/6KkRUTqy7lBA/YSbTge7pb+pAoSLk5HzJH7mJDY5+sB0dMTbqr+r +aqIhvxkgon4Pz85R3/yZ4kSrhgV3gSz4viLpUy/gQGblmbyJIeF0q1dB0xbJ+hhv8 gt95icP6cB8WRWRk7OUHnBuQ/ZnwQsvqkQZqYJFP5QG90/HW8iGIup9lLPCWlsN1n0 qdPMJwGpVCsXzQKFS0RM2a3apXNJamhVleLbFlyEguwnzMb8lMvAnKaujqlNgzkGSj IPlLQeKyFoMeYSaNzKALAo77a/lxzw163s1EYRWNbFHGdMCv80fDDkpUVJgnAE99KU vv/3ksrd9baIg== From: Sasha Levin To: patches@lists.linux.dev, stable@vger.kernel.org Cc: Chintan Vankar , Simon Horman , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.18 228/314] net: ethernet: ti: am65-cpsw-nuss/cpsw-ale: Fix multicast entry handling in ALE table Date: Tue, 10 Mar 2026 07:18:07 -0400 Message-ID: <681b39c878e5a30d5c4e202d0e9ada53ff65e93d.1773141555.git.sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Chintan Vankar [ Upstream commit be11a537224d72b906db6b98510619770298c8a4 ] In the current implementation, flushing multicast entries in MAC mode incorrectly deletes entries for all ports instead of only the target port, disrupting multicast traffic on other ports. The cause is adding multicast entries by setting only host port bit, and not setting the MAC port bits. Fix this by setting the MAC port's bit in the port mask while adding the multicast entry. Also fix the flush logic to preserve the host port bit during removal of MAC port and free ALE entries when mask contains only host port. Fixes: 5c50a856d550 ("drivers: net: ethernet: cpsw: add multicast address to ALE table") Signed-off-by: Chintan Vankar Reviewed-by: Simon Horman Link: https://patch.msgid.link/20260224181359.2055322-1-c-vankar@ti.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 2 +- drivers/net/ethernet/ti/cpsw_ale.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c b/drivers/net/ethernet/ti/am65-cpsw-nuss.c index 110eb2da8dbc1..77c2cf61c1fb4 100644 --- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c +++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c @@ -391,7 +391,7 @@ static void am65_cpsw_nuss_ndo_slave_set_rx_mode(struct net_device *ndev) cpsw_ale_set_allmulti(common->ale, ndev->flags & IFF_ALLMULTI, port->port_id); - port_mask = ALE_PORT_HOST; + port_mask = BIT(port->port_id) | ALE_PORT_HOST; /* Clear all mcast from ALE */ cpsw_ale_flush_multicast(common->ale, port_mask, -1); diff --git a/drivers/net/ethernet/ti/cpsw_ale.c b/drivers/net/ethernet/ti/cpsw_ale.c index fbe35af615a6f..9632ad3741de1 100644 --- a/drivers/net/ethernet/ti/cpsw_ale.c +++ b/drivers/net/ethernet/ti/cpsw_ale.c @@ -455,14 +455,13 @@ static void cpsw_ale_flush_mcast(struct cpsw_ale *ale, u32 *ale_entry, ale->port_mask_bits); if ((mask & port_mask) == 0) return; /* ports dont intersect, not interested */ - mask &= ~port_mask; + mask &= (~port_mask | ALE_PORT_HOST); - /* free if only remaining port is host port */ - if (mask) + if (mask == 0x0 || mask == ALE_PORT_HOST) + cpsw_ale_set_entry_type(ale_entry, ALE_TYPE_FREE); + else cpsw_ale_set_port_mask(ale_entry, mask, ale->port_mask_bits); - else - cpsw_ale_set_entry_type(ale_entry, ALE_TYPE_FREE); } int cpsw_ale_flush_multicast(struct cpsw_ale *ale, int port_mask, int vid) -- 2.51.0