From nobody Mon Nov 25 09:33:41 2024 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9D46C1D2B1B; Mon, 28 Oct 2024 12:02:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730116932; cv=none; b=cY3QCWEkVXFicHbzBw4yoHnAKqepClB1oL536m+O3RMio12A+SVC+DTfkHizSPhdDqLIuAj6jy4ZAHQzjF7DHa35QNJFOpOhwJdx4S74kEVFyYHsuVhOuu+PLUr1zTvaMYYtdLrB1V2wl89egdLNLP3H2EEa5QFhmsWE2cvlf4E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730116932; c=relaxed/simple; bh=xdCyzsk9eJofgvM1fEzwfkQICqwlZnpAOhHlo92T33I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=n2lQQZsab3HCBqA3KQyp76JOUwQeafxFxxK9W3smHRWHeU5H0/RO/m8efuaiU5L09y8meLG2JRhykQL3I4E4UH5GWpKN8WzJfE5qvrQbMQ3XzHfJQgQi8rfGCsB3dk8+5nB5uk8xaqLwL+u60cBAWgB9taPumvYCIrZxoJnKJ20= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 8A7C013D5; Mon, 28 Oct 2024 05:02:38 -0700 (PDT) Received: from pluto.fritz.box (usa-sjc-mx-foss1.foss.arm.com [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 040473F73B; Mon, 28 Oct 2024 05:02:06 -0700 (PDT) From: Cristian Marussi To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, arm-scmi@vger.kernel.org Cc: sudeep.holla@arm.com, james.quinlan@broadcom.com, f.fainelli@gmail.com, vincent.guittot@linaro.org, etienne.carriere@st.com, peng.fan@oss.nxp.com, michal.simek@amd.com, quic_sibis@quicinc.com, quic_nkela@quicinc.com, dan.carpenter@linaro.org, Cristian Marussi Subject: [PATCH v3 1/7] firmware: arm_scmi: Account for SHMEM memory overhead Date: Mon, 28 Oct 2024 12:01:45 +0000 Message-ID: <20241028120151.1301177-2-cristian.marussi@arm.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241028120151.1301177-1-cristian.marussi@arm.com> References: <20241028120151.1301177-1-cristian.marussi@arm.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 Content-Type: text/plain; charset="utf-8" Transports using shared memory have to consider the overhead due to the layout area when determining the area effectively available for messages. Till now, such definitions were ambiguos across the SCMI stack and the overhead layout area was not considered at all. Add proper checks in the shmem layer to validate the provided max_msg_size against the effectively available memory area, less the layout. Signed-off-by: Cristian Marussi --- v2 --> v3 - using a single SCMI_SHMEM_PAYLOAD_SIZE common define --- Note that as a consequence of this fix the default max_msg_size is reduced to 104 bytes for shmem-based transports, in order to fit into the most common implementations where the whole shmem area is sized at 128, including the 24 bytes of standard layout area. This should have NO bad side effects, since the current maximum payload size of any messages across any protocol (including all the known vendor ones) is 76 bytes. --- drivers/firmware/arm_scmi/common.h | 6 +++++- drivers/firmware/arm_scmi/driver.c | 1 + drivers/firmware/arm_scmi/shmem.c | 7 +++++++ drivers/firmware/arm_scmi/transports/mailbox.c | 2 +- drivers/firmware/arm_scmi/transports/optee.c | 8 +++----- drivers/firmware/arm_scmi/transports/smc.c | 2 +- 6 files changed, 18 insertions(+), 8 deletions(-) diff --git a/drivers/firmware/arm_scmi/common.h b/drivers/firmware/arm_scmi= /common.h index 6c2032d4f767..cb39b6bbcffd 100644 --- a/drivers/firmware/arm_scmi/common.h +++ b/drivers/firmware/arm_scmi/common.h @@ -31,6 +31,8 @@ =20 #define SCMI_MAX_RESPONSE_TIMEOUT (2 * MSEC_PER_SEC) =20 +#define SCMI_SHMEM_MAX_PAYLOAD_SIZE 104 + enum scmi_error_codes { SCMI_SUCCESS =3D 0, /* Success */ SCMI_ERR_SUPPORT =3D -1, /* Not supported */ @@ -165,6 +167,7 @@ void scmi_protocol_release(const struct scmi_handle *ha= ndle, u8 protocol_id); * channel * @is_p2a: A flag to identify a channel as P2A (RX) * @rx_timeout_ms: The configured RX timeout in milliseconds. + * @max_msg_size: Maximum size of message payload. * @handle: Pointer to SCMI entity handle * @no_completion_irq: Flag to indicate that this channel has no completion * interrupt mechanism for synchronous commands. @@ -177,6 +180,7 @@ struct scmi_chan_info { struct device *dev; bool is_p2a; unsigned int rx_timeout_ms; + unsigned int max_msg_size; struct scmi_handle *handle; bool no_completion_irq; void *transport_info; @@ -224,7 +228,7 @@ struct scmi_transport_ops { * @max_msg: Maximum number of messages for a channel type (tx or rx) that= can * be pending simultaneously in the system. May be overridden by the * get_max_msg op. - * @max_msg_size: Maximum size of data per message that can be handled. + * @max_msg_size: Maximum size of data payload per message that can be han= dled. * @force_polling: Flag to force this whole transport to use SCMI core pol= ling * mechanism instead of completion interrupts even if available. * @sync_cmds_completed_on_ret: Flag to indicate that the transport assures diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi= /driver.c index dccd066e3ba8..015a4d52ae37 100644 --- a/drivers/firmware/arm_scmi/driver.c +++ b/drivers/firmware/arm_scmi/driver.c @@ -2645,6 +2645,7 @@ static int scmi_chan_setup(struct scmi_info *info, st= ruct device_node *of_node, =20 cinfo->is_p2a =3D !tx; cinfo->rx_timeout_ms =3D info->desc->max_rx_timeout_ms; + cinfo->max_msg_size =3D info->desc->max_msg_size; =20 /* Create a unique name for this transport device */ snprintf(name, 32, "__scmi_transport_device_%s_%02X", diff --git a/drivers/firmware/arm_scmi/shmem.c b/drivers/firmware/arm_scmi/= shmem.c index e9f30ab671a8..11c347bff766 100644 --- a/drivers/firmware/arm_scmi/shmem.c +++ b/drivers/firmware/arm_scmi/shmem.c @@ -16,6 +16,8 @@ =20 #include "common.h" =20 +#define SCMI_SHMEM_LAYOUT_OVERHEAD 24 + /* * SCMI specification requires all parameters, message headers, return * arguments or any protocol data to be expressed in little endian @@ -221,6 +223,11 @@ static void __iomem *shmem_setup_iomap(struct scmi_cha= n_info *cinfo, } =20 size =3D resource_size(res); + if (cinfo->max_msg_size + SCMI_SHMEM_LAYOUT_OVERHEAD > size) { + dev_err(dev, "misconfigured SCMI shared memory\n"); + return IOMEM_ERR_PTR(-ENOSPC); + } + addr =3D devm_ioremap(dev, res->start, size); if (!addr) { dev_err(dev, "failed to ioremap SCMI %s shared memory\n", desc); diff --git a/drivers/firmware/arm_scmi/transports/mailbox.c b/drivers/firmw= are/arm_scmi/transports/mailbox.c index e7efa3376aae..b66df2981456 100644 --- a/drivers/firmware/arm_scmi/transports/mailbox.c +++ b/drivers/firmware/arm_scmi/transports/mailbox.c @@ -371,7 +371,7 @@ static struct scmi_desc scmi_mailbox_desc =3D { .ops =3D &scmi_mailbox_ops, .max_rx_timeout_ms =3D 30, /* We may increase this if required */ .max_msg =3D 20, /* Limited by MBOX_TX_QUEUE_LEN */ - .max_msg_size =3D 128, + .max_msg_size =3D SCMI_SHMEM_MAX_PAYLOAD_SIZE, }; =20 static const struct of_device_id scmi_of_match[] =3D { diff --git a/drivers/firmware/arm_scmi/transports/optee.c b/drivers/firmwar= e/arm_scmi/transports/optee.c index 663272879edf..3949a877e17d 100644 --- a/drivers/firmware/arm_scmi/transports/optee.c +++ b/drivers/firmware/arm_scmi/transports/optee.c @@ -17,8 +17,6 @@ =20 #include "../common.h" =20 -#define SCMI_OPTEE_MAX_MSG_SIZE 128 - enum scmi_optee_pta_cmd { /* * PTA_SCMI_CMD_CAPABILITIES - Get channel capabilities @@ -299,7 +297,7 @@ static int invoke_process_msg_channel(struct scmi_optee= _channel *channel, size_t =20 param[2].attr =3D TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_OUTPUT; param[2].u.memref.shm =3D channel->tee_shm; - param[2].u.memref.size =3D SCMI_OPTEE_MAX_MSG_SIZE; + param[2].u.memref.size =3D SCMI_SHMEM_MAX_PAYLOAD_SIZE; =20 ret =3D tee_client_invoke_func(scmi_optee_private->tee_ctx, &arg, param); if (ret < 0 || arg.ret) { @@ -332,7 +330,7 @@ static void scmi_optee_clear_channel(struct scmi_chan_i= nfo *cinfo) =20 static int setup_dynamic_shmem(struct device *dev, struct scmi_optee_chann= el *channel) { - const size_t msg_size =3D SCMI_OPTEE_MAX_MSG_SIZE; + const size_t msg_size =3D SCMI_SHMEM_MAX_PAYLOAD_SIZE; void *shbuf; =20 channel->tee_shm =3D tee_shm_alloc_kernel_buf(scmi_optee_private->tee_ctx= , msg_size); @@ -519,7 +517,7 @@ static struct scmi_desc scmi_optee_desc =3D { .ops =3D &scmi_optee_ops, .max_rx_timeout_ms =3D 30, .max_msg =3D 20, - .max_msg_size =3D SCMI_OPTEE_MAX_MSG_SIZE, + .max_msg_size =3D SCMI_SHMEM_MAX_PAYLOAD_SIZE, .sync_cmds_completed_on_ret =3D true, }; =20 diff --git a/drivers/firmware/arm_scmi/transports/smc.c b/drivers/firmware/= arm_scmi/transports/smc.c index 2f0e981e7599..f632a62cfb3e 100644 --- a/drivers/firmware/arm_scmi/transports/smc.c +++ b/drivers/firmware/arm_scmi/transports/smc.c @@ -282,7 +282,7 @@ static struct scmi_desc scmi_smc_desc =3D { .ops =3D &scmi_smc_ops, .max_rx_timeout_ms =3D 30, .max_msg =3D 20, - .max_msg_size =3D 128, + .max_msg_size =3D SCMI_SHMEM_MAX_PAYLOAD_SIZE, /* * Setting .sync_cmds_atomic_replies to true for SMC assumes that, * once the SMC instruction has completed successfully, the issued --=20 2.47.0 From nobody Mon Nov 25 09:33:41 2024 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8FE9D1D9339; Mon, 28 Oct 2024 12:02:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730116933; cv=none; b=GRdX1X4bPLzubrtYQNBHF/pLnbK3lCjr3WWWVcRiemVmmYteLlfxI8X6S6wrEVUZXv2lyzxb5IYLv9WImemfEsm3apQgDjW2p2TmkbS1Zoe2ecMUhGe+tOLJxc39i46LrIazoqx4b4aqpPVWj05CzEnQ60qsDY1dsriAzVBuxhw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730116933; c=relaxed/simple; bh=c12CM/G/A6JbS4n+TPvW3jO/rEsVh8BJOOGhyAH2iKA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DKMBYMiAk3VgTgvnMIEGBbrd61WMyEGNKOWgVO9TIPdm58O04G+YQJHseOCKayZhBPBt06wJKWuWrozg7B3q3XMUKrhVLRQ+OhrKnMQx312guFIFtWVDV3LMQuu5tZpBSoFWN0A58dyO8MdAURqDxQ/t6xQSWFxk89gwlXNtlOc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id BB79B1691; Mon, 28 Oct 2024 05:02:40 -0700 (PDT) Received: from pluto.fritz.box (usa-sjc-mx-foss1.foss.arm.com [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 190AB3F73B; Mon, 28 Oct 2024 05:02:08 -0700 (PDT) From: Cristian Marussi To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, arm-scmi@vger.kernel.org Cc: sudeep.holla@arm.com, james.quinlan@broadcom.com, f.fainelli@gmail.com, vincent.guittot@linaro.org, etienne.carriere@st.com, peng.fan@oss.nxp.com, michal.simek@amd.com, quic_sibis@quicinc.com, quic_nkela@quicinc.com, dan.carpenter@linaro.org, Cristian Marussi , Florian Fainelli Subject: [PATCH v3 2/7] firmware: arm_scmi: Calculate virtio PDU max size dynamically Date: Mon, 28 Oct 2024 12:01:46 +0000 Message-ID: <20241028120151.1301177-3-cristian.marussi@arm.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241028120151.1301177-1-cristian.marussi@arm.com> References: <20241028120151.1301177-1-cristian.marussi@arm.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 Content-Type: text/plain; charset="utf-8" SCMI virtio transport maximum PDU size is currently hardcoded at build time; this will not play well with the possibile retrieval of a different size at run-time. Make the virtio transport derive the maximum PDU size from the max_msg_size provided by the SCMI core. No functional change. Reviewed-by: Florian Fainelli Signed-off-by: Cristian Marussi --- drivers/firmware/arm_scmi/transports/virtio.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/firmware/arm_scmi/transports/virtio.c b/drivers/firmwa= re/arm_scmi/transports/virtio.c index d349766bc0b2..41aea33776a9 100644 --- a/drivers/firmware/arm_scmi/transports/virtio.c +++ b/drivers/firmware/arm_scmi/transports/virtio.c @@ -32,8 +32,8 @@ =20 #define VIRTIO_MAX_RX_TIMEOUT_MS 60000 #define VIRTIO_SCMI_MAX_MSG_SIZE 128 /* Value may be increased. */ -#define VIRTIO_SCMI_MAX_PDU_SIZE \ - (VIRTIO_SCMI_MAX_MSG_SIZE + SCMI_MSG_MAX_PROT_OVERHEAD) +#define VIRTIO_SCMI_MAX_PDU_SIZE(ci) \ + ((ci)->max_msg_size + SCMI_MSG_MAX_PROT_OVERHEAD) #define DESCRIPTORS_PER_TX_MSG 2 =20 /** @@ -90,6 +90,7 @@ enum poll_states { * @input: SDU used for (delayed) responses and notifications * @list: List which scmi_vio_msg may be part of * @rx_len: Input SDU size in bytes, once input has been received + * @max_len: Maximumm allowed SDU size in bytes * @poll_idx: Last used index registered for polling purposes if this mess= age * transaction reply was configured for polling. * @poll_status: Polling state for this message. @@ -102,6 +103,7 @@ struct scmi_vio_msg { struct scmi_msg_payld *input; struct list_head list; unsigned int rx_len; + unsigned int max_len; unsigned int poll_idx; enum poll_states poll_status; /* Lock to protect access to poll_status */ @@ -234,7 +236,7 @@ static int scmi_vio_feed_vq_rx(struct scmi_vio_channel = *vioch, unsigned long flags; struct device *dev =3D &vioch->vqueue->vdev->dev; =20 - sg_init_one(&sg_in, msg->input, VIRTIO_SCMI_MAX_PDU_SIZE); + sg_init_one(&sg_in, msg->input, msg->max_len); =20 spin_lock_irqsave(&vioch->lock, flags); =20 @@ -439,9 +441,9 @@ static int virtio_chan_setup(struct scmi_chan_info *cin= fo, struct device *dev, if (!msg) return -ENOMEM; =20 + msg->max_len =3D VIRTIO_SCMI_MAX_PDU_SIZE(cinfo); if (tx) { - msg->request =3D devm_kzalloc(dev, - VIRTIO_SCMI_MAX_PDU_SIZE, + msg->request =3D devm_kzalloc(dev, msg->max_len, GFP_KERNEL); if (!msg->request) return -ENOMEM; @@ -449,8 +451,7 @@ static int virtio_chan_setup(struct scmi_chan_info *cin= fo, struct device *dev, refcount_set(&msg->users, 1); } =20 - msg->input =3D devm_kzalloc(dev, VIRTIO_SCMI_MAX_PDU_SIZE, - GFP_KERNEL); + msg->input =3D devm_kzalloc(dev, msg->max_len, GFP_KERNEL); if (!msg->input) return -ENOMEM; =20 --=20 2.47.0 From nobody Mon Nov 25 09:33:41 2024 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D35581DA0E0; Mon, 28 Oct 2024 12:02:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730116935; cv=none; b=K3jm1US3XxpaQPfOz0gE6QoYdLIMphjzrDrz/Z7oP8txuxJWBCjKrXfPTTrYbbBsnbBnFJRzZ0CxBZ2Xiwb5ifLn7ZZ/bhs92dGIFvjHtttUCwZ7DpnRp+2g8MtMUgajU2/Ofwtsjwqv6Q84XibPJYq7imiLIMJhVtTaTCwgNAk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730116935; c=relaxed/simple; bh=H8xDAOMKrpAJvrKiMXiQPJzeOxCEpqKKUU2Hu9rg+zs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mLtJhfs1gPseph1YBeo1iGS73+Mu+W25V3JNvIiUZWyD/oV+9BsfUAkQPp5a7mUq11P1Q+5ae80ySzl7QSINo+3b/E7AJziJKxAKlG4lOSN5cgG4tndHwWey0hYiGAT5EjbwYuCULH2VG85L3V46ioRvlB6vy9alBvDp2gWJYes= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 137ED497; Mon, 28 Oct 2024 05:02:43 -0700 (PDT) Received: from pluto.fritz.box (usa-sjc-mx-foss1.foss.arm.com [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 499FA3F73B; Mon, 28 Oct 2024 05:02:11 -0700 (PDT) From: Cristian Marussi To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, arm-scmi@vger.kernel.org Cc: sudeep.holla@arm.com, james.quinlan@broadcom.com, f.fainelli@gmail.com, vincent.guittot@linaro.org, etienne.carriere@st.com, peng.fan@oss.nxp.com, michal.simek@amd.com, quic_sibis@quicinc.com, quic_nkela@quicinc.com, dan.carpenter@linaro.org, Cristian Marussi , "Rob Herring (Arm)" , devicetree@vger.kernel.org Subject: [PATCH v3 3/7] dt-bindings: firmware: arm,scmi: Introduce more transport properties Date: Mon, 28 Oct 2024 12:01:47 +0000 Message-ID: <20241028120151.1301177-4-cristian.marussi@arm.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241028120151.1301177-1-cristian.marussi@arm.com> References: <20241028120151.1301177-1-cristian.marussi@arm.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 Content-Type: text/plain; charset="utf-8" Depending on specific hardware and firmware design choices, it may be possible for different platforms to end up having different requirements regarding the same transport characteristics. Introduce max-msg-size and max-msg properties to describe such platform specific transport constraints, since they cannot be discovered otherwise. Reviewed-by: Rob Herring (Arm) Signed-off-by: Cristian Marussi --- Cc: devicetree@vger.kernel.org --- v1 --> v2 - added vendor prefix - dropped warnings about resonable minimum max-msg-size - clarified the intended usage of max-msg - fixed Cc to include all maintainers and using correct e-mails --- .../devicetree/bindings/firmware/arm,scmi.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Documentation/devicetree/bindings/firmware/arm,scmi.yaml b/Doc= umentation/devicetree/bindings/firmware/arm,scmi.yaml index 54d7d11bfed4..9d6e1147f9e9 100644 --- a/Documentation/devicetree/bindings/firmware/arm,scmi.yaml +++ b/Documentation/devicetree/bindings/firmware/arm,scmi.yaml @@ -131,6 +131,21 @@ properties: be a non-zero value if set. minimum: 1 =20 + arm,max-msg-size: + $ref: /schemas/types.yaml#/definitions/uint32 + description: + An optional value, expressed in bytes, representing the maximum size + allowed for the payload of messages transmitted on this transport. + + arm,max-msg: + $ref: /schemas/types.yaml#/definitions/uint32 + description: + An optional value representing the maximum number of concurrent in-f= light + messages allowed by this transport; this number represents the maxim= um + number of concurrently outstanding messages that the server can hand= le on + this platform. If set, the value should be non-zero. + minimum: 1 + arm,smc-id: $ref: /schemas/types.yaml#/definitions/uint32 description: --=20 2.47.0 From nobody Mon Nov 25 09:33:41 2024 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0E98F1DAC9F; Mon, 28 Oct 2024 12:02:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730116937; cv=none; b=gj27d1jpjeexcSnBWN/cCE0oGAkRc3rcvqoOdYAeS87X/Hvm6TjOB4jCDQ2cgA5BMcNuQbj07bNx4ca5HmC3cfvnKh4otNfR3GHd8J+un/cOu8DyEGmh8yWtlYG3Hpe8H3teuxYj/g4l2GRn/ROOI51yv3SED6nAPhvyD6E156w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730116937; c=relaxed/simple; bh=fz60ziG+lao7DWzrHq4INr87CuLl1NlLAQ+wxu2hX5s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Uk00Z9eHD6SUl4Y7sMYvmfivjpHy2tTZ6VQ4vcrjAUoUS/0hKnZZmF4bNdQ5vHa3OHDa0Qbs9Tnr1uz/GBlo/uo8ClFthlcFM7H3NNWdDMgldDp656Nn3z8khBH83qr0tKpwh5RSqZm/tYx9bnptuAUvzfvWsQu7MyR4qiMmIEQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 267F413D5; Mon, 28 Oct 2024 05:02:45 -0700 (PDT) Received: from pluto.fritz.box (usa-sjc-mx-foss1.foss.arm.com [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 9493A3F73B; Mon, 28 Oct 2024 05:02:13 -0700 (PDT) From: Cristian Marussi To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, arm-scmi@vger.kernel.org Cc: sudeep.holla@arm.com, james.quinlan@broadcom.com, f.fainelli@gmail.com, vincent.guittot@linaro.org, etienne.carriere@st.com, peng.fan@oss.nxp.com, michal.simek@amd.com, quic_sibis@quicinc.com, quic_nkela@quicinc.com, dan.carpenter@linaro.org, Cristian Marussi Subject: [PATCH v3 4/7] firmware: arm_scmi: Use max_msg and max_msg_size devicetree properties Date: Mon, 28 Oct 2024 12:01:48 +0000 Message-ID: <20241028120151.1301177-5-cristian.marussi@arm.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241028120151.1301177-1-cristian.marussi@arm.com> References: <20241028120151.1301177-1-cristian.marussi@arm.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 Content-Type: text/plain; charset="utf-8" Override the default built-in max_msg and max_msg_size transport properties when the corresponding properties were found to be described in the devicetree. Signed-off-by: Cristian Marussi --- v1 --> v2 - using new prefixed arm, properties --- drivers/firmware/arm_scmi/driver.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi= /driver.c index 015a4d52ae37..b9a1d8c1034f 100644 --- a/drivers/firmware/arm_scmi/driver.c +++ b/drivers/firmware/arm_scmi/driver.c @@ -3056,8 +3056,20 @@ static const struct scmi_desc *scmi_transport_setup(= struct device *dev) if (ret && ret !=3D -EINVAL) dev_err(dev, "Malformed max-rx-timeout-ms DT property.\n"); =20 - dev_info(dev, "SCMI max-rx-timeout: %dms\n", - trans->desc->max_rx_timeout_ms); + ret =3D of_property_read_u32(dev->of_node, "arm,max-msg-size", + &trans->desc->max_msg_size); + if (ret && ret !=3D -EINVAL) + dev_err(dev, "Malformed arm,max-msg-size DT property.\n"); + + ret =3D of_property_read_u32(dev->of_node, "arm,max-msg", + &trans->desc->max_msg); + if (ret && ret !=3D -EINVAL) + dev_err(dev, "Malformed arm,max-msg DT property.\n"); + + dev_info(dev, + "SCMI max-rx-timeout: %dms / max-msg-size: %dbytes / max-msg: %d\n", + trans->desc->max_rx_timeout_ms, trans->desc->max_msg_size, + trans->desc->max_msg); =20 return trans->desc; } --=20 2.47.0 From nobody Mon Nov 25 09:33:41 2024 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id F0DAE1DA636; Mon, 28 Oct 2024 12:02:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730116940; cv=none; b=odgqpjZBrXBe4S4M8uWKGsjvU9Rc8DEz7UZxo3Y0XV0lhNArKGwnPKqRdh4Bzl8v5j+eun3LUgaO1vWAYXh+moV9eZDNsOBTV1Ve8NzQ9Z78v8zZPCtrnwcbg1IIaiYRRrOitlX2vwmd0Sr+K8JSu32f0ZZwIHdlAyRs2r8E9LQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730116940; c=relaxed/simple; bh=YhowQ+kRplF5ppw0lNNCfnRc5+vM7PeuhHMYj88V+Sc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=t6OYa0ZrU+sFNok+Nc26iau7mdkdAccQa24M04W2+Zd4XwnkXoYZV2Vz5/ry8lLzV5VwTmrrsbhzd5lWZ61ivXno9Q2bodT9ea4iX61RuImR1bRHXdmg9qlAIWFa1cGqV/76Osk/rnUO83e6UA83eYf5FFGDVa7kLtEkIXwzBIs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 39A86497; Mon, 28 Oct 2024 05:02:47 -0700 (PDT) Received: from pluto.fritz.box (usa-sjc-mx-foss1.foss.arm.com [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id A7DA03F73B; Mon, 28 Oct 2024 05:02:15 -0700 (PDT) From: Cristian Marussi To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, arm-scmi@vger.kernel.org Cc: sudeep.holla@arm.com, james.quinlan@broadcom.com, f.fainelli@gmail.com, vincent.guittot@linaro.org, etienne.carriere@st.com, peng.fan@oss.nxp.com, michal.simek@amd.com, quic_sibis@quicinc.com, quic_nkela@quicinc.com, dan.carpenter@linaro.org, Cristian Marussi Subject: [PATCH v3 5/7] firmware: arm_scmi: Relocate atomic_threshold to scmi_desc Date: Mon, 28 Oct 2024 12:01:49 +0000 Message-ID: <20241028120151.1301177-6-cristian.marussi@arm.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241028120151.1301177-1-cristian.marussi@arm.com> References: <20241028120151.1301177-1-cristian.marussi@arm.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 Content-Type: text/plain; charset="utf-8" Relocate the atomic_threshold field to scmi_desc and move the related code to scmi_transport_setup. No functional change. Signed-off-by: Cristian Marussi --- v2 --> v3 - fixed format string using %u instead of %d --- drivers/firmware/arm_scmi/common.h | 7 +++++++ drivers/firmware/arm_scmi/driver.c | 25 +++++++++---------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/firmware/arm_scmi/common.h b/drivers/firmware/arm_scmi= /common.h index cb39b6bbcffd..48b12f81141d 100644 --- a/drivers/firmware/arm_scmi/common.h +++ b/drivers/firmware/arm_scmi/common.h @@ -229,6 +229,12 @@ struct scmi_transport_ops { * be pending simultaneously in the system. May be overridden by the * get_max_msg op. * @max_msg_size: Maximum size of data payload per message that can be han= dled. + * @atomic_threshold: Optional system wide DT-configured threshold, expres= sed + * in microseconds, for atomic operations. + * Only SCMI synchronous commands reported by the platform + * to have an execution latency lesser-equal to the threshold + * should be considered for atomic mode operation: such + * decision is finally left up to the SCMI drivers. * @force_polling: Flag to force this whole transport to use SCMI core pol= ling * mechanism instead of completion interrupts even if available. * @sync_cmds_completed_on_ret: Flag to indicate that the transport assures @@ -247,6 +253,7 @@ struct scmi_desc { int max_rx_timeout_ms; int max_msg; int max_msg_size; + unsigned int atomic_threshold; const bool force_polling; const bool sync_cmds_completed_on_ret; const bool atomic_enabled; diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi= /driver.c index b9a1d8c1034f..9bc1bb7caa55 100644 --- a/drivers/firmware/arm_scmi/driver.c +++ b/drivers/firmware/arm_scmi/driver.c @@ -149,12 +149,6 @@ struct scmi_debug_info { * base protocol * @active_protocols: IDR storing device_nodes for protocols actually defi= ned * in the DT and confirmed as implemented by fw. - * @atomic_threshold: Optional system wide DT-configured threshold, expres= sed - * in microseconds, for atomic operations. - * Only SCMI synchronous commands reported by the platform - * to have an execution latency lesser-equal to the threshold - * should be considered for atomic mode operation: such - * decision is finally left up to the SCMI drivers. * @notify_priv: Pointer to private data structure specific to notificatio= ns. * @node: List head * @users: Number of users of this instance @@ -180,7 +174,6 @@ struct scmi_info { struct mutex protocols_mtx; u8 *protocols_imp; struct idr active_protocols; - unsigned int atomic_threshold; void *notify_priv; struct list_head node; int users; @@ -2445,7 +2438,7 @@ static bool scmi_is_transport_atomic(const struct scm= i_handle *handle, ret =3D info->desc->atomic_enabled && is_transport_polling_capable(info->desc); if (ret && atomic_threshold) - *atomic_threshold =3D info->atomic_threshold; + *atomic_threshold =3D info->desc->atomic_threshold; =20 return ret; } @@ -2959,7 +2952,7 @@ static struct scmi_debug_info *scmi_debugfs_common_se= tup(struct scmi_info *info) (char **)&dbg->name); =20 debugfs_create_u32("atomic_threshold_us", 0400, top_dentry, - &info->atomic_threshold); + (u32 *)&info->desc->atomic_threshold); =20 debugfs_create_str("type", 0400, trans, (char **)&dbg->type); =20 @@ -3071,6 +3064,13 @@ static const struct scmi_desc *scmi_transport_setup(= struct device *dev) trans->desc->max_rx_timeout_ms, trans->desc->max_msg_size, trans->desc->max_msg); =20 + /* System wide atomic threshold for atomic ops .. if any */ + if (!of_property_read_u32(dev->of_node, "atomic-threshold-us", + &trans->desc->atomic_threshold)) + dev_info(dev, + "SCMI System wide atomic threshold set to %u us\n", + trans->desc->atomic_threshold); + return trans->desc; } =20 @@ -3120,13 +3120,6 @@ static int scmi_probe(struct platform_device *pdev) handle->devm_protocol_acquire =3D scmi_devm_protocol_acquire; handle->devm_protocol_get =3D scmi_devm_protocol_get; handle->devm_protocol_put =3D scmi_devm_protocol_put; - - /* System wide atomic threshold for atomic ops .. if any */ - if (!of_property_read_u32(np, "atomic-threshold-us", - &info->atomic_threshold)) - dev_info(dev, - "SCMI System wide atomic threshold set to %d us\n", - info->atomic_threshold); handle->is_transport_atomic =3D scmi_is_transport_atomic; =20 /* Setup all channels described in the DT at first */ --=20 2.47.0 From nobody Mon Nov 25 09:33:41 2024 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id BD4021DB92C; Mon, 28 Oct 2024 12:02:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730116942; cv=none; b=jr8f5VE65iiCNjhZ80jSvY303yLckUzP5iGTS2pax4lLgGxQ3webSCOjGLwCfxElv5fPinG5TMQ9gffqLVNQ4Z6yInmgRpIJUfZriM+XA0sMXKTytA0Q+uMpS4meuy6y3p1RGBdccDqKcgeig0+NMMAew1rBG5qU0jjjxqOdCAE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730116942; c=relaxed/simple; bh=YFSoil/wyoPbsUOnERejF91RTgrdSIFDhVBcGJK0dE4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=U9CtNy+2z8+jl4sEW9ykAJ1GkDKpIrPMmQ8h+xBR1f8KSMeirAqvWEmnk+5RzWtUNNk5eeZryoIKUj3UEgU2mobzImPAjE8Rakne7P0KQBdYNSpeVnJO7TAeE/QsYp8RAeuM7Dr8WkNJc7+EbTtzJ1ZpFQ8UVXmIliLfyxSkSxQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id D9CFA13D5; Mon, 28 Oct 2024 05:02:49 -0700 (PDT) Received: from pluto.fritz.box (usa-sjc-mx-foss1.foss.arm.com [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id BC5A93F73B; Mon, 28 Oct 2024 05:02:17 -0700 (PDT) From: Cristian Marussi To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, arm-scmi@vger.kernel.org Cc: sudeep.holla@arm.com, james.quinlan@broadcom.com, f.fainelli@gmail.com, vincent.guittot@linaro.org, etienne.carriere@st.com, peng.fan@oss.nxp.com, michal.simek@amd.com, quic_sibis@quicinc.com, quic_nkela@quicinc.com, dan.carpenter@linaro.org, Cristian Marussi , Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org, Peng Fan Subject: [PATCH v3 6/7] dt-bindings: firmware: arm,scmi: Add missing vendor string Date: Mon, 28 Oct 2024 12:01:50 +0000 Message-ID: <20241028120151.1301177-7-cristian.marussi@arm.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241028120151.1301177-1-cristian.marussi@arm.com> References: <20241028120151.1301177-1-cristian.marussi@arm.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 Content-Type: text/plain; charset="utf-8" Recently introduced max-rx-timeout-ms optionao property is missing a vendor prefix. Add the vendor prefix from the original committer. Fixes: 3a5e6ab06eab ("dt-bindings: firmware: arm,scmi: Introduce property m= ax-rx-timeout-ms") Signed-off-by: Cristian Marussi --- Note that this fixes a commit that has been merged in v6.12-rc1...so it should not present any backward compatibility issue. --- Cc: Rob Herring Cc: Krzysztof Kozlowski Cc: Conor Dooley Cc: devicetree@vger.kernel.org Cc: Peng Fan --- Documentation/devicetree/bindings/firmware/arm,scmi.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/firmware/arm,scmi.yaml b/Doc= umentation/devicetree/bindings/firmware/arm,scmi.yaml index 9d6e1147f9e9..e331da4d606b 100644 --- a/Documentation/devicetree/bindings/firmware/arm,scmi.yaml +++ b/Documentation/devicetree/bindings/firmware/arm,scmi.yaml @@ -124,7 +124,7 @@ properties: atomic mode of operation, even if requested. default: 0 =20 - max-rx-timeout-ms: + nxp,max-rx-timeout-ms: description: An optional time value, expressed in milliseconds, representing the transport maximum timeout value for the receive channel. The value s= hould --=20 2.47.0 From nobody Mon Nov 25 09:33:41 2024 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 115A61DC747; Mon, 28 Oct 2024 12:02:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730116944; cv=none; b=QOk1ljizKyl8roijiP+vF1yf9LPVttTSCU99jFzHkZAmoBLqj9mupUUjgzuVy2I/kbGPBkYG1QvGEco2srN+Dp47IPOj3wxIpifJ1udhd+KeRKLlYjrV4USiVKPEukyscoSBy7ruFda+rxsg/hKHBCUdjHkUVStInFJusAN4fMw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730116944; c=relaxed/simple; bh=F5zUdak1Jnw75m7oOr4TBN1CMB1W8ProzjphVO1IIzE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=g8S6Cqc0yh0+ZAswLY3Uu/QyBoxyQdOg6hZd3xfP5Vv/Ov0uUFJn+X+zcEFYebjNi7e7dcVgj3mCzZSRtqUF22ixr4XPHIBA88PBw8ywS6jpoNnjtzm7yqUZuyZgwxM9Ra5oCHAt8N5JyINFlap8VjS/TViTE/ax3l5ITOWQQVQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 14E35497; Mon, 28 Oct 2024 05:02:52 -0700 (PDT) Received: from pluto.fritz.box (usa-sjc-mx-foss1.foss.arm.com [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 6767D3F73B; Mon, 28 Oct 2024 05:02:20 -0700 (PDT) From: Cristian Marussi To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, arm-scmi@vger.kernel.org Cc: sudeep.holla@arm.com, james.quinlan@broadcom.com, f.fainelli@gmail.com, vincent.guittot@linaro.org, etienne.carriere@st.com, peng.fan@oss.nxp.com, michal.simek@amd.com, quic_sibis@quicinc.com, quic_nkela@quicinc.com, dan.carpenter@linaro.org, Cristian Marussi , Peng Fan Subject: [PATCH v3 7/7] firmware: arm_scmi: Use vendor string in max-rx-timeout-ms Date: Mon, 28 Oct 2024 12:01:51 +0000 Message-ID: <20241028120151.1301177-8-cristian.marussi@arm.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241028120151.1301177-1-cristian.marussi@arm.com> References: <20241028120151.1301177-1-cristian.marussi@arm.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 Content-Type: text/plain; charset="utf-8" The original optional property was missing a vendor string prefix; this has been rectified. Fix the naming of such optional property in code too. Cc: Peng Fan Fixes: 1780e411ef94 ("firmware: arm_scmi: Use max-rx-timeout-ms from device= tree") Signed-off-by: Cristian Marussi --- drivers/firmware/arm_scmi/driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi= /driver.c index 9bc1bb7caa55..eed73000c902 100644 --- a/drivers/firmware/arm_scmi/driver.c +++ b/drivers/firmware/arm_scmi/driver.c @@ -3044,10 +3044,10 @@ static const struct scmi_desc *scmi_transport_setup= (struct device *dev) =20 dev_info(dev, "Using %s\n", dev_driver_string(trans->supplier)); =20 - ret =3D of_property_read_u32(dev->of_node, "max-rx-timeout-ms", + ret =3D of_property_read_u32(dev->of_node, "nxp,max-rx-timeout-ms", &trans->desc->max_rx_timeout_ms); if (ret && ret !=3D -EINVAL) - dev_err(dev, "Malformed max-rx-timeout-ms DT property.\n"); + dev_err(dev, "Malformed nxp,max-rx-timeout-ms DT property.\n"); =20 ret =3D of_property_read_u32(dev->of_node, "arm,max-msg-size", &trans->desc->max_msg_size); --=20 2.47.0