From mboxrd@z Thu Jan 1 00:00:00 1970 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 9BB0CE7544B for ; Tue, 3 Oct 2023 11:19:45 +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:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=6pDt/QzP0ALg4M64+QUJzyCNSrNSYbP/NCkiWjBReLE=; b=RN/WqBpY0FvMb4 fQwKnlZE6ejYJtLJwjq949NiYywqQ+RJkqreXqaPuVcC80eZnBB5yqSW9Y8aNsNQ20xzv6llndrtM Ym6y5cqx4X7j4an9vKpLg74jhHrrpgjS8OlEEdNM4AuSkmZp8C+Wy0Kdl30SxeZYljBMfRAdTlZzK XOcJ0xrjImr9zNZZ75vQTlYZLGqYdM16igOjiV1jgQbd87zyypbdfvJCRvcyKIHE5eDdT7nuRHqyM 8Jsdt6EcOhusksPS6DHuduU4DVJsvb/mMF1AhkiWoqqycDQMLHD4sl3oSxWRwSWBX+W62rvEyZy5k Yz4IxHpGyWnFcUxVNvYA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qndQy-00EWW5-0h; Tue, 03 Oct 2023 11:19:24 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qndQu-00EWVI-0c for linux-arm-kernel@lists.infradead.org; Tue, 03 Oct 2023 11:19:22 +0000 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 41F69C15; Tue, 3 Oct 2023 04:19:57 -0700 (PDT) Received: from bogus (e103737-lin.cambridge.arm.com [10.1.197.49]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 3FB283F762; Tue, 3 Oct 2023 04:19:17 -0700 (PDT) Date: Tue, 3 Oct 2023 12:19:14 +0100 From: Sudeep Holla To: Nikunj Kela Cc: cristian.marussi@arm.com, robh+dt@kernel.org, Sudeep Holla , krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, andersson@kernel.org, konrad.dybcio@linaro.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: Re: [PATCH v4 4/4] firmware: arm_scmi: Add qcom hvc/shmem transport support Message-ID: <20231003111914.63z35sn3r3k7drtp@bogus> References: <20230718160833.36397-1-quic_nkela@quicinc.com> <20230911194359.27547-1-quic_nkela@quicinc.com> <20230911194359.27547-5-quic_nkela@quicinc.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230911194359.27547-5-quic_nkela@quicinc.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231003_041920_321281_A0ECE49A X-CRM114-Status: GOOD ( 37.86 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Sep 11, 2023 at 12:43:59PM -0700, Nikunj Kela wrote: > 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 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 HVC call is invoked. > > The function-id & capability-id are allocated by the hypervisor on bootup > and are stored in the shmem region by the firmware before starting Linux. > > Signed-off-by: Nikunj Kela > --- > drivers/firmware/arm_scmi/driver.c | 1 + > drivers/firmware/arm_scmi/smc.c | 47 ++++++++++++++++++++++++++---- > 2 files changed, 43 insertions(+), 5 deletions(-) > > diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c > index 87383c05424b..ea344bc6ae49 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-hvc-shmem", .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 0a0b7e401159..94ec07fdc14a 100644 > --- a/drivers/firmware/arm_scmi/smc.c > +++ b/drivers/firmware/arm_scmi/smc.c > @@ -50,6 +50,9 @@ > * @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: hvc doorbell's capability id to be used on Qualcomm virtual > + * platforms > + * @qcom_xport: Flag to indicate the transport on Qualcomm virtual platforms > */ > > struct scmi_smc { > @@ -63,6 +66,8 @@ struct scmi_smc { > u32 func_id; > u32 param_page; > u32 param_offset; > + u64 cap_id; Can it be unsigned long instead so that it just works for both 32 and 64 bit. > + bool qcom_xport; Do we really need this ? > }; > > static irqreturn_t smc_msg_done_isr(int irq, void *data) > @@ -129,6 +134,7 @@ static int smc_chan_setup(struct scmi_chan_info *cinfo, struct device *dev, > struct resource res; > struct device_node *np; > u32 func_id; > + u64 cap_id; Ditto.. > int ret; > > if (!tx) > @@ -158,9 +164,34 @@ static int smc_chan_setup(struct scmi_chan_info *cinfo, struct device *dev, > return -EADDRNOTAVAIL; > } > > - ret = of_property_read_u32(dev->of_node, "arm,smc-id", &func_id); > - if (ret < 0) > - return ret; > + if (of_device_is_compatible(dev->of_node, "qcom,scmi-hvc-shmem")) { > + scmi_info->qcom_xport = true; > + > + /* The func-id & capability-id are kept in last 16 bytes of shmem. > + * +-------+ > + * | | > + * | shmem | > + * | | > + * | | > + * +-------+ <-- (size - 16) > + * | funcId| > + * +-------+ <-- (size - 8) > + * | capId | > + * +-------+ <-- size > + */ > + > + func_id = readl((void __iomem *)(scmi_info->shmem) + size - 16); So unlike 'arm,scmi-smc', you don't want 'arm,smc-id' in the DT ? Any particular reason ? Just to get both FID and cap ID from shmem ? > +#ifdef CONFIG_ARM64 I would rather make this arch agnostic using CONFIG_64BIT > + cap_id = readq((void __iomem *)(scmi_info->shmem) + size - 8); Do you need __iomem typecast here ? Is scmi_info->shmem not already __iomem ? Also scmi_info->shmem is ioremapped just few steps above and you are using read* here, is that safe ? > +#else > + /* capability-id is 32 bit wide on 32bit machines */ > + cap_id = rieadl((void __iomem *)(scmi_info->shmem) + size - 8); Other thought once you move for u64 to unsigned long you need not have #ifdeffery, just do copy of sizeof(unsigned long) > +#endif > + } else { > + ret = of_property_read_u32(dev->of_node, "arm,smc-id", &func_id); > + 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); > @@ -184,6 +215,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; > @@ -213,6 +245,7 @@ static int smc_send_message(struct scmi_chan_info *cinfo, > struct arm_smccc_res res; > unsigned long page = scmi_info->param_page; > unsigned long offset = scmi_info->param_offset; > + unsigned long cap_id = (unsigned long)scmi_info->cap_id; > > /* > * Channel will be released only once response has been > @@ -222,8 +255,12 @@ 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, page, offset, 0, 0, 0, 0, 0, > - &res); > + if (scmi_info->qcom_xport) Just make sure cap_id is set only for qcom and just use that as your flag. No point in setting always true scmi_info->qcom_xport and using it here. > + arm_smccc_1_1_hvc(scmi_info->func_id, cap_id, 0, 0, 0, 0, 0, 0, > + &res); > + else > + 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) { > -- > 2.17.1 > -- Regards, Sudeep _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel