From patchwork Wed Aug 31 20:50:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Loic Pallardy X-Patchwork-Id: 75116 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp532444qga; Wed, 31 Aug 2016 13:51:38 -0700 (PDT) X-Received: by 10.98.59.70 with SMTP id i67mr20362913pfa.45.1472676698447; Wed, 31 Aug 2016 13:51:38 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ie10si1485883pad.137.2016.08.31.13.51.38; Wed, 31 Aug 2016 13:51:38 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933451AbcHaUvT (ORCPT + 27 others); Wed, 31 Aug 2016 16:51:19 -0400 Received: from mx08-00178001.pphosted.com ([91.207.212.93]:49418 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933248AbcHaUvO (ORCPT ); Wed, 31 Aug 2016 16:51:14 -0400 Received: from pps.filterd (m0046660.ppops.net [127.0.0.1]) by mx08-00178001.pphosted.com (8.16.0.11/8.16.0.11) with SMTP id u7VKlHiV018606; Wed, 31 Aug 2016 22:51:05 +0200 Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx08-.pphosted.com with ESMTP id 255bs839av-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT); Wed, 31 Aug 2016 22:51:05 +0200 Received: from zeta.dmz-eu.st.com (zeta.dmz-eu.st.com [164.129.230.9]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 1BF6031; Wed, 31 Aug 2016 20:51:05 +0000 (GMT) Received: from Webmail-eu.st.com (Safex1hubcas23.st.com [10.75.90.46]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 0305750E2; Wed, 31 Aug 2016 20:51:05 +0000 (GMT) Received: from localhost (10.129.5.21) by webmail-ga.st.com (10.75.90.48) with Microsoft SMTP Server (TLS) id 14.3.279.2; Wed, 31 Aug 2016 22:51:04 +0200 From: Loic Pallardy To: , , CC: , , , Subject: [PATCH v2 05/19] remoteproc: core: Add function to over-ride current resource table Date: Wed, 31 Aug 2016 22:50:08 +0200 Message-ID: <1472676622-32533-6-git-send-email-loic.pallardy@st.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1472676622-32533-1-git-send-email-loic.pallardy@st.com> References: <1472676622-32533-1-git-send-email-loic.pallardy@st.com> MIME-Version: 1.0 X-Originating-IP: [10.129.5.21] X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-08-31_04:, , signatures=0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Lee Jones Most of the new resource table handling function are now in place, so it's time to put it all together. Once new resource table information has been requested, the structures will be held in a holding pen until boot-time. During boot-time rproc_apply_resource_overrides() will be invoked which in turn will pull the new information out of the holding pen and edit the table accordingly. Signed-off-by: Lee Jones Signed-off-by: Loic Pallardy --- drivers/remoteproc/remoteproc_core.c | 63 ++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) -- 1.9.1 diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index c2887be..96bc8c644 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -1033,6 +1033,63 @@ rproc_add_resource_table_entry(struct rproc *rproc, return table; } +static struct resource_table* +rproc_apply_resource_overrides(struct rproc *rproc, + struct resource_table **orig_table, + int *tablesz) +{ + struct rproc_request_resource *resource; + struct resource_table *table = *orig_table; + int size = *tablesz; + + if (!table && size != 0) { + dev_err(&rproc->dev, "No table present but table size is set\n"); + return ERR_PTR(-EINVAL); + } + + + rproc_dump_resource_table(rproc, table, size); + + if (!table) { + size = sizeof(*table); + table = devm_kzalloc(&rproc->dev, size, GFP_KERNEL); + if (!table) { + table = ERR_PTR(-ENOMEM); + goto out; + } + table->ver = 1; + } + + list_for_each_entry(resource, &rproc->override_resources, node) { + int updated = 0; + + /* If we already have a table, update it with the new values. */ + updated = rproc_update_resource_table_entry(rproc, resource, + table, size); + if (updated < 0) { + table = ERR_PTR(updated); + goto out; + } + if (updated) + continue; + + /* Didn't find matching resource entry -- creating a new one. */ + table = rproc_add_resource_table_entry(rproc, resource, + table, &size); + if (IS_ERR(table)) + goto out; + + *orig_table = table; + } + + rproc_dump_resource_table(rproc, table, size); + + *tablesz = size; + + out: + return table; +} + /* * take a firmware and boot a remote processor with it. */ @@ -1069,6 +1126,12 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw) goto clean_up; } + if (!list_empty(&rproc->override_resources)) { + table = rproc_apply_resource_overrides(rproc, &table, &tablesz); + if (IS_ERR(table)) + goto clean_up; + } + /* * Create a copy of the resource table. When a virtio device starts * and calls vring_new_virtqueue() the address of the allocated vring