Commit bbb11b8d authored by Justin Chen's avatar Justin Chen Committed by Jakub Kicinski
Browse files

net: bcmasp: Fix network filter wake for asp-3.0 



We need to apply the tx_chan_offset to the netfilter cfg channel or the
output channel will be incorrect for asp-3.0 and newer.

Fixes: e9f31435 ("net: bcmasp: Add support for asp-v3.0")
Signed-off-by: default avatarJustin Chen <justin.chen@broadcom.com>
Reviewed-by: default avatarFlorian Fainelli <florian.fainelli@broadcom.com>
Link: https://patch.msgid.link/20260120192339.2031648-1-justin.chen@broadcom.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 5f9b3290

drivers/net/ethernet/broadcom/asp2/bcmasp.c

+3 −2
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ static void bcmasp_netfilt_hw_en_wake(struct bcmasp_priv *priv, 
			  ASP_RX_FILTER_NET_OFFSET_L4(32),

			  ASP_RX_FILTER_NET_OFFSET(nfilt->hw_index + 1));



	rx_filter_core_wl(priv, ASP_RX_FILTER_NET_CFG_CH(nfilt->port + 8) |

	rx_filter_core_wl(priv, ASP_RX_FILTER_NET_CFG_CH(nfilt->ch) |

			  ASP_RX_FILTER_NET_CFG_EN |

			  ASP_RX_FILTER_NET_CFG_L2_EN |

			  ASP_RX_FILTER_NET_CFG_L3_EN |
@@ -166,7 +166,7 @@ static void bcmasp_netfilt_hw_en_wake(struct bcmasp_priv *priv, 
			  ASP_RX_FILTER_NET_CFG_UMC(nfilt->port),

			  ASP_RX_FILTER_NET_CFG(nfilt->hw_index));



	rx_filter_core_wl(priv, ASP_RX_FILTER_NET_CFG_CH(nfilt->port + 8) |

	rx_filter_core_wl(priv, ASP_RX_FILTER_NET_CFG_CH(nfilt->ch) |

			  ASP_RX_FILTER_NET_CFG_EN |

			  ASP_RX_FILTER_NET_CFG_L2_EN |

			  ASP_RX_FILTER_NET_CFG_L3_EN |
@@ -714,6 +714,7 @@ struct bcmasp_net_filter *bcmasp_netfilt_get_init(struct bcmasp_intf *intf, 
		nfilter = &priv->net_filters[open_index];

		nfilter->claimed = true;

		nfilter->port = intf->port;

		nfilter->ch = intf->channel + priv->tx_chan_offset;

		nfilter->hw_index = open_index;

	}

drivers/net/ethernet/broadcom/asp2/bcmasp.h

+1 −0
Original line number Diff line number Diff line
@@ -348,6 +348,7 @@ struct bcmasp_net_filter { 
	bool				wake_filter;



	int				port;

	int				ch;

	unsigned int			hw_index;

};