From patchwork Fri Dec 18 17:32:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 345472 Delivered-To: patch@linaro.org Received: by 2002:a02:85a7:0:0:0:0:0 with SMTP id d36csp2335610jai; Fri, 18 Dec 2020 09:35:14 -0800 (PST) X-Google-Smtp-Source: ABdhPJxK6Tv7hxVQJcOl0D3ekdmlGxQScMJLQQZNUVc8C7cR+vDUwL9rvhdhbqCthPiuyHQrEwly X-Received: by 2002:a05:6402:229b:: with SMTP id cw27mr5419334edb.23.1608312914280; Fri, 18 Dec 2020 09:35:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1608312914; cv=none; d=google.com; s=arc-20160816; b=E5Pn3PuaGwYnZXOhNQyTuKiy77CK079rSjgdZ9jegIdCmOIWe7asyR2Ft3g0dhFoCs txMXYc1ONjw/P8Gk3J2lJU9cQ9RWw6pRNCaBmX15UVO9d2412BvmZP/rkLYSQ01W8/eo hxoZp4Ln/kKU0jgc+TAmpbXA1MKAK5S68Iw5wa6S7+HYLeG/zTcXj1nvkHes5F7dTnEs Rfn0X1VcVlaIt0lwM+Hp8t2oJhq7P0jD2pNvE27tfimd4X6+69LRbD4JMUkulAVWeP5F +Rbm34rhHPca+fXtz3OT+5lxWJ5hnp1ifcASTp0et90uweQMtsRYwgX/9H+QbMGNhPms gekA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=H4g2ghZevAZZMEldVnDmhvjfkN3XHebraEOrSS89kQg=; b=HOSOl8Mr3B5p9lGEoWJJjJSR80yglrLn8nUt16kPIX5Fm8XwidNYxlPqIwqiFiIkec IPUGW3k17vzZlBD0ZcOluxs8SvVRQHxXWItBdkrrqcffAs/L4HVXKp5m2i26R+lXo3HJ lGXLIvkBC8+cyd8KRxKrmLHF3cBUeTHzA9zeOmLQNcnrIBAfqc64XwWW5HQ6vb71fXFJ Qcfhr9BYf79GStSyJHmv0gWx87J1V8VhIH9L7XHiyb93FSjrb9ppAf+Og5+TckuzEQW+ PKYLK8oDu7cTOpK+Q18Qv1lRH2IJrJwOoJbYIqEFAU2eTgQDyWc9cb88S5q0QM2AJejU 9W2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PiGtjane; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t20si4902939ejd.719.2020.12.18.09.35.14; Fri, 18 Dec 2020 09:35:14 -0800 (PST) Received-SPF: pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PiGtjane; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732843AbgLRReX (ORCPT + 7 others); Fri, 18 Dec 2020 12:34:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60078 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732798AbgLRReW (ORCPT ); Fri, 18 Dec 2020 12:34:22 -0500 Received: from mail-pj1-x102b.google.com (mail-pj1-x102b.google.com [IPv6:2607:f8b0:4864:20::102b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 640DEC061A04 for ; Fri, 18 Dec 2020 09:32:44 -0800 (PST) Received: by mail-pj1-x102b.google.com with SMTP id lj6so1679124pjb.0 for ; Fri, 18 Dec 2020 09:32:44 -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=H4g2ghZevAZZMEldVnDmhvjfkN3XHebraEOrSS89kQg=; b=PiGtjane3hJdt4Yln3JhdBS07fwTZhgAKnMXQnHbOJg02WrEZY4pz3YJ6hr/Ztqkiw FsL0ZJomtWNko8fzcpuOOhFObhAwJMmucvfWrG32NYCh5SaQKS0jl2WOdtNykfh3LIsl gqj47HipepBxZM0Ahsq44RoEEdyquekivZtMsSTDX55neWf+4V0s3M4SmRAzJ/sLTf1a +bVuL+hPj0R0jQOWmWOqyiwk5iOBSJKJyvr47O6WdYhxY5lA9e8lSfLHOvklMPNAzivZ DEej6VIJ6XM3KakaIPcXrn7hN87taHfBENbmlBGkcmDJMlVdzOtS7dCfy82Wr53Ty6GX DI9Q== 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=H4g2ghZevAZZMEldVnDmhvjfkN3XHebraEOrSS89kQg=; b=hRHZjXHyQ/kzDn5kB0KAdu9zMKOOXhj6g0qP5UOuChNPC6JtF9WXu12ow8ySr5bM3/ lHIcpR+D+qxq1gsgw2so/7gsXSkN4lok3FiWjnx+HrShgMitiTtjCBzmITWPIyDuims5 kSLAO8JSsUCou7+NEu8p5x5BfOPskmDxdO9NHQjLvoTfsvJGqOBRPS5pl6/35Uh+Rezh yts0OQPbHWewHhvvr3uczxg+9RZKowwuoP8nDpK5SBDzau20dbvIIROTtAddpl5VtW2r GmG4LgEM46pNJc2ZjO4eJVPeiZC/RmdROHg7fv1TxpcYhBe9yuIkN2tL9dsmtABkODfw 2rCw== X-Gm-Message-State: AOAM5312MKfq6fayD35pLubmL/OuRnzrvtOqzZ0MkDhW9ny0oTUAzlZc k5V89PiEmqgXmtfjW6RqzHcaml3HGyzt8wdk X-Received: by 2002:a17:90a:d790:: with SMTP id z16mr5371190pju.88.1608312763918; Fri, 18 Dec 2020 09:32:43 -0800 (PST) Received: from xps15.cg.shawcable.net (S0106889e681aac74.cg.shawcable.net. [68.147.0.187]) by smtp.gmail.com with ESMTPSA id l11sm9892957pgt.79.2020.12.18.09.32.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Dec 2020 09:32:43 -0800 (PST) From: Mathieu Poirier To: ohad@wizery.com, bjorn.andersson@linaro.org, robh+dt@kernel.org Cc: arnaud.pouliquen@st.com, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 12/17] remoteproc: Introduce function rproc_detach() Date: Fri, 18 Dec 2020 10:32:23 -0700 Message-Id: <20201218173228.2277032-13-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201218173228.2277032-1-mathieu.poirier@linaro.org> References: <20201218173228.2277032-1-mathieu.poirier@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.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: Peng Fan --- drivers/remoteproc/remoteproc_core.c | 71 +++++++++++++++++++++++++++- include/linux/remoteproc.h | 2 + 2 files changed, 72 insertions(+), 1 deletion(-) -- 2.25.1 diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index e665ed4776c3..ece3f15070b9 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -1673,7 +1673,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; @@ -1927,6 +1927,75 @@ 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_actuate()). + * + * 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 (rproc->state != RPROC_RUNNING && rproc->state != RPROC_ATTACHED) { + ret = -EPERM; + goto out; + } + + /* if the remote proc is still needed, bail out */ + if (!atomic_dec_and_test(&rproc->power)) { + ret = -EBUSY; + goto out; + } + + ret = __rproc_detach(rproc); + if (ret) { + atomic_inc(&rproc->power); + goto out; + } + + /* clean up all acquired resources */ + rproc_resource_cleanup(rproc); + + rproc_disable_iommu(rproc); + + /* + * If the remote processor was booted by the core the cached table needs + * to be freed and ->table_ptr set to NULL because it will be + * invalidated by rproc_resource_cleanup(). If the remote processor was + * attached to ->cached_table is NULL and kfree() returns right away. + * + * In either case ->table_ptr has to be set to NULL. It will be set + * again when the remote processor is re-attached to. + */ + kfree(rproc->cached_table); + rproc->cached_table = NULL; + 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 9bb34c3eb847..65ece6f177b7 100644 --- a/include/linux/remoteproc.h +++ b/include/linux/remoteproc.h @@ -659,6 +659,8 @@ 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); int rproc_coredump_add_segment(struct rproc *rproc, dma_addr_t da, size_t size); int rproc_coredump_add_custom_segment(struct rproc *rproc,