From patchwork Wed Aug 31 20:50:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Loic PALLARDY X-Patchwork-Id: 9307837 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 86AA3607D6 for ; Wed, 31 Aug 2016 20:54:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 79E19290F5 for ; Wed, 31 Aug 2016 20:54:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6E99D290E1; Wed, 31 Aug 2016 20:54:26 +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=unavailable 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 10FC2290B0 for ; Wed, 31 Aug 2016 20:54:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933901AbcHaUwB (ORCPT ); Wed, 31 Aug 2016 16:52:01 -0400 Received: from mx07-00178001.pphosted.com ([62.209.51.94]:6325 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933884AbcHaUv7 (ORCPT ); Wed, 31 Aug 2016 16:51:59 -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 u7VKnkDf009045; Wed, 31 Aug 2016 22:51:43 +0200 Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-.pphosted.com with ESMTP id 255btaar1u-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT); Wed, 31 Aug 2016 22:51:43 +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 703C031; Wed, 31 Aug 2016 20:51:42 +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 5396E50E2; Wed, 31 Aug 2016 20:51:42 +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:41 +0200 From: Loic Pallardy To: , , CC: , , , Subject: [PATCH v2 13/19] remoteproc: core: Append resource only if spare resource present Date: Wed, 31 Aug 2016 22:50:16 +0200 Message-ID: <1472676622-32533-14-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-remoteproc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch renames rproc_add_resource_table_entry in __add_rsc_tbl_entry to have shorter function name and adds spare resource support. To guarantee remoteproc won't overwrite firmware data when copying back modified resource table, __add_rsc_tbl_entry verifies first that resource table owns a spare resource and uses spare bytes to create a new resource entry. Spare resource is updated according to changes. Signed-off-by: Loic Pallardy --- drivers/remoteproc/remoteproc_core.c | 54 ++++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index aff1a00..25a429b 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -1107,39 +1107,34 @@ static int __update_rsc_tbl_entry(struct rproc *rproc, return !updated; } -static struct resource_table* -rproc_add_resource_table_entry(struct rproc *rproc, +static int __add_rsc_tbl_entry(struct rproc *rproc, struct rproc_request_resource *request, - struct resource_table *old_table, int *tablesz) + struct resource_table *table, int tablesz) { - struct resource_table *table; struct fw_rsc_hdr h; + struct fw_rsc_spare spare; void *new_rsc_loc; void *fw_header_loc; void *start_of_rscs; int new_rsc_offset; - int size = *tablesz; - int i; + int new_spare_offset; + int i, spare_index = 0; h.type = request->type; - new_rsc_offset = size; + /* check available spare size */ + spare.len = __get_rsc_tbl_spare_size(rproc, table, tablesz, &spare_index); + if (spare.len < (sizeof(h) + request->size + 4)) /* new offset entry */ + return -EPERM; - /* - * 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); + new_rsc_offset = table->offset[spare_index]; /* 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]); + + spare.len -= 4; new_rsc_offset += 4; /* Update existing resource entry's offsets */ @@ -1153,13 +1148,27 @@ rproc_add_resource_table_entry(struct rproc *rproc, /* Copy new firmware header into table */ fw_header_loc = (void *)table + new_rsc_offset; memcpy(fw_header_loc, &h, sizeof(h)); + spare.len -= 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); + spare.len -= request->size; - *tablesz = size; - return table; + /* create new rsc spare resource at the end of remaining spare */ + new_spare_offset = new_rsc_offset + sizeof(h) + request->size; + h.type = RSC_SPARE; + + fw_header_loc = (void *)table + new_spare_offset; + memcpy(fw_header_loc, &h, sizeof(h)); + + new_rsc_loc = (void *)fw_header_loc + sizeof(h); + memcpy(new_rsc_loc, &spare, sizeof(spare)); + + /* update spare offset */ + table->offset[spare_index] = new_spare_offset; + + return 0; } static struct resource_table* @@ -1203,12 +1212,9 @@ rproc_apply_resource_overrides(struct rproc *rproc, 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)) + updated = __add_rsc_tbl_entry(rproc, resource, table, size); + if (updated) goto out; - - *orig_table = table; } rproc_dump_resource_table(rproc, table, size);