From patchwork Fri Mar 12 16:24:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 12135253 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=-17.0 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=unavailable 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 079F1C433E0 for ; Fri, 12 Mar 2021 16:29:49 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 4639464FD9 for ; Fri, 12 Mar 2021 16:29:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4639464FD9 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=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=19It5UXB5ES/nrchBHADY3LIwg27qNYZ7omc3OBBtCI=; b=a6oaFa9VNOn2zNom1WvX9QqbT CSIAyzDgpUJo/XP5VbzFe8cVr1an1nUUFGG5hG1unHVlrOjxbIwkoG+2q8r2b0M2+iftxLL7330Oc RUNidc7AiYedO7q0RREbh7nE75MHzP5V7Z4B85ikyBAREHL6MpY11Tq46dFlQkwQUTgHAcIqKj/Ul WGgSvuwprJeDEN2z7+88viC4sQAOitMNrc+xFZXv16w/ZAU0RGWih8WZBbamlwArMqLgT7dENa8V7 t3F5+Kq2exq8yXyytzy/7Z6kS2QF85iTMWR5OLyu6CPgywW18FqtXOnd5KF+N1UiyxgV2oU2KlFqE ip2kWUoRg==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lKke4-00BxxK-Nf; Fri, 12 Mar 2021 16:28:12 +0000 Received: from mail-pg1-x534.google.com ([2607:f8b0:4864:20::534]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lKkb6-00Bwgs-7u for linux-arm-kernel@lists.infradead.org; Fri, 12 Mar 2021 16:25:11 +0000 Received: by mail-pg1-x534.google.com with SMTP id p21so16192490pgl.12 for ; Fri, 12 Mar 2021 08:25:07 -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=WeMR2UtisGi6ZgniJxY2/huWWVqD2xtcqc6NMb4K8/0=; b=hrmwJzSYPIeP/ikZT0FUOv6iNAG4dxqmaR+3RCyjsplRRAuMhA18kcECbj7vvnAfbe NaSOfAOhiwcTNuUncNMnaMH9m8xrQZ7x9QiU+6ereEKhmOunMqFONUNeV1lqMeUuFKoe chO/8SgS69s2HCvoIYZi8d3H2THRXm5sQHG3/IJqf4GF+bDjxxZvhRJo2il3Bah69cC/ EPhbDfb+9DCY7UCNVU4zDFokOlHJI2Tg3SEvq4E9lCEK0H5y5r0cWDirocy704YqjLT1 ylUxAxgSecBSJctZFQD9HYMltmPLUDKPPFVuZ5KabPkcxM0QEItPDsLWVfn3u+POM5wu yJbg== 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=WeMR2UtisGi6ZgniJxY2/huWWVqD2xtcqc6NMb4K8/0=; b=SqqzcsiEylnvkyRs3VBh7l3lm7YVZkc6fdbIDl4J6LXF/PmquL2p3D79pROebPno3X O1Z3WDjLdd2E0n51JFnXtNQhhAkKVYh809qQ8juXb+QQKSegPajxnstRu9MvRGan3EYh C8tNznRSViiSBRdhjkC2nYn+8B978Z7rDxM319MKEel8W2ZMzg3Ba1p8eOOgep+rBGe6 ARTT4p+QGwG1VNaAZcWsQvIZUG3/03DR3Mplb9SYq+6i/jX7D2TM7Mv9At6vbCS2vBK7 D73kBfuE0l2FRQu+7Fl5SLu60oNaP7fkealI2sv+vlKDKfJUDrLP/kMTh3WHpir5yUYU sA6A== X-Gm-Message-State: AOAM533xWywOe2fRBfosCpBOUn3FOieWEHPn8s3pyXb9kw9METKLX6RA mJtoUJDAIPNEtzVPkQxHRhcFzA== X-Google-Smtp-Source: ABdhPJzG1eDI723bt2kBSs0HFCqP+6RTmAujlcRDLukJBy4XPGPLLvd/XCuOcRq13/2rKSaBaiv9KA== X-Received: by 2002:a63:fc07:: with SMTP id j7mr12638054pgi.401.1615566306850; Fri, 12 Mar 2021 08:25:06 -0800 (PST) Received: from xps15.cg.shawcable.net (S0106889e681aac74.cg.shawcable.net. [68.147.0.187]) by smtp.gmail.com with ESMTPSA id e8sm5899599pgb.35.2021.03.12.08.25.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Mar 2021 08:25:06 -0800 (PST) From: Mathieu Poirier To: bjorn.andersson@linaro.org, ohad@wizery.com Cc: arnaud.pouliquen@st.com, mcoquelin.stm32@gmail.com, alexandre.torgue@st.com, linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v8 10/17] remoteproc: Introduce function rproc_detach() Date: Fri, 12 Mar 2021 09:24:46 -0700 Message-Id: <20210312162453.1234145-11-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210312162453.1234145-1-mathieu.poirier@linaro.org> References: <20210312162453.1234145-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-20210312_162508_474243_5685B794 X-CRM114-Status: GOOD ( 19.52 ) 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: , 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 --- 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 f2a005eadfd5..5eaa47c3ba92 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);