From nobody Sat Feb 7 18:21:15 2026 Received: from mail-yx1-f97.google.com (mail-yx1-f97.google.com [74.125.224.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 E6803225775 for ; Mon, 26 Jan 2026 05:44:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.224.97 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769406242; cv=none; b=OrTe8EYRvRtpuWFjz9mWym9zPOj3AEPkJMU5jDtRkfgAhAId5DeQPXZ30n4Xu0U/WD68NZ7n3XDkrxzD+q8FLKvb88WDtJz7JTyDszT2obxK5K4VbwrKKW+uTuDR4PbcKBylyVftypV8DdmvrLkosoxxFWEVJo5wKE2rVtOIyEU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769406242; c=relaxed/simple; bh=+WUzpV3PbPElxR0d/PLjyo4kLJ+uKzOD75MwINZpAmg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Gqk/u8PNixJ1ZBwbSU08MwRdFIgi7wyrlHZEQ+68PNHk8vidNbfX28i62hXRjc8BXF4RXY6TkLiRmz/mGRyobdZ/VvkNkC5OIdL/6naC3k2kQmXU4yMlLf3SFhjmb0Ubdr7fY4szL6XWGZLzJrCYHylRB2BFpu9kM+yDcfgMbLY= 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=Hbg2hVI8; arc=none smtp.client-ip=74.125.224.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="Hbg2hVI8" Received: by mail-yx1-f97.google.com with SMTP id 956f58d0204a3-649655f14daso1659165d50.0 for ; Sun, 25 Jan 2026 21:44:00 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769406240; x=1770011040; 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=bEtbWQHZB521DtjbqW/QFNdLuWEfMayqWfZdYsYqa1UePXoX7V4/e4qiea8gigVZCy Mcb+T4NVZdyln8qJ7rLYfB6n9rryvh5rkMqexOg2cbyPwWGUGcanqtdtWS5WK2Qv1bKW sgtNDSwfEhRDLcGcJHS29Gjf//0qWOmS8jnyuDjSSZLOWvGrGfXkFKFqV3vOwqjKQpl4 V3nB38ByojIL4rRUR3nMi4npZVrD5GfFq69CaD0bCDZI0kI5+Y4/NLpcCkPhVn08VZ0C 0m/r/4lFtXqEVBZY3okMxYRvXpWfphE4GcPSNPuAQjag2+OY1deon2eQpn8cekcidPIE Lh2Q== X-Gm-Message-State: AOJu0YxyzBL8WlAB64YIi8bhVYzSbGYsNlK19xgK7pKWlusWQ3uXeR+u 66wQjWvj6KQHnBKpRzQAKmvQ1JnGlc4bS1S5cBLLyAbZ0o0rb7eGdOXcQS3Bwn5WuzNnB2Emcr6 xaedITORZwnsBOa+j7n7Uih51WvtT8slToQKXCxeTLLcDKW6kDm1F70sDNV9ZUheruAu9B6lks4 P57QUNUxmDXYg9mfqNv5VOUBbtYho4D5u/dpwYcZsuGYtZ2+q6diHqWKuRki5bM8L8ycWazpCFp IduLw3Lfk1VnbzbKKo= X-Gm-Gg: AZuq6aIomxoeGYa5FuH+Q1kAtLJQMCAQrir36xcGAZV3ogClWnAsrGwSZlFjIqJt4m8 xfupjDGPSzHJFuQWBA73odVa4qKlki7o3tujzWr3Pi8J+m5icPj+e7XylPcvK0kuAShXw6nS6kZ eeVH7eyxKZ1iMOOYoFESp1ndVREhvHcm8Y/n8ZwMkaHnCRlclxYvO/OzIr+JspedxYfle/2BVNI RApbZOGu1d58mQTfoBQ/Wi6VNuMXz8zOklessa5cZ2GKip1KBLICD7UMYWAsJ4E4sL+eHRS6WQx pN/KuuluS8OpMPtM/tS9pvKGdZKzlphhX0nAioiDbuwRfY5XQmhRNb+HX1LCIFSKqUKTNubfm9A EeVEPTlc1XvJN1vtQtYWdj2qtRkELq2O18XVRlTK7bTaQy4FzRPQPxN9RnYZlqBAoBQCBT4p95R QMF98MrwVAoqP1KxvvD6x7m+EBUfJwYAtn67JM5hLhaJkQ X-Received: by 2002:a05:690e:4195:b0:649:5204:a127 with SMTP id 956f58d0204a3-64970ca098cmr2495737d50.60.1769406240017; Sun, 25 Jan 2026 21:44:00 -0800 (PST) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-77.dlp.protect.broadcom.com. [144.49.247.77]) by smtp-relay.gmail.com with ESMTPS id 00721157ae682-7943b2afb8esm5384197b3.15.2026.01.25.21.43.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 25 Jan 2026 21:44:00 -0800 (PST) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-pf1-f199.google.com with SMTP id d2e1a72fcca58-8232bde979bso600809b3a.0 for ; Sun, 25 Jan 2026 21:43:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1769406239; x=1770011039; 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=Hbg2hVI8LE8fnRcKA050ZNvK6MupXvEB3tZfnzseLMY9/tVi9lbIucsdDW1eHsRYbB FK26I6VdZwH8ZMq/MNI1W+juKuqtbNMs0YHeNgKWB/nHPMRwjfBdMy+jLQ5xGyiWIFm5 kqNdR6Qim9vBwehVqFa/BzovigKfZUKaxddQg= X-Received: by 2002:a05:6a00:3a05:b0:7f1:d6e6:8f87 with SMTP id d2e1a72fcca58-823411c5e96mr2734329b3a.17.1769406238586; Sun, 25 Jan 2026 21:43:58 -0800 (PST) X-Received: by 2002:a05:6a00:3a05:b0:7f1:d6e6:8f87 with SMTP id d2e1a72fcca58-823411c5e96mr2734308b3a.17.1769406238150; Sun, 25 Jan 2026 21:43:58 -0800 (PST) Received: from PC-MID-R740.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c635a3f2ddcsm7427213a12.17.2026.01.25.21.43.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jan 2026 21:43: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 v2 fwctl 1/5] fwctl/bnxt_en: Move common definitions to include/linux/bnxt/ Date: Sun, 25 Jan 2026 21:37:06 -0800 Message-Id: <20260126053710.3474483-2-pavan.chebbi@broadcom.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20260126053710.3474483-1-pavan.chebbi@broadcom.com> References: <20260126053710.3474483-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 18:21:15 2026 Received: from mail-qk1-f227.google.com (mail-qk1-f227.google.com [209.85.222.227]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9E508236453 for ; Mon, 26 Jan 2026 05:44:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.227 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769406255; cv=none; b=qlVjhsZ87OXARVkDCmE69wA3leNdMMzRsrrQmjzKKmkj+FPAjsc71udPyeBarx7EnNaHhg5qY0tQ8Sg6/gyGVDrf+z9dmRKRf+JtGJ7kEBo8XkBI8ml1aGUbp4YPTzo0BL5CcmG+xpaMl9f4fGsZuIoCBZ/hf9HDKDn+ZSQlB4Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769406255; c=relaxed/simple; bh=AlDSmdLtThNTvMg5cKevGz/HN6FyPnz9oRw5Fwtd3zI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=q7ZlIZMwWcCFOBgBRX5DXWw/ZOKBaoaefHV01wRIUldFun5X9NFsykHHuJLeJnP5oyJtwPwYrqf4gL6LxhPVG2sJTxo/OwUxn3wQhRNb3V40G3tANrrftgzJhvObl3ayouIF0FpzYzeFX8zDbltpdeWOlvPvNX+cxrwBnGdoxAc= 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=OjIHYFtN; arc=none smtp.client-ip=209.85.222.227 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="OjIHYFtN" Received: by mail-qk1-f227.google.com with SMTP id af79cd13be357-8c538d17816so581000585a.0 for ; Sun, 25 Jan 2026 21:44:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769406252; x=1770011052; 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=5Vo8GbKpsK7bLtMuDfhqrExL3Ad6QrF51zG2vtYVAaA=; b=tL7+Pl976zColKRg806JqhSHc1/GOJhih8jbq1BFoXGxklEirkTcI5zmYbjEoYXXot uLVfu+L1bB3PWhGcCoP9g9agi2lpHza7oTCHSfemNSkd/t4EzaTeJQdiwqkTCCxVNd3w 0s8IXepZFGvcLzQqaejBRydsQOA5+jXL5a+mapcnQo3WpiHUAepf9atYxSCSjK4A/R8z cNRF5cH9Wcp1KLnoyW0m/E9RzId8ffbbP4BpxKOXgcZShfT0h8GVzjy3BRhKofEfIYIP m47MpoGi446olLwxSaoGrY6Lyg21EEFqQH72c301P34kuneKMRwi+adjrds90AUz3miD vIbQ== X-Gm-Message-State: AOJu0YycaPc2hhJIJDJfMuL1qTFZTUK8FYgWh/mHLCivwR6d2fMPEmoJ vef91AMwx6igeKfQVjIE3kzNA3Krft/oJasqy5uUiMBuOQ3kR8T9YCgOiwraUSS+4Rt97bML6VB TQQy5v++gWMFK76RQUmjrujBZGd4ShJ4xmxBPSFm/XIMioXtjqH+jqVJPvfRvznL0NOV4LBvftu 9ZIUYzPqfdY2RiDb0MmZkgAI5qkez8QDV+OkeMf8/yVylxwVx8MKFYPZ06MiBpEBwZkUKrHrMwT uvGp9CJgCojoFTKhZs= X-Gm-Gg: AZuq6aLqXn4BWuJW9D0Ei+Xk5CSWwKkg/X/fCYEsNxEf0UEgfuIBBF6/mrgmnbn2mM+ 253MdSEwDHhkwLgZrK0QIGUOB1WIZk8oqQyINo7rLHKBopOTCs4gP5EVE2yUOPmj26DU1W0V3Dz 8hlU56Qo1ZsBb2DnemdEIWZtnfK7XcfeJ76VRtep8jjOO1jpjksz0JS1bqkZjtzlr2C/zgY/1Lg s42g4SqoJD79getiVS2OS5Y67ZARyF0XpbSvqOKeJDCX+DWGZS551BQpRMsAhaVYCoR6fPgyaJl BjxrzSkuJpFi/ZUpQmOoFGY9oXEYmAtL/XqPMYNSu6xVcwycD/ZbVfyJ8+1s/88teRjObd6pffE HXi2k0iCIQJl5N5UKlUAw+Nk1StMLCnaHvGRMkQPchglmjjamJ4ouWLy3uJ8IzT9pvm7wN4mppG U0ErBsmHMmmPkfo+mZtqeM1vcYuK0+rF0ZcT9+r5UVVr2LKKY= X-Received: by 2002:a05:620a:1712:b0:8c6:e11c:5ec4 with SMTP id af79cd13be357-8c6f95c72a2mr358324385a.35.1769406252367; Sun, 25 Jan 2026 21:44:12 -0800 (PST) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-102.dlp.protect.broadcom.com. [144.49.247.102]) by smtp-relay.gmail.com with ESMTPS id 6a1803df08f44-8949188f1d0sm12894046d6.27.2026.01.25.21.44.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 25 Jan 2026 21:44:12 -0800 (PST) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-pg1-f198.google.com with SMTP id 41be03b00d2f7-c5454bf50e0so7425962a12.2 for ; Sun, 25 Jan 2026 21:44:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1769406251; x=1770011051; 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=5Vo8GbKpsK7bLtMuDfhqrExL3Ad6QrF51zG2vtYVAaA=; b=OjIHYFtNflphdFge4Ru2awHVfJ8NARs7cfUTdElvp5GO2aGburSZwJFV/zxw4s9uT9 iE1bWXyzysQpgsT9iSa9vrcFQG0uAF4nEAj3Zo8ypyLaqnlNfEI9EV84G+H00x08O8rv kB2XMS2dDDHHk4bshVkkC9N/XmAcZaSIgx+r4= X-Received: by 2002:a05:6a20:c91c:b0:38d:f988:613f with SMTP id adf61e73a8af0-38e9f284ec0mr2700078637.80.1769406250637; Sun, 25 Jan 2026 21:44:10 -0800 (PST) X-Received: by 2002:a05:6a20:c91c:b0:38d:f988:613f with SMTP id adf61e73a8af0-38e9f284ec0mr2700060637.80.1769406250122; Sun, 25 Jan 2026 21:44:10 -0800 (PST) Received: from PC-MID-R740.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c635a3f2ddcsm7427213a12.17.2026.01.25.21.44.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jan 2026 21:44:09 -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 v2 fwctl 2/5] fwctl/bnxt_en: Refactor aux bus functions to be more generic Date: Sun, 25 Jan 2026 21:37:07 -0800 Message-Id: <20260126053710.3474483-3-pavan.chebbi@broadcom.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20260126053710.3474483-1-pavan.chebbi@broadcom.com> References: <20260126053710.3474483-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 --- 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 | 334 +++++++++++------- include/linux/bnxt/ulp.h | 25 +- 6 files changed, 271 insertions(+), 164 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..4cdfc9641639 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c @@ -29,9 +29,44 @@ =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) +{ + mutex_lock(&bp->auxdev_lock); + bp->auxdev_state[idx] =3D state; + mutex_unlock(&bp->auxdev_lock); +} + +static bool bnxt_auxdev_is_init(struct bnxt *bp, int idx) +{ + bool ret; + + mutex_lock(&bp->auxdev_lock); + ret =3D (bp->auxdev_state[idx] =3D=3D BNXT_ADEV_STATE_INIT); + mutex_unlock(&bp->auxdev_lock); + return ret; +} + +static bool bnxt_auxdev_is_active(struct bnxt *bp, int idx) +{ + bool ret; + + mutex_lock(&bp->auxdev_lock); + ret =3D (bp->auxdev_state[idx] =3D=3D BNXT_ADEV_STATE_ADD); + mutex_unlock(&bp->auxdev_lock); + return ret; +} + +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 +86,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 +190,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 +276,26 @@ 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; - - if (!edev) - return; + int i; =20 - 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) { + 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 +306,33 @@ 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); } =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; + 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 +342,22 @@ 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); } =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 +374,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 +406,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 +447,19 @@ 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; + int idx; =20 - /* 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); + 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); + } + } } =20 static void bnxt_aux_dev_release(struct device *dev) @@ -408,20 +468,24 @@ 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); kfree(aux_priv); - bp->aux_priv =3D NULL; + bp->aux_priv[aux_priv->id] =3D NULL; + bnxt_auxdev_set_state(bp, aux_priv->id, BNXT_ADEV_STATE_NONE); } =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); + 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); + } + } } =20 static void bnxt_set_edev_info(struct bnxt_en_dev *edev, struct bnxt *bp) @@ -451,83 +515,101 @@ 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; + + 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); + } } } =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; =20 - if (!(bp->flags & BNXT_FLAG_ROCE_CAP)) - return; + for (idx =3D 0; idx < __BNXT_AUXDEV_MAX; idx++) { + bnxt_auxdev_set_state(bp, idx, BNXT_ADEV_STATE_NONE); =20 - aux_priv =3D kzalloc(sizeof(*bp->aux_priv), GFP_KERNEL); - if (!aux_priv) - goto exit; - - 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; - } + if (idx =3D=3D BNXT_AUXDEV_RDMA && + !(bp->flags & BNXT_FLAG_ROCE_CAP)) + continue; =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; + aux_priv =3D kzalloc(sizeof(*aux_priv), GFP_KERNEL); + if (!aux_priv) + goto next_auxdev; =20 - rc =3D auxiliary_device_init(aux_dev); - if (rc) { - ida_free(&bnxt_aux_dev_ids, aux_priv->id); - kfree(aux_priv); - goto exit; - } - bp->aux_priv =3D aux_priv; + 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; =20 - /* 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; + rc =3D auxiliary_device_init(aux_dev); + if (rc) { + kfree(aux_priv); + goto next_auxdev; + } + bp->aux_priv[idx] =3D aux_priv; =20 - aux_priv->edev =3D edev; + /* 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 - ulp =3D kzalloc(sizeof(*ulp), GFP_KERNEL); - if (!ulp) - goto aux_dev_uninit; + aux_priv->edev =3D edev; + bnxt_set_edev_info(edev, bp); =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); + ulp =3D kzalloc(sizeof(*ulp), GFP_KERNEL); + if (!ulp) + goto aux_dev_uninit; =20 - return; + 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 + continue; aux_dev_uninit: - auxiliary_device_uninit(aux_dev); -exit: - bp->flags &=3D ~BNXT_FLAG_ROCE_CAP; + auxiliary_device_uninit(aux_dev); +next_auxdev: + if (idx =3D=3D BNXT_AUXDEV_RDMA) + bp->flags &=3D ~BNXT_FLAG_ROCE_CAP; + } +} + +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; + + return 0; +} + +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 18:21:15 2026 Received: from mail-dy1-f227.google.com (mail-dy1-f227.google.com [74.125.82.227]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A6E2D237713 for ; Mon, 26 Jan 2026 05:44:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.227 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769406267; cv=none; b=AfUX9lYy/PDX2gW1ueRMtfkytwwmyq974m49JVmnifHB5kiF5qnW0BVBVGjfrKEojXjlAPZDqraEgX7alo5bLgzRpXj0Qlx62Sr/cIayVWgV35PvMqdRwXgPloO9aSGvt5SSrQ89nVxD3LROw521qB/CNW+uELUnjlsgQRiSUSM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769406267; c=relaxed/simple; bh=4ryh+Y/RSJnV3e6qju9S9g0fVgzNNnpeBWUn7Xn4sQE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=fAbHYdZC688ny2OidMnUEONxFXGFMNCZyLo85LugZPfY0DHkDFiwF05a6HNWE0Ey8laWJMfMbnRTl9mDp3SDmhjoy9J4EuIGdBAbbYgmCWhceO37vnRxtvPYUqkEpkChHJdbwxbfYqi1tahGovr9HASXwvPPOYvon1KhH/z2UMU= 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=FEAUqf7c; arc=none smtp.client-ip=74.125.82.227 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="FEAUqf7c" Received: by mail-dy1-f227.google.com with SMTP id 5a478bee46e88-2b6fd5bec41so9781664eec.1 for ; Sun, 25 Jan 2026 21:44:25 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769406265; x=1770011065; 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=DX/9D3u5qbIyWsXWQiMiNsL7jWON8Kwc3aIk95oDeQA=; b=In3KHca0R4PVAnjDEF5ouxRPdeQBHyLagji0IV1O3cpPRWwb8h5I0EjGELus6692M0 HdF6lIdMIYbgfUfDnq1OnDaU3chosMlhDsHnKeLDvLPKatbuNXLr5c5Ii2qNN4Sp2iFn vyNxRYV51ZdXDT2I+IAdwecn/qX/RH3n8aV2pXU4MlX1CPkI7A+god5UmD5tFWq1o+wQ VWByuIcwzy9D6kcxpvxjnDrMpSVo6my2n3QKEDbnwKjxMPD0yENYjntMzqcxGOWtWDd/ lYO9U3kPUOxx4fJJNXWPw8vTPrp2Gd3O177AXcf+gJBdhK+8qizFO3qv0hFG2dTk+j90 shjw== X-Gm-Message-State: AOJu0YzeBXp/hBRfAE7Hm77NGxmcwFOQgEn2eMtws2w/wgrnn6KyuL41 /Zwgt0dJJIm3iSuPf6G4QkOlJzJe9v5m1PBsgzbuWkIALUQtOl0aDYkkFN27IGbCLKMUFvxuK5l PYFPyIu+qjrRsb3n7uvoUaieSQDnMGZZpPIbUfMROIX7u4AzcW6KPZIwcBXx/5fqvA0Lxc7zTN9 zQACkFPHeeEz/WvnIxqXQfU8L07xoef4DzmrVgu4kf1cEKxfHEfWKr+Z/5lsDaEH8lAn32lRl1m pMqXQyTCZNhYl9CPrk= X-Gm-Gg: AZuq6aK/LRLPkbl4TwzV+ugn8FNpboGMiEc9RkVKr75WLCdyGnMJyLJg+NMdVzu6g2B wcFSLx6rTe9ouVYuEQlPJTTY6ZWGfIQ+W58UwX//XBrzjy1ZBMDfp/HjhvvNhMnsL3RS+g8Q6UU H1qMoeeds2YxckbOz5+b77rJtXtKqSvU9U4cApCtdRWZZvCOKkxmUktinYmyxJwQhaUlrSmRsd/ dgBShWQGihCx2E/iwqgCzvsdnqHlJKIiAznZ7h69toi6cu6OMjicQ9y9Nq2aosY+f43oTBRfA/L A7dASGkqYjcJ859gaI5kydP4WBg5le4UBMuvACIkBgAcAKG8FYt3dTX/EoEa1fWWhwkhjyUtLOQ FUxKJHrKwvoWnXovIC02KB7zoyWBnxBNLkiWpsCPX5Z491BCgFVVEVxkRiM1tPktnfLn34bEeYp ZhxS129hKHXOQZ/kpxtOu0ylRAZjG18UD7Aul1sEo4YgWe X-Received: by 2002:a05:7300:bc86:b0:2b7:1dbc:c243 with SMTP id 5a478bee46e88-2b76432bf45mr1322452eec.8.1769406264487; Sun, 25 Jan 2026 21:44:24 -0800 (PST) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-77.dlp.protect.broadcom.com. [144.49.247.77]) by smtp-relay.gmail.com with ESMTPS id 5a478bee46e88-2b73a71b216sm1280497eec.7.2026.01.25.21.44.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 25 Jan 2026 21:44:24 -0800 (PST) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-pj1-f69.google.com with SMTP id 98e67ed59e1d1-34c38781efcso3945785a91.2 for ; Sun, 25 Jan 2026 21:44:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1769406263; x=1770011063; 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=DX/9D3u5qbIyWsXWQiMiNsL7jWON8Kwc3aIk95oDeQA=; b=FEAUqf7cVd7KUYXgyuuGs3kw677vInQ5JvReSZxI+cbTQwziN+pH8osID8XoRu5ycs Un+KHCLrwA0Zyv450UEZQyr91TSVMdPOwUmnZ5ZZE/hjGo/F42A7pvfSe297hM8fnF/R E7ftx/RbM986FoC09/pRKpf6FDOI47RU169GY= X-Received: by 2002:a17:90b:3851:b0:353:3f04:1b78 with SMTP id 98e67ed59e1d1-353c40ba152mr3201429a91.4.1769406262843; Sun, 25 Jan 2026 21:44:22 -0800 (PST) X-Received: by 2002:a17:90b:3851:b0:353:3f04:1b78 with SMTP id 98e67ed59e1d1-353c40ba152mr3201407a91.4.1769406262433; Sun, 25 Jan 2026 21:44:22 -0800 (PST) Received: from PC-MID-R740.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c635a3f2ddcsm7427213a12.17.2026.01.25.21.44.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jan 2026 21:44:21 -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 v2 fwctl 3/5] fwctl/bnxt_en: Create an aux device for fwctl Date: Sun, 25 Jan 2026 21:37:08 -0800 Message-Id: <20260126053710.3474483-4-pavan.chebbi@broadcom.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20260126053710.3474483-1-pavan.chebbi@broadcom.com> References: <20260126053710.3474483-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 4cdfc9641639..13159c0515bb 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c @@ -62,6 +62,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) @@ -289,6 +291,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); @@ -325,7 +332,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; } @@ -525,7 +532,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 18:21:15 2026 Received: from mail-pl1-f227.google.com (mail-pl1-f227.google.com [209.85.214.227]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 62FDB126C02 for ; Mon, 26 Jan 2026 05:44:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.227 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769406276; cv=none; b=ZUzt5J80YXdZf++3EgHkWGeofzXTEqATty1du1/4OrsR3GD/48W/qULm++pDGv/RizIlIbWx8Sp6xRmC2tbQUy65dhAHb7VZf5TmrQFcZDippQwJgBexdvfHg2bLkiXCEi72NhjL9fZ7BSWNXiynfKAv3z1PP6IGYifrNOfza2U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769406276; c=relaxed/simple; bh=+H3aKO9u2PKUgx+ewVupjlwlGxUvOuJvmnLqFoMqBUY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Dnd5VgUtwQnS0o3qBqUBJMzaHdtNkxsvA0NScxeFb3plAbrbaoeDYGcD8GI06bun3KYVdSFGgqbd3KL64o50pm+ZL+uujwaQCwUEL0h2FkYQuWJQVy541+bB7OaHbsKwKjZnZvmt7p1POWs3JNW147QZHyPa7gDF4dqG5a8VlJw= 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=Rdi8sJOE; arc=none smtp.client-ip=209.85.214.227 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="Rdi8sJOE" Received: by mail-pl1-f227.google.com with SMTP id d9443c01a7336-29efd139227so28447915ad.1 for ; Sun, 25 Jan 2026 21:44:34 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769406274; x=1770011074; 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=hAfaiQVJ3UDFHS/5OphX/1PrHNW/SSfaizE86diWM2o=; b=NioiYsnzCvDrTxzXz/ADG3eQ6BHLXe2CZJSuMZ+nWS7MBCX6tayNnFjdvbnmsaJfRh vQbqGgy/HEIelrc5Qmv2ITjgWfcrhpc2nGgy5zG+C0m7Of/QaVQSPy1FzNlWIid96CcZ AL2V+EnjHu0SwGZntu5aLi1uXEJzt7FK4fxFV6K/hYwadk5ZKvLbq1Df7Nkwvp+yGRWB UmE8LQTxiqgg2EjQQeZPaZg2RS1kPTE0UsET6/OOaNaxuc6ZuIv1OICpMr6Q3o+zM/LV IfCsndEdo2ery1OhuElngQWCMtfQJquiu01JYOpJFF8pJx9En0vFNZj/I/wluXqig1Eb TAJA== X-Gm-Message-State: AOJu0Ywms3Xuq1YeSjDr1VkxiPS8I7zIkLQOPURmiuyObldXqZScBfAm jM2UOccqL4KAEN6IKyOdnpHH97jbOG2FL4dZd7MsBIMnS+CLLyvH387D25Xp0dCepWq3lWjL5uv o7iikCyiEm0cpD4dCv+hYU8hcHpZN6KWKJSZnPs2xAOyZFDEtfavHMFO48xeaQHINhfIRQwxFtt h3k+zZsaNRJF3ou17795z0gwb1JftcJ4Djml/Vk7cD8P6iJCzOJ0/U0xfOjFkVvqzp+VYSXhMh9 4H5tVJWdY/oBDyGcMM= X-Gm-Gg: AZuq6aI0yFmjp+7vaNSpZNxLM9612rUmcOtx/fwXnJ9Y8oIgADehCVgYwml2exd4apj /qPt2EH5YFvBQ6MWv59wq7VZx5Uosr5f/Zd/m2WfVyao6NT6OK3rt6g1V+ye1tc1TliWYDpVd/v fyu6y7u3+Wkg83ItlHcmmv2k/xcwkhuUEq1Rx0LOf9NFimkoQlHi5oO8XER5pEOZVUF58ng8/FK KQeXqW4vTpuQwxmcA9vetS2x3w0b3ORtI1tj2cMqXu0u6TmiXuhGRUq/h9DK8BF7FXXjUtPjTJ8 NtlBliTGZYJdshvLX/2+suuXA/rYZJ/pPf+ylLcLd+uCKAbvgWcfUukSzlYXVLIOdro3S1x7UsA 3w/dolIsYTAnFamUtd/biGTiOuvFk2IvwMeWVG+t0Iely1Dre2lRhkpSbL8oqG9KCbUQR8zfrZ0 Chumwn4VxXccGDPlxaKBAglv8B2jW2jtC1t/X1kN1BmZT0 X-Received: by 2002:a17:902:db02:b0:2a7:bd4e:db92 with SMTP id d9443c01a7336-2a845306846mr28510285ad.53.1769406273622; Sun, 25 Jan 2026 21:44:33 -0800 (PST) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-77.dlp.protect.broadcom.com. [144.49.247.77]) by smtp-relay.gmail.com with ESMTPS id d9443c01a7336-2a802f8461fsm9413425ad.38.2026.01.25.21.44.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 25 Jan 2026 21:44:33 -0800 (PST) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-pf1-f197.google.com with SMTP id d2e1a72fcca58-82181ef69ceso1789993b3a.2 for ; Sun, 25 Jan 2026 21:44:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1769406272; x=1770011072; 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=hAfaiQVJ3UDFHS/5OphX/1PrHNW/SSfaizE86diWM2o=; b=Rdi8sJOEd+3XfrTKgJzySXl127U15JMQkbdZRwq9onRTOW/2n12NfPI+DwiB5qxOUP z5K/fqCIR5C6vvzbgaw527eSMjJ/wQbGGgSTwQC9LiB22yYqjhNtpbBcrnLIWgTY0+7n bB1sWAUgI+dvwQxiuqHGfUv2RuWy0nE1xqrGs= X-Received: by 2002:a05:6a20:2443:b0:38d:ef23:12d1 with SMTP id adf61e73a8af0-38e9f2470efmr2864574637.74.1769406271728; Sun, 25 Jan 2026 21:44:31 -0800 (PST) X-Received: by 2002:a05:6a20:2443:b0:38d:ef23:12d1 with SMTP id adf61e73a8af0-38e9f2470efmr2864555637.74.1769406271269; Sun, 25 Jan 2026 21:44:31 -0800 (PST) Received: from PC-MID-R740.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c635a3f2ddcsm7427213a12.17.2026.01.25.21.44.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jan 2026 21:44:30 -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 v2 fwctl 4/5] fwctl/bnxt_fwctl: Add bnxt fwctl device Date: Sun, 25 Jan 2026 21:37:09 -0800 Message-Id: <20260126053710.3474483-5-pavan.chebbi@broadcom.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20260126053710.3474483-1-pavan.chebbi@broadcom.com> References: <20260126053710.3474483-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..38acd5d334b2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10408,6 +10408,12 @@ L: linux-kernel@vger.kernel.org S: Maintained F: drivers/fwctl/pds/ =20 +FWCTL BNXT DRIVER +M: Pavan Chebbi +L: linux-kernel@vger.kernel.org +S: Maintained +F: drivers/fwctl/bnxt/ + GALAXYCORE GC0308 CAMERA SENSOR DRIVER M: Sebastian Reichel L: linux-media@vger.kernel.org diff --git a/drivers/fwctl/Kconfig b/drivers/fwctl/Kconfig index b5583b12a011..b3795a17f8f2 100644 --- a/drivers/fwctl/Kconfig +++ b/drivers/fwctl/Kconfig @@ -29,5 +29,16 @@ config FWCTL_PDS to access the debug and configuration information of the AMD/Pensando DSC hardware family. =20 + If you don't know what to do here, say N. + +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. endif diff --git a/drivers/fwctl/Makefile b/drivers/fwctl/Makefile index c093b5f661d6..fdd46f3a0e4e 100644 --- a/drivers/fwctl/Makefile +++ b/drivers/fwctl/Makefile @@ -2,5 +2,6 @@ obj-$(CONFIG_FWCTL) +=3D fwctl.o obj-$(CONFIG_FWCTL_MLX5) +=3D mlx5/ obj-$(CONFIG_FWCTL_PDS) +=3D pds/ +obj-$(CONFIG_FWCTL_BNXT) +=3D bnxt/ =20 fwctl-y +=3D main.o 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 18:21:15 2026 Received: from mail-ua1-f100.google.com (mail-ua1-f100.google.com [209.85.222.100]) (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 529F3126C02 for ; Mon, 26 Jan 2026 05:44:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.100 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769406284; cv=none; b=AipLyC9Qu2m/vXxInwZ7lIZOpOxaByWrBvORiSG80+TGMZrdjDkXji+vgTWAatIGZ+I1KJ0anOV9MIqfwqxI3/jum2z0y0k6GzkkPRo0mjnsYSZ4FfctwuAQ9IhHiDmYe/fy11GBM6BxFviJhA9a8lYc8nc3H61fyb3O9HFRdRg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769406284; c=relaxed/simple; bh=p0+9v6bOKj6/t1LScVQUgu9L7VXJ0bMnHc+ppDkUBOc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=QWutYt9Go9gi4T8xhuM2qKV0gKFDvqhtQxAgZsc9lLyxYcgLYRA/Q7mt5xHMDXxdSnhXWTZtSF7+lzoeb7qd629XM2A9XX+ZCkKaNNNq0RMcY4DC3AGxEorEzg9xQ/2s5Kc74zB5QxdKnPwjSlEAcuDH46RAncRRFyqGrFANaD4= 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=Z/VM6HtZ; arc=none smtp.client-ip=209.85.222.100 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="Z/VM6HtZ" Received: by mail-ua1-f100.google.com with SMTP id a1e0cc1a2514c-941275fece4so887841241.1 for ; Sun, 25 Jan 2026 21:44:43 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769406282; x=1770011082; 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=iPTs9JEbPLXI2vY0VGYEuKpjfV9mALLQxuqZFWZSApOOVsDTthMdUdKHtPKM/3JhD4 eNM1CzJsI5XrajgANor0/WDyz4fq4orODuvc3mGY23EhH6mn2NOuHsoGmqRgHjoZEWPg iUYhwTdB6Ud5Cd3A7gQGGUtnyu4fwb2Kh1XHchGUPOEuLi7qvdMcq+hfCHTvOshR4U0y g26ava+10CEWaLaiV2yWTfVLlFkDJX3OcZplzPtZpD2fSJ8BgIPFG8/WZoeoXki43x7S ca491ebaa1KkZpRsA6lnshNQFNyk80Z2r9157ZHXfmp4VJHdKdO273YNc5DhvhaOv7kL Ebxw== X-Gm-Message-State: AOJu0Yw1u77nX47hvHF8Y1cbe6qAi/CXZrZBnEbs/AqH2zD+eFe1jVL7 Z6ZkEEatPN9CDxaBFWH9iiSKw72Omikxk4Qb1sSZWc+kNmkbIyPqwhjB8tvRwOoYLe/JAHaTdcw jItOwkQWKwWitJpZ61m9m3yzf+sCyrO6OQ7i74fIbFADlm35/F1d1zkkgtmrKDj/bukKfHtzpeD NTAFCH77SdUGYiZU9+qAeaJ2xqQlSuqclqFiSKyNf1yXE0WJ/gxo9C42tjs8l/IfVGr+PWy7VwF es9dl3ptzO5TfwMxeI= X-Gm-Gg: AZuq6aL4U/XcHwLi54VfnQf2lJuppgvKxHRJcZmX3yVNUEiylQ7yDmDx83s4MYMTJOf 0CfOLjuwC8DDXXPVAoirAPDfmDkHNwII2/7LetKkpm7+w4KhAkRiYkrdngIYuxhVAmWeiu/Rc5k +5HA09NPpsXR8SCcjQf/WwCAzQu1QSJRUzVpFXFAmYiPiBMMzFCz25ymlFSPSPNhcq5UGsnjdFc 2Ar+2FQ6vthqp4MbVcU+QxjY3g4yoNwitWqEOVMk3SlodPqbRCBkgxwwrlJ4d7JfkeEgQeDiJCt FuruDtVwUS+YJz226CG3zri/NfifdTXipRmgEo+2mg7jTDB/D3JFuZpIvylVEJZKEcKRSuSpM5m 3+uJfthFDZvXxgdJ+X/y46NXW8qI45hQ/zV8pDjdGhRuVsnoXGNzJn5MhdLePPF3jYcmrq576mV Ogu21NV0HVs2s1LUP6Fy2KMNJ4ws70qquMNk7cLjPZUvOUFCk= X-Received: by 2002:a05:6122:240c:b0:563:5f68:7a75 with SMTP id 71dfb90a1353d-5665ca08509mr800878e0c.20.1769406282161; Sun, 25 Jan 2026 21:44:42 -0800 (PST) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-100.dlp.protect.broadcom.com. [144.49.247.100]) by smtp-relay.gmail.com with ESMTPS id 71dfb90a1353d-5663faf1a4dsm1285392e0c.3.2026.01.25.21.44.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 25 Jan 2026 21:44:42 -0800 (PST) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-pg1-f199.google.com with SMTP id 41be03b00d2f7-c54e81eeab9so2643741a12.3 for ; Sun, 25 Jan 2026 21:44:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1769406281; x=1770011081; 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=Z/VM6HtZvjh3QKa473ElxV+JFV8otTiqSqTKB/TgjRoJEL8s/3ITNb7/zeiDXuxyGD OKX7k1W/O2fTzWAMI2MXjsdfgiAfP79INZDIy4KwoE9P6PnqUZczechFO9rtuGZwbkym mLcSeK0TsrAEs4mf7Pzw6ruPsx5T3M7u/SAgg= X-Received: by 2002:a05:6a21:3988:b0:366:1921:c569 with SMTP id adf61e73a8af0-38e9f0f3f90mr2904413637.4.1769406280931; Sun, 25 Jan 2026 21:44:40 -0800 (PST) X-Received: by 2002:a05:6a21:3988:b0:366:1921:c569 with SMTP id adf61e73a8af0-38e9f0f3f90mr2904392637.4.1769406280373; Sun, 25 Jan 2026 21:44:40 -0800 (PST) Received: from PC-MID-R740.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c635a3f2ddcsm7427213a12.17.2026.01.25.21.44.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jan 2026 21:44:39 -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 v2 fwctl 5/5] fwctl/bnxt_fwctl: Add documentation entries Date: Sun, 25 Jan 2026 21:37:10 -0800 Message-Id: <20260126053710.3474483-6-pavan.chebbi@broadcom.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20260126053710.3474483-1-pavan.chebbi@broadcom.com> References: <20260126053710.3474483-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