From patchwork Tue Dec 13 23:23:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sarangdhar Joshi X-Patchwork-Id: 9473371 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B2102607EE for ; Tue, 13 Dec 2016 23:24:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A451D286C9 for ; Tue, 13 Dec 2016 23:24:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9709E286CD; Tue, 13 Dec 2016 23:24:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0E381286C9 for ; Tue, 13 Dec 2016 23:24:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752703AbcLMXYG (ORCPT ); Tue, 13 Dec 2016 18:24:06 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:49952 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752563AbcLMXYF (ORCPT ); Tue, 13 Dec 2016 18:24:05 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 9DA84614A4; Tue, 13 Dec 2016 23:24:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1481671444; bh=HqxIXhkAbHPme2Xgs9qiPXUXGYPi/CvWUyuHAuCmNz8=; h=From:To:Cc:Subject:Date:From; b=EfnFgqclHotezCgqtUPOuFLDZoLjNUxx19DimvAArbGshQQ69lJ+STk/idIY6i5hb j/OmFSi/2HJzKzgZ6f81jnObRtrEn51iekSOFLZ9nj3A5qsBN54UOQZ0u9DMnX87IC YeFxiIsIVQ7WKqTPONthj8gubmtMINUBqgG5f+sU= Received: from spjoshi-linux.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: spjoshi@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id C015F6147D; Tue, 13 Dec 2016 23:24:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1481671444; bh=HqxIXhkAbHPme2Xgs9qiPXUXGYPi/CvWUyuHAuCmNz8=; h=From:To:Cc:Subject:Date:From; b=EfnFgqclHotezCgqtUPOuFLDZoLjNUxx19DimvAArbGshQQ69lJ+STk/idIY6i5hb j/OmFSi/2HJzKzgZ6f81jnObRtrEn51iekSOFLZ9nj3A5qsBN54UOQZ0u9DMnX87IC YeFxiIsIVQ7WKqTPONthj8gubmtMINUBqgG5f+sU= DMARC-Filter: OpenDMARC Filter v1.3.1 smtp.codeaurora.org C015F6147D Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=pass smtp.mailfrom=spjoshi@codeaurora.org From: Sarangdhar Joshi To: Ohad Ben-Cohen , Bjorn Andersson Cc: Sarangdhar Joshi , linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Stephen Boyd , Trilok Soni Subject: [PATCH] remoteproc: Remove firmware_loading_complete Date: Tue, 13 Dec 2016 15:23:47 -0800 Message-Id: <1481671427-30818-1-git-send-email-spjoshi@codeaurora.org> X-Mailer: git-send-email 1.9.1 Sender: linux-remoteproc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP rproc_del() waits on firmware_loading_complete in order to make sure rproc_add() completed successfully before calling rproc_shutdown(). However since rproc_add() will always be called before rproc_del(), we do not need to wait on firmware_loading_complete. Drop this completion variable altogether. Signed-off-by: Sarangdhar Joshi --- This patch depends on e9b4f9efff5021 ("remoteproc: Drop wait in __rproc_boot()") drivers/remoteproc/remoteproc_core.c | 12 +----------- include/linux/remoteproc.h | 2 -- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index 953ee29..862fa4e 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -975,17 +975,12 @@ static void rproc_fw_config_virtio(const struct firmware *fw, void *context) rproc_boot(rproc); release_firmware(fw); - /* allow rproc_del() contexts, if any, to proceed */ - complete_all(&rproc->firmware_loading_complete); } static int rproc_add_virtio_devices(struct rproc *rproc) { int ret; - /* rproc_del() calls must wait until async loader completes */ - init_completion(&rproc->firmware_loading_complete); - /* * We must retrieve early virtio configuration info from * the firmware (e.g. whether to register a virtio device, @@ -997,10 +992,8 @@ static int rproc_add_virtio_devices(struct rproc *rproc) ret = request_firmware_nowait(THIS_MODULE, FW_ACTION_HOTPLUG, rproc->firmware, &rproc->dev, GFP_KERNEL, rproc, rproc_fw_config_virtio); - if (ret < 0) { + if (ret < 0) dev_err(&rproc->dev, "request_firmware_nowait err: %d\n", ret); - complete_all(&rproc->firmware_loading_complete); - } return ret; } @@ -1483,9 +1476,6 @@ int rproc_del(struct rproc *rproc) if (!rproc) return -EINVAL; - /* if rproc is just being registered, wait */ - wait_for_completion(&rproc->firmware_loading_complete); - /* if rproc is marked always-on, rproc_add() booted it */ /* TODO: make sure this works with rproc->power > 1 */ if (rproc->auto_boot) diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h index e2f3a32..19d84a0 100644 --- a/include/linux/remoteproc.h +++ b/include/linux/remoteproc.h @@ -397,7 +397,6 @@ enum rproc_crash_type { * @num_traces: number of trace buffers * @carveouts: list of physically contiguous memory allocations * @mappings: list of iommu mappings we initiated, needed on shutdown - * @firmware_loading_complete: marks e/o asynchronous firmware loading * @bootaddr: address of first instruction to boot rproc with (optional) * @rvdevs: list of remote virtio devices * @subdevs: list of subdevices, to following the running state @@ -428,7 +427,6 @@ struct rproc { int num_traces; struct list_head carveouts; struct list_head mappings; - struct completion firmware_loading_complete; u32 bootaddr; struct list_head rvdevs; struct list_head subdevs;