From patchwork Mon Aug 1 18:58:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 73131 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp2849535qga; Mon, 1 Aug 2016 11:59:31 -0700 (PDT) X-Received: by 10.66.182.232 with SMTP id eh8mr98696683pac.146.1470077971184; Mon, 01 Aug 2016 11:59:31 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z23si36386654pfi.90.2016.08.01.11.59.30; Mon, 01 Aug 2016 11:59:31 -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 S1755119AbcHAS7M (ORCPT + 27 others); Mon, 1 Aug 2016 14:59:12 -0400 Received: from mail-pf0-f180.google.com ([209.85.192.180]:35403 "EHLO mail-pf0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754959AbcHAS6I (ORCPT ); Mon, 1 Aug 2016 14:58:08 -0400 Received: by mail-pf0-f180.google.com with SMTP id x72so58013674pfd.2 for ; Mon, 01 Aug 2016 11:58:08 -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:in-reply-to:references; bh=8K+DlUJiqfpZwvyOKYcmtka7RBUW92qTWvzL+p38AT4=; b=XBkMhxHlfXjooTlOzC+UtjpwKA+MuoOYIoh7qhq5q36LjPEbkzD+acq10rc0BJfnsg beHZ7lud74eTs4adQdE4Mk27fFef3EF0P3IvgH9yeuWnAWeWH6yZz4a5rTbtvpdN/sp+ 19fLUxgp99KpIVDrkdPBn8r1RJH/lb0Ec6WzE= 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:in-reply-to :references; bh=8K+DlUJiqfpZwvyOKYcmtka7RBUW92qTWvzL+p38AT4=; b=b10aeVyCeiDNp9749cxbBJXPfE5LDF+Zx/z2IrMrfhkIEkYQaNOE243vkHsxkU8dRR GQdf9LS57mIwrzPCXYe4HmmDMBWXekpliAImD4PAfvX2KYND8Zzln+KGCntXOM70/745 1AETn4e0F7bWwd95LtV6xCCxGmXKAIpMuY50w3D/6P91QG/nTYei+00ThDZ4gNiU3jj3 EeLk8w6hG0sTkbeo1wZEeGzy7JdgDu8CvX1DKrJTF9tNljjdMFLF5gOZ5IRhIh3CTXk/ NPnk06mw3T0fF34XqG24sWCAam5HTSwi652icE/4s/ajMfhlsEWrBoD1y7KzjlkcSNZN g7pw== X-Gm-Message-State: AEkoouvIiGNfpgv4FUE6gMiopU23zDysoOmqZIrzeYk+AvmpZdF2peWtX6MFW0O8mtGR/8Ua X-Received: by 10.98.131.8 with SMTP id h8mr98771483pfe.124.1470077887288; Mon, 01 Aug 2016 11:58:07 -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.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 01 Aug 2016 11:58:06 -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 2/4] remoteproc: Calculate max_notifyid during load Date: Mon, 1 Aug 2016 11:58:01 -0700 Message-Id: <1470077883-7419-2-git-send-email-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1470077883-7419-1-git-send-email-bjorn.andersson@linaro.org> References: <1470077883-7419-1-git-send-email-bjorn.andersson@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The calculation of max_notifyid must only be done before we call start() on the remoteproc drivers, so move the calculation to be part of the loading steps. Cc: Lee Jones Cc: Loic Pallardy Signed-off-by: Bjorn Andersson --- drivers/remoteproc/remoteproc_core.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) -- 2.5.0 diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index 7e7f24fcac69..084ebffdfc47 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -697,17 +697,13 @@ static rproc_handle_resource_t rproc_loading_handlers[RSC_LAST] = { [RSC_CARVEOUT] = (rproc_handle_resource_t)rproc_handle_carveout, [RSC_DEVMEM] = (rproc_handle_resource_t)rproc_handle_devmem, [RSC_TRACE] = (rproc_handle_resource_t)rproc_handle_trace, - [RSC_VDEV] = NULL, /* VDEVs were handled upon registrarion */ + [RSC_VDEV] = (rproc_handle_resource_t)rproc_count_vrings, }; static rproc_handle_resource_t rproc_vdev_handler[RSC_LAST] = { [RSC_VDEV] = (rproc_handle_resource_t)rproc_handle_vdev, }; -static rproc_handle_resource_t rproc_count_vrings_handler[RSC_LAST] = { - [RSC_VDEV] = (rproc_handle_resource_t)rproc_count_vrings, -}; - /* handle firmware resource entries before booting the remote processor */ static int rproc_handle_resources(struct rproc *rproc, int len, rproc_handle_resource_t handlers[RSC_LAST]) @@ -836,6 +832,9 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw) goto clean_up; } + /* reset max_notifyid */ + rproc->max_notifyid = -1; + /* handle fw resources which are required to boot rproc */ ret = rproc_handle_resources(rproc, tablesz, rproc_loading_handlers); if (ret) { @@ -923,13 +922,6 @@ static void rproc_fw_config_virtio(const struct firmware *fw, void *context) rproc->table_ptr = rproc->cached_table; - /* count the number of notify-ids */ - rproc->max_notifyid = -1; - ret = rproc_handle_resources(rproc, tablesz, - rproc_count_vrings_handler); - if (ret) - goto out; - /* look for virtio devices and register them */ ret = rproc_handle_resources(rproc, tablesz, rproc_vdev_handler);