From patchwork Sat May 6 18:24:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikunj Kela X-Patchwork-Id: 90789 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1197631vqo; Sat, 6 May 2023 11:29:54 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ73Ix0VNx39X3sHUtT3AXr7dv/vG/lSBnh2TL+lbZhKAvc7HSe/n9nhgK8aZaQRvAKWmRh1 X-Received: by 2002:a17:903:248:b0:1aa:e631:9f7f with SMTP id j8-20020a170903024800b001aae6319f7fmr5669510plh.41.1683397794127; Sat, 06 May 2023 11:29:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683397794; cv=none; d=google.com; s=arc-20160816; b=hEMLaZHX4kJzUjnEXkn3cQN5fKSGSkfv2QAicVtPCYRx9wDDWZCy/ffU897gLC6yOp ReVxfbL3ZNh33TImbXfxJYzCGKAWNl6o3QnjZ7YnJ0RDuMd6UZP0z2mCvoOk7dvDUzi7 euRRiOiftiCrpcLtzUdDNt9E4LPqMwTPj4cT/FRZxyQEo15XJHmWv4yKMCRV419Bamyt FQCvCNKk3QrdSon+5q3Kzim9v+iCQBYxtipYrRzbGMspEo42KmuoncLxqsDh8G23Vek9 ++D9EuYkBBUfdCO5+6po07ySObqM5T54+G6noMNXE01hidnA7mQqsO9a+3V5K9UWMRb/ omlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=Yv4g18ExX5u0yvs/fL8uwt6a4Lfy32SRuuoBb4ZVqCk=; b=iksLLXGLS21BDWWzIuqjiwP4HmfVvcmebYnXg3QB2cO/ktb51h9gAnswhnzmGBxINm vic7a96mIcbXoN2U94x078H+nnUxD/QTD3Qxv0oq66tlkoajUe6XN+6YREX50Or63xn9 0IoI6wdaciR8ycyiBnO6Ivjn7RpyfMJkP0UpwnAgkDiRhOqUshkrzFBkyGfWKCbGdxNj 6iHtPJzaIwWZ3W8lwaAngJY6p36a/Ar7iVomtg8kwnc5QGaXGB0kvDkN9o6o/UxyoIRn X4qGYYgZBeQcfBcutDBVssU+fSm8aXHySOvS01Ag1wnsKweHLubtxL1YXLFgSsveOqy4 4kaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=kpryvZxq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j8-20020a170903024800b001a4fc13dfa5si4544883plh.276.2023.05.06.11.29.38; Sat, 06 May 2023 11:29:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=kpryvZxq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229753AbjEFSZE (ORCPT + 99 others); Sat, 6 May 2023 14:25:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34658 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229463AbjEFSZC (ORCPT ); Sat, 6 May 2023 14:25:02 -0400 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C6A2B1568D; Sat, 6 May 2023 11:25:00 -0700 (PDT) Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 346IAGgB030752; Sat, 6 May 2023 18:24:49 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=qcppdkim1; bh=Yv4g18ExX5u0yvs/fL8uwt6a4Lfy32SRuuoBb4ZVqCk=; b=kpryvZxqToCZruosQctcRqEWYLQ55fIm66CO/r2clgbzu0R6wENmx51510rvk1+nWBDq V/DpfdUUUbx4f0ZZn6mwcMCeCVeK/uoxXkPTjEkacGO9K+5I953qpZ2lfDlVEqJ2fliY NFxmT2u0EYMzIKjxBzHrD7VWDgRi4RLna4Sj/WsZeGBZW5yPcEUVzS0mCmx/NIqCaEJn TMbp0A57q96D6Bt/SkXiEyc3JGABfNeg8XEkBXKZpIKeQZd0VGOBEyCFCaBa2LnriyPU U7obdfrVqxQFlkUfkCXBDjL3hg1Gs5xGxcNkWmaMmd6642mWpo5C9ckv/o/KUX/8v3Cr CQ== Received: from nalasppmta02.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3qdf040tqw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 06 May 2023 18:24:49 +0000 Received: from nalasex01c.na.qualcomm.com (nalasex01c.na.qualcomm.com [10.47.97.35]) by NALASPPMTA02.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 346IOmDC012609 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 6 May 2023 18:24:48 GMT Received: from car-linux11.qualcomm.com (10.80.80.8) by nalasex01c.na.qualcomm.com (10.47.97.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.42; Sat, 6 May 2023 11:24:47 -0700 From: Nikunj Kela To: CC: , , , , , , Nikunj Kela Subject: [PATCH v5 1/2] dt-bindings: firmware: arm,scmi: support for parameter in smc/hvc call Date: Sat, 6 May 2023 11:24:27 -0700 Message-ID: <20230506182428.25343-2-quic_nkela@quicinc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230506182428.25343-1-quic_nkela@quicinc.com> References: <20230506182428.25343-1-quic_nkela@quicinc.com> MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nalasex01c.na.qualcomm.com (10.47.97.35) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: hoNskiPvXpYw_7Hy9BRaPcha9ehhexzw X-Proofpoint-ORIG-GUID: hoNskiPvXpYw_7Hy9BRaPcha9ehhexzw X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-05-06_11,2023-05-05_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 mlxlogscore=999 suspectscore=0 spamscore=0 mlxscore=0 malwarescore=0 bulkscore=0 impostorscore=0 lowpriorityscore=0 clxscore=1015 adultscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2305060144 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1765170525232924516?= X-GMAIL-MSGID: =?utf-8?q?1765170525232924516?= Currently, smc/hvc calls are made with smc-id only. The parameters are all set to zeros. This change defines a new compatible string that can be used to pass shmem address(4KB-page, offset) as two parameters in SMC/HVC doorbell. This is useful when multiple scmi instances are used with common smc-id. Signed-off-by: Nikunj Kela Reviewed-by: Rob Herring Reviewed-by: Florian Fainelli --- Documentation/devicetree/bindings/firmware/arm,scmi.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/firmware/arm,scmi.yaml b/Documentation/devicetree/bindings/firmware/arm,scmi.yaml index 5824c43e9893..ad776911f990 100644 --- a/Documentation/devicetree/bindings/firmware/arm,scmi.yaml +++ b/Documentation/devicetree/bindings/firmware/arm,scmi.yaml @@ -34,6 +34,10 @@ properties: - description: SCMI compliant firmware with ARM SMC/HVC transport items: - const: arm,scmi-smc + - description: SCMI compliant firmware with ARM SMC/HVC transport + with shmem address(4KB-page, offset) as parameters + items: + - const: arm,scmi-smc-param - description: SCMI compliant firmware with SCMI Virtio transport. The virtio transport only supports a single device. items: @@ -299,7 +303,9 @@ else: properties: compatible: contains: - const: arm,scmi-smc + enum: + - arm,scmi-smc + - arm,scmi-smc-param then: required: - arm,smc-id From patchwork Sat May 6 18:24:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikunj Kela X-Patchwork-Id: 90790 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1198816vqo; Sat, 6 May 2023 11:33:00 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7/CNWD/cmmKhd4OhHSevs1tjQFlzqr43mH/gZ20wv6jqCgUPkbYJeQPQysX6Nt5Qye1Y5q X-Received: by 2002:a17:90b:4aca:b0:247:4f32:d108 with SMTP id mh10-20020a17090b4aca00b002474f32d108mr5672261pjb.13.1683397979893; Sat, 06 May 2023 11:32:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683397979; cv=none; d=google.com; s=arc-20160816; b=g7zSqxTmh/v08ul9hu27zyrZlkOQ2Wq39MmnQkhpF/xyUOvd+mGRmvCprNGEih3sJt fTm1LQlkV4IDHupb7/OdGWptONqNm8F+Rq3tTkZSXLU1AjEKdIHE4nvTgqNllcSYsPiK CqYgm5RRTfrXWL+Z6cGQSLm/AbVoTFtzugSZOkqgxofPJhtS2aIXEIUmxIYmy3/f4vxB vPdQH8Q0k/RDBKg1BQorWl0q7Al4CVi4S65BdKH1VSh2o6R/419w2l8RkLtGcvme+c/N h/1aSOD62zFKiVcURtXl+WJfhMUWQ6u5eFTGWe4sAgM2Tw6jEG8HVGiqS+PYTvEIdyk1 DJRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=Uyb35H/kbF9QkDeVzNYPkHik27rYom42LURQicdJjyk=; b=TP8ZAdy/pYnQnnGxDfxUiecR2p76NJUK7kNDFn5YIjIb7FZAPhZDzgwxLA8j0cCK7e hpYNNAJRUReIxVQuovL3GevJaq4dQ6u3kAvf1ooOSG1DGIqfhOzqliEtk2wJKjdIpIxJ 4OKIwdJSnlWW4cAqi0SGAx9OOhTac+V1ymiRA/mRNUi7AUIJMTKv3lolTS3h+cPSFSJF 2QlgStwgqNWHtc3ktv7I1MwN9hIqXsVsYy8llXYfHcvQAp36S/2IWK7YMZ2bfyO6SYE/ gYkGCjwN8JDsskYtgkCHBiX6rI4EF4BM1plzqR0bc+/RekzFlHLJhC9jpp6YB2eJ6It8 2zgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=ExQYlPUa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x185-20020a6386c2000000b0052c5a49b7a4si5244300pgd.542.2023.05.06.11.32.45; Sat, 06 May 2023 11:32:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=ExQYlPUa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229518AbjEFSZO (ORCPT + 99 others); Sat, 6 May 2023 14:25:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34790 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229918AbjEFSZL (ORCPT ); Sat, 6 May 2023 14:25:11 -0400 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ABB3A1A48B; Sat, 6 May 2023 11:25:10 -0700 (PDT) Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 346IOpiV032020; Sat, 6 May 2023 18:24:51 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=qcppdkim1; bh=Uyb35H/kbF9QkDeVzNYPkHik27rYom42LURQicdJjyk=; b=ExQYlPUa5RD/ebD/zcbeNtLJcUZfJ3n1ZFV7FEpRc8AYVoKRvPxUPnih+7bB2TFzUEoJ +TDtM0pEfFYjORVFKyAGAssbtLytUnHabZzPN5XMuPOBMc24Az+3ShUzhwLIM3J2P/0U fcLCO3cbQuoHTfY/Ll5BqoEtpQtOe1HWnKiN99Ayw7+gEpi46s0YxrXZTHZTFSiA5pJU Lk7BvmEh1pCbuf6v+TvrVx+VDWp57jaNpuGt0iNc/G+j22emREFnyJxdp7moSrHxKSqG q+EjOsyhIsTJGIih4dcir2kJBVsI4VYNcGA8p6D/ATrrdiJF1Z7Dzrc3qyCvV28Pn/8/ zw== Received: from nalasppmta05.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3qddwhguyp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 06 May 2023 18:24:51 +0000 Received: from nalasex01c.na.qualcomm.com (nalasex01c.na.qualcomm.com [10.47.97.35]) by NALASPPMTA05.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 346IOoMK003563 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 6 May 2023 18:24:50 GMT Received: from car-linux11.qualcomm.com (10.80.80.8) by nalasex01c.na.qualcomm.com (10.47.97.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.42; Sat, 6 May 2023 11:24:49 -0700 From: Nikunj Kela To: CC: , , , , , , Nikunj Kela Subject: [PATCH v5 2/2] firmware: arm_scmi: Augment SMC/HVC to allow optional parameters Date: Sat, 6 May 2023 11:24:28 -0700 Message-ID: <20230506182428.25343-3-quic_nkela@quicinc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230506182428.25343-1-quic_nkela@quicinc.com> References: <20230506182428.25343-1-quic_nkela@quicinc.com> MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nalasex01c.na.qualcomm.com (10.47.97.35) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: mKG5RoTp8pg9SE_OEdyBYHivLJM-4x4A X-Proofpoint-ORIG-GUID: mKG5RoTp8pg9SE_OEdyBYHivLJM-4x4A X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-05-06_11,2023-05-05_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 malwarescore=0 adultscore=0 impostorscore=0 mlxscore=0 phishscore=0 priorityscore=1501 bulkscore=0 spamscore=0 clxscore=1011 lowpriorityscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2305060144 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1765170720401959870?= X-GMAIL-MSGID: =?utf-8?q?1765170720401959870?= This change adds support for passing shmem channel address as parameters in smc/hvc call. The address is split into 4KB-page and offset. This is useful when multiple scmi instances are using same smc-id and firmware needs to distinguish among the instances. Signed-off-by: Nikunj Kela Reviewed-by: Florian Fainelli --- drivers/firmware/arm_scmi/driver.c | 1 + drivers/firmware/arm_scmi/smc.c | 30 +++++++++++++++++++++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c index e7d97b59963b..b5957cc12fee 100644 --- a/drivers/firmware/arm_scmi/driver.c +++ b/drivers/firmware/arm_scmi/driver.c @@ -2914,6 +2914,7 @@ static const struct of_device_id scmi_of_match[] = { #endif #ifdef CONFIG_ARM_SCMI_TRANSPORT_SMC { .compatible = "arm,scmi-smc", .data = &scmi_smc_desc}, + { .compatible = "arm,scmi-smc-param", .data = &scmi_smc_desc}, #endif #ifdef CONFIG_ARM_SCMI_TRANSPORT_VIRTIO { .compatible = "arm,scmi-virtio", .data = &scmi_virtio_desc}, diff --git a/drivers/firmware/arm_scmi/smc.c b/drivers/firmware/arm_scmi/smc.c index 93272e4bbd12..621c37efe3ec 100644 --- a/drivers/firmware/arm_scmi/smc.c +++ b/drivers/firmware/arm_scmi/smc.c @@ -20,6 +20,23 @@ #include "common.h" +/* + * The shmem address is split into 4K page and offset. + * This is to make sure the parameters fit in 32bit arguments of the + * smc/hvc call to keep it uniform across smc32/smc64 conventions. + * This however limits the shmem address to 44 bit. + * + * These optional parameters can be used to distinguish among multiple + * scmi instances that are using the same smc-id. + * The page parameter is passed in r1/x1/w1 register and the offset parameter + * is passed in r2/x2/w2 register. + */ + +#define SHMEM_SIZE (SZ_4K) +#define SHMEM_SHIFT 12 +#define SHMEM_PAGE(x) (_UL((x) >> SHMEM_SHIFT)) +#define SHMEM_OFFSET(x) ((x) & (SHMEM_SIZE - 1)) + /** * struct scmi_smc - Structure representing a SCMI smc transport * @@ -30,6 +47,8 @@ * @inflight: Atomic flag to protect access to Tx/Rx shared memory area. * Used when operating in atomic mode. * @func_id: smc/hvc call function id + * @param_page: 4K page number of the shmem channel + * @param_offset: Offset within the 4K page of the shmem channel */ struct scmi_smc { @@ -40,6 +59,8 @@ struct scmi_smc { #define INFLIGHT_NONE MSG_TOKEN_MAX atomic_t inflight; u32 func_id; + u32 param_page; + u32 param_offset; }; static irqreturn_t smc_msg_done_isr(int irq, void *data) @@ -137,6 +158,10 @@ static int smc_chan_setup(struct scmi_chan_info *cinfo, struct device *dev, if (ret < 0) return ret; + if (of_device_is_compatible(dev->of_node, "arm,scmi-smc-param")) { + scmi_info->param_page = SHMEM_PAGE(res.start); + scmi_info->param_offset = SHMEM_OFFSET(res.start); + } /* * If there is an interrupt named "a2p", then the service and * completion of a message is signaled by an interrupt rather than by @@ -179,6 +204,8 @@ static int smc_send_message(struct scmi_chan_info *cinfo, { struct scmi_smc *scmi_info = cinfo->transport_info; struct arm_smccc_res res; + unsigned long page = scmi_info->param_page; + unsigned long offset = scmi_info->param_offset; /* * Channel will be released only once response has been @@ -188,7 +215,8 @@ static int smc_send_message(struct scmi_chan_info *cinfo, shmem_tx_prepare(scmi_info->shmem, xfer, cinfo); - arm_smccc_1_1_invoke(scmi_info->func_id, 0, 0, 0, 0, 0, 0, 0, &res); + arm_smccc_1_1_invoke(scmi_info->func_id, page, offset, 0, 0, 0, 0, 0, + &res); /* Only SMCCC_RET_NOT_SUPPORTED is valid error code */ if (res.a0) {