From patchwork Thu Aug 30 18:26:13 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Guzman Lugo, Fernando" X-Patchwork-Id: 1389141 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 1BAC1DF264 for ; Thu, 30 Aug 2012 18:27:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754864Ab2H3S1b (ORCPT ); Thu, 30 Aug 2012 14:27:31 -0400 Received: from na3sys009aog115.obsmtp.com ([74.125.149.238]:59135 "EHLO na3sys009aog115.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754684Ab2H3S0j (ORCPT ); Thu, 30 Aug 2012 14:26:39 -0400 Received: from mail-ob0-f174.google.com ([209.85.214.174]) (using TLSv1) by na3sys009aob115.postini.com ([74.125.148.12]) with SMTP ID DSNKUD+wXgvSpHQsLlrGrkGNoZtNzj0xeIjP@postini.com; Thu, 30 Aug 2012 11:26:38 PDT Received: by obbuo13 with SMTP id uo13so3911209obb.19 for ; Thu, 30 Aug 2012 11:26:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=hezL94kQL6h4DAaI091/B8cVLCCC9yTysP1gL5SAGAc=; b=OFb1StuS/VPTWpgFnDTsU0nbsdY18aIr5fpx4gNfJwUDlQswp5iJ37FQyy85IMgUGQ aC7kH033/mHLfgYFFzmYZZS0LVNBFkuzqh+3Ya3VdR3SpEkeND/TnFO2INPLy97l7JbC RqLOXVmD34VaVlx5/28PJZsEHPGKpU8DcMRzBRjK+8zKudaHqpyKpdc6OrqtFmCh0uzL EC97wb3ZtWwyxiN1sYcRktcSa5A5BxEREnt0erumrwHWZznQIye4gVLHAvXVZFpRxWXN JKRW8giNGC6SW7BH7+qY2C1+UlJ3af59oOvCZLUhsO4uT5+PhWs0d7VaqI493OZYcu3j BuoA== Received: by 10.182.48.8 with SMTP id h8mr5588491obn.75.1346351197631; Thu, 30 Aug 2012 11:26:37 -0700 (PDT) Received: from localhost.localdomain (dragon.ti.com. [192.94.94.33]) by mx.google.com with ESMTPS id d6sm1950349obx.15.2012.08.30.11.26.36 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 30 Aug 2012 11:26:36 -0700 (PDT) From: Fernando Guzman Lugo To: , , , Cc: Fernando Guzman Lugo Subject: [PATCHv2 2/3] remoteproc: recover a remoteproc when it has crashed Date: Thu, 30 Aug 2012 13:26:13 -0500 Message-Id: <1346351174-28441-3-git-send-email-fernando.lugo@ti.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1346351174-28441-1-git-send-email-fernando.lugo@ti.com> References: <1346351174-28441-1-git-send-email-fernando.lugo@ti.com> X-Gm-Message-State: ALoCoQmRlx3jV0qFLlbb8AydQnKvCCtUeJY3pAqdKXQlqfNCFDCmyLsWcAYho/1W20ZnE050M8ZK Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org This patch is introducing rproc_trigger_recover function which is in charge of recovering the rproc. One way to recover the rproc after a crash is resetting all its virtio devices. Doing that, all rpmsg drivers are restored along with the rpmsg devices and that also causes the reset of the remoteproc making the rpmsg communication with the remoteproc functional again. So far, rproc_trigger_recover function is only resetting all virtio devices, if in the future other rproc features are introduced and need to be reset too, rproc_trigger_recover function should take care of that. Signed-off-by: Fernando Guzman Lugo --- drivers/remoteproc/remoteproc_core.c | 37 +++++++++++++++++++++++++++++- drivers/remoteproc/remoteproc_internal.h | 1 + include/linux/remoteproc.h | 2 + 3 files changed, 39 insertions(+), 1 deletions(-) diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index 3a6f1a1..9fbd364 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -882,6 +882,36 @@ out: } /** + * rproc_trigger_recover() - recover a remoteproc + * @rproc: the remote processor + * + * The recovery is done by reseting all the virtio devices, that way all the + * rpmsg drivers will be reseted along with the remote processor making the + * remoteproc functional again. + * + * This function can sleep, so that it cannot be called from atomic context. + */ +int rproc_trigger_recover(struct rproc *rproc) +{ + struct rproc_vdev *rvdev, *rvtmp; + + dev_err(&rproc->dev, "recovering %s\n", rproc->name); + + init_completion(&rproc->crash_comp); + /* clean up remote vdev entries */ + list_for_each_entry_safe(rvdev, rvtmp, &rproc->rvdevs, node) + rproc_remove_virtio_dev(rvdev); + + /* wait until there is no more rproc users */ + wait_for_completion(&rproc->crash_comp); + + /* run rproc_fw_config_virtio to create vdevs again */ + return request_firmware_nowait(THIS_MODULE, FW_ACTION_HOTPLUG, + rproc->firmware, &rproc->dev, GFP_KERNEL, + rproc, rproc_fw_config_virtio); +} + +/** * rproc_crash_handler_work() - handle a crash * * This function needs to handle everything related to a crash, like cpu @@ -906,7 +936,7 @@ static void rproc_crash_handler_work(struct work_struct *work) ++rproc->crash_cnt, rproc->name); mutex_unlock(&rproc->lock); - /* TODO: handle crash */ + rproc_trigger_recover(rproc); } /** @@ -1030,6 +1060,10 @@ void rproc_shutdown(struct rproc *rproc) rproc_disable_iommu(rproc); + /* 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); @@ -1204,6 +1238,7 @@ struct rproc *rproc_alloc(struct device *dev, const char *name, INIT_LIST_HEAD(&rproc->rvdevs); INIT_WORK(&rproc->crash_handler, rproc_crash_handler_work); + init_completion(&rproc->crash_comp); rproc->state = RPROC_OFFLINE; diff --git a/drivers/remoteproc/remoteproc_internal.h b/drivers/remoteproc/remoteproc_internal.h index a690ebe..d9c0730 100644 --- a/drivers/remoteproc/remoteproc_internal.h +++ b/drivers/remoteproc/remoteproc_internal.h @@ -63,6 +63,7 @@ void rproc_free_vring(struct rproc_vring *rvring); int rproc_alloc_vring(struct rproc_vdev *rvdev, int i); void *rproc_da_to_va(struct rproc *rproc, u64 da, int len); +int rproc_trigger_recover(struct rproc *rproc); static inline int rproc_fw_sanity_check(struct rproc *rproc, const struct firmware *fw) diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h index a46ed27..0c1a2f9 100644 --- a/include/linux/remoteproc.h +++ b/include/linux/remoteproc.h @@ -398,6 +398,7 @@ 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 */ struct rproc { struct klist_node node; @@ -423,6 +424,7 @@ struct rproc { int index; struct work_struct crash_handler; unsigned crash_cnt; + struct completion crash_comp; }; /* we currently support only two vrings per rvdev */