From patchwork Wed Oct 12 16:00:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Loic Pallardy X-Patchwork-Id: 77562 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp510458qge; Wed, 12 Oct 2016 09:04:58 -0700 (PDT) X-Received: by 10.66.191.166 with SMTP id gz6mr2419037pac.8.1476288298565; Wed, 12 Oct 2016 09:04:58 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f19si6541759pga.307.2016.10.12.09.04.58; Wed, 12 Oct 2016 09:04:58 -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 S1755054AbcJLQEk (ORCPT + 27 others); Wed, 12 Oct 2016 12:04:40 -0400 Received: from mx07-00178001.pphosted.com ([62.209.51.94]:15272 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753444AbcJLQCx (ORCPT ); Wed, 12 Oct 2016 12:02:53 -0400 Received: from pps.filterd (m0046037.ppops.net [127.0.0.1]) by m0046037.ppops.net (8.16.0.11/8.16.0.11) with SMTP id u9CFxLOT024442; Wed, 12 Oct 2016 18:01:09 +0200 Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-.pphosted.com with ESMTP id 2615cu5d58-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT); Wed, 12 Oct 2016 18:01:09 +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 D1F8431; Wed, 12 Oct 2016 16:01:08 +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 BBF102AB0; Wed, 12 Oct 2016 16:01:08 +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:08 +0200 From: Loic Pallardy To: , , CC: , , , Subject: [PATCH v3 04/20] remoteproc: core: Add function to append a new resource table entry Date: Wed, 12 Oct 2016 18:00:22 +0200 Message-ID: <1476288038-24909-5-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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Lee Jones A new function now exists to pull in and amend and existing resource table entry. But what if we wish to provide a new resource? This function provides functionality to append a brand new resource entry onto the resource table. All complexity related to shuffling parts of the table around, providing new offsets and incriminating number of entries in the resource table's top-level header is taken care of here. Signed-off-by: Lee Jones Signed-off-by: Loic Pallardy --- drivers/remoteproc/remoteproc_core.c | 55 ++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) -- 1.9.1 diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index c3830b4..3a26d4e 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -972,6 +972,61 @@ static int rproc_update_resource_table_entry(struct rproc *rproc, return !updated; } +static struct resource_table* +rproc_add_resource_table_entry(struct rproc *rproc, + struct rproc_request_resource *request, + struct resource_table *old_table, int *tablesz) +{ + struct resource_table *table; + struct fw_rsc_hdr h; + void *new_rsc_loc; + void *fw_header_loc; + void *start_of_rscs; + int new_rsc_offset; + int size = *tablesz; + int i; + + h.type = request->type; + + new_rsc_offset = size; + + /* + * Allocate another contiguous chunk of memory, large enough to + * contain the new, expanded resource table. + * + * The +4 is for the extra offset[] element in the top level header + */ + size += sizeof(struct fw_rsc_hdr) + request->size + 4; + table = devm_kmemdup(&rproc->dev, old_table, size, GFP_KERNEL); + if (!table) + return ERR_PTR(-ENOMEM); + + /* Shunt table by 4 Bytes to account for the extra offset[] element */ + start_of_rscs = (void *)table + table->offset[0]; + memmove(start_of_rscs + 4, + start_of_rscs, new_rsc_offset - table->offset[0]); + new_rsc_offset += 4; + + /* Update existing resource entry's offsets */ + for (i = 0; i < table->num; i++) + table->offset[i] += 4; + + /* Update the top level 'resource table' header */ + table->offset[table->num] = new_rsc_offset; + table->num++; + + /* Copy new firmware header into table */ + fw_header_loc = (void *)table + new_rsc_offset; + memcpy(fw_header_loc, &h, sizeof(h)); + + /* Copy new resource entry into table */ + new_rsc_loc = (void *)fw_header_loc + sizeof(h); + memcpy(new_rsc_loc, request->resource, request->size); + + *tablesz = size; + return table; +} + /* * take a firmware and boot a remote processor with it. */