Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp3109506pxv; Mon, 12 Jul 2021 09:29:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy9H5rl22fE+x5T0Y4gt2HZ400HflskbfvrL619WfKEkuDB5Hls7a2BgHVj7G0x+VM3DXV9 X-Received: by 2002:a5e:8208:: with SMTP id l8mr39959264iom.197.1626107377035; Mon, 12 Jul 2021 09:29:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626107377; cv=none; d=google.com; s=arc-20160816; b=vRrMYPTjw+jaZhQ2q1J4oM6cCwcv9dGqYK3S50o1x+ZLUkyBD7+OPp/4nSftMXcnNG Xg9GSFw6gIt47BwpbFGMMdOcm40VlUP2haUh3S+HQFDHAcdDd+7P97F2rcprS+bNOIeT Yf2L/VuU2Z0+31q4B5Ciqw+TuzwG+6CfbjcAv/MiHFj4omWlEsdqYUDmBYUtjVfgTXT8 g++J6/wf/QTZ2wW14KLvmcXcVuIqobXkIY39jUaRuNQ8Ro5z+DAPkWGPNmaD7Nj/qm1T /fF5QtRKj6D7mxEAcEG5j0fhshK+v9jK8Zzcm8zM3U/BnVj+gkfot+fnmgBADRW6ASag uN/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from; bh=9sIb6ShZBWd6h31uZtZ0bZzYLWeaA4HrdF1I3valhyc=; b=DxtHQI7KJUdQUQqyGeKsJtiI2aKYRVDN0U/HsP6lhb6zWbhdgZX7vT1vW2jhC/uf84 e/tym95hBevEvV6Qf1c127flxbMPlLew91CfPQT1GzIDUBNG6S7kdV4hFitWNBGHGfl0 NLROJl12kS86ff2O3JQvl6sbaY2Nz5VSPKmeOsgnAvZNUxCHvn82ew8TlU2bwyKP58CW 859TVx5zGf4pPfabFmZDZx0t17UQ2lcS9BIqDQRXBxIPusVB3mnW9HK3jQ4vIZLu635J Y2JZtTF7wqvAa8bV3nr87E1wzTQ7XIS2tctKb89U8cOICqbmCL/wMq5ekt5ioraVFL8R uJaQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h15si17934953ili.7.2021.07.12.09.29.24; Mon, 12 Jul 2021 09:29:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234111AbhGLQ35 (ORCPT + 99 others); Mon, 12 Jul 2021 12:29:57 -0400 Received: from foss.arm.com ([217.140.110.172]:58028 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234062AbhGLQ3t (ORCPT ); Mon, 12 Jul 2021 12:29:49 -0400 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 4FABB1FB; Mon, 12 Jul 2021 09:27:00 -0700 (PDT) Received: from e120937-lin.home (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 8C3613F774; Mon, 12 Jul 2021 09:26:58 -0700 (PDT) From: Cristian Marussi To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: sudeep.holla@arm.com, james.quinlan@broadcom.com, Jonathan.Cameron@Huawei.com, f.fainelli@gmail.com, etienne.carriere@linaro.org, vincent.guittot@linaro.org, souvik.chakravarty@arm.com, cristian.marussi@arm.com Subject: [PATCH v3 7/8] [RFC] firmware: arm_scmi: Make smc transport use common completions Date: Mon, 12 Jul 2021 17:26:24 +0100 Message-Id: <20210712162626.34705-8-cristian.marussi@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210712162626.34705-1-cristian.marussi@arm.com> References: <20210712162626.34705-1-cristian.marussi@arm.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When a completion irq is available use it and delegate command completion handling to the core SCMI completion mechanism. If no completion irq is available revert to polling, using the core common polling machinery. Signed-off-by: Cristian Marussi --- drivers/firmware/arm_scmi/smc.c | 41 +++++++++++++++++---------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/drivers/firmware/arm_scmi/smc.c b/drivers/firmware/arm_scmi/smc.c index 4effecc3bb46..ec895a82a9ad 100644 --- a/drivers/firmware/arm_scmi/smc.c +++ b/drivers/firmware/arm_scmi/smc.c @@ -25,8 +25,6 @@ * @shmem: Transmit/Receive shared memory area * @shmem_lock: Lock to protect access to Tx/Rx shared memory area * @func_id: smc/hvc call function id - * @irq: Optional; employed when platforms indicates msg completion by intr. - * @tx_complete: Optional, employed only when irq is valid. */ struct scmi_smc { @@ -34,15 +32,14 @@ struct scmi_smc { struct scmi_shared_mem __iomem *shmem; struct mutex shmem_lock; u32 func_id; - int irq; - struct completion tx_complete; }; static irqreturn_t smc_msg_done_isr(int irq, void *data) { struct scmi_smc *scmi_info = data; - complete(&scmi_info->tx_complete); + scmi_rx_callback(scmi_info->cinfo, + shmem_read_header(scmi_info->shmem), NULL); return IRQ_HANDLED; } @@ -111,8 +108,9 @@ static int smc_chan_setup(struct scmi_chan_info *cinfo, struct device *dev, dev_err(dev, "failed to setup SCMI smc irq\n"); return ret; } - init_completion(&scmi_info->tx_complete); - scmi_info->irq = irq; + } else { + /* No completion interrupt available */ + cinfo->needs_polling = true; } scmi_info->func_id = func_id; @@ -142,26 +140,21 @@ static int smc_send_message(struct scmi_chan_info *cinfo, struct scmi_smc *scmi_info = cinfo->transport_info; struct arm_smccc_res res; + /* + * Channel lock will be released only once response has been + * surely fully retrieved, so after .mark_txdone() + */ mutex_lock(&scmi_info->shmem_lock); - shmem_tx_prepare(scmi_info->shmem, xfer); - if (scmi_info->irq) - reinit_completion(&scmi_info->tx_complete); - arm_smccc_1_1_invoke(scmi_info->func_id, 0, 0, 0, 0, 0, 0, 0, &res); - if (scmi_info->irq) - wait_for_completion(&scmi_info->tx_complete); - - scmi_rx_callback(scmi_info->cinfo, - shmem_read_header(scmi_info->shmem), NULL); - - mutex_unlock(&scmi_info->shmem_lock); - /* Only SMCCC_RET_NOT_SUPPORTED is valid error code */ - if (res.a0) + if (res.a0) { + mutex_unlock(&scmi_info->shmem_lock); return -EOPNOTSUPP; + } + return 0; } @@ -173,6 +166,13 @@ static void smc_fetch_response(struct scmi_chan_info *cinfo, shmem_fetch_response(scmi_info->shmem, xfer); } +static void smc_mark_txdone(struct scmi_chan_info *cinfo, int ret) +{ + struct scmi_smc *scmi_info = cinfo->transport_info; + + mutex_unlock(&scmi_info->shmem_lock); +} + static bool smc_poll_done(struct scmi_chan_info *cinfo, struct scmi_xfer *xfer) { @@ -186,6 +186,7 @@ static const struct scmi_transport_ops scmi_smc_ops = { .chan_setup = smc_chan_setup, .chan_free = smc_chan_free, .send_message = smc_send_message, + .mark_txdone = smc_mark_txdone, .fetch_response = smc_fetch_response, .poll_done = smc_poll_done, }; -- 2.17.1