From patchwork Sun Apr 9 18:19:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikunj Kela X-Patchwork-Id: 13206014 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 98B45C77B6F for ; Sun, 9 Apr 2023 18:21:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=HyImcgIQhJuWPshbf0hTiKgC5DvhfzhM5/wQ4avnUpg=; b=xbjvptrRL9LNHD 9hnXnuW+IpIWptmc8Er5hai2NRDVMwJ5Kobu4npJspS65lATHuboJNuCk8TJweJWsSFPXjOQyZgkP u061yYO7nrmEdks7BciEZn+pAu7VUQaTzO5EkAuaPdKh0Cdsio4G5OG7AT7H4whCYf4roc/oBftz2 2Ht3gykjwAdNbazFDhP7z1dVL5ygsipJG3UqhN8kdcMkw/K4UeIPhtDFmD6BXNQTeINAfe4gBXc5U VGxV/aNqqkeu9iHJyof6NiMxYp8B/pqaac6xcurEu41gMQYYXlbPZ+7FSVFqajE+4zZFw9B0prkW3 yquS27EjGULdfgH23Dbg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1plZdy-00E2c8-1F; Sun, 09 Apr 2023 18:20:02 +0000 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1plZds-00E2Zm-2m for linux-arm-kernel@lists.infradead.org; Sun, 09 Apr 2023 18:19:58 +0000 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 339IJoGl013399; Sun, 9 Apr 2023 18:19:50 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=AH6JycWFfTa0H9UydaGSCHS5yCEanwthhgNDmq0/Tto=; b=muEmNQtCuOuiHAwTyxIcWZOhclyF71lyY+z2hbUVpSF7twHeHSxPR68ueUerLmRlf6vl rytmHFKSwPD7OdIdQW4DHbkIVfLs9pwfpPesUog44U8o2dqhxF72pBV7YnoE5X4Yldkl azfYrF7QTgTgpkjjhxqqryHx4sonLMKbfRZYDk3/8/IKPrP3iHJM7FYxEB3uh4w+ktE6 3+1JfbJnHnx+p/JlscnItLfjeFfUg03B6E+1tsnVmEsyk3WCfD4y80G6d4OH3DfaEi69 cJl7TBEvrWJaoqXDGkpeTnTSDjsZohH2ILVLJ4z1/YQo7zL6cD9u1wm41DNkYk1rW/YX kA== Received: from nalasppmta03.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3pu0c31n9j-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sun, 09 Apr 2023 18:19:49 +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 339IJmcE007268 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sun, 9 Apr 2023 18:19: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; Sun, 9 Apr 2023 11:19:47 -0700 From: Nikunj Kela To: CC: , , , , , , Nikunj Kela Subject: [PATCH 2/2] firmware: arm_scmi: Augment SMC/HVC to allow optional parameters Date: Sun, 9 Apr 2023 11:19:18 -0700 Message-ID: <20230409181918.29270-3-quic_nkela@quicinc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230409181918.29270-1-quic_nkela@quicinc.com> References: <20230409181918.29270-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: YUhtf_wvWNzYzLEuId7HEoLyyz7E5_e7 X-Proofpoint-ORIG-GUID: YUhtf_wvWNzYzLEuId7HEoLyyz7E5_e7 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-09_13,2023-04-06_03,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 priorityscore=1501 bulkscore=0 lowpriorityscore=0 phishscore=0 mlxscore=0 suspectscore=0 clxscore=1015 spamscore=0 malwarescore=0 adultscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304090167 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230409_111957_018060_BF0466F8 X-CRM114-Status: GOOD ( 24.99 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 | 66 ++++++++++++++++++++++++++++++++- 1 file changed, 65 insertions(+), 1 deletion(-) diff --git a/drivers/firmware/arm_scmi/smc.c b/drivers/firmware/arm_scmi/smc.c index 93272e4bbd12..39582d1e2c9f 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,51 @@ 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; + + 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 { + 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 +211,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 +236,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 +246,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, 0, 0, 0, 0, 0, 0, 0, &res); + 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 + 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) {