From patchwork Wed Oct 12 16:00:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Loic PALLARDY X-Patchwork-Id: 9373615 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D471760865 for ; Wed, 12 Oct 2016 17:22:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C26D3293A6 for ; Wed, 12 Oct 2016 17:22:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B6D9C296A9; Wed, 12 Oct 2016 17:22:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2BBDE296A2 for ; Wed, 12 Oct 2016 17:22:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755825AbcJLRWG (ORCPT ); Wed, 12 Oct 2016 13:22:06 -0400 Received: from mx08-00178001.pphosted.com ([91.207.212.93]:34126 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755808AbcJLRWE (ORCPT ); Wed, 12 Oct 2016 13:22:04 -0400 Received: from pps.filterd (m0046661.ppops.net [127.0.0.1]) by mx08-00178001.pphosted.com (8.16.0.11/8.16.0.11) with SMTP id u9CFx3m8004126; Wed, 12 Oct 2016 18:01:10 +0200 Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx08-.pphosted.com with ESMTP id 2615csdhvy-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT); Wed, 12 Oct 2016 18:01:10 +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 D7CD834; Wed, 12 Oct 2016 16:01:09 +0000 (GMT) Received: from Webmail-eu.st.com (Safex1hubcas22.st.com [10.75.90.92]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id C336F2AB0; Wed, 12 Oct 2016 16:01:09 +0000 (GMT) Received: from localhost (10.201.23.23) by Webmail-ga.st.com (10.75.90.48) with Microsoft SMTP Server (TLS) id 14.3.279.2; Wed, 12 Oct 2016 18:01:09 +0200 From: Loic Pallardy To: , , CC: , , , Subject: [PATCH v3 05/20] remoteproc: core: Add function to over-ride current resource table Date: Wed, 12 Oct 2016 18:00:23 +0200 Message-ID: <1476288038-24909-6-git-send-email-loic.pallardy@st.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1476288038-24909-1-git-send-email-loic.pallardy@st.com> References: <1476288038-24909-1-git-send-email-loic.pallardy@st.com> MIME-Version: 1.0 X-Originating-IP: [10.201.23.23] X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-10-12_09:, , signatures=0 Sender: linux-remoteproc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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(+) diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index 3a26d4e..9bf48ba 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -1027,6 +1027,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. */ @@ -1063,6 +1120,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