From patchwork Wed Aug 31 20:50:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Loic PALLARDY X-Patchwork-Id: 9307845 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 2300F60487 for ; Wed, 31 Aug 2016 20:54:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 14EC92909A for ; Wed, 31 Aug 2016 20:54:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 09742290B4; Wed, 31 Aug 2016 20:54:54 +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 67D292909A for ; Wed, 31 Aug 2016 20:54:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933248AbcHaUvY (ORCPT ); Wed, 31 Aug 2016 16:51:24 -0400 Received: from mx07-00178001.pphosted.com ([62.209.51.94]:42922 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933452AbcHaUvW (ORCPT ); Wed, 31 Aug 2016 16:51:22 -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 u7VKn9gv008638; Wed, 31 Aug 2016 22:51:20 +0200 Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-.pphosted.com with ESMTP id 255btaaqym-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT); Wed, 31 Aug 2016 22:51:20 +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 2635A31; Wed, 31 Aug 2016 20:51:19 +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 07E3050E2; Wed, 31 Aug 2016 20:51:19 +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:18 +0200 From: Loic Pallardy To: , , CC: , , , Subject: [PATCH v2 08/19] remoteproc: core: Associate action to resource request Date: Wed, 31 Aug 2016 22:50:11 +0200 Message-ID: <1472676622-32533-9-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 With new rproc_request_resource API, rproc driver has now the capability to provide resources to remoteproc in order to modify firmware resource table. But in some cases, other operations are needed like compatibility check between resources defined at firmware level and those handled by rproc driver, or remoteproc local resource management when firmware has no resource table. This patch associates action to each resource request to: - verify a resource - update/amend a resource in firmware resource table - handle locally a resource Signed-off-by: Loic Pallardy --- drivers/remoteproc/remoteproc_core.c | 13 ++++++++++++- include/linux/remoteproc.h | 26 +++++++++++++++++++++++++- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index 3282a4e..cd64fae 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -876,16 +876,20 @@ static void rproc_dump_resource_table(struct rproc *rproc, } } -int rproc_request_resource(struct rproc *rproc, u32 type, void *resource) +int rproc_request_resource(struct rproc *rproc, u32 type, u32 action, void *resource) { struct device *dev = &rproc->dev; struct rproc_request_resource *request; + struct fw_rsc_vdev *v; int size; request = devm_kzalloc(dev, sizeof(*request), GFP_KERNEL); if (!request) return -ENOMEM; + if (action > RSC_ACT_LAST) + return -EINVAL; + switch (type) { case RSC_CARVEOUT: size = sizeof(struct fw_rsc_carveout); @@ -896,6 +900,12 @@ int rproc_request_resource(struct rproc *rproc, u32 type, void *resource) case RSC_TRACE: size = sizeof(struct fw_rsc_trace); break; + case RSC_VDEV: + v = resource; + size = sizeof(struct fw_rsc_vdev); + size += v->num_of_vrings * sizeof(struct fw_rsc_vdev_vring); + size += v->config_len; + break; default: dev_err(dev, "Unsupported resource type: %d\n", type); return -EINVAL; @@ -908,6 +918,7 @@ int rproc_request_resource(struct rproc *rproc, u32 type, void *resource) memcpy(request->resource, resource, size); request->type = type; request->size = size; + request->action = action; list_add_tail(&request->node, &rproc->override_resources); diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h index 4e2f822..2b0f1d7 100644 --- a/include/linux/remoteproc.h +++ b/include/linux/remoteproc.h @@ -335,11 +335,34 @@ struct rproc_mem_entry { }; /** + * enum rproc_request_action - types of actions associated to a resource + * request + * + * @RSC_ACT_CHECK: request to verify this resource with firmware one + * @RSC_ACT_UPDATE: request to update firmware resource table with associated + * resource if possible + * @RSC_ACT_FORCE_UPDATE: force firmware resource table update with associated + * resource + * @RSC_ACT_LOCAL: request to handle this resource localy but not to update + * firmware resource table + * @RSC_ACT_LAST: just keep this one at the end + * + */ +enum rproc_request_action { + RSC_ACT_VERIFY = 0, + RSC_ACT_UPDATE = 1, + RSC_ACT_FORCE_UPDATE = 2, + RSC_ACT_LOCAL = 3, + RSC_ACT_LAST = 4, +}; + +/** * struct rproc_requested_resources - add a resource to the resource table * * @resource: pointer to a 'struct fw_rsc_*' resource * @type: 'fw_resource_type' resource type * @size: size of resource + * @action: action associated the resource * @node: list node * * Resources can be added by platform-specific rproc drivers calling @@ -350,6 +373,7 @@ struct rproc_request_resource { void *resource; u32 type; u32 size; + u32 action; struct list_head node; }; @@ -517,7 +541,7 @@ struct rproc_vdev { u32 rsc_offset; }; -int rproc_request_resource(struct rproc *rproc, u32 type, void *res); +int rproc_request_resource(struct rproc *rproc, u32 type, u32 action, void *res); struct rproc *rproc_get_by_phandle(phandle phandle); struct rproc *rproc_alloc(struct device *dev, const char *name, const struct rproc_ops *ops,