From patchwork Tue Feb 23 23:35:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 12101077 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 528E7C433DB for ; Tue, 23 Feb 2021 23:38:04 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DF8D764FBE for ; Tue, 23 Feb 2021 23:38:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DF8D764FBE Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=x9pN1FZ/QyZ4zJ4ZuoIPJy6xxDbsC88evNd32p+SUKc=; b=wU9aiFPUNSDwxd6Mb7yzpygBr d2pLYLxE2ZUaVHA9Or5YQaQzfAgPCW6UDftO5Ge1Zm4zkD/7htlBr8G/dqcQB3Gl3Lwd4E9yN6Dib QUPtY+54eoaGIq6QjrCfwtv2STM3AEUYlrM0ej7j8HlLJKfDecJc1SpwMiv701Ovov3ujds9qpYRy wHXmoEgBjY8FgXncx+oMC4au6F5mYY4ycTsge4QXhsjYCnmzmG+Z76ZBrxpL6J6zugPd4uhF9Hf1i G2quUPxGD7cvdLc63zZcrjXdFrdLe2lNf/C/r5wFeAbLhWknBxY/TkKkLcZn3awzCG/T/fk7RTdKO hVhNkjTVg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lEhDx-0003i4-K6; Tue, 23 Feb 2021 23:36:13 +0000 Received: from mail-pf1-x42d.google.com ([2607:f8b0:4864:20::42d]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1lEhDG-0003Uk-4s for linux-arm-kernel@lists.infradead.org; Tue, 23 Feb 2021 23:35:32 +0000 Received: by mail-pf1-x42d.google.com with SMTP id j24so65143pfi.2 for ; Tue, 23 Feb 2021 15:35:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GF5EQHFlmp0+qmUZul6iVpKZ4h0RkwOCQenPoUGAdoc=; b=JXFzabmRKJ8V0T+o9nOAxWVsuMgdr+B8uaPJVlbvmPmcxc8D6urjBQYMXSW2PwklpB bLKPh91Z/GF+3TG31+OpZ+cASxREnq6WnPHRCUV1ycXtwqyrWBImOtrXS5ynLbt2vBsM HOPj48ofMMoFkxHSPjERWm8vGjs97SXvNzKBva13fVqzcrx6emz4c9e9nOxtvyKkXbDn UI/EXGCm5L3V/ZnYJZvvjUVSgdUy99W4qBIzXOCwMgryXYPjgb5oUt/IiRB3+74VMUMg SkY0NYoGrq1zLG0Y9ooK6VlJMJD4YkNiMgngT0hXE5T8g+hR9wjGZsWWCI8fFSqOAkNe ansg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GF5EQHFlmp0+qmUZul6iVpKZ4h0RkwOCQenPoUGAdoc=; b=J0vCV5ey4jXyvMuxf8MRjXovEU2G/wEgaQjDEepFr4JvBWIIHsokaq3NWEQ6miCIfV ETamdoGNvTK8V4waFCQ5uB+K6qB/JV6pV0fDps6f9/B8nuEd2IXYTzrPuUa8ECIg98DA 383gynFQs2MUwEY/phBq2j4mqeGtLkr1e82wq3mSFSMHxMwuowoHZDDYooG4i3U2agxd t1xFwNOGTNUvl4XxluVYe3bckr3gZuCG9kZ9emkTKTclx21rxtYcb++dWmMg5UQ4mubE G6MTy+MbNCzalz2i/KrkEZxmjyMVhMhkUVi7fXUupyUTZYi6sU21MAxu9c6cQnoA/Lh9 /w5g== X-Gm-Message-State: AOAM531L0/8JHfq7VZNS6s0avSuoqGrWG677iozoakX7fd1ZvBTnVib1 TaZaAgLPT2U+zTYam5+r4srlFg== X-Google-Smtp-Source: ABdhPJz42IAXFy40S62cYn6Imjzfoc1xcaOkTJIhpRstco5Pcq5ISsfYuxsdM4Ul6ZKyAulxaa/GhA== X-Received: by 2002:a65:6205:: with SMTP id d5mr4569749pgv.40.1614123327949; Tue, 23 Feb 2021 15:35:27 -0800 (PST) Received: from xps15.cg.shawcable.net (S0106889e681aac74.cg.shawcable.net. [68.147.0.187]) by smtp.gmail.com with ESMTPSA id c24sm311999pfd.11.2021.02.23.15.35.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Feb 2021 15:35:27 -0800 (PST) From: Mathieu Poirier To: ohad@wizery.com, bjorn.andersson@linaro.org, arnaud.pouliquen@st.com Subject: [PATCH v6 10/16] remoteproc: Introduce function rproc_detach() Date: Tue, 23 Feb 2021 16:35:09 -0700 Message-Id: <20210223233515.3468677-11-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210223233515.3468677-1-mathieu.poirier@linaro.org> References: <20210223233515.3468677-1-mathieu.poirier@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210223_183530_313063_3BADD288 X-CRM114-Status: GOOD ( 20.58 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, linux-remoteproc@vger.kernel.org, alexandre.torgue@st.com, mcoquelin.stm32@gmail.com, linux-kernel@vger.kernel.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Introduce function rproc_detach() to enable the remoteproc core to release the resources associated with a remote processor without stopping its operation. Signed-off-by: Mathieu Poirier Reviewed-by: Arnaud Pouliquen --- New for V6: - Checking for rproc->state has been removed. They have been moved to calling functions. - Freeing the cache table has been moved to the next patch, i.e 11/16. --- drivers/remoteproc/remoteproc_core.c | 58 +++++++++++++++++++++++++++- include/linux/remoteproc.h | 1 + 2 files changed, 58 insertions(+), 1 deletion(-) diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index 0f680b7ff8f1..fc01b29290a6 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -1709,7 +1709,7 @@ static int rproc_stop(struct rproc *rproc, bool crashed) /* * __rproc_detach(): Does the opposite of __rproc_attach() */ -static int __maybe_unused __rproc_detach(struct rproc *rproc) +static int __rproc_detach(struct rproc *rproc) { struct device *dev = &rproc->dev; int ret; @@ -1948,6 +1948,62 @@ void rproc_shutdown(struct rproc *rproc) } EXPORT_SYMBOL(rproc_shutdown); +/** + * rproc_detach() - Detach the remote processor from the + * remoteproc core + * + * @rproc: the remote processor + * + * Detach a remote processor (previously attached to with rproc_attach()). + * + * In case @rproc is still being used by an additional user(s), then + * this function will just decrement the power refcount and exit, + * without disconnecting the device. + * + * Function rproc_detach() calls __rproc_detach() in order to let a remote + * processor know that services provided by the application processor are + * no longer available. From there it should be possible to remove the + * platform driver and even power cycle the application processor (if the HW + * supports it) without needing to switch off the remote processor. + */ +int rproc_detach(struct rproc *rproc) +{ + struct device *dev = &rproc->dev; + int ret; + + ret = mutex_lock_interruptible(&rproc->lock); + if (ret) { + dev_err(dev, "can't lock rproc %s: %d\n", rproc->name, ret); + return ret; + } + + /* if the remote proc is still needed, bail out */ + if (!atomic_dec_and_test(&rproc->power)) { + ret = 0; + goto out; + } + + ret = __rproc_detach(rproc); + if (ret) { + atomic_inc(&rproc->power); + goto out; + } + + /* clean up all acquired resources */ + rproc_resource_cleanup(rproc); + + /* release HW resources if needed */ + rproc_unprepare_device(rproc); + + rproc_disable_iommu(rproc); + + rproc->table_ptr = NULL; +out: + mutex_unlock(&rproc->lock); + return ret; +} +EXPORT_SYMBOL(rproc_detach); + /** * rproc_get_by_phandle() - find a remote processor by phandle * @phandle: phandle to the rproc diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h index eff55ec72e80..e1c843c19cc6 100644 --- a/include/linux/remoteproc.h +++ b/include/linux/remoteproc.h @@ -662,6 +662,7 @@ rproc_of_resm_mem_entry_init(struct device *dev, u32 of_resm_idx, size_t len, int rproc_boot(struct rproc *rproc); void rproc_shutdown(struct rproc *rproc); +int rproc_detach(struct rproc *rproc); int rproc_set_firmware(struct rproc *rproc, const char *fw_name); void rproc_report_crash(struct rproc *rproc, enum rproc_crash_type type); void rproc_coredump_using_sections(struct rproc *rproc);