From patchwork Mon Aug 1 18:58:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 73128 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp2849172qga; Mon, 1 Aug 2016 11:58:24 -0700 (PDT) X-Received: by 10.66.76.38 with SMTP id h6mr98139021paw.79.1470077904550; Mon, 01 Aug 2016 11:58:24 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x76si36314275pfd.200.2016.08.01.11.58.24; Mon, 01 Aug 2016 11:58:24 -0700 (PDT) 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; 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 dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754983AbcHAS6M (ORCPT + 27 others); Mon, 1 Aug 2016 14:58:12 -0400 Received: from mail-pf0-f178.google.com ([209.85.192.178]:34625 "EHLO mail-pf0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754952AbcHAS6H (ORCPT ); Mon, 1 Aug 2016 14:58:07 -0400 Received: by mail-pf0-f178.google.com with SMTP id p64so57996839pfb.1 for ; Mon, 01 Aug 2016 11:58:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=AsnCwEPL5oMh6BBvLy38ogMt3TKLVfP6EPVVGHBmMas=; b=VCNEsJPSQ+jodteSA0E5p7xEUyBGd7342mZIqaJO4AnryXzNh7+usyu3GsApHBoeEU KvF/k3LOQCaAEfKnwbmtlhJYg5+VRLzALk6ZfTFi68yfv+xh3FwALEnxwTs2A/9U4Kdr riC8O7yk1h2SGZ4hWiIKD5Wqikg9I01ITfp2w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=AsnCwEPL5oMh6BBvLy38ogMt3TKLVfP6EPVVGHBmMas=; b=keQCkslngEh++BLinZlIuG9i5irm+9eyMCVR5eeXfDRx3u2iFBxcJ9aKnTjPjtVckF TJkkT9jUeGYfkCMdkrnsv4IMzjitN9ZwqE2ZOFKBYt2nAFTgWlnnBPiQZp6cxxyV47/9 FJmUT1s77gNalXROlREDCsZuFI6DPdIhNAOD/CX3XXNUoTEtfI31Ke4BWFn1ua4Z5aK2 lCf4ncG/uWQZ4++jo3Y5IEzwuUB/dYkuGdaTc6EIf7NHusHwneVvdvz/SIhJuRNupvbr 65FNunuRsjFWy//HKoOVo7mgMkqMOEURL3TEZ4yznQUzuti2Y9lyw9WDaKVOMZt+4hV9 M9DQ== X-Gm-Message-State: AEkooutJi3kY/yFnhsx2n8qrQH84v/ZhNkmNUpdXVRiCQ29YYn0ELSiE7u6Xu0Nk2ljkc2C/ X-Received: by 10.98.73.24 with SMTP id w24mr98917609pfa.27.1470077886219; Mon, 01 Aug 2016 11:58:06 -0700 (PDT) Received: from localhost.localdomain (ip68-111-223-48.sd.sd.cox.net. [68.111.223.48]) by smtp.gmail.com with ESMTPSA id s23sm47500241pfd.23.2016.08.01.11.58.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 01 Aug 2016 11:58:05 -0700 (PDT) From: Bjorn Andersson To: linux-remoteproc@vger.kernel.org Cc: Ohad Ben-Cohen , linux-kernel@vger.kernel.org, Lee Jones , Loic Pallardy Subject: [PATCH 1/4] remoteproc: Introduce always-on flag Date: Mon, 1 Aug 2016 11:58:00 -0700 Message-Id: <1470077883-7419-1-git-send-email-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.5.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Introduce an "always-on" flag on rprocs to make it possible to flag remote processors without vdevs to automatically boot once the firmware is found. Cc: Lee Jones Cc: Loic Pallardy Signed-off-by: Bjorn Andersson --- drivers/remoteproc/remoteproc_core.c | 27 ++++++++++++++++++++++++++- drivers/remoteproc/remoteproc_virtio.c | 13 ------------- include/linux/remoteproc.h | 1 + 3 files changed, 27 insertions(+), 14 deletions(-) -- 2.5.0 diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index fe0539ed9cb5..7e7f24fcac69 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -933,6 +933,10 @@ static void rproc_fw_config_virtio(const struct firmware *fw, void *context) /* look for virtio devices and register them */ ret = rproc_handle_resources(rproc, tablesz, rproc_vdev_handler); + /* if rproc is marked always-on, request it to boot */ + if (rproc->always_on) + rproc_boot_nowait(rproc); + out: release_firmware(fw); /* allow rproc_del() contexts, if any, to proceed */ @@ -978,11 +982,16 @@ static int rproc_add_virtio_devices(struct rproc *rproc) int rproc_trigger_recovery(struct rproc *rproc) { struct rproc_vdev *rvdev, *rvtmp; + int ret; dev_err(&rproc->dev, "recovering %s\n", rproc->name); init_completion(&rproc->crash_comp); + /* shut down the remote */ + /* TODO: make sure this works with rproc->power > 1 */ + rproc_shutdown(rproc); + /* clean up remote vdev entries */ list_for_each_entry_safe(rvdev, rvtmp, &rproc->rvdevs, node) rproc_remove_virtio_dev(rvdev); @@ -993,7 +1002,17 @@ int rproc_trigger_recovery(struct rproc *rproc) /* Free the copy of the resource table */ kfree(rproc->cached_table); - return rproc_add_virtio_devices(rproc); + ret = rproc_add_virtio_devices(rproc); + if (ret) + return ret; + + /* + * boot the remote processor up again, waiting for the async fw load to + * finish + */ + rproc_boot(rproc); + + return 0; } /** @@ -1374,6 +1393,7 @@ struct rproc *rproc_alloc(struct device *dev, const char *name, rproc->name = name; rproc->ops = ops; rproc->priv = &rproc[1]; + rproc->always_on = true; device_initialize(&rproc->dev); rproc->dev.parent = dev; @@ -1452,6 +1472,11 @@ int rproc_del(struct rproc *rproc) /* 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->always_on) + rproc_shutdown(rproc); + /* clean up remote vdev entries */ list_for_each_entry_safe(rvdev, tmp, &rproc->rvdevs, node) rproc_remove_virtio_dev(rvdev); diff --git a/drivers/remoteproc/remoteproc_virtio.c b/drivers/remoteproc/remoteproc_virtio.c index cc91556313e1..574c90ce07f7 100644 --- a/drivers/remoteproc/remoteproc_virtio.c +++ b/drivers/remoteproc/remoteproc_virtio.c @@ -136,11 +136,6 @@ static void __rproc_virtio_del_vqs(struct virtio_device *vdev) static void rproc_virtio_del_vqs(struct virtio_device *vdev) { - struct rproc *rproc = vdev_to_rproc(vdev); - - /* power down the remote processor before deleting vqs */ - rproc_shutdown(rproc); - __rproc_virtio_del_vqs(vdev); } @@ -149,7 +144,6 @@ static int rproc_virtio_find_vqs(struct virtio_device *vdev, unsigned nvqs, vq_callback_t *callbacks[], const char * const names[]) { - struct rproc *rproc = vdev_to_rproc(vdev); int i, ret; for (i = 0; i < nvqs; ++i) { @@ -160,13 +154,6 @@ static int rproc_virtio_find_vqs(struct virtio_device *vdev, unsigned nvqs, } } - /* now that the vqs are all set, boot the remote processor */ - ret = rproc_boot_nowait(rproc); - if (ret) { - dev_err(&rproc->dev, "rproc_boot() failed %d\n", ret); - goto error; - } - return 0; error: diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h index 1c457a8dd5a6..bd1cfcbb57b9 100644 --- a/include/linux/remoteproc.h +++ b/include/linux/remoteproc.h @@ -443,6 +443,7 @@ struct rproc { struct resource_table *cached_table; u32 table_csum; bool has_iommu; + bool always_on; }; /* we currently support only two vrings per rvdev */