From nobody Sun Feb 8 15:58:15 2026 Received: from mail-pl1-f227.google.com (mail-pl1-f227.google.com [209.85.214.227]) (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 2414430BF62 for ; Fri, 16 Jan 2026 00:50:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.227 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768524646; cv=none; b=j3xnQmSmhtKPQ8ZGOYdnJD0nQ7Xy0Yt/J2JaaW7NMMZ8BdomQKToZmeelgh2Ye2GNenNEPO3KF0db76kEseeKQHlAYF2eeBqAEwwgvCOL7e+Udq+gFTe7UEbHBzoKQTvO6aC4h+wo+ts45k4af1kYSDimpvyhdpGES4szCYBPO4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768524646; c=relaxed/simple; bh=f0OIUVxI0PgOWhExbU1FecOBaSLnmmkg1XtjgJTX8yA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=CxyiyCqWfmEBxed4n3Xbw8YxxCRprQNaP9I1cuPnQCkh+jcsV6esIqBfeLTgBlQzzYOs5hlOKTK5YiIAkjyz7rwCebM9VJa5qX53P4ksgSRjpgEiimWL1qwJBsJTmIidnEvCggAuiyg2pXqNfKHwAGEesJpsgdk12lFzJZztnMs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=JIxmQowp; arc=none smtp.client-ip=209.85.214.227 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="JIxmQowp" Received: by mail-pl1-f227.google.com with SMTP id d9443c01a7336-2a1388cdac3so10484685ad.0 for ; Thu, 15 Jan 2026 16:50:45 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768524644; x=1769129444; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=jdegUEJa3UjiBfkCLkRNHs7XLVuHULtTod8beQSblao=; b=cuQCIWEmpEJtZYHIlcq4fdcCGbk/a+MdSzoojAT7jvmay6iEkBSLlJsToyM8KczBx8 FWXjLTmELRkhbbPz0JZ7uknW1zM0ujC7sbAy46Ho0LXFW3bEPmU9J89uA7tAsWjqiGsu BXvNL7LNBGinAQ9lwXzrTUsBs/UAcYFDgBmTgt3Vmebd3IzzgTuDnJSYKTQwaGCuxIae 3g5SE1rTMYcRQ40dDBs+fTx5F79uIKpHlVsLIQG2WsQ6h0/SWlUp8KUgm+0LCwN0wJIZ hDvdfj6CEJIsId2/lGfclp6FNPtX2BXNHjRvUyt03BzlQ5FDo0CjkW1ZBGpKQDbHyTAZ jgRw== X-Forwarded-Encrypted: i=1; AJvYcCXjIAjzD1xHANDcao9YPTi9Y+zs9wdSQ+6xmx9zQEqMawK46ja3tpKVx37yakSIDVeG3dApUNwgFHdkfIM=@vger.kernel.org X-Gm-Message-State: AOJu0YyPWesSsRp+K45wotM9p4++fBgMGx0naQXIMTsq/mQFGT2zOo/e bCa8EsWWGVV+AMZt/4eMtXBBwZk0fUxRgqk7Or7vSyZvDcpBn9CqW6IuXBNEflmv2YAbYf4L+9x wq2DirzlAj7kiWBSOPbii8DxkPS528QwAXQ/FQOxaYTTKX8McsovCZAH/XRIQpUBQUck3JLV8bz L4TfuA/ATKY403wgxsGGNtDDjWGvNCCz6kpaQyHWMJbA5nxW2x3gRNLRzuVVZQCPfBskxPZIi1W pZmXq16m7cwf0fHPQ== X-Gm-Gg: AY/fxX4RdFCVn/XCXmEaLcSmt5LG9BVTgHTxA3mbrW6WIHcEcJ/y8QIZbTRnuBRUrOS SUp6DUQ6MlmEIcSQQtLMHNwE4CaxhnYMOSLPHMQBJlsBTz89IkZN/mSvDVi4z+CdNlw34UheZoZ b56Lch1EfEDCHWJX2HKe9dGTDne/Wka2uFUj15EQBdBlHJLNAunwZV3ZPAHKPiROgIV0scl65/h M7KkpLLX+uzz+x7uzuuovTyfmK+61kMFBkg1MJ1bU8iH5cbMTrAdjvJE78CvuvD576uFJ47Vr7c xZ4T8M4o7O40Tma26VojQ6B7lOt9UhnvKyAuiHU1Kc5rO2NlaHdmZ238tZQQJe/9pBh0r4BDsCF aYTFxB98dEngs0MYo/0BwECec+D3+rCXE8LNIbmV9MqtkWzBtaqucjBuKDp0OyrCf1K/RLvCUoh hsPoduCfP/XbNkaioBp8Wt25zEu6AEDBHUwhaGi8zOsGs= X-Received: by 2002:a17:903:fae:b0:2a0:cb8d:2ed8 with SMTP id d9443c01a7336-2a7175a2473mr13226265ad.30.1768524644642; Thu, 15 Jan 2026 16:50:44 -0800 (PST) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-72.dlp.protect.broadcom.com. [144.49.247.72]) by smtp-relay.gmail.com with ESMTPS id d9443c01a7336-2a7193ac28dsm1128465ad.61.2026.01.15.16.50.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Jan 2026 16:50:44 -0800 (PST) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-dl1-f71.google.com with SMTP id a92af1059eb24-11b94abc09dso2511640c88.1 for ; Thu, 15 Jan 2026 16:50:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1768524642; x=1769129442; 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=jdegUEJa3UjiBfkCLkRNHs7XLVuHULtTod8beQSblao=; b=JIxmQowpgj3I/MPSWWd8HudrhO8LVHMvKHiXANL5zEZBSQS4JEO79o9ATcVw7dAkN8 M7AUlVDnBlTAX5eDfy3Stezos6YmzXF1BpMlrek6Z2NFzE1jRxWVZEEz6oy6xvmQYeLh gZEi0gofACiwuDOuV+inL3ZhLhejIMt+i4YoA= X-Forwarded-Encrypted: i=1; AJvYcCW8LJ9eXPfGmp1Bk4bMkxpUCaX1dxV2vLaytQlipksvC3EEcck6iJryWRRZ2gWSlJUQ1HqcCCZSo8BDd30=@vger.kernel.org X-Received: by 2002:a05:7022:6085:b0:11a:51a8:ec9 with SMTP id a92af1059eb24-1244a766aefmr1471422c88.29.1768524642507; Thu, 15 Jan 2026 16:50:42 -0800 (PST) X-Received: by 2002:a05:7022:6085:b0:11a:51a8:ec9 with SMTP id a92af1059eb24-1244a766aefmr1471413c88.29.1768524642030; Thu, 15 Jan 2026 16:50:42 -0800 (PST) Received: from stbsdo-bld-1.sdg.broadcom.net ([192.19.161.248]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-1244ac6c2besm1162305c88.5.2026.01.15.16.50.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Jan 2026 16:50:41 -0800 (PST) From: justin.chen@broadcom.com To: florian.fainelli@broadcom.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, richardcochran@gmail.com Cc: bcm-kernel-feedback-list@broadcom.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Justin Chen Subject: [PATCH net-next 1/3] net: bcmasp: Fix network filter wake for asp-3.0 Date: Thu, 15 Jan 2026 16:50:35 -0800 Message-Id: <20260116005037.540490-2-justin.chen@broadcom.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260116005037.540490-1-justin.chen@broadcom.com> References: <20260116005037.540490-1-justin.chen@broadcom.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 X-DetectorID-Processed: b00c1d49-9d2e-4205-b15f-d015386d3d5e Content-Type: text/plain; charset="utf-8" From: Justin Chen 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. Signed-off-by: Justin Chen Reviewed-by: Florian Fainelli --- drivers/net/ethernet/broadcom/asp2/bcmasp.c | 5 +++-- drivers/net/ethernet/broadcom/asp2/bcmasp.h | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/broadcom/asp2/bcmasp.c b/drivers/net/ethe= rnet/broadcom/asp2/bcmasp.c index fd35f4b4dc50..014340f33345 100644 --- a/drivers/net/ethernet/broadcom/asp2/bcmasp.c +++ b/drivers/net/ethernet/broadcom/asp2/bcmasp.c @@ -156,7 +156,7 @@ static void bcmasp_netfilt_hw_en_wake(struct bcmasp_pri= v *priv, ASP_RX_FILTER_NET_OFFSET_L4(32), ASP_RX_FILTER_NET_OFFSET(nfilt->hw_index + 1)); =20 - 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_pri= v *priv, ASP_RX_FILTER_NET_CFG_UMC(nfilt->port), ASP_RX_FILTER_NET_CFG(nfilt->hw_index)); =20 - 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(struc= t bcmasp_intf *intf, nfilter =3D &priv->net_filters[open_index]; nfilter->claimed =3D true; nfilter->port =3D intf->port; + nfilter->ch =3D intf->channel + priv->tx_chan_offset; nfilter->hw_index =3D open_index; } =20 diff --git a/drivers/net/ethernet/broadcom/asp2/bcmasp.h b/drivers/net/ethe= rnet/broadcom/asp2/bcmasp.h index 74adfdb50e11..e238507be40a 100644 --- a/drivers/net/ethernet/broadcom/asp2/bcmasp.h +++ b/drivers/net/ethernet/broadcom/asp2/bcmasp.h @@ -348,6 +348,7 @@ struct bcmasp_net_filter { bool wake_filter; =20 int port; + int ch; unsigned int hw_index; }; =20 --=20 2.34.1