From nobody Sat Feb 7 22:07:56 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 From nobody Sat Feb 7 22:07:56 2026 Received: from mail-pl1-f226.google.com (mail-pl1-f226.google.com [209.85.214.226]) (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 4115F30EF71 for ; Fri, 16 Jan 2026 00:50:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.226 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768524647; cv=none; b=cOhzicC940LY0IOkVDZYcqj5ZRuUKCsZ3WyUBDTkd/kCH9exVAdSByyzakISSabwq11b4sLWoE0AnVHT9Y+9aIYfSKk2MffsZEzedTSlrpfeF1eG0dqaLMXnMNWH4pXVcLwwnKo3jakyH5barx5BzYLNu+CAmru09hokutChy7E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768524647; c=relaxed/simple; bh=LxCC8AKduReVOLlnP5kuSc8onO9WV8svZBgSLnuvKM8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=njTHgOZqiAjdz8kK8jdVC3Ir3ZKuhWYEdMGXq8AOeG8DM/EeXvPed1Lj6MIWMY+z2VpuAZuJGo05lCF/w7T97BL1eFOAjCYyU8+YKZAbbqaYuUGbVrO1WMLHp9dJ6BMpgHOEKR5CRDowQ8JxiAtgR8d8zMKsUMnqKw0JsOzSuds= 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=WfgAENTP; arc=none smtp.client-ip=209.85.214.226 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="WfgAENTP" Received: by mail-pl1-f226.google.com with SMTP id d9443c01a7336-29f0f875bc5so10458655ad.3 for ; Thu, 15 Jan 2026 16:50:46 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768524645; x=1769129445; 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=AHFPBrVlK2s/u5AKaaQtJA7blAEpHfxbbOxow8w91c8=; b=fvDA0gKWfJr/QQ286O/Q2T2FJj2YNqB88bwd5SQOHvbj41mXGOhPEPypiIn9RDXCLk ncwfZWkAR+WduqNVyq3BcU/mZ2CsZb17S5wsp/lFTHVrG2VveGTZtm12joZn02wrNWl1 6qtdLM89DfKstSmbJS8/boo9X3rWXow9SfGuSXM8Sqr/gSto5Qqu7rg2QOzQoUV4rGlj H7KbvoRQOnOxCifi6kjSOPZOVdkg7E5zk6SQKukyvEMO5ZbJJWFQmNZwqzDtrvzwnk8x wAYSrTijqA6tqgfUmd5+puysrRkJ+OsjCvRt/QagmfQJGq/8agALblw6MrHfvVt3gFK1 4ODw== X-Forwarded-Encrypted: i=1; AJvYcCWbKIn3Qp6gL+DZo9HZXEVI/+CG54i8bbiRxxUfifH6y6O5pdhyu1dLvVe8FhPEdqBgyldbXvYQE8fEu6Y=@vger.kernel.org X-Gm-Message-State: AOJu0YxMHi1Fd1SedWA9ZNpZPGX93lYkNO/XVbcySpTIObu9QA9Kd/D9 A3YZ4rOniOWQnZyJ07x7rkWbidiQdF2+Xx/pZXahgS6eHl/0OOBylT19/SyX6GliaEaoV8XYuhP q0+R7dFurKQuLu3banN+t/ycXOLhtvQBTrK1dL5kjpKwJl/Jp+T8JKiwK0XwVv3NORKM8L+JNCQ oK08HgKkBNeQDoRXVocB4iDfqqQZUkugZMdD5Wq48U3XVrksVGxkW0G+zGmbspzFmSv+cfU3TaN ie/E/M9e+PBOdCZIQ== X-Gm-Gg: AY/fxX4mTtVXS+0DzruMfybf/wXODqhHohsfonU32tqD/juofwY9IexVwefYZVtAwiE tJnH2v2owszFrhtwSHk7yriNtqo5K7aMVIkHRmYStSAadXLEPRF1G0Oq+MpyQqvpfEm/XC1ArKG 7gBrwcREZJYQxj2EGxox/pj5kyiDReeF2kepuqnl6A1oTQGMb3pRsQVyQU1PO6uG8FDBNh96968 eakX/tySWVpfP0fuKOkDoF6ENOA4zau/8tr2cm43keJN+0BpGls4RFydTeA0djWkDXNBvUeXgao BRG25UyIgH4UcsBp6GF5QICsJ9VSUg1KZ8U1WntUxNinoBxK7XqDN9ebL2eMvgOeMwqi3xHo9Uc MUA/4Rp/YxWmg5oT+lbp9BdCyjMhIBIP3gzkCv0nr3kuPNqbH2xRnEvl/yZYyWnBNU1VqsZEo+M Jt7ARLRg1DeKn/Vi1clUhotB5oaOP2waxTlAgYlPtd X-Received: by 2002:a17:902:ceca:b0:2a3:e7fe:645e with SMTP id d9443c01a7336-2a71751c614mr11134745ad.1.1768524645541; Thu, 15 Jan 2026 16:50:45 -0800 (PST) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-2.dlp.protect.broadcom.com. [144.49.247.2]) by smtp-relay.gmail.com with ESMTPS id d9443c01a7336-2a7190a2c83sm1150455ad.6.2026.01.15.16.50.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Jan 2026 16:50:45 -0800 (PST) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-dl1-f71.google.com with SMTP id a92af1059eb24-11b9786fb51so9599834c88.1 for ; Thu, 15 Jan 2026 16:50:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1768524644; x=1769129444; 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=AHFPBrVlK2s/u5AKaaQtJA7blAEpHfxbbOxow8w91c8=; b=WfgAENTPEgxS0jLIIHS/NT6KjJWc1R6g6Q0/YvnWoSfVItunzI3W/JCZ4wnfXQyoRa 2zrDhHzBZKK/3h9pRfFLGa9oxKCDXl0iFBJruH69JIvYuZA2OuBJmqZ3D/lq8ISpRt6B d4QRvDp9FNH2cX31IGJd6kuD16L6kPnN7yQ6g= X-Forwarded-Encrypted: i=1; AJvYcCUy1jfOKRW5kP0fymhvv08J1Pb+fBzXVuD4dWX7hElspAA4CzmMp++/jHKwg2qDiEoLFC2F10yzUprm8NE=@vger.kernel.org X-Received: by 2002:a05:7022:6b86:b0:11a:fe6f:806a with SMTP id a92af1059eb24-1244a769e0emr1212110c88.31.1768524643920; Thu, 15 Jan 2026 16:50:43 -0800 (PST) X-Received: by 2002:a05:7022:6b86:b0:11a:fe6f:806a with SMTP id a92af1059eb24-1244a769e0emr1212094c88.31.1768524643339; Thu, 15 Jan 2026 16:50:43 -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.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Jan 2026 16:50:42 -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 2/3] net: bcmasp: clean up some legacy logic Date: Thu, 15 Jan 2026 16:50:36 -0800 Message-Id: <20260116005037.540490-3-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 Removed wol_irq check. This was needed for brcm,asp-v2.0, which was removed in previous commits. Removed bcmasp_intf_ops. These function pointers were added to make it easier to implement pseudo channels. These channels were removed in newer versions of the hardware and were never implemented. Signed-off-by: Justin Chen Reviewed-by: Florian Fainelli --- drivers/net/ethernet/broadcom/asp2/bcmasp.c | 5 -- drivers/net/ethernet/broadcom/asp2/bcmasp.h | 36 ------------ .../net/ethernet/broadcom/asp2/bcmasp_intf.c | 58 ++++--------------- 3 files changed, 10 insertions(+), 89 deletions(-) diff --git a/drivers/net/ethernet/broadcom/asp2/bcmasp.c b/drivers/net/ethe= rnet/broadcom/asp2/bcmasp.c index 014340f33345..36df7d1a9be3 100644 --- a/drivers/net/ethernet/broadcom/asp2/bcmasp.c +++ b/drivers/net/ethernet/broadcom/asp2/bcmasp.c @@ -1081,15 +1081,10 @@ static irqreturn_t bcmasp_isr_wol(int irq, void *da= ta) struct bcmasp_priv *priv =3D data; u32 status; =20 - /* No L3 IRQ, so we good */ - if (priv->wol_irq <=3D 0) - goto irq_handled; - status =3D wakeup_intr2_core_rl(priv, ASP_WAKEUP_INTR2_STATUS) & ~wakeup_intr2_core_rl(priv, ASP_WAKEUP_INTR2_MASK_STATUS); wakeup_intr2_core_wl(priv, status, ASP_WAKEUP_INTR2_CLEAR); =20 -irq_handled: pm_wakeup_event(&priv->pdev->dev, 0); return IRQ_HANDLED; } diff --git a/drivers/net/ethernet/broadcom/asp2/bcmasp.h b/drivers/net/ethe= rnet/broadcom/asp2/bcmasp.h index e238507be40a..29cd87335ec8 100644 --- a/drivers/net/ethernet/broadcom/asp2/bcmasp.h +++ b/drivers/net/ethernet/broadcom/asp2/bcmasp.h @@ -268,13 +268,6 @@ struct bcmasp_mib_counters { u32 tx_timeout_cnt; }; =20 -struct bcmasp_intf_ops { - unsigned long (*rx_desc_read)(struct bcmasp_intf *intf); - void (*rx_buffer_write)(struct bcmasp_intf *intf, dma_addr_t addr); - void (*rx_desc_write)(struct bcmasp_intf *intf, dma_addr_t addr); - unsigned long (*tx_read)(struct bcmasp_intf *intf); - void (*tx_write)(struct bcmasp_intf *intf, dma_addr_t addr); -}; =20 struct bcmasp_priv; =20 @@ -286,7 +279,6 @@ struct bcmasp_intf { /* ASP Ch */ int channel; int port; - const struct bcmasp_intf_ops *ops; =20 /* Used for splitting shared resources */ int index; @@ -407,34 +399,6 @@ struct bcmasp_priv { struct mutex net_lock; }; =20 -static inline unsigned long bcmasp_intf_rx_desc_read(struct bcmasp_intf *i= ntf) -{ - return intf->ops->rx_desc_read(intf); -} - -static inline void bcmasp_intf_rx_buffer_write(struct bcmasp_intf *intf, - dma_addr_t addr) -{ - intf->ops->rx_buffer_write(intf, addr); -} - -static inline void bcmasp_intf_rx_desc_write(struct bcmasp_intf *intf, - dma_addr_t addr) -{ - intf->ops->rx_desc_write(intf, addr); -} - -static inline unsigned long bcmasp_intf_tx_read(struct bcmasp_intf *intf) -{ - return intf->ops->tx_read(intf); -} - -static inline void bcmasp_intf_tx_write(struct bcmasp_intf *intf, - dma_addr_t addr) -{ - intf->ops->tx_write(intf, addr); -} - #define __BCMASP_IO_MACRO(name, m) \ static inline u32 name##_rl(struct bcmasp_intf *intf, u32 off) \ { \ diff --git a/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c b/drivers/net= /ethernet/broadcom/asp2/bcmasp_intf.c index b9973956c480..6cddd3280cb8 100644 --- a/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c +++ b/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c @@ -231,39 +231,6 @@ static struct sk_buff *bcmasp_csum_offload(struct net_= device *dev, return skb; } =20 -static unsigned long bcmasp_rx_edpkt_dma_rq(struct bcmasp_intf *intf) -{ - return rx_edpkt_dma_rq(intf, RX_EDPKT_DMA_VALID); -} - -static void bcmasp_rx_edpkt_cfg_wq(struct bcmasp_intf *intf, dma_addr_t ad= dr) -{ - rx_edpkt_cfg_wq(intf, addr, RX_EDPKT_RING_BUFFER_READ); -} - -static void bcmasp_rx_edpkt_dma_wq(struct bcmasp_intf *intf, dma_addr_t ad= dr) -{ - rx_edpkt_dma_wq(intf, addr, RX_EDPKT_DMA_READ); -} - -static unsigned long bcmasp_tx_spb_dma_rq(struct bcmasp_intf *intf) -{ - return tx_spb_dma_rq(intf, TX_SPB_DMA_READ); -} - -static void bcmasp_tx_spb_dma_wq(struct bcmasp_intf *intf, dma_addr_t addr) -{ - tx_spb_dma_wq(intf, addr, TX_SPB_DMA_VALID); -} - -static const struct bcmasp_intf_ops bcmasp_intf_ops =3D { - .rx_desc_read =3D bcmasp_rx_edpkt_dma_rq, - .rx_buffer_write =3D bcmasp_rx_edpkt_cfg_wq, - .rx_desc_write =3D bcmasp_rx_edpkt_dma_wq, - .tx_read =3D bcmasp_tx_spb_dma_rq, - .tx_write =3D bcmasp_tx_spb_dma_wq, -}; - static netdev_tx_t bcmasp_xmit(struct sk_buff *skb, struct net_device *dev) { struct bcmasp_intf *intf =3D netdev_priv(dev); @@ -368,7 +335,7 @@ static netdev_tx_t bcmasp_xmit(struct sk_buff *skb, str= uct net_device *dev) =20 skb_tx_timestamp(skb); =20 - bcmasp_intf_tx_write(intf, intf->tx_spb_dma_valid); + tx_spb_dma_wq(intf, intf->tx_spb_dma_valid, TX_SPB_DMA_VALID); =20 if (tx_spb_ring_full(intf, MAX_SKB_FRAGS + 1)) netif_stop_queue(dev); @@ -449,7 +416,7 @@ static int bcmasp_tx_reclaim(struct bcmasp_intf *intf) struct bcmasp_desc *desc; dma_addr_t mapping; =20 - read =3D bcmasp_intf_tx_read(intf); + read =3D tx_spb_dma_rq(intf, TX_SPB_DMA_READ); while (intf->tx_spb_dma_read !=3D read) { txcb =3D &intf->tx_cbs[intf->tx_spb_clean_index]; mapping =3D dma_unmap_addr(txcb, dma_addr); @@ -519,7 +486,7 @@ static int bcmasp_rx_poll(struct napi_struct *napi, int= budget) u64 flags; u32 len; =20 - valid =3D bcmasp_intf_rx_desc_read(intf) + 1; + valid =3D rx_edpkt_dma_rq(intf, RX_EDPKT_DMA_VALID) + 1; if (valid =3D=3D intf->rx_edpkt_dma_addr + DESC_RING_SIZE) valid =3D intf->rx_edpkt_dma_addr; =20 @@ -591,8 +558,8 @@ static int bcmasp_rx_poll(struct napi_struct *napi, int= budget) u64_stats_update_end(&stats->syncp); =20 next: - bcmasp_intf_rx_buffer_write(intf, (DESC_ADDR(desc->buf) + - desc->size)); + rx_edpkt_cfg_wq(intf, (DESC_ADDR(desc->buf) + desc->size), + RX_EDPKT_RING_BUFFER_READ); =20 processed++; intf->rx_edpkt_dma_read =3D @@ -603,7 +570,7 @@ static int bcmasp_rx_poll(struct napi_struct *napi, int= budget) DESC_RING_COUNT); } =20 - bcmasp_intf_rx_desc_write(intf, intf->rx_edpkt_dma_read); + rx_edpkt_dma_wq(intf, intf->rx_edpkt_dma_read, RX_EDPKT_DMA_READ); =20 if (processed < budget && napi_complete_done(&intf->rx_napi, processed)) bcmasp_enable_rx_irq(intf, 1); @@ -1271,7 +1238,6 @@ struct bcmasp_intf *bcmasp_interface_create(struct bc= masp_priv *priv, } =20 SET_NETDEV_DEV(ndev, dev); - intf->ops =3D &bcmasp_intf_ops; ndev->netdev_ops =3D &bcmasp_netdev_ops; ndev->ethtool_ops =3D &bcmasp_ethtool_ops; intf->msg_enable =3D netif_msg_init(-1, NETIF_MSG_DRV | @@ -1333,10 +1299,8 @@ static void bcmasp_suspend_to_wol(struct bcmasp_intf= *intf) =20 umac_enable_set(intf, UMC_CMD_RX_EN, 1); =20 - if (intf->parent->wol_irq > 0) { - wakeup_intr2_core_wl(intf->parent, 0xffffffff, - ASP_WAKEUP_INTR2_MASK_CLEAR); - } + wakeup_intr2_core_wl(intf->parent, 0xffffffff, + ASP_WAKEUP_INTR2_MASK_CLEAR); =20 if (ndev->phydev && ndev->phydev->eee_cfg.eee_enabled && intf->parent->eee_fixup) @@ -1389,10 +1353,8 @@ static void bcmasp_resume_from_wol(struct bcmasp_int= f *intf) reg &=3D ~UMC_MPD_CTRL_MPD_EN; umac_wl(intf, reg, UMC_MPD_CTRL); =20 - if (intf->parent->wol_irq > 0) { - wakeup_intr2_core_wl(intf->parent, 0xffffffff, - ASP_WAKEUP_INTR2_MASK_SET); - } + wakeup_intr2_core_wl(intf->parent, 0xffffffff, + ASP_WAKEUP_INTR2_MASK_SET); } =20 int bcmasp_interface_resume(struct bcmasp_intf *intf) --=20 2.34.1 From nobody Sat Feb 7 22:07:57 2026 Received: from mail-pj1-f98.google.com (mail-pj1-f98.google.com [209.85.216.98]) (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 66FF230FC21 for ; Fri, 16 Jan 2026 00:50:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.98 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768524657; cv=none; b=KGA01f6Hb7lXVsrMtikBrowbOOLPjrgGw9foBZq3S0P2PRGGlEVxRp6UVetqMTC5Ya6nUDE2n1mmZZaRoVEKtyjFHXXBStc6uB8Js03Toc3mXuQ1NMucBC/3XckW19X96w76E2Eac3F0jO/2G58UB2MbrBTRiRDiPledM789Zeg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768524657; c=relaxed/simple; bh=B68hiSoceJbcqhNRzfhRMhhxS2RswzXuTBa7G6mFQh0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=eGcf9P8UXTzVQf+u1fWWjs+gtAq5bHcsKiHbUiPYl+GICzCIDlfG/ZSDUQMXg5V7m+lrYXyakPP2F17YG2O6IyH0JOnwvS2EGtmv9BH0yO1bOEU9qPn+f3tMdv15bHcql4b/M+7Q7nU6KipXBAhZFrFGVd2qpL/5xpzCndCyrLw= 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=AhfzsMIq; arc=none smtp.client-ip=209.85.216.98 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="AhfzsMIq" Received: by mail-pj1-f98.google.com with SMTP id 98e67ed59e1d1-34cf1e31f85so738303a91.1 for ; Thu, 15 Jan 2026 16:50:47 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768524647; x=1769129447; 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=QHSl7KjNCmlL34Leswa6T4gMldUPRkc0V/lVqvwLlhY=; b=vpobWLeWV/2nlGpnol432h10Q781yoPMlyLYKui0c7EZa6AXFtzfa4RWsxhIiv3MH/ 1z5goXn1u+kyXYqr7t9K0nkQqW3xae0wMZcJJ6+PS2eKxLxXTlawuHGH05eKcBdQ7yeg +VVH5G2JxwbWeSIUYaG7Og6pk65XIyI0qdwDBVqTIP5icigLG29HQp2yRjsHgdL7MLko hyRzah7ohsRZR83zq8ZsWyUHQMaPatYdVmH6XojExjw/1aUO4puFlXJdaC09pqGYrska wqM1Bm1EQ5xzZeI8bCkynZSysFkbjwfRmJ3mw6t803GkJDvunOBPY3afPuwn/acTmjSA WzFw== X-Forwarded-Encrypted: i=1; AJvYcCU2+vf2fPg8aGHMyqTHQED4S1Cmb4Ix8mZJPTMtuwtfHegbx32rpZCbXcj9mGbkqnbTgS5lu6vYQpmjPKY=@vger.kernel.org X-Gm-Message-State: AOJu0YyJTJ7xCa333cIFwP4TVoJGEszBzt9f+JzOP0O8m6X8DfIwA8Uf uUP05G4006GCedDWMtcaWaA/Vq1WWOawe1PyDMqqMSwQgMmFW9cLEg39N94XhxHeukXcoaK4LRN 8gBETG9dnBHSRONjuTIBMYPnpOFzw0xf3VdO2Y3ikJK3qkJIntOlp9ihFGbh/Li8x+oQiabcIer ITUNo81JrDsvXwLU7gq/gR8h+dLVSwVuZ6UXB9NTWCRta0HAm0ldBBfoXGDYm1bwEq8KzkmQftY NxUmNR5VPLcm4LTKg== X-Gm-Gg: AY/fxX5SIe6CVHQmOBDjSe7IJL55Wwuv0MWsZbytZGm9bpKJCHPyoRbcM2Tvsi/mSEB 9NS6Ad7Irso+HNuEXog9gEelmSf1uirQZtbRXJCV+PyZZI5siIj55xTdHXA1w12s8vgjYVt/rzW IzyasvGLjCtl6ImJJeI1xuk05hGWHj13kCYguTu2xLCcw2IIiOjZib717rOt6im579qp5D2DtUw y/bOCAO0KTEzQDJaA/7t/zJ+Jai6yFgO4etCNpx4qwl4FdRZ2DxJcUNlw0EnRV1CNe1Lm6i7DoP kbyUdZqDcDBWaILXx73WR7QbxkL8FbxEjg39IFDL+5+DPXwUriEifwS/wgOa6CvwPk0CfLGST7W SqMaBplLkqqMjm+Mrnj65KxjguHI/Ko1AzdQ3NfT97GBiRQ0NPJymRyWnFvmVDNOFYCvk589/RK olaeTSMRfYl1/vMX96lilyRoieOWdK8/EtfrTYvlQW X-Received: by 2002:a17:90b:3c89:b0:343:7714:4caa with SMTP id 98e67ed59e1d1-35272ebb8dcmr1071158a91.3.1768524646718; Thu, 15 Jan 2026 16:50:46 -0800 (PST) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-2.dlp.protect.broadcom.com. [144.49.247.2]) by smtp-relay.gmail.com with ESMTPS id 98e67ed59e1d1-352677c7adbsm606197a91.2.2026.01.15.16.50.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Jan 2026 16:50:46 -0800 (PST) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-dl1-f72.google.com with SMTP id a92af1059eb24-121b1cb8377so2903400c88.0 for ; Thu, 15 Jan 2026 16:50:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1768524645; x=1769129445; 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=QHSl7KjNCmlL34Leswa6T4gMldUPRkc0V/lVqvwLlhY=; b=AhfzsMIqwUsgBws6T0ln5cnR3rZP+2SRB8OmsIynkWP7Ystt8rwrFv7iaUicWlFzv+ +nycr1kCpeOF1LyjR88l19BhQWmBDguTXm0RwhVUsLA8QuF10j0eFiIAkdcCgJagrdyf /NOrUCcZdaUJKaOfo4qpEMyALJ5NpI0OBu8NI= X-Forwarded-Encrypted: i=1; AJvYcCV7oS0zP6GrjRJJbAeNCbo/zogsWXghf5/nhTRpUg4j/La1m4/ExlAooIacIrTCV0Ke/udPDYhWAVc2mdQ=@vger.kernel.org X-Received: by 2002:a05:7022:4388:b0:123:34c2:55ff with SMTP id a92af1059eb24-1244a72ec3dmr1640212c88.20.1768524644963; Thu, 15 Jan 2026 16:50:44 -0800 (PST) X-Received: by 2002:a05:7022:4388:b0:123:34c2:55ff with SMTP id a92af1059eb24-1244a72ec3dmr1640197c88.20.1768524644472; Thu, 15 Jan 2026 16:50:44 -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.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Jan 2026 16:50:44 -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 3/3] net: bcmasp: streamline early exit and fix leak Date: Thu, 15 Jan 2026 16:50:37 -0800 Message-Id: <20260116005037.540490-4-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 Fix an early exit cleanup leak by unregistering of_phy_fixed_link() Streamline the bcmasp_probe early exit. As support for other functionality is added(i.e. ptp), it is easier to keep track of early exit cleanup when it is all in one place. Signed-off-by: Justin Chen --- drivers/net/ethernet/broadcom/asp2/bcmasp.c | 27 ++++++++++--------- .../net/ethernet/broadcom/asp2/bcmasp_intf.c | 5 +++- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/drivers/net/ethernet/broadcom/asp2/bcmasp.c b/drivers/net/ethe= rnet/broadcom/asp2/bcmasp.c index 36df7d1a9be3..aa6d8606849f 100644 --- a/drivers/net/ethernet/broadcom/asp2/bcmasp.c +++ b/drivers/net/ethernet/broadcom/asp2/bcmasp.c @@ -1317,6 +1317,8 @@ static int bcmasp_probe(struct platform_device *pdev) =20 bcmasp_core_init_filters(priv); =20 + bcmasp_init_wol(priv); + ports_node =3D of_find_node_by_name(dev->of_node, "ethernet-ports"); if (!ports_node) { dev_warn(dev, "No ports found\n"); @@ -1328,16 +1330,14 @@ static int bcmasp_probe(struct platform_device *pde= v) intf =3D bcmasp_interface_create(priv, intf_node, i); if (!intf) { dev_err(dev, "Cannot create eth interface %d\n", i); - bcmasp_remove_intfs(priv); - ret =3D -ENOMEM; - goto of_put_exit; + of_node_put(ports_node); + ret =3D -EINVAL; + goto err_cleanup; } list_add_tail(&intf->list, &priv->intfs); i++; } - - /* Check and enable WoL */ - bcmasp_init_wol(priv); + of_node_put(ports_node); =20 /* Drop the clock reference count now and let ndo_open()/ndo_close() * manage it for us from now on. @@ -1352,19 +1352,20 @@ static int bcmasp_probe(struct platform_device *pde= v) list_for_each_entry(intf, &priv->intfs, list) { ret =3D register_netdev(intf->ndev); if (ret) { - netdev_err(intf->ndev, - "failed to register net_device: %d\n", ret); - bcmasp_wol_irq_destroy(priv); - bcmasp_remove_intfs(priv); - goto of_put_exit; + dev_err(dev, "failed to register net_device: %d\n", ret); + goto err_cleanup; } count++; } =20 dev_info(dev, "Initialized %d port(s)\n", count); =20 -of_put_exit: - of_node_put(ports_node); + return ret; + +err_cleanup: + bcmasp_wol_irq_destroy(priv); + bcmasp_remove_intfs(priv); + return ret; } =20 diff --git a/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c b/drivers/net= /ethernet/broadcom/asp2/bcmasp_intf.c index 6cddd3280cb8..f3b8d94f4791 100644 --- a/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c +++ b/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c @@ -1228,7 +1228,7 @@ struct bcmasp_intf *bcmasp_interface_create(struct bc= masp_priv *priv, netdev_err(intf->ndev, "invalid PHY mode: %s for port %d\n", phy_modes(intf->phy_interface), intf->port); ret =3D -EINVAL; - goto err_free_netdev; + goto err_unregister_fixed_link; } =20 ret =3D of_get_ethdev_address(ndev_dn, ndev); @@ -1252,6 +1252,9 @@ struct bcmasp_intf *bcmasp_interface_create(struct bc= masp_priv *priv, =20 return intf; =20 +err_unregister_fixed_link: + if (of_phy_is_fixed_link(ndev_dn)) + of_phy_deregister_fixed_link(ndev_dn); err_free_netdev: free_netdev(ndev); err: --=20 2.34.1