From nobody Thu Apr 16 19:10:59 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 A578E392C2D for ; Thu, 26 Feb 2026 08:33:54 +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=1772094837; cv=none; b=fOIxH7tNAJAwVBqcF6NyWRK0c9EXeBZePCMs2gNH/+fCxGQnFBPzCWVbPtnrhtKpoX/F1yQ7wy776DERRN06NY+Z2ncmdhLR8cDC0K0qlO+TZPz2zWuWx3f2FHbJspgME39AXAyCVuDOzd1Wb9eNXlcVVajD4hxu/GUz8/eTwiQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772094837; c=relaxed/simple; bh=+WUzpV3PbPElxR0d/PLjyo4kLJ+uKzOD75MwINZpAmg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Gbn/rSKuO5cwolzTby2xIE3C74u6DpY/Y3RS1ox0EZeonZq1ABIEDBgecOzyCBeCbe0I5NbOpaHeAEClxzQbw+fJ3Vy3D6teKIQdRoSCqXshAz3MQnISZHMO/T111im5uWj9a+2i8IYutPXMoT1n8rMSzSlIUwDcj0qodK0Quxc= 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=HEdFl7Sa; 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="HEdFl7Sa" Received: by mail-pl1-f226.google.com with SMTP id d9443c01a7336-2a9296b3926so4527765ad.1 for ; Thu, 26 Feb 2026 00:33:54 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772094834; x=1772699634; 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=Qlotyy7boBYMZpKi80kpBSA+qi3F1NtVP9AUOIT6y7r8QEMFaofQDwFwCMoDW8aLAN 5/DA2hZi1U4HtoBS0fwylhrPWZvR7Id928TmZgxoS+y1ExvlbNwd3wS60vHTvLJcm35a QodMGFiYr4TsF0GcOf6qI1j/m+OwmW5QkiHLLG8Gp3dYPC2MPdSeEvM+xGBX0V53KjHj 8OUiqkGMyKbZSioFzz0fpH/MDNgLWurIHLDOTd7zIlF457VPV5p8ZvROF6+mdQppKLDf uVXfm7KXAnYqfQCWysvR3oCroD5jS14RdL0OaKMgg3zkbBFVmaRoSUPnISr/1eXLsBGd kJRA== X-Gm-Message-State: AOJu0Yz8QaM7TtefJLp/fGbHTHzesNg3cBPeC9XAD9F3fLlw6IxpFycG pvX4cBv+ojf8x+YPEu8wzaRNxF32NYidFat1vuh1bsTXNn6waj+ix4xjxoUyTw0RBIhBJmod9xn 7Iu4ySjbokaiIim10v0ClrNPan6VukWn3Q1csfm8GeTcjc+ftG406JSwZPEcefh8ns5noLmDemd iUc8cCnKAzXs4CDs+lsrABypBGCeSTJNcaAlnJcugV7KwXAqVD3GMCM6Zgq0jm4rKiR1XDkuD4A VgLbK+o2iP8C1C+IrYvbg== X-Gm-Gg: ATEYQzyufuLfjmTE7wJTLW7FtPJ/uXeSROYTRr18p1e/ytjbLlNd+sJLKM7aiIymTqI gTxA83Pl3q9s3EiqVHIYgx+ObSCCV77eu16QFed6hLf+pSRQPF6iw/wE4j+puK4VbXh0c0qUBwu 5yBa1yI0JCE4MSt1EoBJuu4m1rdpEb5V4ZJg4cJchAl5jE/V3xI+N/jWCoGNb+hdLyq0P4Mr7M8 WqJj5xhxdg7zyJhyr99Z1NRajpG/Ti1XIdXV9W+B4y4/EPnUEDUXZuDbYXW58mq049HxY2EMXYn EhY8I0HZQ5DXvkazDON8MbumuVXvxKeNLfSmTgWNQhwP5ptWnmsG3MsvkscnzEj4qOzuwkw/55w /rsvqU5q3ggoSu39fM+4shVZPC5pueAICRvdj5pdx+Dh+ckerWuQppuR7jb1Gb/oAFVbUcdFl4C 9AEHKqv/u/FmEl2PXpEZ48H/bCc5rD5wxE8YyuNhyfbRtJiRaRRsdlemc3j20= X-Received: by 2002:a17:902:ef49:b0:2a0:d05c:7de3 with SMTP id d9443c01a7336-2ae0317786dmr21079745ad.15.1772094833859; Thu, 26 Feb 2026 00:33:53 -0800 (PST) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-103.dlp.protect.broadcom.com. [144.49.247.103]) by smtp-relay.gmail.com with ESMTPS id d9443c01a7336-2adfb5dbabbsm1781705ad.26.2026.02.26.00.33.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Feb 2026 00:33:53 -0800 (PST) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-pg1-f197.google.com with SMTP id 41be03b00d2f7-c6e74e55d35so346536a12.3 for ; Thu, 26 Feb 2026 00:33:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1772094832; x=1772699632; 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=HEdFl7SaC78TY+dSIkXdzSZPvIMqcjOC9c57zfVcYJc6qU/3KDA4uTKY0TAkVsT6UA z1ZSlkglMW0KQZ+h8W9SFodYAL6X+vrX/z/jxUAEg0C7pwzPcY0yeQreoeWjp91jmgY8 PBVGM/mZQjPXrXlR5+W+75AgjrFC0Xe3/6Drc= X-Received: by 2002:aa7:8884:0:b0:823:f96:63bb with SMTP id d2e1a72fcca58-8273c077551mr1657040b3a.52.1772094831915; Thu, 26 Feb 2026 00:33:51 -0800 (PST) X-Received: by 2002:aa7:8884:0:b0:823:f96:63bb with SMTP id d2e1a72fcca58-8273c077551mr1657014b3a.52.1772094831431; Thu, 26 Feb 2026 00:33:51 -0800 (PST) Received: from PC-MID-R740.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82739d4c9b5sm1661613b3a.9.2026.02.26.00.33.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Feb 2026 00:33:50 -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 v5 fwctl 1/5] fwctl/bnxt_en: Move common definitions to include/linux/bnxt/ Date: Thu, 26 Feb 2026 00:23:14 -0800 Message-Id: <20260226082318.525518-2-pavan.chebbi@broadcom.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20260226082318.525518-1-pavan.chebbi@broadcom.com> References: <20260226082318.525518-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 Thu Apr 16 19:10:59 2026 Received: from mail-yw1-f226.google.com (mail-yw1-f226.google.com [209.85.128.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 677CD3939AF for ; Thu, 26 Feb 2026 08:33:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.226 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772094841; cv=none; b=kyKRkj+IiehdI47YunXLU9pKPjqtyjaVTriGzfarFuAkmo1JwN9Fuo90Y3pxvUyzjs0YdprXxoB2Qskk/G83YJzfd0B5JVYOYh0ph9jH/ealk899sOHsAwm7dyakeIHzSdYpmdETzdg1/OtlB6aEA23yuYQMehQ36ctjylZDtdY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772094841; c=relaxed/simple; bh=xx9KiCaR2AMOSvUJOVkNa4/+FG5ffgFVUCsVkKhEM6Y=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=a1bXkSKABgnIIG3p0sxFGCxE1l1z3Az3PDQf8fyd4qjHpKGbujxPBWrmgtdlp/E1BkQ24vhnHvHo+4zJstwZ2iNyJemLCBT3DHOwXsRB+4tG8q4/F9jqvqOGeqGUf9n4ZNXkL5HbBP39HlUdbHW0yDY8Q6pfZ9EqGx9JqObHGPg= 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=I+7JoTS9; arc=none smtp.client-ip=209.85.128.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="I+7JoTS9" Received: by mail-yw1-f226.google.com with SMTP id 00721157ae682-7984d31b895so5199107b3.1 for ; Thu, 26 Feb 2026 00:33:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772094838; x=1772699638; 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=lJAzDrJquq5PoOl0EU+l7lDdTHUHhiAEkR6EQlMPgdU=; b=o+l4rTaM1AkrZUonrU5WvqBSS1egSbpvw2mTqNsJa7DrqgAsT50DLW4dmY0dM2+2QM oaNgkz0UFeGRdbkzXlb4eKudgWwrE9HOWE032hVcfYgIsJPe5WnfHA3iilROcZnnkJdz PgR9dj5daKRRFbEZ5fIpyFjLcG1efZ8wn4wacbK+RblU9EU7AUrcB+v/zNUhQhOaQyqA lORqp/6zrmsXmqXxCSRkSOzThkms9nzJFd+Zlkwgf+/PR73NMPSMdbUTJvJ6XDQTj4Rt lG9swrhOBV0ppBfZ5KuvWYa43vtZjPUbdjV5lKa+1ccvwsnycflJV0JePYrfK7fOyCDU leQg== X-Gm-Message-State: AOJu0Yydjy61I4GDR2LQWvQfebw0oyouOUCNDmumH2b2lMexk5Lk9hvT vtAm1aV9wKVYrIXa5f1QNV2r8kPdnZzOv1tpZsHK/POSO6/UYZopMcQS3GefQ9d4jZ8K2VDOMQ6 M3GfAW2b7LkoiyFkG3cKtUxx8hnc8Jzd+93LfJEEE1daY9upVtv1VcKY3hZDIMbZxK/HHzt1umN FAa1mgxCNUxMaFT/2gDqdDujPG4xljK3BjF8m6cmi7kPhOg0+elFUbE3pQxrRx+mo6T5fRzxqXT tAAA/4OAUbjAeZyxOXsvA== X-Gm-Gg: ATEYQzy4gPRSj3u9UbWbxuPoThTWVOuhUYxOAIvkAk7jxmwAovG8mjstYnnhlvRPOAr fRitwcOKyjOz3lotUZESMg7fuSnIyIiyFoFNHSKoFoFoov4cqOkjIn2d/zXdtTWLnVdmZ9Gq2nF HazFRlk4gv4FwMuh8l7p7sTWbEaH6gbyYuNTwPJlCSl/n47Om6j2KGA7Jf2JxjfiDW9lg+NXxv/ 1G2vxuOXj16aeHLcqg1B92cSnPb4d0RAXMXPtwJnGutb2xtOkGZFGvuN81iDm7w3Y1U/HSg0ZY9 qLMAOPqXL5ki5uJenSGtjGzqK2Hfsu35StIPYJ0u1uSCn+U/RCGFaDzKyfj8+4AppRao70F/fOX gbCO1pa6Tqmf8CoMOi+w43k6QyiQ5bhyYMAaldXfK/MWGAf8pqCqylT4xSEVv7GKEi/Z/PySmxm NNoxA8erORbqpzNF78CWjbBhB+uJsQIbZqWIHBypcqpnXcimUT02dJVEbV4QA= X-Received: by 2002:a05:690c:14:b0:798:4f43:a706 with SMTP id 00721157ae682-7986fdfcd55mr30578427b3.36.1772094838094; Thu, 26 Feb 2026 00:33:58 -0800 (PST) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-118.dlp.protect.broadcom.com. [144.49.247.118]) by smtp-relay.gmail.com with ESMTPS id 00721157ae682-79876ab7b69sm1593777b3.1.2026.02.26.00.33.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Feb 2026 00:33:58 -0800 (PST) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-pf1-f200.google.com with SMTP id d2e1a72fcca58-8273f4ed107so224811b3a.2 for ; Thu, 26 Feb 2026 00:33:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1772094836; x=1772699636; 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=lJAzDrJquq5PoOl0EU+l7lDdTHUHhiAEkR6EQlMPgdU=; b=I+7JoTS9udebngDhR5cxMO6sDis/c1DyEgUWeqii6CAh3MGbUiZDEzInLQvQ82L/dg iH9VevSnOv2pMMHEYuv+SjZMpR6pSefcZ1rhc3Oo3uDTQVmf4afQWfe2hEoelsE42MEV 1NGWXtBl97a9T2zpYTjwgOts0NKkeh2KhLMlU= X-Received: by 2002:a05:6a00:a242:b0:823:1094:2458 with SMTP id d2e1a72fcca58-827333f3955mr3380275b3a.0.1772094836365; Thu, 26 Feb 2026 00:33:56 -0800 (PST) X-Received: by 2002:a05:6a00:a242:b0:823:1094:2458 with SMTP id d2e1a72fcca58-827333f3955mr3380245b3a.0.1772094835851; Thu, 26 Feb 2026 00:33:55 -0800 (PST) Received: from PC-MID-R740.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82739d4c9b5sm1661613b3a.9.2026.02.26.00.33.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Feb 2026 00:33:55 -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 Subject: [PATCH v5 fwctl 2/5] fwctl/bnxt_en: Refactor aux bus functions to be more generic Date: Thu, 26 Feb 2026 00:23:15 -0800 Message-Id: <20260226082318.525518-3-pavan.chebbi@broadcom.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20260226082318.525518-1-pavan.chebbi@broadcom.com> References: <20260226082318.525518-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 Reviewed-by: Leon Romanovsky Signed-off-by: Pavan Chebbi --- 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 Thu Apr 16 19:10:59 2026 Received: from mail-yw1-f228.google.com (mail-yw1-f228.google.com [209.85.128.228]) (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 92586392813 for ; Thu, 26 Feb 2026 08:34:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.228 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772094844; cv=none; b=aj4IVOQXbpXirOgnyRMBrcPgb5o1CsqXLN0ki0gbSVl2ZwAaD2PoCypVbYvTyox6yZ6uEONb0wKAILwARVtMOngbg1EMtJrXb1bz+WHGv6ojFBL6ktQqmgoradMywto52HPc2jYZVy4hP9oaKThTiSE9RNV/cn0ETCn5cHvCj7c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772094844; c=relaxed/simple; bh=PN0vtQNFjFQuxfFGZCUfaC2nXnFaOhQ0eX4/W+A8K5U=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=NkvHADJ/GQf9uZrvzzW/dCmEq12GPaAs4dSa11QapiEyB9Mqor3K8Vyk02+4P5aDNO195kHs8NX5c6NaNDxPWdnHpLHYEgmash0b2vlzmcLCTk+p5P4zgbB3NJkLieXzwsobKz//FerWvkcqhvo5ojEkfdsw/vTtOFqy+aIvmbQ= 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=CRzGKI28; arc=none smtp.client-ip=209.85.128.228 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="CRzGKI28" Received: by mail-yw1-f228.google.com with SMTP id 00721157ae682-7986e538decso4316947b3.1 for ; Thu, 26 Feb 2026 00:34:03 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772094842; x=1772699642; 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=hip7uX5emMqIAF3MBqMOQQe9Pkpj0KxYKUF9OZQ2RqI=; b=liu1/AqbFmU4GDPj9Mv784qDco1GVCpf72H/QPr4FF12/zSIJzJKZjcxtgDCpaapIy 3bKaEQ4ZvMjh6yP9ImQIKp4QuLRcmNwitVHPzR00GJ//ulLIc+o86vvUo6GY4TjqW8kw GCVLypAnPvCBIALPgIbE2ScKbayTt1K0RTk/Ry7JyqkiKaju5OugUlW9Lx6LHhceOuta fiq0HQK99R/pjkNCad5CT4YMleMqrd4RNZP5e9qcHF3qSPi6kmkAv6WlxOwyBo7CD5uq RRI/gZ+w1zMLHKeJVxgWTbu1u/pHSxL+fpaj24bJ2JicUjjzlD4lX/A+aRQ581FZny/m 2h+Q== X-Gm-Message-State: AOJu0YyoI7U1x7W87EPV0ikSyw9xCvphFVNkBDh575Xfbzh+oDkvDoto Ea6sDa5qDMp8xkCww+hV/RvT85mIIkWmHFO8DnWMz2ZJYUmFLXyRAuVbZB0J5DuBYaovASLbRqr VkvMZHXpczzvC1CloEcqTMCYPr1Pw3/a5z4OGmkgDqbE699YvPXFgg+P7bWax8RPbdo6OGN5xuV it5w32KC6bbtO4ibeZ1Zm5+bryRwyv1vo1sOvU7c+N64XT0Bs3Tp30YQL+Po+jjx3/vBelPtjPY UMivqeI8y6O7/o1+Bqt4A== X-Gm-Gg: ATEYQzylQbtP3WK8cY+0HyF4P8ASled/gS6ftzDGwttVKMHScqP6p8GoRheVVgSWXAV vqATcmnCqs2hbRMA/TaxrhsZSKPueRMCpw52X/clz25Qh4ctxIJFqWBM6DZXdZ7dOadbWBzb/Bq 10rO3H9Dq+XFAIHxNUhK4G48/1C7dE21eaLx0ssCr0cSHg99H93DD4fZ5Fm8/eR6KwSiaf2TSD7 GvDDdE7yw1QU+6DyWVKzmcES9zhasiPwzBqfci2I8RkwpSr5pCSReEKNQV2ZTuYkHn/j8lLRsG5 yXGMbfE7tZrob5P0RLYWnTPE0Gu+zDXe4xe7tov6SYArUQi1HKWLG6RRYLFHxl61iVlAhOA+Rk2 +iXKrxAbE90SEhFitVcOKtYUy5QDzBMJhX+2nYpGhcMQSjDhQh1vXSG8T4uDx5oGn/4Dz/E+M62 M+R0zHI47FzNSen6PzoYRkeHgPqukOoNwtykYsjCN+iWhNlofOMW2be0V1 X-Received: by 2002:a05:690c:f03:b0:796:6784:82cb with SMTP id 00721157ae682-7986fc9b102mr32127047b3.2.1772094842147; Thu, 26 Feb 2026 00:34:02 -0800 (PST) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-95.dlp.protect.broadcom.com. [144.49.247.95]) by smtp-relay.gmail.com with ESMTPS id 00721157ae682-79876c8295dsm1552737b3.27.2026.02.26.00.34.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Feb 2026 00:34:02 -0800 (PST) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-pf1-f199.google.com with SMTP id d2e1a72fcca58-8273e7824e4so422612b3a.1 for ; Thu, 26 Feb 2026 00:34:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1772094840; x=1772699640; 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=hip7uX5emMqIAF3MBqMOQQe9Pkpj0KxYKUF9OZQ2RqI=; b=CRzGKI28KCqRbeRsxgK98420ZmokdsOInPhbU6MJrT8bTPNuukmZCrGCPDVNYyoqpQ 2VgbdmgVZtRTFFlYcP/o5DuUr2WfPbYMuskMc0ZHpG8k11yiGkpocgpu0rraV6YxES2I yPBK+aZP63MAA6cyvfV2L1WQ+xju5Xjb9nguk= X-Received: by 2002:a05:6a00:1791:b0:827:2995:3ba0 with SMTP id d2e1a72fcca58-827337843eamr2807501b3a.32.1772094840489; Thu, 26 Feb 2026 00:34:00 -0800 (PST) X-Received: by 2002:a05:6a00:1791:b0:827:2995:3ba0 with SMTP id d2e1a72fcca58-827337843eamr2807483b3a.32.1772094840006; Thu, 26 Feb 2026 00:34:00 -0800 (PST) Received: from PC-MID-R740.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82739d4c9b5sm1661613b3a.9.2026.02.26.00.33.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Feb 2026 00:33:59 -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 Subject: [PATCH v5 fwctl 3/5] fwctl/bnxt_en: Create an aux device for fwctl Date: Thu, 26 Feb 2026 00:23:16 -0800 Message-Id: <20260226082318.525518-4-pavan.chebbi@broadcom.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20260226082318.525518-1-pavan.chebbi@broadcom.com> References: <20260226082318.525518-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 Reviewed-by: Leon Romanovsky 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 Thu Apr 16 19:10:59 2026 Received: from mail-ua1-f99.google.com (mail-ua1-f99.google.com [209.85.222.99]) (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 82631392C2D for ; Thu, 26 Feb 2026 08:34:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.99 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772094849; cv=none; b=hAc46GK+HwUpW77CqTe1NmHrjVX3AspaNs592rCZXtjQDd00GsZt2qsVEFZ5bb/6OMawV5HyD0Vb1MjNj6HN8WsIBlpguMz/iEfu0eyfWmlJ2hpfk2waKoX3v1tqS7OU5HrxEwECO37jj7hjK4OQQ9Fc7m6sdJKRTwKp2lNKscA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772094849; c=relaxed/simple; bh=Es2E4P0fjbSgU/NkqBJYWq+WVGskaIWh6x+xoP5+IHc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Je1dy3igT/AEeSw589jtrXL1qiTNQHE3siMZcMaX9s97n6Kwou+5oRf+KwTS+Pht7d7/5a4RtqPv/IHTlFvoRLTB/HLm1n+eQHmusVdhg57uVZrBWdoWFH+FAWUx68kz1qKb/QxfaqPTtjuQkZertYLmmNmvS2U3H9BOHx7R2aY= 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=LRxw1prU; arc=none smtp.client-ip=209.85.222.99 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="LRxw1prU" Received: by mail-ua1-f99.google.com with SMTP id a1e0cc1a2514c-94dd06a96easo456661241.2 for ; Thu, 26 Feb 2026 00:34:07 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772094846; x=1772699646; 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=2FyOyN/U47kbIetX0AyHYHUcNDSNWQShComY15+Z9C4=; b=ubJi2AgE91d4MxDUuJzcsJTjWejDgzUwstNmgTa3t+1CND/pgo4v6uqOsqcmOFdfml 2J01b/mg6lc4TfI4ez6JX6VAH8bKOUaPL/RhSdK7hOMW5N67K8fXbKXKv2rvDmIuAQQt nsivC5vW1I4RUFUg4N+wg2HCVkatRgLroqgAM+2AsNWlx/9qnf5cToMvkO4e0hCafi11 wBNPQlzXy8zIUCPsbatzbRaOTZ02prKb+Cs8VY2DcOXmOavrka9j3GD2N/y00D0Lm+dw +KAtqrDn+3LNSJQ8R37LV2ZXVckmbKHbRqYFPahUZSsOtJCl/TsQZeBdQ8X6mgTDLVyK JfHw== X-Gm-Message-State: AOJu0Yzui0zDsOJkm8Ft88FQ7E5QN/Vp1RX6BFSA46sVVrg9gZo4daNF rG4JwKLLof6AgsxwS8bQ8NmR0jBy4VvcF4oFusRKgoG/DBGH4x1rT28xxuoQxR+d3Azpyhb+KX/ OaVMMV/UR6iPgprV9d6sULff7yLQnAkJKAoGHHYNx/iTxGPl4G4VE/0c5sY711lpMrsrEp2y6k0 Dv6nMoUbx1fQdnQyP5bhNbWc0GfqwCmU/DRalpv4ytFAaiXAeT1Fz+dBjVafPAMTrjvkDK1XDZT pCbsN0sNRNebnW9jRZckw== X-Gm-Gg: ATEYQzxO6BUVPDDuwnR82r/r/hDzzywea2q8aOAiO3hvtampX5sSH9fVLNCbKhptd1q nXtJAFY+3AOf18XmhM5gAzZoT8YvuBDbDykPy3sMnhPdyUHaAJUZL9ETGmlxZwEPFTL0+IWrdwM sesnHocA6CakfOOBPITvWniRoZnygJ9XagXUNXhiTGdxE1fqB3HqtZKD2i2R8SbgjJiPABHiBhd 2dM/ZJlQgF6VSNJDKJ5CDlSLbFHClZvgDZS1m0XHaIWNAeRe4ezwouQHMOhuambh6UL5evFjTxF PpW5SFfrdKy2y9jSWldMfmjNE8sHmyCX2aqJqRmBVBId/I1yAdpKU2JSp/lIMIVI7yhjAun9c2H L6LJFk9GPUYBVHVXGnPeH3TyfyYKOlSyX55O4y9gScQdzI+kfyUQOgh+FjmS0BCnQ1EtVTep7sF Xlg5tqc2uqt8B9gzp8iwovjngF8DlBqFYHv5RjZ+IiDrnhDIy+14HAEMsNp5g= X-Received: by 2002:a05:6102:304d:b0:5fd:efb0:8562 with SMTP id ada2fe7eead31-5ff20caf75cmr635521137.39.1772094846349; Thu, 26 Feb 2026 00:34:06 -0800 (PST) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-103.dlp.protect.broadcom.com. [144.49.247.103]) by smtp-relay.gmail.com with ESMTPS id ada2fe7eead31-5ff1e9f156fsm168235137.4.2026.02.26.00.34.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Feb 2026 00:34:06 -0800 (PST) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-pg1-f200.google.com with SMTP id 41be03b00d2f7-c6e74e55d35so346696a12.3 for ; Thu, 26 Feb 2026 00:34:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1772094845; x=1772699645; 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=2FyOyN/U47kbIetX0AyHYHUcNDSNWQShComY15+Z9C4=; b=LRxw1prUeMy+izHmwOBgyEQJWRm/ErVXgpVRun/GoKV0xbjfvLa0JUiYR0tzrjd9sr zzZ4PIavYpBSRafZTXiPFde/yGjnCbtiushavnS+SuvLk44syWwShokG495pQoDaI9AW oPjtvQUIyBS9isYV6Ld1Fmj047jxuCB89E1pM= X-Received: by 2002:a05:6a00:f08:b0:821:8ea4:480e with SMTP id d2e1a72fcca58-8273bc93800mr1261113b3a.10.1772094844884; Thu, 26 Feb 2026 00:34:04 -0800 (PST) X-Received: by 2002:a05:6a00:f08:b0:821:8ea4:480e with SMTP id d2e1a72fcca58-8273bc93800mr1261088b3a.10.1772094843980; Thu, 26 Feb 2026 00:34:03 -0800 (PST) Received: from PC-MID-R740.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82739d4c9b5sm1661613b3a.9.2026.02.26.00.34.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Feb 2026 00:34:03 -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 v5 fwctl 4/5] fwctl/bnxt_fwctl: Add bnxt fwctl device Date: Thu, 26 Feb 2026 00:23:17 -0800 Message-Id: <20260226082318.525518-5-pavan.chebbi@broadcom.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20260226082318.525518-1-pavan.chebbi@broadcom.com> References: <20260226082318.525518-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 | 278 ++++++++++++++++++++++++++++++++++++ include/uapi/fwctl/bnxt.h | 44 ++++++ include/uapi/fwctl/fwctl.h | 1 + 7 files changed, 345 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..4d7449b9d686 --- /dev/null +++ b/drivers/fwctl/bnxt/main.c @@ -0,0 +1,278 @@ +// 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_INLINE_COMMANDS) | + BIT(FWCTL_BNXT_QUERY_COMMANDS) | + BIT(FWCTL_BNXT_SEND_COMMANDS); + 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_RESET: + case HWRM_FW_SYNC: + case HWRM_FW_SET_TIME: + case HWRM_DBG_LOG_BUFFER_FLUSH: + case HWRM_DBG_ERASE_NVM: + case HWRM_DBG_CFG: + case HWRM_NVM_DEFRAG: + case HWRM_NVM_FACTORY_DEFAULTS: + case HWRM_NVM_FLUSH: + case HWRM_NVM_VERIFY_UPDATE: + case HWRM_NVM_ERASE_DIR_ENTRY: + case HWRM_NVM_MOD_DIR_ENTRY: + case HWRM_NVM_FIND_DIR_ENTRY: + return scope >=3D FWCTL_RPC_CONFIGURATION; + + case HWRM_VER_GET: + case HWRM_ERROR_RECOVERY_QCFG: + case HWRM_FUNC_QCAPS: + case HWRM_FUNC_QCFG: + case HWRM_FUNC_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_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_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_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_CFA_REDIRECT_QUERY_TUNNEL_TYPE: + 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_PORT_PHY_FDRSTAT: + 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_DEV_INFO: + case HWRM_NVM_GET_DIR_INFO: + case HWRM_SELFTEST_QLIST: + return scope >=3D FWCTL_RPC_DEBUG_READ_ONLY; + + case HWRM_PORT_PHY_I2C_WRITE: + case HWRM_PORT_PHY_MDIO_WRITE: + return scope >=3D FWCTL_RPC_DEBUG_WRITE; + + default: + return false; + } +} + +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; + size_t off =3D offsetof(struct fwctl_rpc_bnxt, reserved1); + struct fwctl_rpc_bnxt *msg =3D in; + struct bnxt_fw_msg rpc_in =3D {0}; + int rc, err =3D 0; + + if (in_len < sizeof(*msg)) + return ERR_PTR(-EINVAL); + + if (memchr_inv((unsigned char *)msg + off, 0, in_len - off)) + return ERR_PTR(-EINVAL); + + if (msg->req_len < sizeof(struct input) || + msg->req_len > HWRM_MAX_REQ_LEN) + return ERR_PTR(-EINVAL); + + 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 FWCTL_BNXT_HWRM_DFLT_TIMEOUT; + else + rpc_in.timeout =3D msg->timeout; + + 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; + } +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..bfb27e8f6779 --- /dev/null +++ b/include/uapi/fwctl/bnxt.h @@ -0,0 +1,44 @@ +/* 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 FWCTL_BNXT_HWRM_DFLT_TIMEOUT 500 /* ms */ + +enum fwctl_bnxt_commands { + FWCTL_BNXT_INLINE_COMMANDS =3D 0, + FWCTL_BNXT_QUERY_COMMANDS, + FWCTL_BNXT_SEND_COMMANDS, +}; + +/** + * 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; +}; + +/** + * struct fwctl_rpc_bnxt - describe the fwctl message for bnxt + * @req: FW (HWRM) command input structure + * @req_len: length of @req + * @timeout: in ms to override the driver's default, 0 otherwise + * @reserved: must be 0 + * @reserved1: must be 0 + */ +struct fwctl_rpc_bnxt { + __aligned_u64 req; + __u32 req_len; + __u32 timeout; + __u32 reserved[2]; + __aligned_u64 reserved1; +}; +#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 Thu Apr 16 19:10:59 2026 Received: from mail-pg1-f225.google.com (mail-pg1-f225.google.com [209.85.215.225]) (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 1E747393DDA for ; Thu, 26 Feb 2026 08:34:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.225 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772094853; cv=none; b=YJ+aytaMDA8129wHZTwNcqYThTDUMo+y1O+GfOeUQUoPfJhxm31fo9lyf07GVCCUMPQ16iYJQ6+gGh7tj2Y/iTU8o68GIi2+cASu1dxPf4bc0hBzHBwGdQGpdJbk6Wx9DiUCDJS9RoSwQlHumjQtDwa+Se4imLwKJ7KlKKa9e7Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772094853; c=relaxed/simple; bh=9W2bvS41zx2lrqGbpawvH8nmfGfm6zEBUvzjefui0RA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=KeW3l6Pqk9gTHjS2HiG47raduRn+SOJ3420EPvRudt1brKfkViTaMAwTv2VQNyBZF5329nVkmhWmtw0jvZLWDfxBLEJM3YsXiteesgjtlpuY0MgRWQ8V9IRddiCrl+o4Jz8TSh/igH6NcTKCi5bSJ7GxSkTeqsQ2Dbaea38yePw= 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=f/pyXJub; arc=none smtp.client-ip=209.85.215.225 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="f/pyXJub" Received: by mail-pg1-f225.google.com with SMTP id 41be03b00d2f7-c6e191c4b8fso193879a12.0 for ; Thu, 26 Feb 2026 00:34:11 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772094851; x=1772699651; 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=Z8FXJMLGuDXL/GZvSCfMINdGN4yhbyEMKgFt1iKeJPo=; b=C8TukOJD82baZQRsZXIhzHBa+StHGwlBfrAK1ZP3Cl3hu4926gyeBtOG3EGtv5TYHM EmuX5oH/h3mB3YOPgdYQOT3bAj61zhO9Dh1NKHgcJapgsB7hPui3sogia10d+XVQU/LE QLbdJOlLQEUX1Cmdqnk4V2FUWcmrBmS9SuM388DbuwonRoOgt+1JeNKk1guxCEq9cjh0 jd+5stdwu+T5wBJHRrpAvZXM1bAbhfYzNa4pM05oGBVNLplctAom4BfPNvLoqIhAyzAA F59ECK3yn98iTpoj7XSOTXIUMf0isId1KoDiCjnWzafaZHZaeVgbQNB2Ki6Q1xfQ1oMv 8WnA== X-Gm-Message-State: AOJu0YzMhlqjgsCBLk7oyol+6xCOjJmqB2bsfSA/H630mZnFptjo6BGa eONovC77MEc59y6hpYLBXu95s9durjJ6O/2TF4zMX6+2DkP2PJRkA1JyS+mxZmsAxJLIpksF9F8 cHRsYV61xoTfoloP8pa+dptK1q64lqaVNXAuWDVc/V363v6s2Bak7hEeAY6pyuqKgC6fJLgAWpr lpEgC+GnbrRUTEHXYXDCzkU2fSqEP8NmrSNa/DAhF1DSD5/zoRs002xG266/8icOQSunnuB3wSK CO67TaHeX1XRnrIfq6swQ== X-Gm-Gg: ATEYQzxmx8pS3w7lf/CClOCTbDeYYiiQh0wqPTxg9P/ceDVi1e2g2sqeLLRauq0DEj7 2XhVmca/tm/YeBeiBKVKdA8ZYCut+5vQESkOA7AyGKYIz4v5MDFXyvpptzcy49sVacHUbxQrkWl YHwmH9ryoxfVrAowllQfnVqv01DwcnjY/oIzH/ycZ+9Moz5x3YUfJkXDclzq6VbYnOSMUMs326D 2kTRCRFeupemxlmjo2fcwcmcJ9FENT3vJHDy+hwcKZx09Oto6Y+3dDf2AWjxNUEg+6JqVNAg2lI 0oAJhRL4NhIvJWl7PxjVt1WrErdXTduG2VF9lgYvPxseGeHm7fv3VJW4b9cMnAp72sUtPRgOGjn cdc/rmBX49CMOA8tA8uNNXQaVN9pFrGdumImO2OMcM4qIav1fwfw4G5hBRxZ4uwX773tbcEdpc7 dmQJdgOtOxUeO/w0FQ9qGGB9XEh+oF9582Q7GR5vqHG4Qyxo+spKoM6zKjIRE= X-Received: by 2002:a17:903:3b8c:b0:2ad:ca65:a394 with SMTP id d9443c01a7336-2ade9a7cd3cmr23520875ad.52.1772094851319; Thu, 26 Feb 2026 00:34:11 -0800 (PST) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-117.dlp.protect.broadcom.com. [144.49.247.117]) by smtp-relay.gmail.com with ESMTPS id d9443c01a7336-2adfb05e5c2sm1845425ad.12.2026.02.26.00.34.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Feb 2026 00:34:11 -0800 (PST) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-pg1-f200.google.com with SMTP id 41be03b00d2f7-c70eb09daefso369746a12.0 for ; Thu, 26 Feb 2026 00:34:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1772094849; x=1772699649; 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=Z8FXJMLGuDXL/GZvSCfMINdGN4yhbyEMKgFt1iKeJPo=; b=f/pyXJubYtsxhbTrCTnamA3KKgdItFeNEzflVmK02xKCuZ3WHw7bzMx28spXIpRHsa ZExaTNKBT49/2dhKcPL8G8eY33ZtZxzEHgwqmrzjw8diVkGHev680q6daPNMeAfhaPXH D2wPnYlmCq+vW9+e98FTMQDFfBZFrtxrN11zc= X-Received: by 2002:a05:6a00:3d0e:b0:821:8202:44e3 with SMTP id d2e1a72fcca58-82733789bfdmr2895215b3a.30.1772094849427; Thu, 26 Feb 2026 00:34:09 -0800 (PST) X-Received: by 2002:a05:6a00:3d0e:b0:821:8202:44e3 with SMTP id d2e1a72fcca58-82733789bfdmr2895171b3a.30.1772094848519; Thu, 26 Feb 2026 00:34:08 -0800 (PST) Received: from PC-MID-R740.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82739d4c9b5sm1661613b3a.9.2026.02.26.00.34.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Feb 2026 00:34:07 -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 v5 fwctl 5/5] fwctl/bnxt_fwctl: Add documentation entries Date: Thu, 26 Feb 2026 00:23:18 -0800 Message-Id: <20260226082318.525518-6-pavan.chebbi@broadcom.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20260226082318.525518-1-pavan.chebbi@broadcom.com> References: <20260226082318.525518-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..15a0b06b3dd8 --- /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/linux/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); + 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