From patchwork Wed Aug 31 20:50: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: 9307821 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 16C2C60756 for ; Wed, 31 Aug 2016 20:52:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 07F602909A for ; Wed, 31 Aug 2016 20:52:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F1108290B0; Wed, 31 Aug 2016 20:52:46 +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 A0BDD2909A for ; Wed, 31 Aug 2016 20:52:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932362AbcHaUwQ (ORCPT ); Wed, 31 Aug 2016 16:52:16 -0400 Received: from mx07-00178001.pphosted.com ([62.209.51.94]:8861 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934052AbcHaUwO (ORCPT ); Wed, 31 Aug 2016 16:52:14 -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 u7VKmDLB004438; Wed, 31 Aug 2016 22:52:11 +0200 Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-.pphosted.com with ESMTP id 255bt0awn9-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT); Wed, 31 Aug 2016 22:52:11 +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 D05C431; Wed, 31 Aug 2016 20:52:10 +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 BA33C50E2; Wed, 31 Aug 2016 20:52:10 +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:52:09 +0200 From: Loic Pallardy To: , , CC: , , , Subject: [PATCH v2 19/19] remoteproc: core: Support empty resource tables Date: Wed, 31 Aug 2016 22:50:22 +0200 Message-ID: <1472676622-32533-20-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 Currently, when a remote processor does not require resources, the platform-specific remoteproc driver has to create a fake resource table in order to by-pass the strict checking. But there is no hard requirement for a remote processor so require or support shared resources. This patch removes the strict checking and skips resource table related operations if none is provided. Signed-off-by: Lee Jones Signed-off-by: Loic Pallardy --- drivers/remoteproc/remoteproc_core.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index 73b460a..235ca2a 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -685,6 +685,9 @@ static int rproc_handle_resources(struct rproc *rproc, struct resource_table *ta rproc_handle_resource_t handler; int ret = 0, i; + if (!table_ptr) + return ret; + for (i = 0; i < table_ptr->num; i++) { int offset = table_ptr->offset[i]; struct fw_rsc_hdr *hdr = (void *)table_ptr + offset; @@ -1337,7 +1340,7 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw) struct device *dev = &rproc->dev; const char *name = rproc->firmware; struct resource_table *table, *loaded_table; - int ret, tablesz, local_tablesz; + int ret, tablesz = 0, local_tablesz; ret = rproc_fw_sanity_check(rproc, fw); if (ret) @@ -1361,8 +1364,8 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw) /* look for the resource table */ table = rproc_find_rsc_table(rproc, fw, &tablesz); if (!table) { - dev_err(dev, "Failed to find resource table\n"); - goto clean_up; + rproc->cached_table = table; + goto skip_resources; } /* verify resource table consistency */ @@ -1384,6 +1387,7 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw) goto clean_up; } +skip_resources: rproc->table_ptr = rproc->cached_table; if (!list_empty(&rproc->override_resources)) {