From patchwork Wed Dec 13 22:41:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 121872 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp6064840qgn; Wed, 13 Dec 2017 14:43:01 -0800 (PST) X-Google-Smtp-Source: ACJfBouZxvs7GO/C1ws1vglgDpf7rsYaMl9P3VF+M2/4AKaV5S7994sHxl/duAUCvolPZyKhsMB5 X-Received: by 10.98.46.7 with SMTP id u7mr7545808pfu.37.1513204981461; Wed, 13 Dec 2017 14:43:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513204981; cv=none; d=google.com; s=arc-20160816; b=HlyDITHVteKNEtQ0j9uSGiq4X4t0YyS+pTdwlbqGm12wjh6U/qEoO1fZ7ab8l+Wf1l rA+OXYHt+70MubuZ9s29zvkCgH6GvmXQ6x1Y5KU85bqfsA3jQjrpVgnavtiLrOIwhETr 7DbAMU6uLFjFboRH7uvTeuIBQCEs9onGgxrMrX6kA2PfHdeYy2+Dw28kONoikvRzCnZS Jiy62zAATMqUGEpuWD0DLvUqcEm3/NXbDE3Agm543xgS+0OsfO+LJPE89YHQmemCOv7y cF1SPFfg19DSAFM+uk5m2gxObGgPX9KF/QdXUVn7LylfzlgG2oiy64/wBkHJUBbeVqwP xNZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=bq8TdGQjagZoow55sXdxLaQ04rt/+nuXUXQV/0cUf1c=; b=mPfbV/H3affL5P1rGP8YbvvBRtq9KYYXQhQreSjliFmffymAMn/iRXWZoWhROrjyhO t/AE3twTCDj+CPIee0xqgnk2LDraje1/iES4BsFmvztagOIWvyTLXjiSoR1lwPMMq1MX tHveKFJiGFZmHIzXnIUmm5Xg+wEtrBddyTw74C3Cac2bJOV4Bw85sAtQA0RqU1oFSHMz mDVN1GOBNWcd1daCgxbVl9nsXSe5FfFnLGARwAHu+QEc/b6FhzgJ1iz9fxSvHK/uLvqk DbNvC5LSb++LXjRAYjq12JpceehHiPxp8vM2W+HgpnT8wgZlgfPuSoiywcV+8l2UPNpl FFOQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fPRWtqBR; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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. [209.132.180.67]) by mx.google.com with ESMTP id t25si1877854pgv.644.2017.12.13.14.43.01; Wed, 13 Dec 2017 14:43:01 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fPRWtqBR; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 S1753190AbdLMWm5 (ORCPT + 23 others); Wed, 13 Dec 2017 17:42:57 -0500 Received: from mail-pf0-f195.google.com ([209.85.192.195]:33866 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752434AbdLMWlR (ORCPT ); Wed, 13 Dec 2017 17:41:17 -0500 Received: by mail-pf0-f195.google.com with SMTP id a90so2202861pfk.1 for ; Wed, 13 Dec 2017 14:41:17 -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; bh=bq8TdGQjagZoow55sXdxLaQ04rt/+nuXUXQV/0cUf1c=; b=fPRWtqBR5Wr46ahCySP6KQf/LsxPAKAB2OhG5hLtPoMQD+TY1iVQ29dGt30JqYi1Ud lWYsGaUfuRWs6JYnpiMsuCTzpNzNe3TDvb6JP7HG7iY9Ba9/tbV/HIb0ifDbXpjiFDCt F7s92lAQid/RC9UJRbP68qz1XoeIZUpjcDWKE= 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; bh=bq8TdGQjagZoow55sXdxLaQ04rt/+nuXUXQV/0cUf1c=; b=qZao5d1yf7H7m71dWDrDDbLpozASeY9FB72U+S9q+5R7IfvHscIM5kqG/mx+Jw/BnZ nK+LP6BgQpY79Eecrx5zXs+V4mamwPqi3WuK4H9jrk0aPUP+eCxgHsW5RkzohA6KON5C Hyess6f//oKIwDK9BzjV0pHnFURMaT5927/7W2Liq1/BVZWUupFSiVQY9i+IPbiabXY5 kEXYsO+CmBaHIVtkkivh/PQG2F4NTpZXG3GALN9u1Oy9LdsG2i53At+wgQ0yirawcgQv N1JLLW2Nrlgp8N6q16/BA4/Ei9DG3LDOwMmtp2jYGd4+kNkut1NBnHmACUbMPATyfZnQ mElw== X-Gm-Message-State: AKGB3mLXIiiDzurE6fwkRXX6YOk0F/scpou5sjAJYJCjKy4qvRiV7KgJ 4AG+bkYs06ripKRUFBAOtSeqSw== X-Received: by 10.84.217.131 with SMTP id p3mr163810pli.270.1513204877004; Wed, 13 Dec 2017 14:41:17 -0800 (PST) Received: from localhost.localdomain (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id x15sm4464205pfh.27.2017.12.13.14.41.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Dec 2017 14:41:15 -0800 (PST) From: Bjorn Andersson To: Ohad Ben-Cohen , Bjorn Andersson Cc: linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/8] remoteproc: Remove depricated crash completion Date: Wed, 13 Dec 2017 14:41:04 -0800 Message-Id: <20171213224111.17864-2-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20171213224111.17864-1-bjorn.andersson@linaro.org> References: <20171213224111.17864-1-bjorn.andersson@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The crash handling now happens in a single execution context, so there's no longer a need for a completion to synchronize this. Signed-off-by: Bjorn Andersson --- drivers/remoteproc/remoteproc_core.c | 10 ---------- include/linux/remoteproc.h | 2 -- 2 files changed, 12 deletions(-) -- 2.15.0 diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index b2f8afee2b67..15e2c4530a0a 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -1028,10 +1028,6 @@ static int rproc_stop(struct rproc *rproc, bool graceful) return ret; } - /* if in crash state, unlock crash handler */ - if (rproc->state == RPROC_CRASHED) - complete_all(&rproc->crash_comp); - rproc->state = RPROC_OFFLINE; dev_info(dev, "stopped remote processor %s\n", rproc->name); @@ -1057,8 +1053,6 @@ int rproc_trigger_recovery(struct rproc *rproc) dev_err(dev, "recovering %s\n", rproc->name); - init_completion(&rproc->crash_comp); - ret = mutex_lock_interruptible(&rproc->lock); if (ret) return ret; @@ -1067,9 +1061,6 @@ int rproc_trigger_recovery(struct rproc *rproc) if (ret) goto unlock_mutex; - /* wait until there is no more rproc users */ - wait_for_completion(&rproc->crash_comp); - /* load firmware */ ret = request_firmware(&firmware_p, rproc->firmware, dev); if (ret < 0) { @@ -1459,7 +1450,6 @@ struct rproc *rproc_alloc(struct device *dev, const char *name, INIT_LIST_HEAD(&rproc->subdevs); INIT_WORK(&rproc->crash_handler, rproc_crash_handler_work); - init_completion(&rproc->crash_comp); rproc->state = RPROC_OFFLINE; diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h index 20a9467744ea..2d1058111e57 100644 --- a/include/linux/remoteproc.h +++ b/include/linux/remoteproc.h @@ -406,7 +406,6 @@ enum rproc_crash_type { * @index: index of this rproc device * @crash_handler: workqueue for handling a crash * @crash_cnt: crash counter - * @crash_comp: completion used to sync crash handler and the rproc reload * @recovery_disabled: flag that state if recovery was disabled * @max_notifyid: largest allocated notify id. * @table_ptr: pointer to the resource table in effect @@ -437,7 +436,6 @@ struct rproc { int index; struct work_struct crash_handler; unsigned int crash_cnt; - struct completion crash_comp; bool recovery_disabled; int max_notifyid; struct resource_table *table_ptr;