From patchwork Thu Sep 30 15:32:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Kumar Singh X-Patchwork-Id: 12528719 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 415E0C4332F for ; Thu, 30 Sep 2021 15:32:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2F9A8615A7 for ; Thu, 30 Sep 2021 15:32:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344477AbhI3Peb (ORCPT ); Thu, 30 Sep 2021 11:34:31 -0400 Received: from so254-9.mailgun.net ([198.61.254.9]:32352 "EHLO so254-9.mailgun.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344425AbhI3PeZ (ORCPT ); Thu, 30 Sep 2021 11:34:25 -0400 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1633015962; h=References: In-Reply-To: Message-Id: Date: Subject: Cc: To: From: Sender; bh=C/qBvYf2EP+KVRMD/NdGWaHULa4uWJMkzMkyP3aoIVg=; b=vwyXHHRU86lXDUULDCUKFoPeBmu2YQRw78d2lE4cJeKhmM/4WjRFPnBn/y/+9U/mtZSQF6yE 4oKFMUXCMYCDEJvVq1aBshDzFeWqh2TYfIVi1dsoI37XHDB6qZwbiCsegEEKLcpa88T8NB3W ACSzuIFN4q3ARktJ0RfTgJCmAEs= X-Mailgun-Sending-Ip: 198.61.254.9 X-Mailgun-Sid: WyI4ZWZiZiIsICJsaW51eC1yZW1vdGVwcm9jQHZnZXIua2VybmVsLm9yZyIsICJiZTllNGEiXQ== Received: from smtp.codeaurora.org (ec2-35-166-182-171.us-west-2.compute.amazonaws.com [35.166.182.171]) by smtp-out-n07.prod.us-west-2.postgun.com with SMTP id 6155d890605ecf100b10fce5 (version=TLS1.2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256); Thu, 30 Sep 2021 15:32:32 GMT Sender: deesin=codeaurora.org@mg.codeaurora.org Received: by smtp.codeaurora.org (Postfix, from userid 1001) id A04A9C4360C; Thu, 30 Sep 2021 15:32:32 +0000 (UTC) Received: from deesin-linux.qualcomm.com (unknown [202.46.22.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: deesin) by smtp.codeaurora.org (Postfix) with ESMTPSA id 6904CC43460; Thu, 30 Sep 2021 15:32:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 smtp.codeaurora.org 6904CC43460 Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; spf=fail smtp.mailfrom=codeaurora.org From: Deepak Kumar Singh To: bjorn.andersson@linaro.org, swboyd@chromium.org, clew@codeaurora.org, mathieu.poirier@linaro.org Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, Deepak Kumar Singh , Andy Gross Subject: [PATCH 1/1] soc: qcom: smp2p: add feature negotiation and ssr ack feature support Date: Thu, 30 Sep 2021 21:02:02 +0530 Message-Id: <1633015924-881-3-git-send-email-deesin@codeaurora.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1633015924-881-1-git-send-email-deesin@codeaurora.org> References: <1633015924-881-1-git-send-email-deesin@codeaurora.org> Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org This patch adds feature negotiation and ssr ack feature between local and remote host. Local host can negotiate on common features supported with remote host. --- drivers/soc/qcom/smp2p.c | 151 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 104 insertions(+), 47 deletions(-) diff --git a/drivers/soc/qcom/smp2p.c b/drivers/soc/qcom/smp2p.c index 38585a7..1c6ad1c 100644 --- a/drivers/soc/qcom/smp2p.c +++ b/drivers/soc/qcom/smp2p.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include @@ -41,8 +40,11 @@ #define SMP2P_MAX_ENTRY_NAME 16 #define SMP2P_FEATURE_SSR_ACK 0x1 +#define SMP2P_FLAGS_RESTART_DONE_BIT 0 +#define SMP2P_FLAGS_RESTART_ACK_BIT 1 #define SMP2P_MAGIC 0x504d5324 +#define SMP2P_FEATURES SMP2P_FEATURE_SSR_ACK /** * struct smp2p_smem_item - in memory communication structure @@ -113,7 +115,6 @@ struct smp2p_entry { * struct qcom_smp2p - device driver context * @dev: device driver handle * @in: pointer to the inbound smem item - * @out: pointer to the outbound smem item * @smem_items: ids of the two smem items * @valid_entries: already scanned inbound entries * @local_pid: processor id of the inbound edge @@ -136,6 +137,10 @@ struct qcom_smp2p { unsigned valid_entries; + bool ssr_ack_enabled; + bool ssr_ack; + bool open; + unsigned local_pid; unsigned remote_pid; @@ -163,22 +168,59 @@ static void qcom_smp2p_kick(struct qcom_smp2p *smp2p) } } -/** - * qcom_smp2p_intr() - interrupt handler for incoming notifications - * @irq: unused - * @data: smp2p driver context - * - * Handle notifications from the remote side to handle newly allocated entries - * or any changes to the state bits of existing entries. - */ -static irqreturn_t qcom_smp2p_intr(int irq, void *data) +static bool qcom_smp2p_check_ssr(struct qcom_smp2p *smp2p) +{ + struct smp2p_smem_item *in = smp2p->in; + bool restart; + + if (!smp2p->ssr_ack_enabled) + return false; + + restart = in->flags & BIT(SMP2P_FLAGS_RESTART_DONE_BIT); + if (restart == smp2p->ssr_ack) + return false; + + return true; +} + +static void qcom_smp2p_do_ssr_ack(struct qcom_smp2p *smp2p) +{ + struct smp2p_smem_item *out = smp2p->out; + u32 ack; + u32 val; + + ack = !smp2p->ssr_ack; + smp2p->ssr_ack = ack; + ack = ack << SMP2P_FLAGS_RESTART_ACK_BIT; + + val = out->flags & ~BIT(SMP2P_FLAGS_RESTART_ACK_BIT); + val |= ack; + out->flags = val; + + qcom_smp2p_kick(smp2p); +} + +static void qcom_smp2p_negotiate(struct qcom_smp2p *smp2p) +{ + struct smp2p_smem_item *out = smp2p->out; + struct smp2p_smem_item *in = smp2p->in; + u32 features; + + if (in->version == out->version) { + features = in->features & out->features; + out->features = features; + + if (features & SMP2P_FEATURE_SSR_ACK) + smp2p->ssr_ack_enabled = true; + + smp2p->open = true; + } +} + +static void qcom_smp2p_notify_in(struct qcom_smp2p *smp2p) { struct smp2p_smem_item *in; struct smp2p_entry *entry; - struct qcom_smp2p *smp2p = data; - unsigned smem_id = smp2p->smem_items[SMP2P_INBOUND]; - unsigned pid = smp2p->remote_pid; - size_t size; int irq_pin; u32 status; char buf[SMP2P_MAX_ENTRY_NAME]; @@ -187,18 +229,6 @@ static irqreturn_t qcom_smp2p_intr(int irq, void *data) in = smp2p->in; - /* Acquire smem item, if not already found */ - if (!in) { - in = qcom_smem_get(pid, smem_id, &size); - if (IS_ERR(in)) { - dev_err(smp2p->dev, - "Unable to acquire remote smp2p item\n"); - return IRQ_HANDLED; - } - - smp2p->in = in; - } - /* Match newly created entries */ for (i = smp2p->valid_entries; i < in->valid_entries; i++) { list_for_each_entry(entry, &smp2p->inbound, node) { @@ -210,7 +240,7 @@ static irqreturn_t qcom_smp2p_intr(int irq, void *data) } } smp2p->valid_entries = i; - + /* Fire interrupts based on any value changes */ list_for_each_entry(entry, &smp2p->inbound, node) { /* Ignore entries not yet allocated by the remote side */ @@ -237,7 +267,52 @@ static irqreturn_t qcom_smp2p_intr(int irq, void *data) } } } +} + +/** + * qcom_smp2p_intr() - interrupt handler for incoming notifications + * @irq: unused + * @data: smp2p driver context + * + * Handle notifications from the remote side to handle newly allocated entries + * or any changes to the state bits of existing entries. + */ +static irqreturn_t qcom_smp2p_intr(int irq, void *data) +{ + struct smp2p_smem_item *in; + struct qcom_smp2p *smp2p = data; + unsigned int smem_id = smp2p->smem_items[SMP2P_INBOUND]; + unsigned int pid = smp2p->remote_pid; + size_t size; + in = smp2p->in; + + /* Acquire smem item, if not already found */ + if (!in) { + in = qcom_smem_get(pid, smem_id, &size); + if (IS_ERR(in)) { + dev_err(smp2p->dev, + "Unable to acquire remote smp2p item\n"); + goto out; + } + + smp2p->in = in; + } + + if (!smp2p->open) + qcom_smp2p_negotiate(smp2p); + + if (smp2p->open) { + bool do_restart; + + do_restart = qcom_smp2p_check_ssr(smp2p); + qcom_smp2p_notify_in(smp2p); + + if (do_restart) + qcom_smp2p_do_ssr_ack(smp2p); + } + +out: return IRQ_HANDLED; } @@ -393,6 +468,7 @@ static int qcom_smp2p_alloc_outbound_item(struct qcom_smp2p *smp2p) out->remote_pid = smp2p->remote_pid; out->total_entries = SMP2P_MAX_ENTRY; out->valid_entries = 0; + out->features = SMP2P_FEATURES; /* * Make sure the rest of the header is written before we validate the @@ -539,26 +615,9 @@ static int qcom_smp2p_probe(struct platform_device *pdev) goto unwind_interfaces; } - /* - * Treat smp2p interrupt as wakeup source, but keep it disabled - * by default. User space can decide enabling it depending on its - * use cases. For example if remoteproc crashes and device wants - * to handle it immediatedly (e.g. to not miss phone calls) it can - * enable wakeup source from user space, while other devices which - * do not have proper autosleep feature may want to handle it with - * other wakeup events (e.g. Power button) instead waking up immediately. - */ - device_set_wakeup_capable(&pdev->dev, true); - - ret = dev_pm_set_wake_irq(&pdev->dev, irq); - if (ret) - goto set_wake_irq_fail; return 0; -set_wake_irq_fail: - dev_pm_clear_wake_irq(&pdev->dev); - unwind_interfaces: list_for_each_entry(entry, &smp2p->inbound, node) irq_domain_remove(entry->domain); @@ -583,8 +642,6 @@ static int qcom_smp2p_remove(struct platform_device *pdev) struct qcom_smp2p *smp2p = platform_get_drvdata(pdev); struct smp2p_entry *entry; - dev_pm_clear_wake_irq(&pdev->dev); - list_for_each_entry(entry, &smp2p->inbound, node) irq_domain_remove(entry->domain);