Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757285AbcLPAEA (ORCPT ); Thu, 15 Dec 2016 19:04:00 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:48602 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757253AbcLPAD6 (ORCPT ); Thu, 15 Dec 2016 19:03:58 -0500 DMARC-Filter: OpenDMARC Filter v1.3.1 smtp.codeaurora.org 5D016600EC 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 , Santosh Shilimkar Cc: Sarangdhar Joshi , linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, Stephen Boyd , Trilok Soni , Dave Gerlach , Suman Anna Subject: [PATCH 1/2] soc: ti: Use remoteproc auto_boot feature Date: Thu, 15 Dec 2016 16:03:51 -0800 Message-Id: <1481846632-4778-1-git-send-email-spjoshi@codeaurora.org> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3649 Lines: 126 The function wkup_m3_rproc_boot_thread waits for asynchronous firmware loading to complete successfully before calling rproc_boot(). The same can be achieved by just setting rproc->auto_boot flag. Change this. As a result this change removes wkup_m3_rproc_boot_thread and moves m3_ipc->sync_complete initialization to the wkup_m3_ipc_probe(). Other than the current usage, the firmware_loading_complete is only used in rproc_del() where it's no longer needed. This change is in preparation for removing firmware_loading_complete completely. CC: Dave Gerlach CC: Suman Anna CC: Bjorn Andersson Signed-off-by: Sarangdhar Joshi --- Hi Suman, Unfortunately, I don't have a TI device and couldn't test this change. Is it possible for you to test this change on TI device? Thanks in advance. Regards, Sarang drivers/remoteproc/wkup_m3_rproc.c | 2 +- drivers/soc/ti/wkup_m3_ipc.c | 35 ++--------------------------------- 2 files changed, 3 insertions(+), 34 deletions(-) diff --git a/drivers/remoteproc/wkup_m3_rproc.c b/drivers/remoteproc/wkup_m3_rproc.c index 18175d0..79ea022 100644 --- a/drivers/remoteproc/wkup_m3_rproc.c +++ b/drivers/remoteproc/wkup_m3_rproc.c @@ -167,7 +167,7 @@ static int wkup_m3_rproc_probe(struct platform_device *pdev) goto err; } - rproc->auto_boot = false; + rproc->auto_boot = true; wkupm3 = rproc->priv; wkupm3->rproc = rproc; diff --git a/drivers/soc/ti/wkup_m3_ipc.c b/drivers/soc/ti/wkup_m3_ipc.c index 8823cc8..31090d70 100644 --- a/drivers/soc/ti/wkup_m3_ipc.c +++ b/drivers/soc/ti/wkup_m3_ipc.c @@ -17,7 +17,6 @@ #include #include -#include #include #include #include @@ -365,22 +364,6 @@ void wkup_m3_ipc_put(struct wkup_m3_ipc *m3_ipc) } EXPORT_SYMBOL_GPL(wkup_m3_ipc_put); -static void wkup_m3_rproc_boot_thread(struct wkup_m3_ipc *m3_ipc) -{ - struct device *dev = m3_ipc->dev; - int ret; - - wait_for_completion(&m3_ipc->rproc->firmware_loading_complete); - - init_completion(&m3_ipc->sync_complete); - - ret = rproc_boot(m3_ipc->rproc); - if (ret) - dev_err(dev, "rproc_boot failed\n"); - - do_exit(0); -} - static int wkup_m3_ipc_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; @@ -388,7 +371,6 @@ static int wkup_m3_ipc_probe(struct platform_device *pdev) phandle rproc_phandle; struct rproc *m3_rproc; struct resource *res; - struct task_struct *task; struct wkup_m3_ipc *m3_ipc; m3_ipc = devm_kzalloc(dev, sizeof(*m3_ipc), GFP_KERNEL); @@ -402,6 +384,8 @@ static int wkup_m3_ipc_probe(struct platform_device *pdev) return PTR_ERR(m3_ipc->ipc_mem_base); } + init_completion(&m3_ipc->sync_complete); + irq = platform_get_irq(pdev, 0); if (!irq) { dev_err(&pdev->dev, "no irq resource\n"); @@ -449,25 +433,10 @@ static int wkup_m3_ipc_probe(struct platform_device *pdev) m3_ipc->ops = &ipc_ops; - /* - * Wait for firmware loading completion in a thread so we - * can boot the wkup_m3 as soon as it's ready without holding - * up kernel boot - */ - task = kthread_run((void *)wkup_m3_rproc_boot_thread, m3_ipc, - "wkup_m3_rproc_loader"); - - if (IS_ERR(task)) { - dev_err(dev, "can't create rproc_boot thread\n"); - goto err_put_rproc; - } - m3_ipc_state = m3_ipc; return 0; -err_put_rproc: - rproc_put(m3_rproc); err_free_mbox: mbox_free_channel(m3_ipc->mbox); return ret; -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project