From mboxrd@z Thu Jan 1 00:00:00 1970 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 CA4C025A359 for ; Thu, 2 Jul 2026 05:49:24 +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=1782971366; cv=none; b=gU+5kgq5SZ90vo0UKYLrNhjuXekOJoo2tBXKw3QIY7V6Nwb1nMc6ZjawquJi9Df4jzkxVLHU7OLx40D+ImBLCJmg1VD10n/MtGX+psRcKBp+0QOR3lGipAmVJUIL+3aFFWQsEkOLqRkLgQ19FbOyyeAg+l2uwvjpqE4C6JAeVog= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782971366; c=relaxed/simple; bh=/DuY8mIZv2TzxwyPsmbYcpqZtuTiB+7/lJ9Pfhkrz2I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qvAgahgcfIFm/pvrpM+FuqVXP6ykU2p/Yimp2ReuVb+hPaf5XqMSkf6f1DOy1i/gmOZN1kDmPdc7BzPLVkGlVapXJzBFAuLVnF1vQow1y02if+d9RKUp9ypm2wxFhJ8iOu/EBER508mppWRe8oUYB539W4WByNSIuCNOeuugfoI= 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=CxbkYC/c; 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="CxbkYC/c" Received: by mail-pl1-f227.google.com with SMTP id d9443c01a7336-2c9b19bbaefso12464065ad.0 for ; Wed, 01 Jul 2026 22:49:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782971364; x=1783576164; 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=9+lAzRluesmpXXpxiuswyfTqQlQPH8s79CW7QLpS4m0=; b=mfqizeGxo4a7puDXZkg/bAvMqYuwQPX3vM2Pd+Xl024xD3TcEvAgE0/auIxrhJyRnC cJ7bhOlPEXqcn76QHNSPc/UKl7F9dG1Y13yImfaxMuvTc7t3JdffV0a+IDlIq2jBNicX HlM+AkYyZV85xR+zAmaeMc9i1K4VAXp7ZdotmVD0CO0QrurO+PKU8ZRQhA9gjIvKvDZX bfa3IPTIEas4QWZeRR+IfxQjxE+fsq2TcW59EymKSM+Hd+UqmuG/5eES39JoOZoUG/eV rCwIR8ubq/pE/Mj/Sqqa4xYLwoj1JCk8sJpVx8K4f2g7xBClUt5Yb/mJDMTU/GgXvrzr fhuA== X-Gm-Message-State: AOJu0YyvCIpUULFeOYbbxt7vhL7kuGS3M0+Jq3IhnKBWWe7+I4Acvmcv 7gn6cAFfLgQdhOVjaPy8s4/9/MMChn5u7gGvOKjfILixVNPXnvH4KjYgFIbyyczL5z2ErjO9nDn IxRFhbRjalEH6Ru8gt1WjgdLWVsfcRsUU8as/dMGb/+HGam7s7raSYftfaEs0X7xEBfOZX0IxDi +qP2RaOEeuY44euZQymIVBg49wDEQNN6YI3zmmqDlkvcz+PrDOWb/OAyL7pr3Bagi2FSjsstqck ZmSC4aNsd0EnvSY+FU= X-Gm-Gg: AfdE7ck6gkxAJEgQSIRexEgtKXy8SZIYsbsYtmH88a6MwUQhlAemskA3l4q9ycrbXs4 6epbWJ4HapQmG+2nNKcosM7Y4u0pnmxWT9eWSeO/SU/rj8jd8gs0taU5PIZxo2OerYsGl48otTC oQQXQlkbjeoSlXbEZUApu1nyvTmK+rkT+EtO9DW8+rK5yBXtklSZ2uNDM51cozh/0hmG5JAekdR GrinJw8N4nrmhyD4Qy4efeFjTPbvARDn7y70K7Ha8SmQgF0SZMItCUbI9826xjaPzzCEj98R2lK dhC2qcQ3LDgOntSd3a8/BVff1KS3gafXPdj7e+zfcNKs+Hog1hm+8f2feoCXY/0x2GQG/K8Q8vk 2pnkEit+lcOwAkFdElse3/JdhUl1LKav6buSz7s5vN8gfQuRiZ8ozUDxXxZj7pjzbXKdu4EJqGi TrvBfx2vJnta2+0kB2H7Qzd8pGM/DfABR5YRX/iPJ5kreTzQ== X-Received: by 2002:a17:903:9cc:b0:2c9:97a7:71b0 with SMTP id d9443c01a7336-2ca7e936c01mr48720545ad.43.1782971363734; Wed, 01 Jul 2026 22:49:23 -0700 (PDT) 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-2ca9a9edd2fsm1382135ad.42.2026.07.01.22.49.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Jul 2026 22:49:23 -0700 (PDT) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-pg1-f200.google.com with SMTP id 41be03b00d2f7-c894c1c4aa9so1654610a12.0 for ; Wed, 01 Jul 2026 22:49:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1782971362; x=1783576162; 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=9+lAzRluesmpXXpxiuswyfTqQlQPH8s79CW7QLpS4m0=; b=CxbkYC/cz3mFvIMeOxanbdXWpXp2KuUnhBSK4+gxt1scTb1z4+iy5TK4mvYJaz5c4q p5qgdRym9pIscCc7BBxhZolzJawQV1nzvmh0/qxtLyUQAahjfr1nEOLAGfee0M7vLT5V SlJ0j41ueQR0DT8iAPi0mArh+owtqz1KSN/n4= X-Received: by 2002:a05:6a20:734f:b0:3bf:e2f1:1b17 with SMTP id adf61e73a8af0-3bfed5d84b3mr4790612637.50.1782971361930; Wed, 01 Jul 2026 22:49:21 -0700 (PDT) X-Received: by 2002:a05:6a20:734f:b0:3bf:e2f1:1b17 with SMTP id adf61e73a8af0-3bfed5d84b3mr4790583637.50.1782971361456; Wed, 01 Jul 2026 22:49:21 -0700 (PDT) Received: from pc-hpe-top-git-sendmail-server.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-30f0bc38e5fsm4656033eec.29.2026.07.01.22.49.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2026 22:49:18 -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 v4 fwctl 1/3] fwctl: Add driver_data field to fwctl_rpc Date: Thu, 2 Jul 2026 11:21:23 +0530 Message-ID: <20260702055125.557963-2-pavan.chebbi@broadcom.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260702055125.557963-1-pavan.chebbi@broadcom.com> References: <20260702055125.557963-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 3435db9ea6b1..a0d7f26c5b6d 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 08872ee8422f..bb61e60843cf 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; @@ -362,6 +363,9 @@ static void *pdsfc_fw_rpc(struct fwctl_uctx *uctx, enum fwctl_rpc_scope scope, void *out = NULL; int err; + 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