From patchwork Wed Oct 12 16:00:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Loic PALLARDY X-Patchwork-Id: 9373445 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 B5D1A607FD for ; Wed, 12 Oct 2016 16:03:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A525429686 for ; Wed, 12 Oct 2016 16:03:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 99A5E29688; Wed, 12 Oct 2016 16:03:02 +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 6A6F029686 for ; Wed, 12 Oct 2016 16:03:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753976AbcJLQC7 (ORCPT ); Wed, 12 Oct 2016 12:02:59 -0400 Received: from mx08-00178001.pphosted.com ([91.207.212.93]:6403 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753441AbcJLQCx (ORCPT ); Wed, 12 Oct 2016 12:02:53 -0400 Received: from pps.filterd (m0046660.ppops.net [127.0.0.1]) by mx08-00178001.pphosted.com (8.16.0.11/8.16.0.11) with SMTP id u9CFuR15029118; Wed, 12 Oct 2016 18:01:07 +0200 Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx08-.pphosted.com with ESMTP id 2615cgwhv1-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT); Wed, 12 Oct 2016 18:01:07 +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 C7A1038; Wed, 12 Oct 2016 16:01:06 +0000 (GMT) Received: from Webmail-eu.st.com (Safex1hubcas22.st.com [10.75.90.92]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id ACA682AB0; Wed, 12 Oct 2016 16:01:06 +0000 (GMT) Received: from localhost (10.201.23.23) by Webmail-ga.st.com (10.75.90.48) with Microsoft SMTP Server (TLS) id 14.3.279.2; Wed, 12 Oct 2016 18:01:06 +0200 From: Loic Pallardy To: , , CC: , , , Subject: [PATCH v3 02/20] remoteproc: core: Add function to dump resource table Date: Wed, 12 Oct 2016 18:00:20 +0200 Message-ID: <1476288038-24909-3-git-send-email-loic.pallardy@st.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1476288038-24909-1-git-send-email-loic.pallardy@st.com> References: <1476288038-24909-1-git-send-email-loic.pallardy@st.com> MIME-Version: 1.0 X-Originating-IP: [10.201.23.23] X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-10-12_09:, , 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 Firmware can be loaded with a resource table, which details resources needed by coprocessor like carevout memory, virtual device, trace log buffer etc. Until now, no method exists to display resource table content. This function adds the capability to display the different resources associated to a firmware if DEBUG is enabled. Signed-off-by: Lee Jones Signed-off-by: Loic Pallardy --- drivers/remoteproc/remoteproc_core.c | 85 ++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index 67633ee..3c8395b 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -785,6 +785,91 @@ static void rproc_resource_cleanup(struct rproc *rproc) rproc_remove_virtio_dev(rvdev); } +static void rproc_dump_resource_table(struct rproc *rproc, + struct resource_table *table, int size) +{ + static const char *types[] = {"carveout", "devmem", "trace", "vdev"}; + struct device *dev = &rproc->dev; + struct fw_rsc_carveout *c; + struct fw_rsc_devmem *d; + struct fw_rsc_trace *t; + struct fw_rsc_vdev *v; + int i, j; + + if (!table) { + dev_dbg(dev, "No resource table found\n"); + return; + } + + dev_dbg(dev, "Resource Table: Version %d with %d entries [size: %x]\n", + table->ver, table->num, size); + + for (i = 0; i < table->num; i++) { + int offset = table->offset[i]; + struct fw_rsc_hdr *hdr = (void *)table + offset; + void *rsc = (void *)hdr + sizeof(*hdr); + + switch (hdr->type) { + case RSC_CARVEOUT: + c = rsc; + dev_dbg(dev, "Entry %d is of type %s\n", i, types[hdr->type]); + dev_dbg(dev, " Device Address 0x%x\n", c->da); + dev_dbg(dev, " Physical Address 0x%x\n", c->pa); + dev_dbg(dev, " Length 0x%x Bytes\n", c->len); + dev_dbg(dev, " Flags 0x%x\n", c->flags); + dev_dbg(dev, " Reserved (should be zero) [%d]\n", c->reserved); + dev_dbg(dev, " Name %s\n\n", c->name); + break; + case RSC_DEVMEM: + d = rsc; + dev_dbg(dev, "Entry %d is of type %s\n", i, types[hdr->type]); + dev_dbg(dev, " Device Address 0x%x\n", d->da); + dev_dbg(dev, " Physical Address 0x%x\n", d->pa); + dev_dbg(dev, " Length 0x%x Bytes\n", d->len); + dev_dbg(dev, " Flags 0x%x\n", d->flags); + dev_dbg(dev, " Reserved (should be zero) [%d]\n", d->reserved); + dev_dbg(dev, " Name %s\n\n", d->name); + break; + case RSC_TRACE: + t = rsc; + dev_dbg(dev, "Entry %d is of type %s\n", i, types[hdr->type]); + dev_dbg(dev, " Device Address 0x%x\n", t->da); + dev_dbg(dev, " Length 0x%x Bytes\n", t->len); + dev_dbg(dev, " Reserved (should be zero) [%d]\n", t->reserved); + dev_dbg(dev, " Name %s\n\n", t->name); + break; + case RSC_VDEV: + v = rsc; + dev_dbg(dev, "Entry %d is of type %s\n", i, types[hdr->type]); + + dev_dbg(dev, " ID %d\n", v->id); + dev_dbg(dev, " Notify ID %d\n", v->notifyid); + dev_dbg(dev, " Device features 0x%x\n", v->dfeatures); + dev_dbg(dev, " Guest features 0x%x\n", v->gfeatures); + dev_dbg(dev, " Config length 0x%x\n", v->config_len); + dev_dbg(dev, " Status 0x%x\n", v->status); + dev_dbg(dev, " Number of vrings %d\n", v->num_of_vrings); + dev_dbg(dev, " Reserved (should be zero) [%d][%d]\n\n", + v->reserved[0], v->reserved[1]); + + for (j = 0; j < v->num_of_vrings; j++) { + dev_dbg(dev, " Vring %d\n", j); + dev_dbg(dev, " Device Address 0x%x\n", v->vring[j].da); + dev_dbg(dev, " Alignment %d\n", v->vring[j].align); + dev_dbg(dev, " Number of buffers %d\n", v->vring[j].num); + dev_dbg(dev, " Notify ID %d\n", v->vring[j].notifyid); + dev_dbg(dev, " Physical Address 0x%x\n\n", + v->vring[j].pa); + } + break; + default: + dev_dbg(dev, "Invalid resource type found: %d [hdr: %p]\n", + hdr->type, hdr); + return; + } + } +} + int rproc_request_resource(struct rproc *rproc, u32 type, void *resource) { struct device *dev = &rproc->dev;