From patchwork Mon Oct 9 19:14:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikunj Kela X-Patchwork-Id: 150300 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp2073599vqo; Mon, 9 Oct 2023 12:16:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGrG8gQF0ASFgj2G66gfsXfPoCrCij0aTHvrQzR49iZKo7W/mGLxvv2nArzektr2c6K6eXS X-Received: by 2002:a05:6a20:9191:b0:152:4615:cb9d with SMTP id v17-20020a056a20919100b001524615cb9dmr18764286pzd.12.1696878969053; Mon, 09 Oct 2023 12:16:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696878969; cv=none; d=google.com; s=arc-20160816; b=qKKw/b+SPeDVuWqDPjd9FOpK+dXGItwkpNBQPT8lxukTfo23BABRP66OOK0R2e0HRG WiR83WEcHgKvasOsR4keh9DR7Fj78TZNmvDOTlKNTvcjjr8uRfPi8pw6MzPaKJYCTuZs y7Yu8LVHJC8fpTATu8q9HMQxE3va2B7NDHXDO1daHnLrF4gCVnrLPG95l4+3+FDNubhN htkWchZAGe1Lv7DUY6dTLnJ2WTpxSAsoc4obrF95h09b5yJ3SxAgk72PmAT6RYZcqtcT 6yJNS3ObPKc3WGAqtT2rCuQuCLph04qSDBUQy5odgrJziZg0CzZLioizweATg0XxrxU0 wJrg== 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=tWRKWpXhvsDqqfeaAHHgGggYdW5N5cRaEvFAjiLKlRY=; fh=GEq5dEC3I2ew8qX2rLc4VZLR0KApgkJja2wJiy1iHxw=; b=PFh8PJQqfOicT8YCbtmErokpjl1zDQequ1cS6b0f7Aah3jaoWGh3FWZjyP7T6Zb5vT OUwEcfPTw6E3Bjs1HkMUOlsnZ2Mf3lwydYHF2mI+nzuFK7eESgF9C6sJcUINi3BCwMj2 gTbWsrlqAx7swBoWX6edDFM5UDGM6rdy2t2N8FWhCWgIGVDeRPiFQHGlK5D5EI3MFbd7 2RiKnXO+mKSleDFpEdEuaPyhlWrrwZId02+QuYMrJ5LpoFPPDvyUs8EAzceNMu8tdSTr Ddirqrrx8S4V38ZdLbjBdPs7wP3UvpNlZvhNj8qM+bW7SGriyFIqUtuMr+fGju/6J+1n RPNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=HIX81vKt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id a185-20020a6390c2000000b00578d08489a8si9893977pge.832.2023.10.09.12.16.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 12:16:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=HIX81vKt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 30820806E4C2; Mon, 9 Oct 2023 12:15:40 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378385AbjJITPS (ORCPT + 18 others); Mon, 9 Oct 2023 15:15:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33406 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378349AbjJITPL (ORCPT ); Mon, 9 Oct 2023 15:15:11 -0400 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C1B71B4; Mon, 9 Oct 2023 12:15:08 -0700 (PDT) Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 399HiYee025944; Mon, 9 Oct 2023 19:14:55 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=tWRKWpXhvsDqqfeaAHHgGggYdW5N5cRaEvFAjiLKlRY=; b=HIX81vKtkiNZN6d8zilW9zLPEyg013s9x6cgadaqWPyYeb8x/89v10HLSQ+eMj6FPfOA g5QoJUaY5Yw6BL16U+IVaLdwfOcd0wWN+k9W0ms+rgp7y3NtvcHie72ARWPeg1MgRrUE HjAAT7Y5VxrdnJV6k8Q/pnnq7onXbwh08pP/yheEKVK+AVK9MAvsepR964njycb1SsLv bgTNzaH8hCwezjshDqzvahkUPhI0tU3GNXHYqY5kS+nTFQq26toFyaSMTq4dcwK4vQt7 ZQGbbZId+s1H5YFOtDuEIswNFpgZZ0HEmnOx9Gk2/oWIjNPyIsq0DIKk9vauclpN4nfL lA== Received: from nalasppmta03.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3tmj0y8tts-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 09 Oct 2023 19:14:55 +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 399JEsKB002376 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 9 Oct 2023 19:14:54 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.1118.30; Mon, 9 Oct 2023 12:14:54 -0700 From: Nikunj Kela To: CC: , , , , , , , , , , Nikunj Kela Subject: [PATCH v6 1/2] dt-bindings: arm: Add new compatible for smc/hvc transport for SCMI Date: Mon, 9 Oct 2023 12:14:36 -0700 Message-ID: <20231009191437.27926-2-quic_nkela@quicinc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231009191437.27926-1-quic_nkela@quicinc.com> References: <20230718160833.36397-1-quic_nkela@quicinc.com> <20231009191437.27926-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-GUID: _8a3jWOtXvc0wNqj94usnSsS4GcB3Eqf X-Proofpoint-ORIG-GUID: _8a3jWOtXvc0wNqj94usnSsS4GcB3Eqf X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.980,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-10-09_17,2023-10-09_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=999 clxscore=1015 impostorscore=0 priorityscore=1501 malwarescore=0 phishscore=0 bulkscore=0 mlxscore=0 adultscore=0 lowpriorityscore=0 suspectscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2309180000 definitions=main-2310090157 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE, SPF_PASS 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 09 Oct 2023 12:15:40 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778730781702430481 X-GMAIL-MSGID: 1779306562148788706 Introduce compatible "qcom,scmi-smc" for SCMI smc/hvc transport channel for Qualcomm virtual platforms. This compatible mandates populating an additional parameter 'capability-id' from the last 8 bytes of the shmem channel. Signed-off-by: Nikunj Kela Reviewed-by: Brian Masney Signed-off-by: Sudeep Holla --- Documentation/devicetree/bindings/firmware/arm,scmi.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Documentation/devicetree/bindings/firmware/arm,scmi.yaml b/Documentation/devicetree/bindings/firmware/arm,scmi.yaml index 563a87dfb31a..4591523b51a0 100644 --- a/Documentation/devicetree/bindings/firmware/arm,scmi.yaml +++ b/Documentation/devicetree/bindings/firmware/arm,scmi.yaml @@ -38,6 +38,9 @@ properties: with shmem address(4KB-page, offset) as parameters items: - const: arm,scmi-smc-param + - description: SCMI compliant firmware with Qualcomm SMC/HVC transport + items: + - const: qcom,scmi-smc - description: SCMI compliant firmware with SCMI Virtio transport. The virtio transport only supports a single device. items: @@ -313,6 +316,7 @@ else: enum: - arm,scmi-smc - arm,scmi-smc-param + - qcom,scmi-smc then: required: - arm,smc-id From patchwork Mon Oct 9 19:14:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikunj Kela X-Patchwork-Id: 150299 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp2073418vqo; Mon, 9 Oct 2023 12:15:45 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH7dz//Y4JJanc0EUYL3mI9IQZJXkXZPhTuAJ1JGwYnuKEVfEz3Iablb9e+XQNi+SWkCPcV X-Received: by 2002:a17:903:2309:b0:1c6:2acc:62d7 with SMTP id d9-20020a170903230900b001c62acc62d7mr16891675plh.15.1696878945157; Mon, 09 Oct 2023 12:15:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696878945; cv=none; d=google.com; s=arc-20160816; b=agxnqT1D7nyxITHBFoPg++ao/dStYqNCYZu1NLDKa6KHXx854OTTqAfYis0RCsiOaF j8T3MPq6J3U1Bouw6yhzcjPKAFucEFtMfRgE+QLoFeIkVUV2TQMBTqi4LLcVTNYesOWV /lEXYav2v5ajE9xVoPrO1acrvfhik3NGDlohcGu9rI6IpSV9ni1roySPFzIu0+LE7CsB Jrp0XPWx1ehzY6kbOZLA/xYNLSy9boyjovtRZikyALjwPZ9b0IP9DG8f7WTHAH7o7SXo HA5FSPC0hiKJ1angRHXlCtVXMvcasnq4iRYNZYzA26fBQDBu0j6AKAmcb2xXysRjwH+2 eJCw== 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=FCCxoje8kg6jXSsVtFFxcsmOhpr+5T91c0+ubbqsFgs=; fh=GEq5dEC3I2ew8qX2rLc4VZLR0KApgkJja2wJiy1iHxw=; b=TzFoxBwWDoy94AIrd386cqCP2QlPDnnAekNFRAMw0YJDQRBO5nL6o0N0bZyLGPsJKy OkjQVHXUOedWQEmsN+ONkd+3l4G10y+MESuFiUJHrQxY1ufB0WhYyQa9t5Y+ap3ZYRi7 x8PSEoyKXTLCTy4BMa3I+OHgydyv0pNYdCMlHaRHfNlSwCalHquuNkZAGTn9V9T5BYfV 2gAz0pjCyhWmMCfQv4z5AY+Kn2wWllVc2zPi6GhERfKqwYEshxe+xruFVZkRGsIf713A gyGt4WbRcRmbP3CNSF5z7nzVkkWrCiJdAETFv0dXpie1+j753umHFi8JWly75s53Ne3L ft7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b="J84vq+N/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id n5-20020a170903110500b001c5bfb049a4si11093235plh.368.2023.10.09.12.15.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 12:15:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b="J84vq+N/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id E62E38055ACA; Mon, 9 Oct 2023 12:15:35 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378360AbjJITPO (ORCPT + 18 others); Mon, 9 Oct 2023 15:15:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33364 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378336AbjJITPI (ORCPT ); Mon, 9 Oct 2023 15:15:08 -0400 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 292EDA4; Mon, 9 Oct 2023 12:15:06 -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 399HddU2030352; Mon, 9 Oct 2023 19:14:58 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=FCCxoje8kg6jXSsVtFFxcsmOhpr+5T91c0+ubbqsFgs=; b=J84vq+N/xaD6B+CmLttXvw/IhFC5XBbXb1C8tv0gkqX34uuRVz6uqz8ZWJmUb2fl0XAY 8gKUTXsc7NNP1JmiX36U6Q4mGXpLwLaigIciuau8YhV0/CKS1AoogmQStXmh5RqOMBIE NSUa5VFNG9mHDASuXHiXqh5LMEne7Zvt+ilws+gGXCokcNSwxGJUmZWN/hpUpIkqhQ8T 5EpXcfvDGkgfceWJlmBDDGJfeNAEdQ/JLs374G6CY4VjIx0C2PeJKwTDdV6NAiWvQsiU ZX23bjJJNg7d7kvlL0dmxtsau8HyYGzT764Zfusr0viQd2o6TnJMj13qD6nhlk8Sjg+F YA== Received: from nalasppmta05.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3tmj2prugs-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 09 Oct 2023 19:14:57 +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 399JEuNl023728 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 9 Oct 2023 19:14:56 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.1118.30; Mon, 9 Oct 2023 12:14:56 -0700 From: Nikunj Kela To: CC: , , , , , , , , , , Nikunj Kela Subject: [PATCH v6 2/2] firmware: arm_scmi: Add qcom smc/hvc transport support Date: Mon, 9 Oct 2023 12:14:37 -0700 Message-ID: <20231009191437.27926-3-quic_nkela@quicinc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231009191437.27926-1-quic_nkela@quicinc.com> References: <20230718160833.36397-1-quic_nkela@quicinc.com> <20231009191437.27926-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: e5u8-HKKd0LbDuYecvFMURSQqJWHE1S0 X-Proofpoint-GUID: e5u8-HKKd0LbDuYecvFMURSQqJWHE1S0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.980,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-10-09_17,2023-10-09_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 adultscore=0 impostorscore=0 clxscore=1015 phishscore=0 malwarescore=0 priorityscore=1501 mlxscore=0 spamscore=0 bulkscore=0 suspectscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2309180000 definitions=main-2310090157 X-Spam-Status: No, score=2.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Mon, 09 Oct 2023 12:15:35 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779025215106593176 X-GMAIL-MSGID: 1779306536864203008 This change adds the support for SCMI message exchange on Qualcomm virtual platforms. The hypervisor associates an object-id also known as capability-id with each smc/hvc doorbell object. The capability-id is used to identify the doorbell from the VM's capability namespace, similar to a file-descriptor. The hypervisor, in addition to the function-id, expects the capability-id to be passed in x1 register when SMC/HVC call is invoked. The capability-id is allocated by the hypervisor on bootup and is stored in the shmem region by the firmware before starting Linux. Signed-off-by: Nikunj Kela Reviewed-by: Brian Masney Signed-off-by: Sudeep Holla --- drivers/firmware/arm_scmi/driver.c | 1 + drivers/firmware/arm_scmi/smc.c | 27 +++++++++++++++++++++++++-- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c index 87383c05424b..09371f40d61f 100644 --- a/drivers/firmware/arm_scmi/driver.c +++ b/drivers/firmware/arm_scmi/driver.c @@ -2915,6 +2915,7 @@ static const struct of_device_id scmi_of_match[] = { #ifdef CONFIG_ARM_SCMI_TRANSPORT_SMC { .compatible = "arm,scmi-smc", .data = &scmi_smc_desc}, { .compatible = "arm,scmi-smc-param", .data = &scmi_smc_desc}, + { .compatible = "qcom,scmi-smc", .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 8eba60a41975..7611e9665038 100644 --- a/drivers/firmware/arm_scmi/smc.c +++ b/drivers/firmware/arm_scmi/smc.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include @@ -50,6 +51,8 @@ * @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 + * @cap_id: smc/hvc doorbell's capability id to be used on Qualcomm virtual + * platforms */ struct scmi_smc { @@ -63,6 +66,7 @@ struct scmi_smc { unsigned long func_id; unsigned long param_page; unsigned long param_offset; + unsigned long cap_id; }; static irqreturn_t smc_msg_done_isr(int irq, void *data) @@ -124,6 +128,7 @@ static int smc_chan_setup(struct scmi_chan_info *cinfo, struct device *dev, bool tx) { struct device *cdev = cinfo->dev; + unsigned long cap_id = ULONG_MAX; struct scmi_smc *scmi_info; resource_size_t size; struct resource res; @@ -162,6 +167,18 @@ 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, "qcom,scmi-smc")) { + void __iomem *ptr = (void __iomem *)scmi_info->shmem + size - 8; + /* The capability-id is kept in last 8 bytes of shmem. + * +-------+ <-- 0 + * | shmem | + * +-------+ <-- size - 8 + * | capId | + * +-------+ <-- size + */ + memcpy_fromio(&cap_id, ptr, sizeof(cap_id)); + } + 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); @@ -184,6 +201,7 @@ static int smc_chan_setup(struct scmi_chan_info *cinfo, struct device *dev, } scmi_info->func_id = func_id; + scmi_info->cap_id = cap_id; scmi_info->cinfo = cinfo; smc_channel_lock_init(scmi_info); cinfo->transport_info = scmi_info; @@ -220,8 +238,13 @@ 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, scmi_info->param_page, - scmi_info->param_offset, 0, 0, 0, 0, 0, &res); + if (scmi_info->cap_id != ULONG_MAX) + arm_smccc_1_1_invoke(scmi_info->func_id, scmi_info->cap_id, 0, + 0, 0, 0, 0, 0, &res); + else + arm_smccc_1_1_invoke(scmi_info->func_id, scmi_info->param_page, + scmi_info->param_offset, 0, 0, 0, 0, 0, + &res); /* Only SMCCC_RET_NOT_SUPPORTED is valid error code */ if (res.a0) {