From patchwork Mon Apr 10 18:20:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikunj Kela X-Patchwork-Id: 81600 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2077493vqo; Mon, 10 Apr 2023 11:31:47 -0700 (PDT) X-Google-Smtp-Source: AKy350ZqcShI+iSGATl9d4TZl0KnAbbpAXSj83KfgY8KglD39Fh7a5E5AyFfGTal60WLVI9Z5Oyv X-Received: by 2002:a17:906:5645:b0:94a:698a:c263 with SMTP id v5-20020a170906564500b0094a698ac263mr4580881ejr.71.1681151507079; Mon, 10 Apr 2023 11:31:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681151507; cv=none; d=google.com; s=arc-20160816; b=n3rHyHeAk/LT7tAANKjvAo4zJHlEKp19cMKBgjpoIv+1J8f3Z+V9UJR/esmQZFG6fi uWtZWcFGqiG3Lu7/INY37rd1/a6D/BBYKjEQz+9Ws4I2ADkfZz3k1N3lb1joOkwIAOsS GWja0hSGn0gf7oFJfnVovgjJgMPWVOw3DkWeJTIAQVlWDTBRw5XMuOsRse58xhFogkDm 1dEijLjuq0dlp/nwO5iLe/oV9LKlaSX1oJeUU3Uq29T4Kxoxau9tD9qyryOOUhnxQQXe /oMkbG6Dn2RVJ6PCyhkPGxBKQX2qnSPVkan+NM2Qq6RsKDksUpK5unv09DdtDVzaLQ1i E7Qg== 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=JSpEpYA4kOiSI571keV7JwSrxOWjSXDVljItBH9YooM=; b=KTtsyIJQfQ4yFESTXKOTUZ+PWaEPJVE2v34EG8o3mreQ1h7GePbYbAIAuLhZ280/d7 NCDca7xQFQRheJxrEaYzSQgO2t7IZybiDiQbBCBOttB0CUE6SLfH25lmek+tcyhc+I4r m1YOZU8clOohD1sQb7yAblp74Tx/7kNUwi7Q+9/Z7wXqfagHcAECz9aTjPmnCij7CHYF Mf7PwVqhA6p0Q4CSthHp/NEfe907rVBQAFDHmVjdwhra6Iuhpi2y7qsi7ipSO+pgEP2i Bk0E+XOqENW0XILY9Y4TIJYm62kxrFvk2XAjOOJNc5BS3yJr/oTePtqqncrAo7c0ElcJ xzfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=YEdP3J3l; 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 r19-20020a170906c29300b0093aa9b57f97si9112458ejz.138.2023.04.10.11.31.23; Mon, 10 Apr 2023 11:31:47 -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=YEdP3J3l; 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 S229708AbjDJSVp (ORCPT + 99 others); Mon, 10 Apr 2023 14:21:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35982 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229698AbjDJSVl (ORCPT ); Mon, 10 Apr 2023 14:21:41 -0400 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 799E51FED; Mon, 10 Apr 2023 11:21:40 -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 33AGRcqJ030951; Mon, 10 Apr 2023 18:21:24 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=JSpEpYA4kOiSI571keV7JwSrxOWjSXDVljItBH9YooM=; b=YEdP3J3l/tud5nLpq9C4wPf6hAxoocrEQPk32PXiC1sC+Ox0Gxl5f/+OQaZP1YR5J876 0mdH0HjybdqxVeuq6knCTbhfzcf2XAWKX/MJroiHb1UQ29J9oA9a9INnAokq5qc9eJqz xzIiXnVJvu7VeauOCQWOeEjU91pdMvvxdybwv7G8JTn1+iZV+qsgDjpvtVvbq5bBwQlV 0BqFtCQ+/6pMH79B/6Fi1fQARAjyyZRLgoAXl4DKqROvI+s8h2m53eBtNygdJ9aVFTwK zpZiUHoG1ycUS+S4Tr8LR7FPq73vS22nU5cCZe9yelcaDYjJybxUIQTBLrkc/0St4EpJ lw== Received: from nalasppmta03.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3pvnjerbrc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 10 Apr 2023 18:21:24 +0000 Received: from nalasex01c.na.qualcomm.com (nalasex01c.na.qualcomm.com [10.47.97.35]) by NALASPPMTA03.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 33AILNj8021022 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 10 Apr 2023 18:21:23 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; Mon, 10 Apr 2023 11:21:22 -0700 From: Nikunj Kela To: CC: , , , , , , , Nikunj Kela Subject: [PATCH v2 1/2] dt-bindings: firmware: arm,scmi: support parameter passing in smc/hvc Date: Mon, 10 Apr 2023 11:20:57 -0700 Message-ID: <20230410182058.8949-2-quic_nkela@quicinc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230410182058.8949-1-quic_nkela@quicinc.com> References: <20230409181918.29270-1-quic_nkela@quicinc.com> <20230410182058.8949-1-quic_nkela@quicinc.com> MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01b.na.qualcomm.com (10.46.141.250) 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-ORIG-GUID: VfJ-4yjuVbfbvqKxgTwfEkLfNllHpCmB X-Proofpoint-GUID: VfJ-4yjuVbfbvqKxgTwfEkLfNllHpCmB 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-04-10_13,2023-04-06_03,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 mlxlogscore=999 clxscore=1015 lowpriorityscore=0 adultscore=0 mlxscore=0 impostorscore=0 bulkscore=0 suspectscore=0 phishscore=0 malwarescore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304100158 X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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?1762726007934474859?= X-GMAIL-MSGID: =?utf-8?q?1762815122915688133?= Currently, smc/hvc calls are made with smc-id only. The parameters are all set to zeros. This patch defines two optional device tree bindings, that can be used to pass parameters in smc/hvc calls. This is useful when multiple scmi instances are used with common smc-id. Signed-off-by: Nikunj Kela --- .../devicetree/bindings/firmware/arm,scmi.yaml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/Documentation/devicetree/bindings/firmware/arm,scmi.yaml b/Documentation/devicetree/bindings/firmware/arm,scmi.yaml index 5824c43e9893..ecf76b763c8c 100644 --- a/Documentation/devicetree/bindings/firmware/arm,scmi.yaml +++ b/Documentation/devicetree/bindings/firmware/arm,scmi.yaml @@ -115,6 +115,23 @@ properties: description: SMC id required when using smc or hvc transports + arm,smc32-params: + $ref: /schemas/types.yaml#/definitions/uint32-array + description: + An optional parameter list passed in smc32 or hvc32 calls + default: 0 + minItems: 1 + maxItems: 6 + + arm,smc64-params: + $ref: /schemas/types.yaml#/definitions/uint64-array + description: + An optional parameter list passed in smc64 or hvc64 calls. + This is valid only on ARM64 machines. + default: 0 + minItems: 1 + maxItems: 6 + linaro,optee-channel-id: $ref: /schemas/types.yaml#/definitions/uint32 description: @@ -427,6 +444,7 @@ examples: compatible = "arm,scmi-smc"; shmem = <&cpu_scp_lpri0>, <&cpu_scp_lpri1>; arm,smc-id = <0xc3000001>; + arm,smc64-params = <0xcd974d6c 0x5ed97289>; #address-cells = <1>; #size-cells = <0>; From patchwork Mon Apr 10 18:20:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikunj Kela X-Patchwork-Id: 81604 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2085164vqo; Mon, 10 Apr 2023 11:47:30 -0700 (PDT) X-Google-Smtp-Source: AKy350YdQGwuTdVLsMhLZrXoW+SQ7t4fEndQwbkvus7L82vntUkh+jCbWx6n6CvQY7nRLZdOcafj X-Received: by 2002:aa7:cf19:0:b0:502:70e9:2c14 with SMTP id a25-20020aa7cf19000000b0050270e92c14mr10996313edy.29.1681152450375; Mon, 10 Apr 2023 11:47:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681152450; cv=none; d=google.com; s=arc-20160816; b=FcsEBPFLMCOfw3B62GTqwm+wOcsDXqWU0OPWcKXqVugsVpTEGn6lQhz1jK+Y8S9mga sxk61vndRYHCaDRQjdWlMRy+eGNBTdHDznNnfC9fKr2qnyv2wn0VKi3CS75L11swy1Uz Mt003R6Em91lmoMOeg77rw+gXmLoeloOPEihPQa5aDOK+cpDrQWXabNZCfvW2HWUa0K4 3+SxVmW4C6Btt3hkcEeBrMehVH0FOP7d54BQkl5bqCH7G7Ftz6gATHQyoMVRo+X6oC0x h3PMQAIe3tIdkNpctFMBegLhqndPnIEBBQUin6C8oG9nO6mw01sZ0LuriTqEBnFKs+0M 8urQ== 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=UTfBHR4o7qOdeLqIQF2mVUdqvGtnPPbpMmp3J3EEHYU=; b=EMsG87Tj4iLM0soRBZQyfld5omyXrdv4Qno7MxI005se8PJ0HbV0iRASLFRexIYHqg TG4S4Zc4kEkN160evmsOCyyJeBDrZ+ejrhiXyzpDE+dvNuf5B3Erh4qwuc0TtZ9y+Lrd NAUwpDp6d4Guc8p8wuW/MRyC6fMxU2yS97/utRilNa0ySVnfhSl8FaVEVOmd/YNnpOxE N8Kn5mmc5Euyvwq/2eXovBSbGvWOXHSJfeYX/UvYPg3pJ2Sy1P5k8vAuI0bqH2jXG1aP g0fA3/TR34WKPSeqlB61vt0BoKFppMtuWzOsTv2U10Y1uXcN8YtKeFNMGP3jk++JDJp8 8Pqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=DNq5MgJt; 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 i26-20020aa7dd1a000000b00504b23cd567si1293116edv.460.2023.04.10.11.47.06; Mon, 10 Apr 2023 11:47:30 -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=DNq5MgJt; 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 S229698AbjDJSVr (ORCPT + 99 others); Mon, 10 Apr 2023 14:21:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36020 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229721AbjDJSVp (ORCPT ); Mon, 10 Apr 2023 14:21:45 -0400 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 282A52136; Mon, 10 Apr 2023 11:21:44 -0700 (PDT) Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 33AHjC2A002159; Mon, 10 Apr 2023 18:21:30 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=UTfBHR4o7qOdeLqIQF2mVUdqvGtnPPbpMmp3J3EEHYU=; b=DNq5MgJtHOb4OOcju4SEVhS+o98gwDrd8hZQ1ViKOR5o2m8yoBLT8n1UbVs2fUr/Zb8L WVLMH5XOvVrNaVWz6Nld9Fd3IfEWqqzTFuwViA5InqRCTBUt3lkLg/ZmrHUZjC2PpslU z5OgNRXo+x67W70oWPUOSfjVmHdv2NLIal5pvwo/GPlxy8tzOL8dsU3qvPd5WrgdS3ul hJsp//ZYZ0JH15KQwdR38gebt0CfnWNm9t3oKZcur2BlCqtmW7n+kCaCQR506+Xx2nSC oaCZwaD26wKW+0s8wTDRmuuUxn33UaT9e1RVEEQKUFjt7mVaE4D8/FkpIfk5JfuGymZD cA== Received: from nalasppmta04.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3pvq4dg2e8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 10 Apr 2023 18:21:29 +0000 Received: from nalasex01c.na.qualcomm.com (nalasex01c.na.qualcomm.com [10.47.97.35]) by NALASPPMTA04.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 33AILSjD030585 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 10 Apr 2023 18:21:28 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; Mon, 10 Apr 2023 11:21:28 -0700 From: Nikunj Kela To: CC: , , , , , , , Nikunj Kela Subject: [PATCH v2 2/2] firmware: arm_scmi: Augment SMC/HVC to allow optional parameters Date: Mon, 10 Apr 2023 11:20:58 -0700 Message-ID: <20230410182058.8949-3-quic_nkela@quicinc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230410182058.8949-1-quic_nkela@quicinc.com> References: <20230409181918.29270-1-quic_nkela@quicinc.com> <20230410182058.8949-1-quic_nkela@quicinc.com> MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01b.na.qualcomm.com (10.46.141.250) 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-ORIG-GUID: YZUolred9wys3Zpo7i4Z59F7R6P2zY55 X-Proofpoint-GUID: YZUolred9wys3Zpo7i4Z59F7R6P2zY55 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-04-10_12,2023-04-06_03,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 bulkscore=0 priorityscore=1501 impostorscore=0 mlxlogscore=999 adultscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 phishscore=0 spamscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304100157 X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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?1762726129018668140?= X-GMAIL-MSGID: =?utf-8?q?1762816111597234890?= This patch add support for passing parameters to smc/hvc calls. This patch is useful when multiple scmi instances are using same smc-id and firmware needs to distiguish among the instances. Signed-off-by: Nikunj Kela --- drivers/firmware/arm_scmi/smc.c | 72 ++++++++++++++++++++++++++++++++- 1 file changed, 71 insertions(+), 1 deletion(-) diff --git a/drivers/firmware/arm_scmi/smc.c b/drivers/firmware/arm_scmi/smc.c index 93272e4bbd12..c57d2f3fab87 100644 --- a/drivers/firmware/arm_scmi/smc.c +++ b/drivers/firmware/arm_scmi/smc.c @@ -20,6 +20,16 @@ #include "common.h" +#define MAX_PARAM_COUNT 6 + +/** + * scmi_smc_param_t - parameter type for SCMI smc/hvc call + */ +typedef union { + u64 x; + u32 w; +} scmi_smc_param_t; + /** * struct scmi_smc - Structure representing a SCMI smc transport * @@ -30,6 +40,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 + * @is_smc64: A flag, indicating smc64 calling convention. + * @params: Optional, smc/hvc call parameters. */ struct scmi_smc { @@ -40,8 +52,55 @@ struct scmi_smc { #define INFLIGHT_NONE MSG_TOKEN_MAX atomic_t inflight; u32 func_id; + bool is_smc64; + scmi_smc_param_t params[MAX_PARAM_COUNT]; }; +static void populate_smc_params(struct device *dev, struct scmi_smc *scmi_info) +{ + struct device_node *np = dev->of_node; + u64 params64[MAX_PARAM_COUNT] = { 0 }; + u32 params32[MAX_PARAM_COUNT] = { 0 }; + int i, count; + +#ifdef CONFIG_ARM64 + if (scmi_info->is_smc64) { + count = of_property_read_variable_u64_array(np, + "arm,smc64-params", + ¶ms64[0], 1, + MAX_PARAM_COUNT); + if (count == -EINVAL) /* if property is not defined */ + return; + + if (count > 0) /* populate the parameters */ + for (i = 0; i < count; i++) + scmi_info->params[i].x = params64[i]; + else + goto param_err; + } else { +#else + { +#endif + count = of_property_read_variable_u32_array(np, + "arm,smc32-params", + ¶ms32[0], 1, + MAX_PARAM_COUNT); + if (count == -EINVAL) /* if property is not defined */ + return; + + if (count > 0) /* populate the parameters */ + for (i = 0; i < count; i++) + scmi_info->params[i].w = params32[i]; + else + goto param_err; + } + + return; + +param_err: + dev_warn(dev, "failed to read smc/hvc call parameters\n"); +} + static irqreturn_t smc_msg_done_isr(int irq, void *data) { struct scmi_smc *scmi_info = data; @@ -156,6 +215,8 @@ static int smc_chan_setup(struct scmi_chan_info *cinfo, struct device *dev, } scmi_info->func_id = func_id; + scmi_info->is_smc64 = ARM_SMCCC_IS_64(func_id); + populate_smc_params(dev, scmi_info); scmi_info->cinfo = cinfo; smc_channel_lock_init(scmi_info); cinfo->transport_info = scmi_info; @@ -179,6 +240,7 @@ static int smc_send_message(struct scmi_chan_info *cinfo, { struct scmi_smc *scmi_info = cinfo->transport_info; struct arm_smccc_res res; + scmi_smc_param_t *p = scmi_info->params; /* * Channel will be released only once response has been @@ -188,7 +250,15 @@ 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); +#ifdef CONFIG_ARM64 + if (scmi_info->is_smc64) + arm_smccc_1_1_invoke(scmi_info->func_id, p[0].x, p[1].x, p[2].x, + p[3].x, p[4].x, p[5].x, 0, &res); + else +#endif + arm_smccc_1_1_invoke(scmi_info->func_id, p[0].w, p[1].w, p[2].w, + p[3].w, p[4].w, p[5].w, 0, &res); + /* Only SMCCC_RET_NOT_SUPPORTED is valid error code */ if (res.a0) {