From patchwork Wed Aug 31 20:50:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Loic PALLARDY X-Patchwork-Id: 9307863 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 F02F060487 for ; Wed, 31 Aug 2016 20:55:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E04EE290BA for ; Wed, 31 Aug 2016 20:55:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D00C5290B2; Wed, 31 Aug 2016 20:55:55 +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 6F893290B2 for ; Wed, 31 Aug 2016 20:55:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760329AbcHaUux (ORCPT ); Wed, 31 Aug 2016 16:50:53 -0400 Received: from mx08-00178001.pphosted.com ([91.207.212.93]:59482 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1760305AbcHaUuu (ORCPT ); Wed, 31 Aug 2016 16:50:50 -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 u7VKnJ7g015771; Wed, 31 Aug 2016 22:50:47 +0200 Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx08-.pphosted.com with ESMTP id 255btkb8bv-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT); Wed, 31 Aug 2016 22:50:47 +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 6C1A831; Wed, 31 Aug 2016 20:50:46 +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 3AF2A50E2; Wed, 31 Aug 2016 20:50:46 +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:50:45 +0200 From: Loic Pallardy To: , , CC: , , , Subject: [PATCH v2 01/19] remoteproc: core: New API to add new resources to the resource table Date: Wed, 31 Aug 2016 22:50:04 +0200 Message-ID: <1472676622-32533-2-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 From: Lee Jones In order to amend or add a new resource table entry we need a method for a platform-specific to submit them. rproc_request_resource() is a new public API which provides this functionality. It is to be called between rproc_alloc() and rproc_add(). Signed-off-by: Lee Jones Signed-off-by: Loic Pallardy --- drivers/remoteproc/remoteproc_core.c | 40 ++++++++++++++++++++++++++++++++++++ include/linux/remoteproc.h | 21 +++++++++++++++++++ 2 files changed, 61 insertions(+) diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index 18f4286..fb2d2a0 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -791,6 +791,45 @@ static void rproc_resource_cleanup(struct rproc *rproc) rproc_remove_virtio_dev(rvdev); } +int rproc_request_resource(struct rproc *rproc, u32 type, void *resource) +{ + struct device *dev = &rproc->dev; + struct rproc_request_resource *request; + int size; + + request = devm_kzalloc(dev, sizeof(*request), GFP_KERNEL); + if (!request) + return -ENOMEM; + + switch (type) { + case RSC_CARVEOUT: + size = sizeof(struct fw_rsc_carveout); + break; + case RSC_DEVMEM: + size = sizeof(struct fw_rsc_devmem); + break; + case RSC_TRACE: + size = sizeof(struct fw_rsc_trace); + break; + default: + dev_err(dev, "Unsupported resource type: %d\n", type); + return -EINVAL; + } + + request->resource = devm_kzalloc(dev, size, GFP_KERNEL); + if (!request->resource) + return -ENOMEM; + + memcpy(request->resource, resource, size); + request->type = type; + request->size = size; + + list_add_tail(&request->node, &rproc->override_resources); + + return 0; +} +EXPORT_SYMBOL(rproc_request_resource); + /* * take a firmware and boot a remote processor with it. */ @@ -1387,6 +1426,7 @@ struct rproc *rproc_alloc(struct device *dev, const char *name, INIT_LIST_HEAD(&rproc->mappings); INIT_LIST_HEAD(&rproc->traces); INIT_LIST_HEAD(&rproc->rvdevs); + INIT_LIST_HEAD(&rproc->override_resources); INIT_WORK(&rproc->crash_handler, rproc_crash_handler_work); init_completion(&rproc->crash_comp); diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h index d488f9e..d0c0793 100644 --- a/include/linux/remoteproc.h +++ b/include/linux/remoteproc.h @@ -323,6 +323,25 @@ struct rproc_mem_entry { struct list_head node; }; +/** + * 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 + * @node: list node + * + * Resources can be added by platform-specific rproc drivers calling + * rproc_request_resource() + * + */ +struct rproc_request_resource { + void *resource; + u32 type; + u32 size; + struct list_head node; +}; + struct rproc; /** @@ -428,6 +447,7 @@ struct rproc { int num_traces; struct list_head carveouts; struct list_head mappings; + struct list_head override_resources; struct completion firmware_loading_complete; u32 bootaddr; struct list_head rvdevs; @@ -486,6 +506,7 @@ struct rproc_vdev { u32 rsc_offset; }; +int rproc_request_resource(struct rproc *rproc, u32 type, 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,