From nobody Sat Feb 7 13:05:39 2026 Received: from mail-vs1-f97.google.com (mail-vs1-f97.google.com [209.85.217.97]) (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 A06CA7260A for ; Fri, 30 Jan 2026 16:49:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.217.97 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769791742; cv=none; b=vDGVmUf9CSe7/ta0NG4LLfOQTTFd14XE/QT617RYV6DiKNql5z0FeOkKJWjc/k2N1WXMZFl1pALfov73XQPiGgmNUYVeGVwP0NHK4DaRBIlRroSlE9hXrseP/u2sF/Yb09nqcVBeY8dlQbbodt4BSFla4oA40+geyihtCeLChUo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769791742; c=relaxed/simple; bh=+WUzpV3PbPElxR0d/PLjyo4kLJ+uKzOD75MwINZpAmg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=QEnfFis05xKQTtiWM+haVV3sDnNZSKzOPbJDARkoVv/VpHNJXLSWJUQ3Vu3fXo0kUrfgLoy0mJo0gZgwee1DFHYLEydN2gzI85BAI7rjtg5rOBhLWk+AqnnUaRotJF030y4fObzZpvfzS4NrTbEIm0y36u/vs3LqCucOkA2i6dQ= 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=TSD1XAks; arc=none smtp.client-ip=209.85.217.97 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="TSD1XAks" Received: by mail-vs1-f97.google.com with SMTP id ada2fe7eead31-5f535b24326so631917137.3 for ; Fri, 30 Jan 2026 08:49:00 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769791739; x=1770396539; 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=8aUFXob2xzBSFhsX/0qnIN28cjguocYoYmX9AhWUVHs=; b=fiUhlF3mgfTPBnPP+WDa2yRT9wkx2NRhW0vIWmYc2DzQEwdKdkcmQJA41D9FM29Zuk xQSrODod/iueMpCwLPza7wxlqjpR6e2TlIwu1MHd4MSOKafVKK6CXimbgG8cN/+z2p2J tZtYp0+Fm48fGb0kUGUT2qwyB05OGhBIluBy3l/aJ9BbBVzoEs5GMmtqL9EJTXUqkGja 3VMpvJO9OREfracWb5DOSsz652M8EGh6Qwj3tYgOhrWIjVnjzRViEiyWwi3PR7RM0xKg 0bn/3JxYh0OQqS3hqzlhAWM4eSSX9rKtwwxnp/Po75ya8BQoD2aeiGbDZWmnTk2Do3CR TjPw== X-Gm-Message-State: AOJu0YyOyeLKeZt4EmIrfR0Ws/jWcDmwoPGPrxB46U1tgMC+bPEz6nBJ m0QAqX+MBDUwFcMMY3gFMDg3fvPWTiPvCi9zLBW4no7B2au6m1kbQP76AKKYjXUKPshH0Rquutc NpT/7HHeLgdA+4RH/2TIYwUQSUjdiwNeioX7eg7ARwM744X5d9LhcEUZyQwmL8f22bFfDV8D5ef oXwqpw2dS9i8hmRG5hnMD73o0PcrwrVxMVb013I0l4iEaOGs5pu5EAPQXuav9czfF7iA8wMXljP T9AFW1pO4FbFEnq248= X-Gm-Gg: AZuq6aINoY4wArLFcO5AsiMoVl/P76sPzrMKkzZNETw4V9+Pai7aLVbxPHlNfl6tJbK V9vDm8mrlP1Nh/dbWyWJzcGANjL0RjEQ8P2DocyKSXrmxhXXwPONGaFG0OvSCe7VRlzaitTXf5a BX0ZsmcsJKKPBDKAfubeoy44uw8Ye/fBHz2BtWOJeGj5p6rmdwiVi+0gBSZ8Q4fxOtGpSMPRpE1 L0C/KzH4tXSnItDa/XSoNRt/ceygcwUWrS5uRYx9eirOFTLslHI7Gc5QvE+6ZG4mj5WmwdT0dHa APYhNTVZ69jbRP4scNR6HTy70bgWMK0WamLUkpqHngu5lLWDI/oa7i9imwMW4NuAZZwB5OV5VFn YiMsPAZ5k8QcwhjqfOV4YyfY5I51raNTjUkejmNb1ksBBsxZGtNgLkfvgkLg+B1v0QKKjIolbXg 1O8PEPNznCC5z9WKzHQU8kTyN/WGYTOra/EcT0BU20KgyH X-Received: by 2002:a05:6102:6c3:b0:5f7:24dc:3ac3 with SMTP id ada2fe7eead31-5f8e23e69eamr1041133137.7.1769791739306; Fri, 30 Jan 2026 08:48:59 -0800 (PST) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-20.dlp.protect.broadcom.com. [144.49.247.20]) by smtp-relay.gmail.com with ESMTPS id a1e0cc1a2514c-948723825ffsm223593241.1.2026.01.30.08.48.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Jan 2026 08:48:59 -0800 (PST) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-2a7b7f04a11so54142935ad.3 for ; Fri, 30 Jan 2026 08:48:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1769791738; x=1770396538; 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=8aUFXob2xzBSFhsX/0qnIN28cjguocYoYmX9AhWUVHs=; b=TSD1XAks+UMqSiOW2uz9/cBbOvHNp9dYb5h+vkzc1cnK7QsgDMvc4Fe6yvklzmhKD/ MTUV34UxOq6BunfKnPt8N3QGJm4m4BDKalQ1N6feVBgXymjaRnQcB9OPoywTPQiELUx7 J4/Hw9LdUVNcZB3oQ3aIfGRsmdKr8UBuHsnNE= X-Received: by 2002:a17:903:388e:b0:295:596f:8507 with SMTP id d9443c01a7336-2a8d89464b3mr41442255ad.0.1769791738072; Fri, 30 Jan 2026 08:48:58 -0800 (PST) X-Received: by 2002:a17:903:388e:b0:295:596f:8507 with SMTP id d9443c01a7336-2a8d89464b3mr41441935ad.0.1769791737656; Fri, 30 Jan 2026 08:48:57 -0800 (PST) Received: from PC-MID-R740.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a88b5d9a7bsm80193085ad.79.2026.01.30.08.48.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jan 2026 08:48:57 -0800 (PST) From: Pavan Chebbi To: jgg@ziepe.ca, michael.chan@broadcom.com Cc: linux-kernel@vger.kernel.org, dave.jiang@intel.com, saeedm@nvidia.com, Jonathan.Cameron@huawei.com, gospo@broadcom.com, selvin.xavier@broadcom.com, leon@kernel.org, kalesh-anakkur.purayil@broadcom.com, Pavan Chebbi , Leon Romanovsky , linux-rdma@vger.kernel.org Subject: [PATCH v4 fwctl 1/5] fwctl/bnxt_en: Move common definitions to include/linux/bnxt/ Date: Fri, 30 Jan 2026 08:41:42 -0800 Message-Id: <20260130164146.3752166-2-pavan.chebbi@broadcom.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20260130164146.3752166-1-pavan.chebbi@broadcom.com> References: <20260130164146.3752166-1-pavan.chebbi@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" We have common definitions that are now going to be used by more than one component outside of bnxt (bnxt_re and fwctl) Move bnxt_ulp.h to include/linux/bnxt/ as ulp.h. Reviewed-by: Andy Gospodarek Reviewed-by: Leon Romanovsky Cc: linux-rdma@vger.kernel.org Signed-off-by: Pavan Chebbi --- drivers/infiniband/hw/bnxt_re/debugfs.c | 2 +- drivers/infiniband/hw/bnxt_re/main.c | 2 +- drivers/infiniband/hw/bnxt_re/qplib_fp.c | 2 +- drivers/infiniband/hw/bnxt_re/qplib_res.h | 2 +- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 +- drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 2 +- drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 2 +- drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 2 +- drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 2 +- .../broadcom/bnxt/bnxt_ulp.h =3D> include/linux/bnxt/ulp.h | 0 10 files changed, 9 insertions(+), 9 deletions(-) rename drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h =3D> include/linux/bn= xt/ulp.h (100%) diff --git a/drivers/infiniband/hw/bnxt_re/debugfs.c b/drivers/infiniband/h= w/bnxt_re/debugfs.c index 88817c86ae24..c57bbe3492a8 100644 --- a/drivers/infiniband/hw/bnxt_re/debugfs.c +++ b/drivers/infiniband/hw/bnxt_re/debugfs.c @@ -10,8 +10,8 @@ #include #include #include +#include =20 -#include "bnxt_ulp.h" #include "roce_hsi.h" #include "qplib_res.h" #include "qplib_sp.h" diff --git a/drivers/infiniband/hw/bnxt_re/main.c b/drivers/infiniband/hw/b= nxt_re/main.c index 73003ad25ee8..79ca734a1377 100644 --- a/drivers/infiniband/hw/bnxt_re/main.c +++ b/drivers/infiniband/hw/bnxt_re/main.c @@ -55,8 +55,8 @@ #include #include #include +#include =20 -#include "bnxt_ulp.h" #include "roce_hsi.h" #include "qplib_res.h" #include "qplib_sp.h" diff --git a/drivers/infiniband/hw/bnxt_re/qplib_fp.c b/drivers/infiniband/= hw/bnxt_re/qplib_fp.c index c88f049136fc..5a28946e4668 100644 --- a/drivers/infiniband/hw/bnxt_re/qplib_fp.c +++ b/drivers/infiniband/hw/bnxt_re/qplib_fp.c @@ -46,6 +46,7 @@ #include #include #include +#include #include =20 #include "roce_hsi.h" @@ -55,7 +56,6 @@ #include "qplib_sp.h" #include "qplib_fp.h" #include -#include "bnxt_ulp.h" #include "bnxt_re.h" #include "ib_verbs.h" =20 diff --git a/drivers/infiniband/hw/bnxt_re/qplib_res.h b/drivers/infiniband= /hw/bnxt_re/qplib_res.h index 2ea3b7f232a3..ebe8893937f6 100644 --- a/drivers/infiniband/hw/bnxt_re/qplib_res.h +++ b/drivers/infiniband/hw/bnxt_re/qplib_res.h @@ -39,7 +39,7 @@ #ifndef __BNXT_QPLIB_RES_H__ #define __BNXT_QPLIB_RES_H__ =20 -#include "bnxt_ulp.h" +#include =20 extern const struct bnxt_qplib_gid bnxt_qplib_gid_zero; =20 diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethern= et/broadcom/bnxt/bnxt.c index d17d0ea89c36..4481d80cdfc2 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -59,10 +59,10 @@ #include #include #include +#include =20 #include "bnxt.h" #include "bnxt_hwrm.h" -#include "bnxt_ulp.h" #include "bnxt_sriov.h" #include "bnxt_ethtool.h" #include "bnxt_dcb.h" diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c b/drivers/ne= t/ethernet/broadcom/bnxt/bnxt_devlink.c index 15de802bbac4..230cd95d30a2 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c @@ -13,12 +13,12 @@ #include #include #include +#include #include "bnxt.h" #include "bnxt_hwrm.h" #include "bnxt_vfr.h" #include "bnxt_devlink.h" #include "bnxt_ethtool.h" -#include "bnxt_ulp.h" #include "bnxt_ptp.h" #include "bnxt_coredump.h" #include "bnxt_nvm_defs.h" diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/ne= t/ethernet/broadcom/bnxt/bnxt_ethtool.c index 068e191ede19..8cad7b982664 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c @@ -27,9 +27,9 @@ #include #include #include +#include #include "bnxt.h" #include "bnxt_hwrm.h" -#include "bnxt_ulp.h" #include "bnxt_xdp.h" #include "bnxt_ptp.h" #include "bnxt_ethtool.h" diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c b/drivers/net/= ethernet/broadcom/bnxt/bnxt_sriov.c index be7deb9cc410..83884af32249 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c @@ -17,9 +17,9 @@ #include #include #include +#include #include "bnxt.h" #include "bnxt_hwrm.h" -#include "bnxt_ulp.h" #include "bnxt_sriov.h" #include "bnxt_vfr.h" #include "bnxt_ethtool.h" diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c b/drivers/net/et= hernet/broadcom/bnxt/bnxt_ulp.c index 927971c362f1..fa513892db50 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c @@ -22,10 +22,10 @@ #include #include #include +#include =20 #include "bnxt.h" #include "bnxt_hwrm.h" -#include "bnxt_ulp.h" =20 static DEFINE_IDA(bnxt_aux_dev_ids); =20 diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h b/include/linux/= bnxt/ulp.h similarity index 100% rename from drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h rename to include/linux/bnxt/ulp.h --=20 2.39.1 From nobody Sat Feb 7 13:05:39 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 6CAE82DC322 for ; Fri, 30 Jan 2026 16:49:10 +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=1769791752; cv=none; b=GMwK6WHpzpldE9FFCEJXOq8R2bqU3jpnm40HYAYlpW5MoVE/HEVmwIMi95eSwguwzXPHcaF2K7jZ+dplFVvXCGMCW77HW5RG12WqkLW50XOmD4rGqifU4aR8C05DOTdQeLAZb6wtzxhbC9BaIZ+Lj5D+5DWuMk0tGKtnzhksJy8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769791752; c=relaxed/simple; bh=qCC2KMpCsbspALNd2Z8qWcD3VPQHyLrB6y3RByKBENk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=MDrPqh1p0aorFi7Dz1XtZVvJ5pTjvkzt6J7TGxxN96rHorWrgNsb4KkxIkwq9r8JFNT6u7ioYWrdiHK/4vB1Ste0/boSi6av7Ox7xRuU5br9lgXVOCBVBDzdsMX1/5rq3AOozia8+kABpNhAJndzf/qxQgYXrd15Zjt/yWDg/pI= 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=RMgX9VM9; 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="RMgX9VM9" Received: by mail-pl1-f226.google.com with SMTP id d9443c01a7336-2a0c09bb78cso19521375ad.0 for ; Fri, 30 Jan 2026 08:49:10 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769791750; x=1770396550; 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=t34+SHlXI4j7gS228Qc5x/6cnIk49ZpjxOL24sMqaWs=; b=P5BGk5cLydBixnxeHZk6o6Ru1Hs7h4ZDisTXwAf3GhQ3CPftBCcfsZp+I6r7/cK13q cUeO0VIOwr489DqQE6oiYAUrQvFWP95a65cJZtoq55Lk23rm7e70VMwDGm+vcQZz0Fkl /pVSqXKxbrFksj+/cgZT7JKtUtUhYpGEVt5okiUzhdLzC8lhC75/nLfRi1jHrrM3/wN6 4s+FXmRruQrpFWbkGNB7vKEDvyuMlWDG6Iv8iUahs+L/eD5caEJaPrMD2jQlfj8KcP98 UTRy3pRuYJ0M25/AJulTyIjR67vMOJZ2jIgLlIN8jXVHdUq1xSPt8DpNUpk0ESWws4mb j/rw== X-Gm-Message-State: AOJu0YyBni27uf5j4n71AB7I4MunSS+Kqj9hNPCg+3rppvb/hEzGRRM6 dxX7V9dRBgS5QIAdkuzj2TN5BkNXAQ0dIl6cF6varaAN8ZKDS26IqiqRA3fyjlm0FFjprRhKiPv JWWdjKVlclq5mttTNYwaJ/f/2C6k+hkcMAPa4uSatId7IFOgbVRAPoMJq+3/alG2aFHdbHXdtjH JRrUMkdQ/TfabSIQs9tyn0fZ1Eory5D0Prkw7oC6UaKuxQo9SuehRiPxNs6Ab5ss+cWIvQxzlsf ledxvK/7W1ENkF4SK4= X-Gm-Gg: AZuq6aKlR7kC2xkCHbwzScm8LH9odPtP13XKYNXOi3aj/9JnpXekVNEmAZZNKZWERij WrybFHVbJFPYTdBUwJxLKliqKO2ezRZ1iYZDnC/uFtN59K4wWUBJr2Nve5Y7jYGnIMbmTYznKOS 9+bpKN08tJbWhZwU5NKDDbXC8ctVRlO/PGZmGWjO44fr4IxqrpBRi5G/8g4zMdYaCxjtc/EQsmU qGeW9igvXMfvdzYL3VJi29qtqfRHi0RkEWxb97IjCaCjIqPZHu+boFb73iA2Bl4ioicdEKQcU7E U61eplwMtpi+WOA5V2omhgkwSzk/Pka/in1J8mllR2Sez3DaAYUiXsX8uV9TVGUBSFqwsnq4HUB kdEjJYIv8tWMhp1ruA9dq+sv/FBmMP17/mpzdiyACssJ/o6jOop/4H9CCAlSdp3SnjRYUJtTDcf wsfToS8EQiMeWL0bp0nFaYgS5ImhYFlPdbiyWdUcEey2Eg X-Received: by 2002:a17:902:f712:b0:2a8:ec3c:f326 with SMTP id d9443c01a7336-2a8ec3cf4a9mr8484865ad.21.1769791749723; Fri, 30 Jan 2026 08:49:09 -0800 (PST) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-20.dlp.protect.broadcom.com. [144.49.247.20]) by smtp-relay.gmail.com with ESMTPS id d9443c01a7336-2a88b422d53sm11050755ad.24.2026.01.30.08.49.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Jan 2026 08:49:09 -0800 (PST) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-2a7a98ba326so27439955ad.1 for ; Fri, 30 Jan 2026 08:49:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1769791748; x=1770396548; 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=t34+SHlXI4j7gS228Qc5x/6cnIk49ZpjxOL24sMqaWs=; b=RMgX9VM9eJd5jZTsmMEWv2+PIMgQW7s4lnAZw1YZLthnjemvy5rKjCGe2FVms/wKGd 4Ea7BTN6owISctudFdmL6peVv0FynHBRJ83ChXzHcwN1BQBVFSidpcnGCywstMtgM2OE jgn/4Fi91hZBFsBcooswMZxnQ0zTvcIHaGEbI= X-Received: by 2002:a17:903:38c8:b0:2a7:a771:3d36 with SMTP id d9443c01a7336-2a8bd5514admr72402175ad.30.1769791747680; Fri, 30 Jan 2026 08:49:07 -0800 (PST) X-Received: by 2002:a17:903:38c8:b0:2a7:a771:3d36 with SMTP id d9443c01a7336-2a8bd5514admr72401895ad.30.1769791747180; Fri, 30 Jan 2026 08:49:07 -0800 (PST) Received: from PC-MID-R740.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a88b5d9a7bsm80193085ad.79.2026.01.30.08.49.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jan 2026 08:49:06 -0800 (PST) From: Pavan Chebbi To: jgg@ziepe.ca, michael.chan@broadcom.com Cc: linux-kernel@vger.kernel.org, dave.jiang@intel.com, saeedm@nvidia.com, Jonathan.Cameron@huawei.com, gospo@broadcom.com, selvin.xavier@broadcom.com, leon@kernel.org, kalesh-anakkur.purayil@broadcom.com, Pavan Chebbi Subject: [PATCH v4 fwctl 2/5] fwctl/bnxt_en: Refactor aux bus functions to be more generic Date: Fri, 30 Jan 2026 08:41:43 -0800 Message-Id: <20260130164146.3752166-3-pavan.chebbi@broadcom.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20260130164146.3752166-1-pavan.chebbi@broadcom.com> References: <20260130164146.3752166-1-pavan.chebbi@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" Up until now there was only one auxiliary device that bnxt created and that was for RoCE driver. bnxt fwctl is also going to use an aux bus device that bnxt should create. This requires some nomenclature changes and refactoring of the existing bnxt aux dev functions. Convert 'aux_priv' and 'edev' members of struct bnxt into arrays where each element contains supported auxbus device's data. Move struct bnxt_aux_priv from bnxt.h to ulp.h because that is where it belongs. Make aux bus init/uninit/add/del functions more generic which will loop through all the aux device types. Make bnxt_ulp_start/stop functions (the only other common functions applicable to any aux device) loop through the aux devices to update their config and states. Make callers of bnxt_ulp_start() call it only when there are no errors. Also, as an improvement in code, bnxt_register_dev() can skip unnecessary dereferencing of edev from bp, instead use the edev pointer from the function parameter. Future patches will reuse these functions to add an aux bus device for fwctl. Reviewed-by: Andy Gospodarek Signed-off-by: Pavan Chebbi Reviewed-by: Leon Romanovsky --- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 47 ++- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 19 +- .../net/ethernet/broadcom/bnxt/bnxt_devlink.c | 8 +- .../net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 2 +- drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 339 +++++++++++------- include/linux/bnxt/ulp.h | 25 +- 6 files changed, 273 insertions(+), 167 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethern= et/broadcom/bnxt/bnxt.c index 4481d80cdfc2..a9bfbfabf121 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -6859,7 +6859,8 @@ int bnxt_hwrm_vnic_cfg(struct bnxt *bp, struct bnxt_v= nic_info *vnic) #endif if ((bp->flags & BNXT_FLAG_STRIP_VLAN) || def_vlan) req->flags |=3D cpu_to_le32(VNIC_CFG_REQ_FLAGS_VLAN_STRIP_MODE); - if (vnic->vnic_id =3D=3D BNXT_VNIC_DEFAULT && bnxt_ulp_registered(bp->ede= v)) + if (vnic->vnic_id =3D=3D BNXT_VNIC_DEFAULT && + bnxt_ulp_registered(bp->edev[BNXT_AUXDEV_RDMA])) req->flags |=3D cpu_to_le32(bnxt_get_roce_vnic_mode(bp)); =20 return hwrm_req_send(bp, req); @@ -7974,6 +7975,7 @@ static int bnxt_get_avail_msix(struct bnxt *bp, int n= um); =20 static int __bnxt_reserve_rings(struct bnxt *bp) { + struct bnxt_en_dev *edev =3D bp->edev[BNXT_AUXDEV_RDMA]; struct bnxt_hw_rings hwr =3D {0}; int rx_rings, old_rx_rings, rc; int cp =3D bp->cp_nr_rings; @@ -7984,7 +7986,7 @@ static int __bnxt_reserve_rings(struct bnxt *bp) if (!bnxt_need_reserve_rings(bp)) return 0; =20 - if (BNXT_NEW_RM(bp) && !bnxt_ulp_registered(bp->edev)) { + if (BNXT_NEW_RM(bp) && !bnxt_ulp_registered(edev)) { ulp_msix =3D bnxt_get_avail_msix(bp, bp->ulp_num_msix_want); if (!ulp_msix) bnxt_set_ulp_stat_ctxs(bp, 0); @@ -8035,8 +8037,7 @@ static int __bnxt_reserve_rings(struct bnxt *bp) } rx_rings =3D min_t(int, rx_rings, hwr.grp); hwr.cp =3D min_t(int, hwr.cp, bp->cp_nr_rings); - if (bnxt_ulp_registered(bp->edev) && - hwr.stat > bnxt_get_ulp_stat_ctxs(bp)) + if (bnxt_ulp_registered(edev) && hwr.stat > bnxt_get_ulp_stat_ctxs(bp)) hwr.stat -=3D bnxt_get_ulp_stat_ctxs(bp); hwr.cp =3D min_t(int, hwr.cp, hwr.stat); rc =3D bnxt_trim_rings(bp, &rx_rings, &hwr.tx, hwr.cp, sh); @@ -8075,7 +8076,7 @@ static int __bnxt_reserve_rings(struct bnxt *bp) !netif_is_rxfh_configured(bp->dev)) bnxt_set_dflt_rss_indir_tbl(bp, NULL); =20 - if (!bnxt_ulp_registered(bp->edev) && BNXT_NEW_RM(bp)) { + if (!bnxt_ulp_registered(edev) && BNXT_NEW_RM(bp)) { int resv_msix, resv_ctx, ulp_ctxs; struct bnxt_hw_resc *hw_resc; =20 @@ -11430,6 +11431,7 @@ static void bnxt_clear_int_mode(struct bnxt *bp) =20 int bnxt_reserve_rings(struct bnxt *bp, bool irq_re_init) { + struct bnxt_en_dev *edev =3D bp->edev[BNXT_AUXDEV_RDMA]; bool irq_cleared =3D false; bool irq_change =3D false; int tcs =3D bp->num_tc; @@ -11439,7 +11441,7 @@ int bnxt_reserve_rings(struct bnxt *bp, bool irq_re= _init) if (!bnxt_need_reserve_rings(bp)) return 0; =20 - if (BNXT_NEW_RM(bp) && !bnxt_ulp_registered(bp->edev)) { + if (BNXT_NEW_RM(bp) && !bnxt_ulp_registered(edev)) { int ulp_msix =3D bnxt_get_avail_msix(bp, bp->ulp_num_msix_want); =20 if (ulp_msix > bp->ulp_num_msix_want) @@ -14522,7 +14524,7 @@ static void bnxt_fw_echo_reply(struct bnxt *bp) static void bnxt_ulp_restart(struct bnxt *bp) { bnxt_ulp_stop(bp); - bnxt_ulp_start(bp, 0); + bnxt_ulp_start(bp); } =20 static void bnxt_sp_task(struct work_struct *work) @@ -14679,7 +14681,7 @@ int bnxt_check_rings(struct bnxt *bp, int tx, int r= x, bool sh, int tcs, hwr.cp_p5 =3D hwr.tx + rx; rc =3D bnxt_hwrm_check_rings(bp, &hwr); if (!rc && pci_msix_can_alloc_dyn(bp->pdev)) { - if (!bnxt_ulp_registered(bp->edev)) { + if (!bnxt_ulp_registered(bp->edev[BNXT_AUXDEV_RDMA])) { hwr.cp +=3D bnxt_get_ulp_msix_num(bp); hwr.cp =3D min_t(int, hwr.cp, bnxt_get_max_func_irqs(bp)); } @@ -15199,7 +15201,7 @@ static void bnxt_fw_reset_task(struct work_struct *= work) bnxt_dl_health_fw_status_update(bp, true); } netdev_unlock(bp->dev); - bnxt_ulp_start(bp, 0); + bnxt_ulp_start(bp); bnxt_reenable_sriov(bp); netdev_lock(bp->dev); bnxt_vf_reps_alloc(bp); @@ -15221,7 +15223,8 @@ static void bnxt_fw_reset_task(struct work_struct *= work) bnxt_fw_reset_abort(bp, rc); netdev_unlock(bp->dev); ulp_start: - bnxt_ulp_start(bp, rc); + if (!rc) + bnxt_ulp_start(bp); } =20 static int bnxt_init_board(struct pci_dev *pdev, struct net_device *dev) @@ -16211,12 +16214,13 @@ static void bnxt_remove_one(struct pci_dev *pdev) if (BNXT_PF(bp)) __bnxt_sriov_disable(bp); =20 - bnxt_rdma_aux_device_del(bp); + bnxt_aux_devices_del(bp); =20 unregister_netdev(dev); bnxt_ptp_clear(bp); =20 - bnxt_rdma_aux_device_uninit(bp); + bnxt_aux_devices_uninit(bp); + bnxt_auxdev_id_free(bp, bp->auxdev_id); =20 bnxt_free_l2_filters(bp, true); bnxt_free_ntp_fltrs(bp, true); @@ -16802,7 +16806,9 @@ static int bnxt_init_one(struct pci_dev *pdev, cons= t struct pci_device_id *ent) bnxt_set_tpa_flags(bp); bnxt_init_ring_params(bp); bnxt_set_ring_params(bp); - bnxt_rdma_aux_device_init(bp); + mutex_init(&bp->auxdev_lock); + if (!bnxt_auxdev_id_alloc(bp)) + bnxt_aux_devices_init(bp); rc =3D bnxt_set_dflt_rings(bp, true); if (rc) { if (BNXT_VF(bp) && rc =3D=3D -ENODEV) { @@ -16866,7 +16872,7 @@ static int bnxt_init_one(struct pci_dev *pdev, cons= t struct pci_device_id *ent) =20 bnxt_dl_fw_reporters_create(bp); =20 - bnxt_rdma_aux_device_add(bp); + bnxt_aux_devices_add(bp); =20 bnxt_print_device_info(bp); =20 @@ -16874,7 +16880,8 @@ static int bnxt_init_one(struct pci_dev *pdev, cons= t struct pci_device_id *ent) =20 return 0; init_err_cleanup: - bnxt_rdma_aux_device_uninit(bp); + bnxt_aux_devices_uninit(bp); + bnxt_auxdev_id_free(bp, bp->auxdev_id); bnxt_dl_unregister(bp); init_err_dl: bnxt_shutdown_tc(bp); @@ -17008,9 +17015,10 @@ static int bnxt_resume(struct device *device) =20 resume_exit: netdev_unlock(bp->dev); - bnxt_ulp_start(bp, rc); - if (!rc) + if (!rc) { + bnxt_ulp_start(bp); bnxt_reenable_sriov(bp); + } return rc; } =20 @@ -17190,9 +17198,10 @@ static void bnxt_io_resume(struct pci_dev *pdev) netif_device_attach(netdev); =20 netdev_unlock(netdev); - bnxt_ulp_start(bp, err); - if (!err) + if (!err) { + bnxt_ulp_start(bp); bnxt_reenable_sriov(bp); + } } =20 static const struct pci_error_handlers bnxt_err_handler =3D { diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethern= et/broadcom/bnxt/bnxt.h index f5f07a7e6b29..a739e7d52bdc 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h @@ -24,12 +24,12 @@ #include #include #include -#include #include #include #include #include #include +#include #ifdef CONFIG_TEE_BNXT_FW #include #endif @@ -2076,12 +2076,6 @@ struct bnxt_fw_health { #define BNXT_FW_IF_RETRY 10 #define BNXT_FW_SLOT_RESET_RETRY 4 =20 -struct bnxt_aux_priv { - struct auxiliary_device aux_dev; - struct bnxt_en_dev *edev; - int id; -}; - enum board_idx { BCM57301, BCM57302, @@ -2341,8 +2335,8 @@ struct bnxt { #define BNXT_CHIP_P5_AND_MINUS(bp) \ (BNXT_CHIP_P3(bp) || BNXT_CHIP_P4(bp) || BNXT_CHIP_P5(bp)) =20 - struct bnxt_aux_priv *aux_priv; - struct bnxt_en_dev *edev; + struct bnxt_aux_priv *aux_priv[__BNXT_AUXDEV_MAX]; + struct bnxt_en_dev *edev[__BNXT_AUXDEV_MAX]; =20 struct bnxt_napi **bnapi; =20 @@ -2751,6 +2745,13 @@ struct bnxt { struct bnxt_ctx_pg_info *fw_crash_mem; u32 fw_crash_len; struct bnxt_bs_trace_info bs_trace[BNXT_TRACE_MAX]; + int auxdev_id; + /* synchronize validity checks of available aux devices */ + struct mutex auxdev_lock; + u8 auxdev_state[__BNXT_AUXDEV_MAX]; +#define BNXT_ADEV_STATE_NONE 0 +#define BNXT_ADEV_STATE_INIT 1 +#define BNXT_ADEV_STATE_ADD 2 }; =20 #define BNXT_NUM_RX_RING_STATS 8 diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c b/drivers/ne= t/ethernet/broadcom/bnxt/bnxt_devlink.c index 230cd95d30a2..835f2b413931 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c @@ -440,13 +440,13 @@ static int bnxt_dl_reload_down(struct devlink *dl, bo= ol netns_change, "reload is unsupported while VFs are allocated or being configured= "); netdev_unlock(bp->dev); rtnl_unlock(); - bnxt_ulp_start(bp, 0); + bnxt_ulp_start(bp); return -EOPNOTSUPP; } if (bp->dev->reg_state =3D=3D NETREG_UNREGISTERED) { netdev_unlock(bp->dev); rtnl_unlock(); - bnxt_ulp_start(bp, 0); + bnxt_ulp_start(bp); return -ENODEV; } if (netif_running(bp->dev)) @@ -578,8 +578,8 @@ static int bnxt_dl_reload_up(struct devlink *dl, enum d= evlink_reload_action acti } netdev_unlock(bp->dev); rtnl_unlock(); - if (action =3D=3D DEVLINK_RELOAD_ACTION_DRIVER_REINIT) - bnxt_ulp_start(bp, rc); + if (!rc && action =3D=3D DEVLINK_RELOAD_ACTION_DRIVER_REINIT) + bnxt_ulp_start(bp); return rc; } =20 diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/ne= t/ethernet/broadcom/bnxt/bnxt_ethtool.c index 8cad7b982664..064d7bc4ce8d 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c @@ -5100,7 +5100,7 @@ static void bnxt_self_test(struct net_device *dev, st= ruct ethtool_test *etest, =20 memset(buf, 0, sizeof(u64) * bp->num_tests); if (etest->flags & ETH_TEST_FL_OFFLINE && - bnxt_ulp_registered(bp->edev)) { + bnxt_ulp_registered(bp->edev[BNXT_AUXDEV_RDMA])) { etest->flags |=3D ETH_TEST_FL_FAILED; netdev_warn(dev, "Offline tests cannot be run with RoCE driver loaded\n"= ); return; diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c b/drivers/net/et= hernet/broadcom/bnxt/bnxt_ulp.c index fa513892db50..d05a1c62fd0b 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c @@ -29,9 +29,32 @@ =20 static DEFINE_IDA(bnxt_aux_dev_ids); =20 +struct bnxt_aux_device { + const char *name; +}; + +static void bnxt_auxdev_set_state(struct bnxt *bp, int idx, int state) +{ + bp->auxdev_state[idx] =3D state; +} + +static bool bnxt_auxdev_is_init(struct bnxt *bp, int idx) +{ + return (bp->auxdev_state[idx] =3D=3D BNXT_ADEV_STATE_INIT); +} + +static bool bnxt_auxdev_is_active(struct bnxt *bp, int idx) +{ + return (bp->auxdev_state[idx] =3D=3D BNXT_ADEV_STATE_ADD); +} + +static struct bnxt_aux_device bnxt_aux_devices[__BNXT_AUXDEV_MAX] =3D {{ + .name =3D "rdma", +}}; + static void bnxt_fill_msix_vecs(struct bnxt *bp, struct bnxt_msix_entry *e= nt) { - struct bnxt_en_dev *edev =3D bp->edev; + struct bnxt_en_dev *edev =3D bp->edev[BNXT_AUXDEV_RDMA]; int num_msix, i; =20 if (!edev->ulp_tbl->msix_requested) { @@ -51,61 +74,75 @@ static void bnxt_fill_msix_vecs(struct bnxt *bp, struct= bnxt_msix_entry *ent) =20 int bnxt_get_ulp_msix_num(struct bnxt *bp) { - if (bp->edev) - return bp->edev->ulp_num_msix_vec; + struct bnxt_en_dev *edev =3D bp->edev[BNXT_AUXDEV_RDMA]; + + if (edev) + return edev->ulp_num_msix_vec; return 0; } =20 void bnxt_set_ulp_msix_num(struct bnxt *bp, int num) { - if (bp->edev) - bp->edev->ulp_num_msix_vec =3D num; + struct bnxt_en_dev *edev =3D bp->edev[BNXT_AUXDEV_RDMA]; + + if (edev) + edev->ulp_num_msix_vec =3D num; } =20 int bnxt_get_ulp_msix_num_in_use(struct bnxt *bp) { - if (bnxt_ulp_registered(bp->edev)) - return bp->edev->ulp_num_msix_vec; + struct bnxt_en_dev *edev =3D bp->edev[BNXT_AUXDEV_RDMA]; + + if (bnxt_ulp_registered(edev)) + return edev->ulp_num_msix_vec; return 0; } =20 int bnxt_get_ulp_stat_ctxs(struct bnxt *bp) { - if (bp->edev) - return bp->edev->ulp_num_ctxs; + struct bnxt_en_dev *edev =3D bp->edev[BNXT_AUXDEV_RDMA]; + + if (edev) + return edev->ulp_num_ctxs; return 0; } =20 void bnxt_set_ulp_stat_ctxs(struct bnxt *bp, int num_ulp_ctx) { - if (bp->edev) - bp->edev->ulp_num_ctxs =3D num_ulp_ctx; + struct bnxt_en_dev *edev =3D bp->edev[BNXT_AUXDEV_RDMA]; + + if (edev) + edev->ulp_num_ctxs =3D num_ulp_ctx; } =20 int bnxt_get_ulp_stat_ctxs_in_use(struct bnxt *bp) { - if (bnxt_ulp_registered(bp->edev)) - return bp->edev->ulp_num_ctxs; + struct bnxt_en_dev *edev =3D bp->edev[BNXT_AUXDEV_RDMA]; + + if (bnxt_ulp_registered(edev)) + return edev->ulp_num_ctxs; return 0; } =20 void bnxt_set_dflt_ulp_stat_ctxs(struct bnxt *bp) { - if (bp->edev) { - bp->edev->ulp_num_ctxs =3D BNXT_MIN_ROCE_STAT_CTXS; + struct bnxt_en_dev *edev =3D bp->edev[BNXT_AUXDEV_RDMA]; + + if (edev) { + edev->ulp_num_ctxs =3D BNXT_MIN_ROCE_STAT_CTXS; /* Reserve one additional stat_ctx for PF0 (except * on 1-port NICs) as it also creates one stat_ctx * for PF1 in case of RoCE bonding. */ if (BNXT_PF(bp) && !bp->pf.port_id && bp->port_count > 1) - bp->edev->ulp_num_ctxs++; + edev->ulp_num_ctxs++; =20 /* Reserve one additional stat_ctx when the device is capable * of supporting port mirroring on RDMA device. */ if (BNXT_MIRROR_ON_ROCE_CAP(bp)) - bp->edev->ulp_num_ctxs++; + edev->ulp_num_ctxs++; } } =20 @@ -141,7 +178,7 @@ int bnxt_register_dev(struct bnxt_en_dev *edev, =20 edev->ulp_tbl->msix_requested =3D bnxt_get_ulp_msix_num(bp); =20 - bnxt_fill_msix_vecs(bp, bp->edev->msix_entries); + bnxt_fill_msix_vecs(bp, edev->msix_entries); exit: mutex_unlock(&edev->en_dev_lock); netdev_unlock(dev); @@ -227,20 +264,27 @@ EXPORT_SYMBOL(bnxt_send_msg); =20 void bnxt_ulp_stop(struct bnxt *bp) { - struct bnxt_aux_priv *aux_priv =3D bp->aux_priv; - struct bnxt_en_dev *edev =3D bp->edev; + int i; =20 - if (!edev) - return; - - mutex_lock(&edev->en_dev_lock); - if (!bnxt_ulp_registered(edev) || - (edev->flags & BNXT_EN_FLAG_ULP_STOPPED)) - goto ulp_stop_exit; - - edev->flags |=3D BNXT_EN_FLAG_ULP_STOPPED; - if (aux_priv) { + mutex_lock(&bp->auxdev_lock); + for (i =3D 0; i < __BNXT_AUXDEV_MAX; i++) { + struct bnxt_aux_priv *aux_priv; struct auxiliary_device *adev; + struct bnxt_en_dev *edev; + + if (!bnxt_auxdev_is_active(bp, i)) + continue; + + aux_priv =3D bp->aux_priv[i]; + edev =3D bp->edev[i]; + mutex_lock(&edev->en_dev_lock); + if (!bnxt_ulp_registered(edev) || + (edev->flags & BNXT_EN_FLAG_ULP_STOPPED)) { + mutex_unlock(&edev->en_dev_lock); + continue; + } + + edev->flags |=3D BNXT_EN_FLAG_ULP_STOPPED; =20 adev =3D &aux_priv->aux_dev; if (adev->dev.driver) { @@ -251,29 +295,35 @@ void bnxt_ulp_stop(struct bnxt *bp) edev->en_state =3D bp->state; adrv->suspend(adev, pm); } + mutex_unlock(&edev->en_dev_lock); } -ulp_stop_exit: - mutex_unlock(&edev->en_dev_lock); + mutex_unlock(&bp->auxdev_lock); } =20 -void bnxt_ulp_start(struct bnxt *bp, int err) +void bnxt_ulp_start(struct bnxt *bp) { - struct bnxt_aux_priv *aux_priv =3D bp->aux_priv; - struct bnxt_en_dev *edev =3D bp->edev; + int i; =20 - if (!edev || err) - return; + mutex_lock(&bp->auxdev_lock); + for (i =3D 0; i < __BNXT_AUXDEV_MAX; i++) { + struct bnxt_aux_priv *aux_priv; + struct auxiliary_device *adev; + struct bnxt_en_dev *edev; =20 - mutex_lock(&edev->en_dev_lock); - if (!bnxt_ulp_registered(edev) || - !(edev->flags & BNXT_EN_FLAG_ULP_STOPPED)) - goto ulp_start_exit; + if (!bnxt_auxdev_is_active(bp, i)) + continue; =20 - if (edev->ulp_tbl->msix_requested) - bnxt_fill_msix_vecs(bp, edev->msix_entries); + aux_priv =3D bp->aux_priv[i]; + edev =3D bp->edev[i]; + mutex_lock(&edev->en_dev_lock); + if (!bnxt_ulp_registered(edev) || + !(edev->flags & BNXT_EN_FLAG_ULP_STOPPED)) { + goto clear_flag_continue; + } + + if (edev->ulp_tbl->msix_requested) + bnxt_fill_msix_vecs(bp, edev->msix_entries); =20 - if (aux_priv) { - struct auxiliary_device *adev; =20 adev =3D &aux_priv->aux_dev; if (adev->dev.driver) { @@ -283,22 +333,23 @@ void bnxt_ulp_start(struct bnxt *bp, int err) edev->en_state =3D bp->state; adrv->resume(adev); } +clear_flag_continue: + edev->flags &=3D ~BNXT_EN_FLAG_ULP_STOPPED; + mutex_unlock(&edev->en_dev_lock); } -ulp_start_exit: - edev->flags &=3D ~BNXT_EN_FLAG_ULP_STOPPED; - mutex_unlock(&edev->en_dev_lock); + mutex_unlock(&bp->auxdev_lock); } =20 void bnxt_ulp_irq_stop(struct bnxt *bp) { - struct bnxt_en_dev *edev =3D bp->edev; + struct bnxt_en_dev *edev =3D bp->edev[BNXT_AUXDEV_RDMA]; struct bnxt_ulp_ops *ops; bool reset =3D false; =20 if (!edev) return; =20 - if (bnxt_ulp_registered(bp->edev)) { + if (bnxt_ulp_registered(edev)) { struct bnxt_ulp *ulp =3D edev->ulp_tbl; =20 if (!ulp->msix_requested) @@ -315,13 +366,13 @@ void bnxt_ulp_irq_stop(struct bnxt *bp) =20 void bnxt_ulp_irq_restart(struct bnxt *bp, int err) { - struct bnxt_en_dev *edev =3D bp->edev; + struct bnxt_en_dev *edev =3D bp->edev[BNXT_AUXDEV_RDMA]; struct bnxt_ulp_ops *ops; =20 if (!edev) return; =20 - if (bnxt_ulp_registered(bp->edev)) { + if (bnxt_ulp_registered(edev)) { struct bnxt_ulp *ulp =3D edev->ulp_tbl; struct bnxt_msix_entry *ent =3D NULL; =20 @@ -347,7 +398,7 @@ void bnxt_ulp_irq_restart(struct bnxt *bp, int err) void bnxt_ulp_async_events(struct bnxt *bp, struct hwrm_async_event_cmpl *= cmpl) { u16 event_id =3D le16_to_cpu(cmpl->event_id); - struct bnxt_en_dev *edev =3D bp->edev; + struct bnxt_en_dev *edev =3D bp->edev[BNXT_AUXDEV_RDMA]; struct bnxt_ulp_ops *ops; struct bnxt_ulp *ulp; =20 @@ -388,18 +439,21 @@ void bnxt_register_async_events(struct bnxt_en_dev *e= dev, } EXPORT_SYMBOL(bnxt_register_async_events); =20 -void bnxt_rdma_aux_device_uninit(struct bnxt *bp) +void bnxt_aux_devices_uninit(struct bnxt *bp) { struct bnxt_aux_priv *aux_priv; struct auxiliary_device *adev; - - /* Skip if no auxiliary device init was done. */ - if (!bp->aux_priv) - return; - - aux_priv =3D bp->aux_priv; - adev =3D &aux_priv->aux_dev; - auxiliary_device_uninit(adev); + int idx; + + mutex_lock(&bp->auxdev_lock); + for (idx =3D 0; idx < __BNXT_AUXDEV_MAX; idx++) { + if (bnxt_auxdev_is_init(bp, idx)) { + aux_priv =3D bp->aux_priv[idx]; + adev =3D &aux_priv->aux_dev; + auxiliary_device_uninit(adev); + } + } + mutex_unlock(&bp->auxdev_lock); } =20 static void bnxt_aux_dev_release(struct device *dev) @@ -408,20 +462,25 @@ static void bnxt_aux_dev_release(struct device *dev) container_of(dev, struct bnxt_aux_priv, aux_dev.dev); struct bnxt *bp =3D netdev_priv(aux_priv->edev->net); =20 - ida_free(&bnxt_aux_dev_ids, aux_priv->id); kfree(aux_priv->edev->ulp_tbl); - bp->edev =3D NULL; + bp->edev[aux_priv->id] =3D NULL; kfree(aux_priv->edev); + bp->aux_priv[aux_priv->id] =3D NULL; kfree(aux_priv); - bp->aux_priv =3D NULL; } =20 -void bnxt_rdma_aux_device_del(struct bnxt *bp) +void bnxt_aux_devices_del(struct bnxt *bp) { - if (!bp->edev) - return; + int idx; =20 - auxiliary_device_delete(&bp->aux_priv->aux_dev); + mutex_lock(&bp->auxdev_lock); + for (idx =3D 0; idx < __BNXT_AUXDEV_MAX; idx++) { + if (bnxt_auxdev_is_active(bp, idx)) { + auxiliary_device_delete(&bp->aux_priv[idx]->aux_dev); + bnxt_auxdev_set_state(bp, idx, BNXT_ADEV_STATE_INIT); + } + } + mutex_unlock(&bp->auxdev_lock); } =20 static void bnxt_set_edev_info(struct bnxt_en_dev *edev, struct bnxt *bp) @@ -451,83 +510,105 @@ static void bnxt_set_edev_info(struct bnxt_en_dev *e= dev, struct bnxt *bp) edev->bar0 =3D bp->bar0; } =20 -void bnxt_rdma_aux_device_add(struct bnxt *bp) +void bnxt_aux_devices_add(struct bnxt *bp) { struct auxiliary_device *aux_dev; - int rc; - - if (!bp->edev) - return; - - aux_dev =3D &bp->aux_priv->aux_dev; - rc =3D auxiliary_device_add(aux_dev); - if (rc) { - netdev_warn(bp->dev, "Failed to add auxiliary device for ROCE\n"); - auxiliary_device_uninit(aux_dev); - bp->flags &=3D ~BNXT_FLAG_ROCE_CAP; + int rc, idx; + + mutex_lock(&bp->auxdev_lock); + for (idx =3D 0; idx < __BNXT_AUXDEV_MAX; idx++) { + if (bnxt_auxdev_is_init(bp, idx)) { + aux_dev =3D &bp->aux_priv[idx]->aux_dev; + rc =3D auxiliary_device_add(aux_dev); + if (rc) { + netdev_warn(bp->dev, "Failed to add auxiliary device for ROCE\n"); + auxiliary_device_uninit(aux_dev); + if (idx =3D=3D BNXT_AUXDEV_RDMA) + bp->flags &=3D ~BNXT_FLAG_ROCE_CAP; + continue; + } + bnxt_auxdev_set_state(bp, idx, BNXT_ADEV_STATE_ADD); + } } + mutex_unlock(&bp->auxdev_lock); } =20 -void bnxt_rdma_aux_device_init(struct bnxt *bp) +void bnxt_aux_devices_init(struct bnxt *bp) { struct auxiliary_device *aux_dev; struct bnxt_aux_priv *aux_priv; struct bnxt_en_dev *edev; struct bnxt_ulp *ulp; - int rc; + int rc, idx; + + mutex_lock(&bp->auxdev_lock); + for (idx =3D 0; idx < __BNXT_AUXDEV_MAX; idx++) { + bnxt_auxdev_set_state(bp, idx, BNXT_ADEV_STATE_NONE); + + if (idx =3D=3D BNXT_AUXDEV_RDMA && + !(bp->flags & BNXT_FLAG_ROCE_CAP)) + continue; + + aux_priv =3D kzalloc(sizeof(*aux_priv), GFP_KERNEL); + if (!aux_priv) + goto next_auxdev; + + aux_dev =3D &aux_priv->aux_dev; + aux_dev->id =3D bp->auxdev_id; + aux_dev->name =3D bnxt_aux_devices[idx].name; + aux_dev->dev.parent =3D &bp->pdev->dev; + aux_dev->dev.release =3D bnxt_aux_dev_release; + + rc =3D auxiliary_device_init(aux_dev); + if (rc) { + kfree(aux_priv); + goto next_auxdev; + } + bp->aux_priv[idx] =3D aux_priv; =20 - if (!(bp->flags & BNXT_FLAG_ROCE_CAP)) - return; + /* From this point, all cleanup will happen via the .release + * callback & any error unwinding will need to include a call + * to auxiliary_device_uninit. + */ + edev =3D kzalloc(sizeof(*edev), GFP_KERNEL); + if (!edev) + goto aux_dev_uninit; =20 - aux_priv =3D kzalloc(sizeof(*bp->aux_priv), GFP_KERNEL); - if (!aux_priv) - goto exit; + aux_priv->edev =3D edev; + bnxt_set_edev_info(edev, bp); =20 - aux_priv->id =3D ida_alloc(&bnxt_aux_dev_ids, GFP_KERNEL); - if (aux_priv->id < 0) { - netdev_warn(bp->dev, - "ida alloc failed for ROCE auxiliary device\n"); - kfree(aux_priv); - goto exit; - } + ulp =3D kzalloc(sizeof(*ulp), GFP_KERNEL); + if (!ulp) + goto aux_dev_uninit; =20 - aux_dev =3D &aux_priv->aux_dev; - aux_dev->id =3D aux_priv->id; - aux_dev->name =3D "rdma"; - aux_dev->dev.parent =3D &bp->pdev->dev; - aux_dev->dev.release =3D bnxt_aux_dev_release; + edev->ulp_tbl =3D ulp; + bp->edev[idx] =3D edev; + if (idx =3D=3D BNXT_AUXDEV_RDMA) + bp->ulp_num_msix_want =3D bnxt_set_dflt_ulp_msix(bp); + aux_priv->id =3D idx; + bnxt_auxdev_set_state(bp, idx, BNXT_ADEV_STATE_INIT); =20 - rc =3D auxiliary_device_init(aux_dev); - if (rc) { - ida_free(&bnxt_aux_dev_ids, aux_priv->id); - kfree(aux_priv); - goto exit; + continue; +aux_dev_uninit: + auxiliary_device_uninit(aux_dev); +next_auxdev: + if (idx =3D=3D BNXT_AUXDEV_RDMA) + bp->flags &=3D ~BNXT_FLAG_ROCE_CAP; } - bp->aux_priv =3D aux_priv; - - /* From this point, all cleanup will happen via the .release callback & - * any error unwinding will need to include a call to - * auxiliary_device_uninit. - */ - edev =3D kzalloc(sizeof(*edev), GFP_KERNEL); - if (!edev) - goto aux_dev_uninit; - - aux_priv->edev =3D edev; - - ulp =3D kzalloc(sizeof(*ulp), GFP_KERNEL); - if (!ulp) - goto aux_dev_uninit; + mutex_unlock(&bp->auxdev_lock); +} =20 - edev->ulp_tbl =3D ulp; - bp->edev =3D edev; - bnxt_set_edev_info(edev, bp); - bp->ulp_num_msix_want =3D bnxt_set_dflt_ulp_msix(bp); +int bnxt_auxdev_id_alloc(struct bnxt *bp) +{ + bp->auxdev_id =3D ida_alloc(&bnxt_aux_dev_ids, GFP_KERNEL); + if (bp->auxdev_id < 0) + return bp->auxdev_id; =20 - return; + return 0; +} =20 -aux_dev_uninit: - auxiliary_device_uninit(aux_dev); -exit: - bp->flags &=3D ~BNXT_FLAG_ROCE_CAP; +void bnxt_auxdev_id_free(struct bnxt *bp, int id) +{ + if (bp->auxdev_id >=3D 0) + ida_free(&bnxt_aux_dev_ids, id); } diff --git a/include/linux/bnxt/ulp.h b/include/linux/bnxt/ulp.h index 3c5b8a53f715..1a4643c46f86 100644 --- a/include/linux/bnxt/ulp.h +++ b/include/linux/bnxt/ulp.h @@ -10,6 +10,8 @@ #ifndef BNXT_ULP_H #define BNXT_ULP_H =20 +#include + #define BNXT_MIN_ROCE_CP_RINGS 2 #define BNXT_MIN_ROCE_STAT_CTXS 1 =20 @@ -20,6 +22,17 @@ struct hwrm_async_event_cmpl; struct bnxt; =20 +enum bnxt_auxdev_type { + BNXT_AUXDEV_RDMA =3D 0, + __BNXT_AUXDEV_MAX +}; + +struct bnxt_aux_priv { + struct auxiliary_device aux_dev; + struct bnxt_en_dev *edev; + int id; +}; + struct bnxt_msix_entry { u32 vector; u32 ring_idx; @@ -110,19 +123,21 @@ void bnxt_set_ulp_stat_ctxs(struct bnxt *bp, int num_= ctxs); int bnxt_get_ulp_stat_ctxs_in_use(struct bnxt *bp); void bnxt_set_dflt_ulp_stat_ctxs(struct bnxt *bp); void bnxt_ulp_stop(struct bnxt *bp); -void bnxt_ulp_start(struct bnxt *bp, int err); +void bnxt_ulp_start(struct bnxt *bp); void bnxt_ulp_sriov_cfg(struct bnxt *bp, int num_vfs); void bnxt_ulp_irq_stop(struct bnxt *bp); void bnxt_ulp_irq_restart(struct bnxt *bp, int err); void bnxt_ulp_async_events(struct bnxt *bp, struct hwrm_async_event_cmpl *= cmpl); -void bnxt_rdma_aux_device_uninit(struct bnxt *bp); -void bnxt_rdma_aux_device_del(struct bnxt *bp); -void bnxt_rdma_aux_device_add(struct bnxt *bp); -void bnxt_rdma_aux_device_init(struct bnxt *bp); +void bnxt_aux_devices_uninit(struct bnxt *bp); +void bnxt_aux_devices_del(struct bnxt *bp); +void bnxt_aux_devices_add(struct bnxt *bp); +void bnxt_aux_devices_init(struct bnxt *bp); int bnxt_register_dev(struct bnxt_en_dev *edev, struct bnxt_ulp_ops *ulp_o= ps, void *handle); void bnxt_unregister_dev(struct bnxt_en_dev *edev); int bnxt_send_msg(struct bnxt_en_dev *edev, struct bnxt_fw_msg *fw_msg); void bnxt_register_async_events(struct bnxt_en_dev *edev, unsigned long *events_bmap, u16 max_id); +int bnxt_auxdev_id_alloc(struct bnxt *bp); +void bnxt_auxdev_id_free(struct bnxt *bp, int id); #endif --=20 2.39.1 From nobody Sat Feb 7 13:05:39 2026 Received: from mail-oo1-f97.google.com (mail-oo1-f97.google.com [209.85.161.97]) (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 2A04C34F481 for ; Fri, 30 Jan 2026 16:49:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.97 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769791756; cv=none; b=ZMAOPtBqMFkWQzEdm5Mt8b69CXSrzkB5oIMrMw/Eqt0jDJGmEEWfpxDffsu0YENdbXLjMPVbl5QGg46mKL6Yad4385g5j4omC8wsi8F47cdd7hYXvnrNrN38+Tcnz3dGkPZFOK9ZE34J/zGPh0IscSx4TeEJSJlQ6O2sueyJlXM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769791756; c=relaxed/simple; bh=iHptridqpIIQK84x0MoLFP4xp5oEqggXS9US7q1XcxA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=EbJmRj0Y2wVOUaFJ7TK4mUY5gnsq8vuOLKa9YMWpg3gAA6/rLKQ0nbBj7zaKQ31zlxSsO/Nte3ki52wm2cPtr2APBoaDOzwZnkQmtJl639WyKDxXTQI3DYM6OI9cwio1gCQg3S1hVTCoZSgS4HolA8XTxaxVJWQvi+J7qhVCsmg= 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=Ug+Ks+um; arc=none smtp.client-ip=209.85.161.97 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="Ug+Ks+um" Received: by mail-oo1-f97.google.com with SMTP id 006d021491bc7-662f91bba0fso1838526eaf.0 for ; Fri, 30 Jan 2026 08:49:14 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769791754; x=1770396554; 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=n3x0K0XWcZUyj9kY6k6s8ToNxhMeCFsexjQ7sigdc0Q=; b=iLzAVN/2CAqQDgAlwqQR2Dn+3hl+9sT3cS6VDgdnxRTA7NnwzJRxNTAwwwhzBc1uJg YlGbdjzgtYWPbdg0JcZcHdhg5gCmvSwXI7J3CG4va0o4ekeh6q9qMKfsUmnh64bvkI/F HvH/HldnXXW/tDb84GJgSNB118w1cgV7lfN8NDDHoKjL8hx54Hwzz2xeZzB4TtUsbsGF AXTGrFxjDs+su+ZPsOv1+Ld1kEgpPkG3ZubsaFxamgEo/hfdOJS+US4ULz/pPTlaFIbD QwAb3hw/0ccrP0wHxbgDgImSa6OT8P874MNoyIyhqz9H0zxLz9t1V8fnNlxY0GbPN1Ue AXXw== X-Gm-Message-State: AOJu0YwDHHgpTndiSB5BuECzK7hJkb+psEqhozH8y3LJluIItZPfHhKs RY/7pb+r454Hh2h30SvXij/yAM9SJv4tIqdckcBqfQeyRXe9AdOQseJX1Lq5JseB5TVra1joE4Z ZTMv8Cr4c3x7Wu/oQOeiT/NBW8IfDYgPSLg8Q6x59YjTR/fB1prkFKobi1cOlxqUkLnvAs1+/21 Crhic8PcBRtdvIjdMbumrdsW3lwn//WnuVn+FCEDX/GaJu5nRHdcf532N/ikxKzzAINGCnkuMpT 2tEi1Zv3O07d1be3cI= X-Gm-Gg: AZuq6aKwNLi5pAZhZYuwLyEA6tyjpKJspDDrbPjLOCIJvvDJW+rzK8rsQslkbzlwbcJ ni0hLZfVv8uERzCEMgYcxNEoIH2wG4N2TMUgmTd11a7Ho6moKKZ3zggdP4NC5lM9sZ+2LOcM+jr RAU2wTW26eI7ihQT98IT7bj8jY+jymfT1cdUwl10fCWMs5jr0xmd2LVxAHeTgLqpPtent0b9nrU 5i+0i/ndtT5G2EJufQSiAwIAgFjq5klTnJZoZ4KV2pN+djjgMjOIzucuyf2YEnExFGHxlixpXa3 JuwwW1XGLMDGFCEoUxPawXlh4BxrlPVobd701oF5RtRyppfG8nrary7yGK89saWNbYPayDJalHN qbaBFWa8LC+ql11Tm2C6yPEl37HDRlWlACd3zkFxeAWaufu5dT3b7ys2wLz81gRs3YC32EnucB9 OYfBjNoyCsQJTzoq24U1GFcGHxxCwE8a24QPhOZQA5z2AO X-Received: by 2002:a4a:dd8b:0:b0:663:1400:1897 with SMTP id 006d021491bc7-66314001f87mr551962eaf.10.1769791753957; Fri, 30 Jan 2026 08:49:13 -0800 (PST) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-17.dlp.protect.broadcom.com. [144.49.247.17]) by smtp-relay.gmail.com with ESMTPS id 006d021491bc7-662f9a2269esm170669eaf.10.2026.01.30.08.49.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Jan 2026 08:49:13 -0800 (PST) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-2a755a780caso23207645ad.0 for ; Fri, 30 Jan 2026 08:49:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1769791752; x=1770396552; 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=n3x0K0XWcZUyj9kY6k6s8ToNxhMeCFsexjQ7sigdc0Q=; b=Ug+Ks+umrA9EqMYSDRvgyMc9IXnTUViaoAsb5YnyNqK2xNQOeG/Uz5zZbH62+vTcDI B7XXD9PHdeFHVK5/YHbFxrYeVA3I1BcLETNtgytN6CTc0LgqFM+9u2P473FKQWExDtdX rap//J8rkYx/YUxTXx8JIdmxaFXuxqGHkrBvg= X-Received: by 2002:a17:902:f712:b0:2a8:ec3c:f326 with SMTP id d9443c01a7336-2a8ec3cf4a9mr8485795ad.21.1769791752589; Fri, 30 Jan 2026 08:49:12 -0800 (PST) X-Received: by 2002:a17:902:f712:b0:2a8:ec3c:f326 with SMTP id d9443c01a7336-2a8ec3cf4a9mr8485615ad.21.1769791752157; Fri, 30 Jan 2026 08:49:12 -0800 (PST) Received: from PC-MID-R740.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a88b5d9a7bsm80193085ad.79.2026.01.30.08.49.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jan 2026 08:49:11 -0800 (PST) From: Pavan Chebbi To: jgg@ziepe.ca, michael.chan@broadcom.com Cc: linux-kernel@vger.kernel.org, dave.jiang@intel.com, saeedm@nvidia.com, Jonathan.Cameron@huawei.com, gospo@broadcom.com, selvin.xavier@broadcom.com, leon@kernel.org, kalesh-anakkur.purayil@broadcom.com, Pavan Chebbi Subject: [PATCH v4 fwctl 3/5] fwctl/bnxt_en: Create an aux device for fwctl Date: Fri, 30 Jan 2026 08:41:44 -0800 Message-Id: <20260130164146.3752166-4-pavan.chebbi@broadcom.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20260130164146.3752166-1-pavan.chebbi@broadcom.com> References: <20260130164146.3752166-1-pavan.chebbi@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" Create an additional auxiliary device to support fwctl. The next patch will create bnxt_fwctl and bind to this device. Reviewed-by: Andy Gospodarek Signed-off-by: Pavan Chebbi --- drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 12 ++++++++++-- include/linux/bnxt/ulp.h | 1 + 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c b/drivers/net/et= hernet/broadcom/bnxt/bnxt_ulp.c index d05a1c62fd0b..9eaf01177efb 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c @@ -50,6 +50,8 @@ static bool bnxt_auxdev_is_active(struct bnxt *bp, int id= x) =20 static struct bnxt_aux_device bnxt_aux_devices[__BNXT_AUXDEV_MAX] =3D {{ .name =3D "rdma", +}, { + .name =3D "fwctl", }}; =20 static void bnxt_fill_msix_vecs(struct bnxt *bp, struct bnxt_msix_entry *e= nt) @@ -278,6 +280,11 @@ void bnxt_ulp_stop(struct bnxt *bp) aux_priv =3D bp->aux_priv[i]; edev =3D bp->edev[i]; mutex_lock(&edev->en_dev_lock); + if (i =3D=3D BNXT_AUXDEV_FWCTL) { + edev->flags |=3D BNXT_EN_FLAG_ULP_STOPPED; + mutex_unlock(&edev->en_dev_lock); + continue; + } if (!bnxt_ulp_registered(edev) || (edev->flags & BNXT_EN_FLAG_ULP_STOPPED)) { mutex_unlock(&edev->en_dev_lock); @@ -316,7 +323,7 @@ void bnxt_ulp_start(struct bnxt *bp) aux_priv =3D bp->aux_priv[i]; edev =3D bp->edev[i]; mutex_lock(&edev->en_dev_lock); - if (!bnxt_ulp_registered(edev) || + if (i =3D=3D BNXT_AUXDEV_FWCTL || !bnxt_ulp_registered(edev) || !(edev->flags & BNXT_EN_FLAG_ULP_STOPPED)) { goto clear_flag_continue; } @@ -521,7 +528,8 @@ void bnxt_aux_devices_add(struct bnxt *bp) aux_dev =3D &bp->aux_priv[idx]->aux_dev; rc =3D auxiliary_device_add(aux_dev); if (rc) { - netdev_warn(bp->dev, "Failed to add auxiliary device for ROCE\n"); + netdev_warn(bp->dev, "Failed to add auxiliary device for auxdev type %= d\n", + idx); auxiliary_device_uninit(aux_dev); if (idx =3D=3D BNXT_AUXDEV_RDMA) bp->flags &=3D ~BNXT_FLAG_ROCE_CAP; diff --git a/include/linux/bnxt/ulp.h b/include/linux/bnxt/ulp.h index 1a4643c46f86..0851ad3394b0 100644 --- a/include/linux/bnxt/ulp.h +++ b/include/linux/bnxt/ulp.h @@ -24,6 +24,7 @@ struct bnxt; =20 enum bnxt_auxdev_type { BNXT_AUXDEV_RDMA =3D 0, + BNXT_AUXDEV_FWCTL, __BNXT_AUXDEV_MAX }; =20 --=20 2.39.1 From nobody Sat Feb 7 13:05:39 2026 Received: from mail-qv1-f98.google.com (mail-qv1-f98.google.com [209.85.219.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 27CA1352FA8 for ; Fri, 30 Jan 2026 16:49:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.98 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769791764; cv=none; b=byp+tdTDBO8CQeno5/P4lGdvyFg0nH35zLqVzCfObCVhNjARQySttx+RX3YX3kjLN6NiGhqcU+HkWdDNKKGPF5FBCNzIRCQX+DfM6qtrivYBf2Hq1rF/kXlbSxqxY/Mr+wIkbwtgXq9kdUdPmzJEivbO4tTtopDFyZ7+8vLcVvI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769791764; c=relaxed/simple; bh=VMvQva12skwiuYMQJCmCkAql/B/lZeRJOxP1jnKyg5w=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=FV9v4H4pRC1KxAGcH7qD6fqMUS1mzBRk0G7IAnEuyTT9purm6Rh3QtDfKZ8GCsyjSNspiAK+2ZJatkY3mVrPLyeiSW4A61ukvLdp/BFN0uYJdtKy3RhvEMMPjood4EX7q2a3ml2HNoOf0Cdv6TMqQna7XUpMlTrkQtjAmjU8qzU= 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=Vhn3b/aF; arc=none smtp.client-ip=209.85.219.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="Vhn3b/aF" Received: by mail-qv1-f98.google.com with SMTP id 6a1803df08f44-88fca7bce90so29162376d6.3 for ; Fri, 30 Jan 2026 08:49:21 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769791761; x=1770396561; 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=iC5XaNnb9UaNfh8C8rzTmnZxNyokvpdWDH0DBfMUFBw=; b=RkY0nkYI6zeAHuo5uwCSUesxVGZlVbzGGn90nPrWqBm/0VsbP8p7trZm/n27cf1WjT sRsoDnFJ3kaoc+591pMwYgNXyhSxBrFK+oQ7tTioouaPPBZFMhHcVfr7SaaWXKAlpUpb ME5hWaivbQvy57JXp+X8x6yyMWyga0R7hMVAOMc53ae+pTDYMlAgHoVYenl8f5/x4RIY luEJCogrvu39pf3x7xsuZryDP5exFB2hmyDoInwHVu7/1gkmAEdggecEPk0EGWwc4E4M 3izWA+VorXjekDmnjEUjqzxeB7y9frxj29TuhA+SzNTYxCVey6+cvAaxXCBE/7T3kliB 3+aA== X-Gm-Message-State: AOJu0YxZkfh72GVhShoy6AUlrhwdqJztE35hSO6zHE7Q+Xs9buqljtOF msvEo6D1V2l2JN8KEvzeJt3PKtVzZWtkJdFMblzC23aoBNpJ+38giYBUqHRviba16ZpdsjV/yWG a19T2axRtncHLywBaTSXcYieZH6ErL8JQvc2C6uzrTfOaJxpt+FVLm65vkEWatw32zSvk4KZell 4FnWL2nTJ6Z2wvd9EctvbPg7PXPDVofXdoHBi4C8Yq2l1DNIqfRAEpTJRbkXTRzd2lqTGoN89z4 9H/Kg4AQJEOyzwpDXI= X-Gm-Gg: AZuq6aIjtxFwWBaOuWIML6u9bIWLppYBBQwVrqOoavm6V6M1rhyV0SUmA9z+Pj9PxKR LuoRgOglYxVO1RqZv0DX5E8Rzoh/6Xv5eHac58qhIH8Jn+nx5TOFPOuXjgWxLwSL813vJ8LyNlJ zgd/v46CW00HQHHS/fsR1hlu6B6bf/yY9n5DphYoF1Etl4QWLoKKzGNGd+RVQLNgy10laQqjhF0 UlSNCw2L1hZzyc0N2JdqVsTj4TdREajWSZ05BnVodNNoP4KI30MrFmWWliJPcjicqOgA2x+5qxC amudsWvuXImtL9iLWFCFIkk7mW0XscSGx2kVHL6JCMHALgGIwp65BKxm9PjdnCul5nFEkbFhYYH cQnHP8ZEoqmmyJEwN/TO+Vz4AutDs4R5MOCae4OAdhMgPwavMOBYSamNjF08LRGfZtXGauIz1mR 7kiqZ8FGtWlF2kv4D1hrW/BiTSR7KJLzFWV8SOLzwjvKps X-Received: by 2002:ad4:5d66:0:b0:890:3eb8:1ee3 with SMTP id 6a1803df08f44-894e9f6d92dmr49539436d6.15.1769791760990; Fri, 30 Jan 2026 08:49:20 -0800 (PST) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-17.dlp.protect.broadcom.com. [144.49.247.17]) by smtp-relay.gmail.com with ESMTPS id 6a1803df08f44-894d374091fsm10764986d6.27.2026.01.30.08.49.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Jan 2026 08:49:20 -0800 (PST) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-2a79164b686so24567155ad.0 for ; Fri, 30 Jan 2026 08:49:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1769791760; x=1770396560; 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=iC5XaNnb9UaNfh8C8rzTmnZxNyokvpdWDH0DBfMUFBw=; b=Vhn3b/aFjGPNHvLKt5jeLC2A5tI+PFbQvYAatXPVeo0kuBRx8jmxXK9YOu6a+/xkBA a6SIfmQ2YaFh9+USICmRuNZ9nqHcal0pilRrIevVoJR7EZQ0ai8mQQOZALRqp4mWwBIn IVAtWktOVEJkmnnPKw8Bi43YZHY8p95S23CbE= X-Received: by 2002:a17:902:e78f:b0:2a1:388d:8ef3 with SMTP id d9443c01a7336-2a8d96a2b73mr37762425ad.18.1769791759501; Fri, 30 Jan 2026 08:49:19 -0800 (PST) X-Received: by 2002:a17:902:e78f:b0:2a1:388d:8ef3 with SMTP id d9443c01a7336-2a8d96a2b73mr37762095ad.18.1769791758914; Fri, 30 Jan 2026 08:49:18 -0800 (PST) Received: from PC-MID-R740.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a88b5d9a7bsm80193085ad.79.2026.01.30.08.49.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jan 2026 08:49:18 -0800 (PST) From: Pavan Chebbi To: jgg@ziepe.ca, michael.chan@broadcom.com Cc: linux-kernel@vger.kernel.org, dave.jiang@intel.com, saeedm@nvidia.com, Jonathan.Cameron@huawei.com, gospo@broadcom.com, selvin.xavier@broadcom.com, leon@kernel.org, kalesh-anakkur.purayil@broadcom.com, Pavan Chebbi Subject: [PATCH v4 fwctl 4/5] fwctl/bnxt_fwctl: Add bnxt fwctl device Date: Fri, 30 Jan 2026 08:41:45 -0800 Message-Id: <20260130164146.3752166-5-pavan.chebbi@broadcom.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20260130164146.3752166-1-pavan.chebbi@broadcom.com> References: <20260130164146.3752166-1-pavan.chebbi@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" Create bnxt_fwctl device. This will bind to bnxt's aux device. On the upper edge, it will register with the fwctl subsystem. It will make use of bnxt's ULP functions to send FW commands. Reviewed-by: Andy Gospodarek Reviewed-by: Dave Jiang Signed-off-by: Pavan Chebbi --- MAINTAINERS | 6 + drivers/fwctl/Kconfig | 11 + drivers/fwctl/Makefile | 1 + drivers/fwctl/bnxt/Makefile | 4 + drivers/fwctl/bnxt/main.c | 416 ++++++++++++++++++++++++++++++++++++ include/uapi/fwctl/bnxt.h | 64 ++++++ include/uapi/fwctl/fwctl.h | 1 + 7 files changed, 503 insertions(+) create mode 100644 drivers/fwctl/bnxt/Makefile create mode 100644 drivers/fwctl/bnxt/main.c create mode 100644 include/uapi/fwctl/bnxt.h diff --git a/MAINTAINERS b/MAINTAINERS index 12f49de7fe03..15cc43ccb919 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10395,6 +10395,12 @@ F: drivers/fwctl/ F: include/linux/fwctl.h F: include/uapi/fwctl/ =20 +FWCTL BNXT DRIVER +M: Pavan Chebbi +L: linux-kernel@vger.kernel.org +S: Maintained +F: drivers/fwctl/bnxt/ + FWCTL MLX5 DRIVER M: Saeed Mahameed R: Itay Avraham diff --git a/drivers/fwctl/Kconfig b/drivers/fwctl/Kconfig index b5583b12a011..d1b1925bdaec 100644 --- a/drivers/fwctl/Kconfig +++ b/drivers/fwctl/Kconfig @@ -9,6 +9,17 @@ menuconfig FWCTL fit neatly into an existing subsystem. =20 if FWCTL +config FWCTL_BNXT + tristate "bnxt control fwctl driver" + depends on BNXT + help + BNXT provides interface for the user process to access the debug and + configuration registers of the Broadcom NIC hardware family. + This will allow configuration and debug tools to work out of the box on + mainstream kernel. + + If you don't know what to do here, say N. + config FWCTL_MLX5 tristate "mlx5 ConnectX control fwctl driver" depends on MLX5_CORE diff --git a/drivers/fwctl/Makefile b/drivers/fwctl/Makefile index c093b5f661d6..692e4b8d7beb 100644 --- a/drivers/fwctl/Makefile +++ b/drivers/fwctl/Makefile @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_FWCTL) +=3D fwctl.o +obj-$(CONFIG_FWCTL_BNXT) +=3D bnxt/ obj-$(CONFIG_FWCTL_MLX5) +=3D mlx5/ obj-$(CONFIG_FWCTL_PDS) +=3D pds/ =20 diff --git a/drivers/fwctl/bnxt/Makefile b/drivers/fwctl/bnxt/Makefile new file mode 100644 index 000000000000..b47172761f1e --- /dev/null +++ b/drivers/fwctl/bnxt/Makefile @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-$(CONFIG_FWCTL_BNXT) +=3D bnxt_fwctl.o + +bnxt_fwctl-y +=3D main.o diff --git a/drivers/fwctl/bnxt/main.c b/drivers/fwctl/bnxt/main.c new file mode 100644 index 000000000000..67d65b36cb38 --- /dev/null +++ b/drivers/fwctl/bnxt/main.c @@ -0,0 +1,416 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (c) 2026, Broadcom Corporation + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +struct bnxtctl_uctx { + struct fwctl_uctx uctx; + u32 uctx_caps; +}; + +struct bnxtctl_dev { + struct fwctl_device fwctl; + struct bnxt_aux_priv *aux_priv; +}; + +DEFINE_FREE(bnxtctl, struct bnxtctl_dev *, if (_T) fwctl_put(&_T->fwctl)) + +static int bnxtctl_open_uctx(struct fwctl_uctx *uctx) +{ + struct bnxtctl_uctx *bnxtctl_uctx =3D + container_of(uctx, struct bnxtctl_uctx, uctx); + + bnxtctl_uctx->uctx_caps =3D BIT(FWCTL_BNXT_QUERY_COMMANDS) | + BIT(FWCTL_BNXT_SEND_COMMAND); + return 0; +} + +static void bnxtctl_close_uctx(struct fwctl_uctx *uctx) +{ +} + +static void *bnxtctl_info(struct fwctl_uctx *uctx, size_t *length) +{ + struct bnxtctl_uctx *bnxtctl_uctx =3D + container_of(uctx, struct bnxtctl_uctx, uctx); + struct fwctl_info_bnxt *info; + + info =3D kzalloc(sizeof(*info), GFP_KERNEL); + if (!info) + return ERR_PTR(-ENOMEM); + + info->uctx_caps =3D bnxtctl_uctx->uctx_caps; + + *length =3D sizeof(*info); + return info; +} + +static bool bnxtctl_validate_rpc(struct bnxt_en_dev *edev, + struct bnxt_fw_msg *hwrm_in, + enum fwctl_rpc_scope scope) +{ + struct input *req =3D (struct input *)hwrm_in->msg; + + guard(mutex)(&edev->en_dev_lock); + if (edev->flags & BNXT_EN_FLAG_ULP_STOPPED) + return false; + + switch (le16_to_cpu(req->req_type)) { + case HWRM_FUNC_RESET: + case HWRM_PORT_CLR_STATS: + case HWRM_FW_SET_STRUCTURED_DATA: + case HWRM_PORT_PRBS_TEST: + case HWRM_FW_LIVEPATCH: + case HWRM_FW_RESET: + case HWRM_FW_SYNC: + case HWRM_FW_SET_TIME: + case HWRM_MFG_TESTS: + case HWRM_DBG_SERDES_TEST: + case HWRM_DBG_LOG_BUFFER_FLUSH: + case HWRM_DBG_DUMP: + case HWRM_DBG_ERASE_NVM: + case HWRM_DBG_CFG: + case HWRM_DBG_COREDUMP_LIST: + case HWRM_DBG_COREDUMP_INITIATE: + case HWRM_DBG_COREDUMP_RETRIEVE: + case HWRM_DBG_CRASHDUMP_HEADER: + case HWRM_DBG_CRASHDUMP_ERASE: + case HWRM_DBG_PTRACE: + case HWRM_DBG_TOKEN_CFG: + case HWRM_NVM_DEFRAG: + case HWRM_NVM_FACTORY_DEFAULTS: + case HWRM_NVM_FLUSH: + case HWRM_NVM_INSTALL_UPDATE: + case HWRM_NVM_MODIFY: + case HWRM_NVM_VERIFY_UPDATE: + case HWRM_NVM_ERASE_DIR_ENTRY: + case HWRM_NVM_MOD_DIR_ENTRY: + case HWRM_NVM_FIND_DIR_ENTRY: + case HWRM_NVM_RAW_DUMP: + return scope >=3D FWCTL_RPC_CONFIGURATION; + + case HWRM_VER_GET: + case HWRM_FW_GET_STRUCTURED_DATA: + case HWRM_ERROR_RECOVERY_QCFG: + case HWRM_FUNC_QCAPS: + case HWRM_FUNC_QCFG: + case HWRM_FUNC_QSTATS: + case HWRM_PORT_QSTATS: + case HWRM_PORT_PHY_QCFG: + case HWRM_PORT_MAC_QCFG: + case HWRM_PORT_PHY_QCAPS: + case HWRM_PORT_PHY_I2C_READ: + case HWRM_PORT_PHY_MDIO_READ: + case HWRM_QUEUE_PRI2COS_QCFG: + case HWRM_QUEUE_COS2BW_QCFG: + case HWRM_QUEUE_DSCP2PRI_QCFG: + case HWRM_VNIC_RSS_QCFG: + case HWRM_QUEUE_GLOBAL_QCFG: + case HWRM_QUEUE_ADPTV_QOS_RX_FEATURE_QCFG: + case HWRM_QUEUE_ADPTV_QOS_TX_FEATURE_QCFG: + case HWRM_QUEUE_QCAPS: + case HWRM_QUEUE_ADPTV_QOS_RX_TUNING_QCFG: + case HWRM_QUEUE_ADPTV_QOS_TX_TUNING_QCFG: + case HWRM_TUNNEL_DST_PORT_QUERY: + case HWRM_PORT_QSTATS_EXT: + case HWRM_PORT_TX_FIR_QCFG: + case HWRM_FW_LIVEPATCH_QUERY: + case HWRM_FW_QSTATUS: + case HWRM_FW_HEALTH_CHECK: + case HWRM_FW_GET_TIME: + case HWRM_PORT_DSC_DUMP: + case HWRM_PORT_EP_TX_QCFG: + case HWRM_PORT_QCFG: + case HWRM_PORT_MAC_QCAPS: + case HWRM_TEMP_MONITOR_QUERY: + case HWRM_REG_POWER_QUERY: + case HWRM_CORE_FREQUENCY_QUERY: + case HWRM_STAT_QUERY_ROCE_STATS: + case HWRM_STAT_QUERY_ROCE_STATS_EXT: + case HWRM_CFA_REDIRECT_QUERY_TUNNEL_TYPE: + case HWRM_CFA_FLOW_INFO: + case HWRM_CFA_ADV_FLOW_MGNT_QCAPS: + case HWRM_FUNC_RESOURCE_QCAPS: + case HWRM_FUNC_BACKING_STORE_QCAPS: + case HWRM_FUNC_BACKING_STORE_QCFG: + case HWRM_FUNC_QSTATS_EXT: + case HWRM_FUNC_PTP_PIN_QCFG: + case HWRM_FUNC_PTP_EXT_QCFG: + case HWRM_FUNC_BACKING_STORE_QCFG_V2: + case HWRM_FUNC_BACKING_STORE_QCAPS_V2: + case HWRM_FUNC_SYNCE_QCFG: + case HWRM_FUNC_TTX_PACING_RATE_PROF_QUERY: + case HWRM_PCIE_QSTATS: + case HWRM_MFG_OTP_QCFG: + case HWRM_MFG_FRU_EEPROM_READ: + case HWRM_MFG_GET_NVM_MEASUREMENT: + case HWRM_STAT_GENERIC_QSTATS: + case HWRM_PORT_PHY_FDRSTAT: + case HWRM_QUEUE_ADPTV_QOS_RX_QCFG: + case HWRM_QUEUE_ADPTV_QOS_TX_QCFG: + case HWRM_DBG_READ_DIRECT: + case HWRM_DBG_READ_INDIRECT: + case HWRM_DBG_RING_INFO_GET: + case HWRM_DBG_QCAPS: + case HWRM_DBG_QCFG: + case HWRM_DBG_USEQ_FLUSH: + case HWRM_DBG_USEQ_QCAPS: + case HWRM_DBG_SIM_CABLE_STATE: + case HWRM_DBG_TOKEN_QUERY_AUTH_IDS: + case HWRM_NVM_GET_VARIABLE: + case HWRM_NVM_GET_DEV_INFO: + case HWRM_NVM_GET_DIR_ENTRIES: + case HWRM_NVM_GET_DIR_INFO: + case HWRM_NVM_READ: + case HWRM_SELFTEST_QLIST: + case HWRM_SELFTEST_RETRIEVE_SERDES_DATA: + return scope >=3D FWCTL_RPC_DEBUG_READ_ONLY; + + case HWRM_PORT_PHY_I2C_WRITE: + case HWRM_MFG_FRU_WRITE_CONTROL: + case HWRM_MFG_FRU_EEPROM_WRITE: + case HWRM_DBG_WRITE_DIRECT: + case HWRM_NVM_SET_VARIABLE: + case HWRM_NVM_WRITE: + case HWRM_NVM_RAW_WRITE_BLK: + case HWRM_PORT_PHY_MDIO_WRITE: + return scope >=3D FWCTL_RPC_DEBUG_WRITE; + + default: + return false; + } +} + +static int bnxt_fw_setup_input_dma(struct bnxtctl_dev *bnxt_dev, + struct device *dev, + struct fwctl_dma_info_bnxt *msg, + struct bnxt_fw_msg *fw_msg, + int num_dma, + void **dma_virt_addr, + dma_addr_t *dma_addr) +{ + struct fwctl_dma_info_bnxt *dma_buf =3D msg; + u8 i, num_allocated =3D 0; + void *dma_ptr; + int rc; + + for (i =3D 0; i < num_dma; i++) { + if (msg->len =3D=3D 0 || msg->len > MAX_DMA_MEM_SIZE) { + rc =3D -EINVAL; + goto err; + } + dma_virt_addr[i] =3D dma_alloc_coherent(dev->parent, msg->len, + &dma_addr[i], GFP_KERNEL); + if (!dma_virt_addr[i]) { + rc =3D -ENOMEM; + goto err; + } + num_allocated++; + if (msg->dma_direction =3D=3D DEVICE_WRITE) { + if (copy_from_user(dma_virt_addr[i], + u64_to_user_ptr(msg->data), + msg->len)) { + rc =3D -EFAULT; + goto err; + } + } + dma_ptr =3D fw_msg->msg + msg->offset; + + if (!(PTR_ALIGN(dma_ptr, 8) =3D=3D dma_ptr) || + msg->offset >=3D fw_msg->msg_len) { + rc =3D -EINVAL; + goto err; + } + + *(__le64 *)(dma_ptr) =3D cpu_to_le64(dma_addr[i]); + msg++; + } + + return 0; +err: + for (i =3D 0; i < num_allocated; i++) + dma_free_coherent(dev->parent, dma_buf[i].len, + dma_virt_addr[i], dma_addr[i]); + + return rc; +} + +static void *bnxtctl_fw_rpc(struct fwctl_uctx *uctx, + enum fwctl_rpc_scope scope, + void *in, size_t in_len, size_t *out_len) +{ + struct bnxtctl_dev *bnxtctl =3D + container_of(uctx->fwctl, struct bnxtctl_dev, fwctl); + struct bnxt_aux_priv *bnxt_aux_priv =3D bnxtctl->aux_priv; + void *dma_virt_addr[MAX_NUM_DMA_INDICATIONS]; + dma_addr_t dma_addr[MAX_NUM_DMA_INDICATIONS]; + struct fwctl_dma_info_bnxt *dma_buf =3D NULL; + struct device *dev =3D &uctx->fwctl->dev; + struct fwctl_rpc_bnxt *msg =3D in; + struct bnxt_fw_msg rpc_in =3D {0}; + int i, rc, err =3D 0; + + rpc_in.msg =3D memdup_user(u64_to_user_ptr(msg->req), msg->req_len); + if (IS_ERR(rpc_in.msg)) + return rpc_in.msg; + + if (!bnxtctl_validate_rpc(bnxt_aux_priv->edev, &rpc_in, scope)) { + err =3D -EPERM; + goto free_msg_out; + } + + rpc_in.msg_len =3D msg->req_len; + rpc_in.resp =3D kzalloc(*out_len, GFP_KERNEL); + if (!rpc_in.resp) { + err =3D -ENOMEM; + goto free_msg_out; + } + + rpc_in.resp_max_len =3D *out_len; + if (!msg->timeout) + rpc_in.timeout =3D DFLT_HWRM_CMD_TIMEOUT; + else + rpc_in.timeout =3D msg->timeout; + + if (msg->num_dma) { + if (msg->num_dma > MAX_NUM_DMA_INDICATIONS) { + dev_err(dev, "DMA buffers exceed the number supported\n"); + err =3D -EINVAL; + goto free_msg_out; + } + + dma_buf =3D kcalloc(msg->num_dma, sizeof(*dma_buf), GFP_KERNEL); + if (!dma_buf) { + err =3D -ENOMEM; + goto free_msg_out; + } + + if (copy_from_user(dma_buf, u64_to_user_ptr(msg->payload), + msg->num_dma * sizeof(*dma_buf))) { + dev_dbg(dev, "Failed to copy payload from user\n"); + err =3D -EFAULT; + goto free_dmabuf_out; + } + + err =3D bnxt_fw_setup_input_dma(bnxtctl, dev, dma_buf, &rpc_in, + msg->num_dma, &dma_virt_addr[0], + &dma_addr[0]); + if (err) + goto free_dmabuf_out; + } + + rc =3D bnxt_send_msg(bnxt_aux_priv->edev, &rpc_in); + if (rc) { + struct output *resp =3D rpc_in.resp; + + /* Copy the response to user always, as it contains + * detailed status of the command failure + */ + if (!resp->error_code) + /* bnxt_send_msg() returned much before FW + * received the command. + */ + resp->error_code =3D rc; + + goto free_dma_out; + } + + for (i =3D 0; i < msg->num_dma; i++) { + if (dma_buf[i].dma_direction !=3D DEVICE_READ) + continue; + if (copy_to_user(u64_to_user_ptr(dma_buf[i].data), + dma_virt_addr[i], dma_buf[i].len)) { + dev_dbg(dev, "Failed to copy resp to user\n"); + err =3D -EFAULT; + break; + } + } +free_dma_out: + /* Cleanup any dma memory that bnxt_fw_setup_input_dma() may have + * allocated + */ + for (i =3D 0; i < msg->num_dma; i++) + dma_free_coherent(dev->parent, dma_buf[i].len, dma_virt_addr[i], + dma_addr[i]); +free_dmabuf_out: + kfree(dma_buf); +free_msg_out: + kfree(rpc_in.msg); + + if (err) { + kfree(rpc_in.resp); + return ERR_PTR(err); + } + + return rpc_in.resp; +} + +static const struct fwctl_ops bnxtctl_ops =3D { + .device_type =3D FWCTL_DEVICE_TYPE_BNXT, + .uctx_size =3D sizeof(struct bnxtctl_uctx), + .open_uctx =3D bnxtctl_open_uctx, + .close_uctx =3D bnxtctl_close_uctx, + .info =3D bnxtctl_info, + .fw_rpc =3D bnxtctl_fw_rpc, +}; + +static int bnxtctl_probe(struct auxiliary_device *adev, + const struct auxiliary_device_id *id) +{ + struct bnxt_aux_priv *aux_priv =3D + container_of(adev, struct bnxt_aux_priv, aux_dev); + struct bnxtctl_dev *bnxtctl __free(bnxtctl) =3D + fwctl_alloc_device(&aux_priv->edev->pdev->dev, &bnxtctl_ops, + struct bnxtctl_dev, fwctl); + int rc; + + if (!bnxtctl) + return -ENOMEM; + + bnxtctl->aux_priv =3D aux_priv; + + rc =3D fwctl_register(&bnxtctl->fwctl); + if (rc) + return rc; + + auxiliary_set_drvdata(adev, no_free_ptr(bnxtctl)); + return 0; +} + +static void bnxtctl_remove(struct auxiliary_device *adev) +{ + struct bnxtctl_dev *ctldev =3D auxiliary_get_drvdata(adev); + + fwctl_unregister(&ctldev->fwctl); + fwctl_put(&ctldev->fwctl); +} + +static const struct auxiliary_device_id bnxtctl_id_table[] =3D { + { .name =3D "bnxt_en.fwctl", }, + {} +}; +MODULE_DEVICE_TABLE(auxiliary, bnxtctl_id_table); + +static struct auxiliary_driver bnxtctl_driver =3D { + .name =3D "bnxt_fwctl", + .probe =3D bnxtctl_probe, + .remove =3D bnxtctl_remove, + .id_table =3D bnxtctl_id_table, +}; + +module_auxiliary_driver(bnxtctl_driver); + +MODULE_IMPORT_NS("FWCTL"); +MODULE_DESCRIPTION("BNXT fwctl driver"); +MODULE_AUTHOR("Pavan Chebbi "); +MODULE_AUTHOR("Andy Gospodarek "); +MODULE_LICENSE("GPL"); diff --git a/include/uapi/fwctl/bnxt.h b/include/uapi/fwctl/bnxt.h new file mode 100644 index 000000000000..5620812d839c --- /dev/null +++ b/include/uapi/fwctl/bnxt.h @@ -0,0 +1,64 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * Copyright (c) 2026, Broadcom Inc + */ + +#ifndef _UAPI_FWCTL_BNXT_H_ +#define _UAPI_FWCTL_BNXT_H_ + +#include + +#define MAX_DMA_MEM_SIZE 0x10000 /*64K*/ +#define DFLT_HWRM_CMD_TIMEOUT 500 +#define DEVICE_WRITE 0 +#define DEVICE_READ 1 + +enum fwctl_bnxt_commands { + FWCTL_BNXT_QUERY_COMMANDS =3D 0, + FWCTL_BNXT_SEND_COMMAND, +}; + +/** + * struct fwctl_info_bnxt - ioctl(FWCTL_INFO) out_device_data + * @uctx_caps: The command capabilities driver accepts. + * + * Return basic information about the FW interface available. + */ +struct fwctl_info_bnxt { + __u32 uctx_caps; +}; + +#define MAX_NUM_DMA_INDICATIONS 10 + +/** + * struct fwctl_dma_info_bnxt - describe the buffer that should be DMAed + * @data: DMA-intended buffer + * @len: length of the @data + * @offset: offset at which FW (HWRM) input structure needs DMA address + * @dma_direction: DMA direction, DEVICE_READ or DEVICE_WRITE + * @unused: pad + */ +struct fwctl_dma_info_bnxt { + __aligned_u64 data; + __u32 len; + __u16 offset; + __u8 dma_direction; + __u8 unused; +}; + +/** + * struct fwctl_rpc_bnxt - describe the fwctl message for bnxt + * @req: FW (HWRM) command input structure + * @req_len: length of @req + * @timeout: if the user wants to override the driver's default, 0 otherwi= se + * @num_dma: number of DMA buffers to be added to @req + * @payload: DMA buffer details in struct fwctl_dma_info_bnxt format + */ +struct fwctl_rpc_bnxt { + __aligned_u64 req; + __u32 req_len; + __u32 timeout; + __u32 num_dma; + __aligned_u64 payload; +}; +#endif diff --git a/include/uapi/fwctl/fwctl.h b/include/uapi/fwctl/fwctl.h index 716ac0eee42d..2d6d4049c205 100644 --- a/include/uapi/fwctl/fwctl.h +++ b/include/uapi/fwctl/fwctl.h @@ -44,6 +44,7 @@ enum fwctl_device_type { FWCTL_DEVICE_TYPE_ERROR =3D 0, FWCTL_DEVICE_TYPE_MLX5 =3D 1, FWCTL_DEVICE_TYPE_CXL =3D 2, + FWCTL_DEVICE_TYPE_BNXT =3D 3, FWCTL_DEVICE_TYPE_PDS =3D 4, }; =20 --=20 2.39.1 From nobody Sat Feb 7 13:05:39 2026 Received: from mail-yx1-f98.google.com (mail-yx1-f98.google.com [74.125.224.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 CDDE83542E3 for ; Fri, 30 Jan 2026 16:49:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.224.98 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769791769; cv=none; b=hJPoAB2WwDnRYBqz3Bw5tGAKg/sr/GB+r9kMMRv/lldejCZQQ2kvLchT4GyyAG/s5Gdg0nUW8S5hfPyBbXveBHsPqGlpItjyzp/8KpphJEeDoGR4vM6brRsSP8nxvkB2haW0kXz2AKMtbeHY1PtP+9Ddjlv1Q4SEsSKpHOovNTY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769791769; c=relaxed/simple; bh=p0+9v6bOKj6/t1LScVQUgu9L7VXJ0bMnHc+ppDkUBOc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=AD8axW9TMB/o5LBe1WVpSZNu/cY7Nop9+1zU9qJZa0rb73il+3blQO5SIrj0EBtoEIGthhreph+36xipdv6A4pQGQWJbiRro+F1XFfESy4FJg+MuzDsPp1pkUmvdgL5Ygz6P8kKaDCcdiX2mSObdkh2wASLz0ZPkBA4vU5B0mL4= 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=ESoc4kZh; arc=none smtp.client-ip=74.125.224.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="ESoc4kZh" Received: by mail-yx1-f98.google.com with SMTP id 956f58d0204a3-649605d3664so2603898d50.3 for ; Fri, 30 Jan 2026 08:49:27 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769791766; x=1770396566; 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=ylrqotwPOThrY3/hhjb9VMXvSLNMw+ZG4RF4c6zLl9k=; b=NnllrQTrHR7i0ECfNVnCO8WTL4imduxpWLBsZ3HnM5guPNBJXs+wn2Jx5iYfkqjJIK ezoWu0vw/3Mcyple3oJAbv9h9PALDyDFTm+ShLy3f3lNfnBeH1keIjB8p3cfOSRv9Wx8 LylvEy31SFRip5QtlYYCScXsqxfHpabwlEG1aFC5qTKMCl7CEUvteLZfHB7POyvblzrg FMAk2onbUrqLCZKHV0lgcEf+52HFkxww46cjQanroWyqqmQzKdgh+kwWiniVpCzAhxal qVmfnRQrgMMQvImA/h6hP2Wuatl2EotYjEmyKjVxOGnteT84PP3IzC+dySvQsB5Ehepy ey1Q== X-Gm-Message-State: AOJu0Yxzun/7lKYsuTk5ehTPRBCGtvBuYBOLqCJ2UnpvMy/qtj7Kj8dk 3kxSrO+13I82GWJ5uPUoxH/A05nmJErdRmdkVExIEYngou6vzLK9AIdOcthrRGT1EgoiG8f74At /TpmdMpx4rYSKTLgh9KXcP9SHaYD3xs0CJ0VDh78i7o4nSojjAnA24yb2BYdULn2EzU0qQpU4Lw 8D2Lc4QQvA7+eFvQIYVg2/I/Auos37YUS1hAXTH4G0d8159+pV25n1Q/I9rXqjEV+xqFhR/dS4T YbIbDMT2c+ZDgQDESs= X-Gm-Gg: AZuq6aJkGgL4ZD8y74AkEq83/3EHkbYJEwN8EnMLKeXWgDC2NvAR1ZEE/hiae4CSPFv Wly6brw1m7jOZ/cqRAg+qoTtyYcoa3xGrakwfhe3r2LXnWQrbrGopE9g2birtUr36KC3OwwHlFm QMXauflSdVX9baa6UZkP8Pm/VpG+OY0Psr8r2eD8vkLAKKFAaw2QH4/CAqTxRQqgCTgiMoEhbY/ lw66rdF9Q5EznoNkYSLLZnDlmzVfCUcXw/Uss603VRPcfVFjdZIHnmFevRKZj/8/rVddmzJ95KM dftUxjycq17hNtTDRr9RA+ZffWbJLXNdd4okrmflntXUESILUR1nczihZn8FZlDlkCstx3S9emu AQfSV17bfOnDcHefbTpEtoYDcMDOnJPd9bnNtwG6xvhuRzA0Ywu6RPnk+2f0IB21HZfN42F5tBn LSCzPikT/yUTj6DVepK7oj3hqpz99vaoEyIANJq3DgIusC X-Received: by 2002:a05:690e:4107:b0:649:6830:2f76 with SMTP id 956f58d0204a3-649a8436a83mr2608030d50.17.1769791766424; Fri, 30 Jan 2026 08:49:26 -0800 (PST) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-17.dlp.protect.broadcom.com. [144.49.247.17]) by smtp-relay.gmail.com with ESMTPS id 956f58d0204a3-649960731b8sm881378d50.1.2026.01.30.08.49.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Jan 2026 08:49:26 -0800 (PST) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-pg1-f200.google.com with SMTP id 41be03b00d2f7-c6136af8e06so1564290a12.1 for ; Fri, 30 Jan 2026 08:49:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1769791765; x=1770396565; 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=ylrqotwPOThrY3/hhjb9VMXvSLNMw+ZG4RF4c6zLl9k=; b=ESoc4kZhH59+e4mBxZC8o1iG3r0ohrY1jpAU/FhZrO4bCjxmjWv8LM26WKta+mQOmn iqELdHY5eaSxtn7N54pqoRraBUnjNATp0FVJL7fNNJ+2Wrx+JeAgBqYxmI97P37/bYh2 +8xY2ZPtmaeViZjm19opIN7ojtMM0pyLl7b9g= X-Received: by 2002:a17:902:ef52:b0:297:df4e:fdd5 with SMTP id d9443c01a7336-2a8d7ed959dmr39351465ad.23.1769791765156; Fri, 30 Jan 2026 08:49:25 -0800 (PST) X-Received: by 2002:a17:902:ef52:b0:297:df4e:fdd5 with SMTP id d9443c01a7336-2a8d7ed959dmr39351345ad.23.1769791764756; Fri, 30 Jan 2026 08:49:24 -0800 (PST) Received: from PC-MID-R740.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a88b5d9a7bsm80193085ad.79.2026.01.30.08.49.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jan 2026 08:49:24 -0800 (PST) From: Pavan Chebbi To: jgg@ziepe.ca, michael.chan@broadcom.com Cc: linux-kernel@vger.kernel.org, dave.jiang@intel.com, saeedm@nvidia.com, Jonathan.Cameron@huawei.com, gospo@broadcom.com, selvin.xavier@broadcom.com, leon@kernel.org, kalesh-anakkur.purayil@broadcom.com, Pavan Chebbi Subject: [PATCH v4 fwctl 5/5] fwctl/bnxt_fwctl: Add documentation entries Date: Fri, 30 Jan 2026 08:41:46 -0800 Message-Id: <20260130164146.3752166-6-pavan.chebbi@broadcom.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20260130164146.3752166-1-pavan.chebbi@broadcom.com> References: <20260130164146.3752166-1-pavan.chebbi@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" Add bnxt_fwctl to the driver and fwctl documentation pages. Reviewed-by: Andy Gospodarek Reviewed-by: Dave Jiang Signed-off-by: Pavan Chebbi --- .../userspace-api/fwctl/bnxt_fwctl.rst | 83 +++++++++++++++++++ Documentation/userspace-api/fwctl/fwctl.rst | 1 + Documentation/userspace-api/fwctl/index.rst | 1 + 3 files changed, 85 insertions(+) create mode 100644 Documentation/userspace-api/fwctl/bnxt_fwctl.rst diff --git a/Documentation/userspace-api/fwctl/bnxt_fwctl.rst b/Documentati= on/userspace-api/fwctl/bnxt_fwctl.rst new file mode 100644 index 000000000000..41a74a085324 --- /dev/null +++ b/Documentation/userspace-api/fwctl/bnxt_fwctl.rst @@ -0,0 +1,83 @@ +.. SPDX-License-Identifier: GPL-2.0 + +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +fwctl bnxt driver +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +:Author: Pavan Chebbi + +Overview +=3D=3D=3D=3D=3D=3D=3D=3D + +BNXT driver makes a fwctl service available through an auxiliary_device. +The bnxt_fwctl driver binds to this device and registers itself with the +fwctl subsystem. + +The bnxt_fwctl driver is agnostic to the device firmware internals. It +uses the Upper Layer Protocol (ULP) conduit provided by bnxt to send +HardWare Resource Manager (HWRM) commands to firmware. + +These commands can query or change firmware driven device configurations +and read/write registers that are useful for debugging. + +bnxt_fwctl User API +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +Each RPC request contains a message request structure (HWRM input), +its length, optional request timeout, and dma buffers' information +if the command needs any DMA. The request is then put together with +the request data and sent through bnxt's message queue to the firmware, +and the results are returned to the caller. + +A typical user application can send a FWCTL_INFO command using ioctl() +to discover bnxt_fwctl's RPC capabilities as shown below: + + ioctl(fd, FWCTL_INFO, &fwctl_info_msg); + +where fwctl_info_msg (of type struct fwctl_info) describes bnxt_info_msg +(of type struct fwctl_info_bnxt). fwctl_info_msg is set up as follows: + + size =3D sizeof(struct fwctl_info); + flags =3D 0; + device_data_len =3D sizeof(bnxt_info_msg); + out_device_data =3D (__aligned_u64)&bnxt_info_msg; + +The uctx_caps of bnxt_info_msg represents the capabilities as described +in fwctl_bnxt_commands of include/uapi/fwctl/bnxt.h + +The FW RPC itself, FWCTL_RPC can be sent using ioctl() as: + + ioctl(fd, FWCTL_RPC, &fwctl_rpc_msg); + +where fwctl_rpc_msg (of type struct fwctl_rpc) encapsulates fwctl_rpc_bnxt +(see bnxt_rpc_msg below). fwctl_rpc_bnxt members are set up as per the +requirements of specific HWRM commands described in include/bnxt/hsi.h. +An example for HWRM_VER_GET is shown below: + + struct fwctl_rpc_bnxt bnxt_rpc_msg; + struct hwrm_ver_get_output resp; + struct fwctl_rpc fwctl_rpc_msg; + struct hwrm_ver_get_input req; + + req.req_type =3D HWRM_VER_GET; + req.hwrm_intf_maj =3D HWRM_VERSION_MAJOR; + req.hwrm_intf_min =3D HWRM_VERSION_MINOR; + req.hwrm_intf_upd =3D HWRM_VERSION_UPDATE; + req.cmpl_ring =3D -1; + req.target_id =3D -1; + + bnxt_rpc_msg.req_len =3D sizeof(struct hwrm_ver_get_input); + bnxt_rpc_msg.num_dma =3D 0; + bnxt_rpc_msg.req =3D (__aligned_u64)&req; + + fwctl_rpc_msg.size =3D sizeof(struct fwctl_rpc); + fwctl_rpc_msg.scope =3D FWCTL_RPC_DEBUG_READ_ONLY; + fwctl_rpc_msg.in_len =3D sizeof(bnxt_rpc_msg) + sizeof(req); + fwctl_rpc_msg.out_len =3D sizeof(struct hwrm_ver_get_output); + fwctl_rpc_msg.in =3D (__aligned_u64)&bnxt_rpc_msg; + fwctl_rpc_msg.out =3D (__aligned_u64)&resp; + +An example python3 program that can exercise this interface can be found in +the following git repository: + +https://github.com/Broadcom/fwctl-tools diff --git a/Documentation/userspace-api/fwctl/fwctl.rst b/Documentation/us= erspace-api/fwctl/fwctl.rst index a74eab8d14c6..826817bfd54d 100644 --- a/Documentation/userspace-api/fwctl/fwctl.rst +++ b/Documentation/userspace-api/fwctl/fwctl.rst @@ -148,6 +148,7 @@ area resulting in clashes will be resolved in favour of= a kernel implementation. fwctl User API =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 +.. kernel-doc:: include/uapi/fwctl/bnxt.h .. kernel-doc:: include/uapi/fwctl/fwctl.h .. kernel-doc:: include/uapi/fwctl/mlx5.h .. kernel-doc:: include/uapi/fwctl/pds.h diff --git a/Documentation/userspace-api/fwctl/index.rst b/Documentation/us= erspace-api/fwctl/index.rst index 316ac456ad3b..8062f7629654 100644 --- a/Documentation/userspace-api/fwctl/index.rst +++ b/Documentation/userspace-api/fwctl/index.rst @@ -10,5 +10,6 @@ to securely construct and execute RPCs inside device firm= ware. :maxdepth: 1 =20 fwctl + bnxt_fwctl fwctl-cxl pds_fwctl --=20 2.39.1