From patchwork Wed Aug 31 20:50:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Loic PALLARDY X-Patchwork-Id: 9307805 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 D821260756 for ; Wed, 31 Aug 2016 20:52:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CAC3A2909A for ; Wed, 31 Aug 2016 20:52:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BF4AE290B0; Wed, 31 Aug 2016 20:52:04 +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 60C1E2909A for ; Wed, 31 Aug 2016 20:52:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933939AbcHaUwD (ORCPT ); Wed, 31 Aug 2016 16:52:03 -0400 Received: from mx07-00178001.pphosted.com ([62.209.51.94]:14421 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933795AbcHaUv7 (ORCPT ); Wed, 31 Aug 2016 16:51:59 -0400 Received: from pps.filterd (m0046668.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.16.0.11/8.16.0.11) with SMTP id u7VKmE8s004441; Wed, 31 Aug 2016 22:51:38 +0200 Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-.pphosted.com with ESMTP id 255bt0awgw-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT); Wed, 31 Aug 2016 22:51:38 +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 9DF7931; Wed, 31 Aug 2016 20:51:37 +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 894DB50E2; Wed, 31 Aug 2016 20:51:37 +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:36 +0200 From: Loic Pallardy To: , , CC: , , , Subject: [PATCH v2 12/19] remoteproc: core: Add vdev support and force mode to resource amending function Date: Wed, 31 Aug 2016 22:50:15 +0200 Message-ID: <1472676622-32533-13-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 proposes diverse updates to rproc_update_resource_table_entry function: - rename rproc_update_resource_table_entry to __update_rsc_tbl_entry to have shorter function name. - add RSC_VDEV support - add force mode resource even if resource already fixed on firmware side. Signed-off-by: Loic Pallardy --- drivers/remoteproc/remoteproc_core.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index 30e9c70..aff1a00 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -1027,13 +1027,15 @@ static int __verify_rsc_tbl_entry(struct rproc *rproc, return -EINVAL; } -static int rproc_update_resource_table_entry(struct rproc *rproc, +static int __update_rsc_tbl_entry(struct rproc *rproc, struct rproc_request_resource *request, - struct resource_table *table, int size) + struct resource_table *table, int size, + bool force) { struct fw_rsc_carveout *tblc, *newc; struct fw_rsc_devmem *tbld, *newd; struct fw_rsc_trace *tblt, *newt; + struct fw_rsc_vdev *tblv, *newv; int updated = true; int i; @@ -1054,7 +1056,8 @@ static int rproc_update_resource_table_entry(struct rproc *rproc, sizeof(*tblc->name))) break; - memcpy(tblc, newc, request->size); + if (tblc->pa == FW_RSC_ADDR_ANY || force) + memcpy(tblc, newc, request->size); return updated; case RSC_DEVMEM: @@ -1079,6 +1082,20 @@ static int rproc_update_resource_table_entry(struct rproc *rproc, memcpy(tblt, newt, request->size); return updated; + case RSC_VDEV: + tblv = rsc; + newv = request->resource; + if (newv->id != tblv->id) + break; + + if (request->size > (sizeof(*tblv) + + tblv->num_of_vrings * sizeof(struct fw_rsc_vdev_vring) + + tblv->config_len)) + return -ENOSPC; + + memcpy(tblv, newv, request->size); + + return updated; default: dev_err(&rproc->dev, "Unsupported resource type: %d\n", @@ -1176,8 +1193,8 @@ rproc_apply_resource_overrides(struct rproc *rproc, 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); + updated = __update_rsc_tbl_entry(rproc, resource, table, size, + false); if (updated < 0) { table = ERR_PTR(updated); goto out;