From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qt1-f227.google.com (mail-qt1-f227.google.com [209.85.160.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 A27E43D88FA for ; Tue, 7 Jul 2026 09:58:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.227 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783418316; cv=none; b=jeBL5gF5ew3ECcRdgB3zQ1Kn3SmKXOv6XV18sz7VlAW/m+Tkq1bOtEhqkJBOHdP5zspk7+MQmeorDefEXzhDxhEc2+gILzHH9O2Yd/Ih4xuBnW2Qsy1Ncs3emeGhOUlU7g74PkO8B4R2Mwi5SKf8evqj6Gpv6cRN0ZzxXoZgM1o= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783418316; c=relaxed/simple; bh=Czftc50n4WR5ucJCvzNmPISs03Hc5M1mxYTOVSvs7x0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RKwxtOTh5irs7l0+SIFWsw4X3g/BCiTGVrcIwJbgdCA9GRi976G80HG2H7auqJ5PtHvB5vFLjxBe4bOsWB7ct1KlPOZGe88ZjtimU25pH525PMhmO+CGS7cq1/D/zRW/8Xbl/uEAqwSu0WbnUThnu+jirU7XXYQRRiHg+vnr6HU= 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=M0B+J0wC; arc=none smtp.client-ip=209.85.160.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="M0B+J0wC" Received: by mail-qt1-f227.google.com with SMTP id d75a77b69052e-51bfad59921so28060461cf.0 for ; Tue, 07 Jul 2026 02:58:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783418313; x=1784023113; 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=apyS20bPgFzu1Pj+AfHFgLp8SVmzDXx4KKlGemea9Lc=; b=jHzMnzXUj64WA69IUKteoiVVLmCHHZOq/EXXU4JyMxZgVunAVJ1mOBzyjLg6uf3j4J qZfcvP/04LMfV+kpuxFNyFSMsVBAXz2E5H0xTcf/X4YhzuuJCKGJCLeqNieRa7S8x4P4 fznzOKyJ/a6eEmDcb5/r3QoT/VHD97w0Ti0pjIrfUqC23YiTPvzUe48BTTYnn4Mr2S69 j4SU+43pR4///Q8kF7YjIq4PPxwATWinjrWLEpY2xxPOIXYFV/p1+aYR6HMbAEBxKD1a zLQ4V9cLAI798lrmtUnOJEOjv112PYpIrFX94vwND62MgDLuo72mfbby4XfUoiWqtd8c Ubuw== X-Gm-Message-State: AOJu0Yy/RE3dx+FEJA8kOxjnstRS0VcgAl3AWrWrKY3cBZHuvnUB2A2d xSU5BxfWza51qsjGwaXnvLjEh9JoA/f1J5C9IYgmsddRxqFz1wZH5kN/E0Ti+IPhDErKi2Z7xyp 1FxA+Ep1HE3tVb+7DcisLkAruw1oUvANs4eJm92IAekrjrJsUDQ5T3SAc6fyIn5sdn9DGIpEvB7 2NAeYgQZGkbTfloyfEA8UzHDtxRxC2XiJN2sBDT8WO4GEEpitwbcCySa1Dt6hZ/AVabtwYwljPe M8c8IOhXeiG2z/NFV4= X-Gm-Gg: AfdE7clgun1Q7jUEF/PaCeGAuKf+5BF9EUAu0cCqg8E1MbEWUFLUEDsg4MTpenW+Iqz a7+73035Da7WGrsEIJsU0vd41yVl3/lXlipOT1h5i5QY6x4p+qj7grqUg0hrLGF+/YWeOfGHoct Wsvp9ds/CnbwAtH0ZoEYX47XnM7uJXJ37BQ6fWYvmkwNmW9DhRrmHURoIHbjqeH3SVt50K75IHe zu8YwU6CQTRDbb6xquaJiEiEvm/6NiF0s8lODmweCLOKMUSNA8bqveOema9nnd6BK9RTggYdXLW 1pEqnWGYkIHjE+Eas+wrWvcE4CcM4667CYmQLwzLTDDHX5fENoaY6Z65t7FxubJ6JVcEcb7e9yS oTI7/q32ebpUeS9GPnENBwgZwQQVIpODT8AcydKvuMT0zq6+qLIG0eTl4K3kyT6f0qb9u5S3TDz sZuMvtgr3zmiHw+sfOp7bHVo4tyIl1TptFoFe6tAO7NjZ1bk4m X-Received: by 2002:a05:622a:ce:b0:51c:667:7e30 with SMTP id d75a77b69052e-51c748c03dbmr44840141cf.47.1783418313512; Tue, 07 Jul 2026 02:58:33 -0700 (PDT) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-101.dlp.protect.broadcom.com. [144.49.247.101]) by smtp-relay.gmail.com with ESMTPS id d75a77b69052e-51c41ad8b91sm5647771cf.3.2026.07.07.02.58.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Jul 2026 02:58:33 -0700 (PDT) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-pg1-f197.google.com with SMTP id 41be03b00d2f7-c89704da8c7so6785288a12.0 for ; Tue, 07 Jul 2026 02:58:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1783418312; x=1784023112; 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=apyS20bPgFzu1Pj+AfHFgLp8SVmzDXx4KKlGemea9Lc=; b=M0B+J0wCt5r7Dv2oSudVbV7jfZxnH/ZoJPz/oSrxNpTsVU7/cuYKE3DHAw86Jmg1GW 5v2Hk1nFTx4Dz84kzyDDHDoTxZpBxj1ckr9wh6aa0AV6zTeovDn39RSiAMLyQ5+ErmHv 6kNx0k4Zoy57tiUgu0Nvwr7F0FHaNJcY6GzME= X-Received: by 2002:a05:6300:6698:b0:3bf:6c08:fba8 with SMTP id adf61e73a8af0-3c08f0331f2mr5024664637.60.1783418312064; Tue, 07 Jul 2026 02:58:32 -0700 (PDT) X-Received: by 2002:a05:6300:6698:b0:3bf:6c08:fba8 with SMTP id adf61e73a8af0-3c08f0331f2mr5024631637.60.1783418311652; Tue, 07 Jul 2026 02:58:31 -0700 (PDT) Received: from pc-hpe-top-git-sendmail-server.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-13b659666e7sm8407566c88.7.2026.07.07.02.58.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jul 2026 02:58:31 -0700 (PDT) From: Pavan Chebbi To: jgg@ziepe.ca, michael.chan@broadcom.com Cc: linux-kernel@vger.kernel.org, dave.jiang@intel.com, saeedm@nvidia.com, jic23@kernel.org, gospo@broadcom.com, selvin.xavier@broadcom.com, leon@kernel.org, kalesh-anakkur.purayil@broadcom.com, Pavan Chebbi Subject: [PATCH v5 fwctl 1/3] fwctl: Add driver_data field to fwctl_rpc Date: Tue, 7 Jul 2026 15:30:17 +0530 Message-ID: <20260707100019.60553-2-pavan.chebbi@broadcom.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260707100019.60553-1-pavan.chebbi@broadcom.com> References: <20260707100019.60553-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: 8bit X-DetectorID-Processed: b00c1d49-9d2e-4205-b15f-d015386d3d5e Add a driver_data field to struct fwctl_rpc in the UAPI and thread the value through the fw_rpc() ops callback as a new __u64 parameter. The field is opaque and driver-defined. Drivers that do not define a driver_data format may return -EOPNOTSUPP. Update the existing drivers' fw_rpc implementations to enforce this. Reviewed-by: Dave Jiang Signed-off-by: Pavan Chebbi --- drivers/cxl/core/features.c | 6 +++++- drivers/fwctl/bnxt/main.c | 6 +++++- drivers/fwctl/main.c | 3 ++- drivers/fwctl/mlx5/main.c | 6 +++++- drivers/fwctl/pds/main.c | 6 +++++- include/linux/fwctl.h | 8 ++++++-- include/uapi/fwctl/fwctl.h | 3 +++ 7 files changed, 31 insertions(+), 7 deletions(-) diff --git a/drivers/cxl/core/features.c b/drivers/cxl/core/features.c index 85185af46b72..7a3809b1722b 100644 --- a/drivers/cxl/core/features.c +++ b/drivers/cxl/core/features.c @@ -643,7 +643,8 @@ static void *cxlctl_handle_commands(struct cxl_features_state *cxlfs, } static void *cxlctl_fw_rpc(struct fwctl_uctx *uctx, enum fwctl_rpc_scope scope, - void *in, size_t in_len, size_t *out_len) + void *in, size_t in_len, size_t *out_len, + __u64 driver_data) { struct fwctl_device *fwctl_dev = uctx->fwctl; struct cxl_memdev *cxlmd = fwctl_to_memdev(fwctl_dev); @@ -651,6 +652,9 @@ static void *cxlctl_fw_rpc(struct fwctl_uctx *uctx, enum fwctl_rpc_scope scope, const struct fwctl_rpc_cxl *rpc_in = in; u16 opcode = rpc_in->opcode; + if (driver_data) + return ERR_PTR(-EOPNOTSUPP); + if (!cxlctl_validate_hw_command(cxlfs, rpc_in, scope, opcode)) return ERR_PTR(-EINVAL); diff --git a/drivers/fwctl/bnxt/main.c b/drivers/fwctl/bnxt/main.c index 951c8ac2e0a1..5eb3651a1784 100644 --- a/drivers/fwctl/bnxt/main.c +++ b/drivers/fwctl/bnxt/main.c @@ -172,7 +172,8 @@ static unsigned int bnxtctl_get_timeout(struct input *req) static void *bnxtctl_fw_rpc(struct fwctl_uctx *uctx, enum fwctl_rpc_scope scope, - void *in, size_t in_len, size_t *out_len) + void *in, size_t in_len, size_t *out_len, + __u64 driver_data) { struct bnxtctl_dev *bnxtctl = container_of(uctx->fwctl, struct bnxtctl_dev, fwctl); @@ -180,6 +181,9 @@ static void *bnxtctl_fw_rpc(struct fwctl_uctx *uctx, struct bnxt_fw_msg rpc_in = {0}; int rc; + if (driver_data) + return ERR_PTR(-EOPNOTSUPP); + if (in_len < sizeof(struct input) || in_len > HWRM_MAX_REQ_LEN) return ERR_PTR(-EINVAL); diff --git a/drivers/fwctl/main.c b/drivers/fwctl/main.c index 098c3824ad75..32c4c66dd7d5 100644 --- a/drivers/fwctl/main.c +++ b/drivers/fwctl/main.c @@ -122,7 +122,8 @@ static int fwctl_cmd_rpc(struct fwctl_ucmd *ucmd) out_len = cmd->out_len; void *outbuf __free(kvfree) = fwctl->ops->fw_rpc( - ucmd->uctx, cmd->scope, inbuf, cmd->in_len, &out_len); + ucmd->uctx, cmd->scope, inbuf, cmd->in_len, &out_len, + cmd->driver_data); if (IS_ERR(outbuf)) return PTR_ERR(outbuf); if (outbuf == inbuf) { diff --git a/drivers/fwctl/mlx5/main.c b/drivers/fwctl/mlx5/main.c index e86ab703c767..2a5105769126 100644 --- a/drivers/fwctl/mlx5/main.c +++ b/drivers/fwctl/mlx5/main.c @@ -304,7 +304,8 @@ static bool mlx5ctl_validate_rpc(const void *in, enum fwctl_rpc_scope scope) } static void *mlx5ctl_fw_rpc(struct fwctl_uctx *uctx, enum fwctl_rpc_scope scope, - void *rpc_in, size_t in_len, size_t *out_len) + void *rpc_in, size_t in_len, size_t *out_len, + __u64 driver_data) { struct mlx5ctl_dev *mcdev = container_of(uctx->fwctl, struct mlx5ctl_dev, fwctl); @@ -313,6 +314,9 @@ static void *mlx5ctl_fw_rpc(struct fwctl_uctx *uctx, enum fwctl_rpc_scope scope, void *rpc_out; int ret; + if (driver_data) + return ERR_PTR(-EOPNOTSUPP); + if (in_len < MLX5_ST_SZ_BYTES(mbox_in_hdr) || *out_len < MLX5_ST_SZ_BYTES(mbox_out_hdr)) return ERR_PTR(-EMSGSIZE); diff --git a/drivers/fwctl/pds/main.c b/drivers/fwctl/pds/main.c index 68fe254dd10a..f036a3e3f5cd 100644 --- a/drivers/fwctl/pds/main.c +++ b/drivers/fwctl/pds/main.c @@ -348,7 +348,8 @@ static int pdsfc_validate_rpc(struct pdsfc_dev *pdsfc, } static void *pdsfc_fw_rpc(struct fwctl_uctx *uctx, enum fwctl_rpc_scope scope, - void *in, size_t in_len, size_t *out_len) + void *in, size_t in_len, size_t *out_len, + __u64 driver_data) { struct pdsfc_dev *pdsfc = container_of(uctx->fwctl, struct pdsfc_dev, fwctl); struct device *dev = &uctx->fwctl->dev; @@ -365,6 +366,9 @@ static void *pdsfc_fw_rpc(struct fwctl_uctx *uctx, enum fwctl_rpc_scope scope, if (in_len < sizeof(*rpc)) return ERR_PTR(-EINVAL); + if (driver_data) + return ERR_PTR(-EOPNOTSUPP); + err = pdsfc_validate_rpc(pdsfc, rpc, scope); if (err) return ERR_PTR(err); diff --git a/include/linux/fwctl.h b/include/linux/fwctl.h index 5d61fc8a6871..afb7f72d0cb1 100644 --- a/include/linux/fwctl.h +++ b/include/linux/fwctl.h @@ -51,10 +51,14 @@ struct fwctl_ops { * @fw_rpc: Implement FWCTL_RPC. Deliver rpc_in/in_len to the FW and * return the response and set out_len. rpc_in can be returned as the * response pointer. Otherwise the returned pointer is freed with - * kvfree(). + * kvfree(). driver_data is the opaque value from fwctl_rpc, passed + * verbatim from userspace. The driver is responsible for interpreting + * and validating it. Drivers that do not define a driver_data format + * must return -EOPNOTSUPP if driver_data is non-zero. */ void *(*fw_rpc)(struct fwctl_uctx *uctx, enum fwctl_rpc_scope scope, - void *rpc_in, size_t in_len, size_t *out_len); + void *rpc_in, size_t in_len, size_t *out_len, + __u64 driver_data); }; /** diff --git a/include/uapi/fwctl/fwctl.h b/include/uapi/fwctl/fwctl.h index 2d6d4049c205..2e07425402a3 100644 --- a/include/uapi/fwctl/fwctl.h +++ b/include/uapi/fwctl/fwctl.h @@ -120,6 +120,8 @@ enum fwctl_rpc_scope { * @out_len: Length of the out memory * @in: Request message in device specific format * @out: Response message in device specific format + * @driver_data: Opaque userspace pointer passed verbatim to the driver. + * Must be 0 for drivers that do not define a driver_data format. * * Deliver a Remote Procedure Call to the device FW and return the response. The * call's parameters and return are marshaled into linear buffers of memory. Any @@ -136,6 +138,7 @@ struct fwctl_rpc { __u32 out_len; __aligned_u64 in; __aligned_u64 out; + __aligned_u64 driver_data; }; #define FWCTL_RPC _IO(FWCTL_TYPE, FWCTL_CMD_RPC) -- 2.52.0