Received: by 2002:ac0:aed5:0:0:0:0:0 with SMTP id t21csp2764446imb; Mon, 4 Mar 2019 13:38:04 -0800 (PST) X-Google-Smtp-Source: APXvYqxO4PWW14a1fG4Fvyej/eOeynVvWVj0t2VTyIbi3JJfY5BwS0NrOup6XmI+yvX8p6rEYvkM X-Received: by 2002:a17:902:2963:: with SMTP id g90mr22656965plb.182.1551735484098; Mon, 04 Mar 2019 13:38:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551735484; cv=none; d=google.com; s=arc-20160816; b=c5QAk4LWth2LnohxJJI/gPV4IrqOm+B7teepfrkdwxyDW+6N56sViLgMwDr165TeIN ONUvA63DRqD9EPQ8FU4voipkZISZk90C7ud9NcvN9XWXkfS7nOOUZlX1Og7JJSdBHtCH 4Ytr41TpFq/0u+8IASlW5j0e4mhwXbpwhpU9Zg6KSa+07sxg7pZOLoQHeassQwxgK3n6 xSohiMMsjtkVCejX4gPq/VQ3RuCK1ksR0f91wENcytKbADSJpdGMiFewWHAVIhTf6prX w/iKZm0V28YA9UzJDiIlRrqOfVnkrOlsC43h5/SEfO8mtxuql37yu1/OweGeq23vcFMg zptw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:references:in-reply-to:date :subject:cc:to:from; bh=IpfOIumXn+EGmgsON+/w6mEKiQ65qIA0zhrp/NMlZJA=; b=MWhycc+Sr+1nQvZe+u8QJb/xPjW9Wq7nPGlSZfEpyXe/sv2ZeY99iy59oafQPCIlRX 8SF1Ey0xqrNsAWDHdydLE2u0SU0lyh8gFdk+7Ca7fcAjIiKnuX7LrxM1suee6Zs14Jlq 5/eITPpUuJi4bmtt7JhxTEnfiE+yPElnLKgSNR5kuYlAFZY2RfJ8ACN0Q8W8zNBMnnzl n0cvROOaoX2yw4siqRZsYjF28N0sRxFg5Bgp9gir50NI2n5FfPMSj2vdFgbUNEizbqMB xqRovZJEHO93r99biqOXhXWwxmw4LSz2HrwQT8Xsnpkisn1nqU5DmLxHAnw2MOdhRVFN 5s0Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 1si6485237pln.122.2019.03.04.13.37.48; Mon, 04 Mar 2019 13:38:04 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726667AbfCDVhT (ORCPT + 99 others); Mon, 4 Mar 2019 16:37:19 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:36992 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726620AbfCDVhS (ORCPT ); Mon, 4 Mar 2019 16:37:18 -0500 Received: from pps.filterd (m0098404.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x24LWMRp141413 for ; Mon, 4 Mar 2019 16:37:18 -0500 Received: from e36.co.us.ibm.com (e36.co.us.ibm.com [32.97.110.154]) by mx0a-001b2d01.pphosted.com with ESMTP id 2r1adv3x4t-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 04 Mar 2019 16:37:17 -0500 Received: from localhost by e36.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 4 Mar 2019 21:37:17 -0000 Received: from b03cxnp08028.gho.boulder.ibm.com (9.17.130.20) by e36.co.us.ibm.com (192.168.1.136) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Mon, 4 Mar 2019 21:37:14 -0000 Received: from b03ledav002.gho.boulder.ibm.com (b03ledav002.gho.boulder.ibm.com [9.17.130.233]) by b03cxnp08028.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x24LbDZk31916170 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 4 Mar 2019 21:37:13 GMT Received: from b03ledav002.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3871113604F; Mon, 4 Mar 2019 21:37:13 +0000 (GMT) Received: from b03ledav002.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7432C136051; Mon, 4 Mar 2019 21:37:12 +0000 (GMT) Received: from talon7.ibm.com (unknown [9.41.179.222]) by b03ledav002.gho.boulder.ibm.com (Postfix) with ESMTP; Mon, 4 Mar 2019 21:37:12 +0000 (GMT) From: Eddie James To: linux-kernel@vger.kernel.org Cc: linux-aspeed@lists.ozlabs.org, devicetree@vger.kernel.org, robh+dt@kernel.org, mark.rutland@arm.com, joel@jms.id.au, andrew@aj.id.au, arnd@arndb.de, gregkh@linuxfoundation.org, jk@ozlabs.org, openbmc@lists.ozlabs.org, Eddie James Subject: [PATCH 5/6] drivers/misc: xdma: Add debugfs entries Date: Mon, 4 Mar 2019 15:36:59 -0600 X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1551735420-16202-1-git-send-email-eajames@linux.ibm.com> References: <1551735420-16202-1-git-send-email-eajames@linux.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 19030421-0020-0000-0000-00000EC46D93 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00010705; HX=3.00000242; KW=3.00000007; PH=3.00000004; SC=3.00000281; SDB=6.01169658; UDB=6.00611233; IPR=6.00950286; MB=3.00025831; MTD=3.00000008; XFM=3.00000015; UTC=2019-03-04 21:37:16 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19030421-0021-0000-0000-000064FD8AEE Message-Id: <1551735420-16202-6-git-send-email-eajames@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-03-04_11:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=3 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1903040151 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add debugfs entries for the relevant XDMA engine registers and for dumping the AST2500 reserved memory space. Signed-off-by: Eddie James --- drivers/misc/aspeed-xdma.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) diff --git a/drivers/misc/aspeed-xdma.c b/drivers/misc/aspeed-xdma.c index 0a1a093..a645a5f 100644 --- a/drivers/misc/aspeed-xdma.c +++ b/drivers/misc/aspeed-xdma.c @@ -142,6 +142,12 @@ struct aspeed_xdma { struct list_head vga_blks_free; struct miscdevice misc; + struct dentry *debugfs_dir; + +#if IS_ENABLED(CONFIG_DEBUG_FS) + struct debugfs_regset32 regset; + struct debugfs_reg32 regs[XDMA_NUM_DEBUGFS_REGS]; +#endif /* IS_ENABLED(CONFIG_DEBUG_FS) */ }; struct aspeed_xdma_client { @@ -634,6 +640,92 @@ static int aspeed_xdma_init_mem(struct aspeed_xdma *ctx) return 0; } +#if IS_ENABLED(CONFIG_DEBUG_FS) +static ssize_t aspeed_xdma_debugfs_vga_read(struct file *file, + char __user *buf, size_t len, + loff_t *offset) +{ + int rc; + struct inode *inode = file_inode(file); + struct aspeed_xdma *ctx = inode->i_private; + void __iomem *vga = ioremap(ctx->vga_phys, ctx->vga_size); + loff_t offs = *offset; + void *tmp; + + if (!vga) + return -ENOMEM; + + if (len + offs > ctx->vga_size) { + iounmap(vga); + return -EINVAL; + } + + tmp = kzalloc(len, GFP_KERNEL); + if (!tmp) { + iounmap(vga); + return -ENOMEM; + } + + memcpy_fromio(tmp, vga + offs, len); + + rc = copy_to_user(buf, tmp, len); + if (rc) { + iounmap(vga); + kfree(tmp); + return rc; + } + + *offset = offs + len; + + kfree(tmp); + iounmap(vga); + + return len; +} + +static const struct file_operations aspeed_xdma_debugfs_vga_fops = { + .owner = THIS_MODULE, + .llseek = generic_file_llseek, + .read = aspeed_xdma_debugfs_vga_read, +}; + +static void aspeed_xdma_init_debugfs(struct aspeed_xdma *ctx) +{ + ctx->debugfs_dir = debugfs_create_dir(DEVICE_NAME, NULL); + if (IS_ERR_OR_NULL(ctx->debugfs_dir)) { + dev_warn(ctx->dev, "Failed to create debugfs directory.\n"); + return; + } + + debugfs_create_file("vga", 0444, ctx->debugfs_dir, ctx, + &aspeed_xdma_debugfs_vga_fops); + + ctx->regs[0].name = "addr"; + ctx->regs[0].offset = XDMA_BMC_CMD_QUEUE_ADDR; + ctx->regs[1].name = "endp"; + ctx->regs[1].offset = XDMA_BMC_CMD_QUEUE_ENDP; + ctx->regs[2].name = "writep"; + ctx->regs[2].offset = XDMA_BMC_CMD_QUEUE_WRITEP; + ctx->regs[3].name = "readp"; + ctx->regs[3].offset = XDMA_BMC_CMD_QUEUE_READP; + ctx->regs[4].name = "control"; + ctx->regs[4].offset = XDMA_CTRL; + ctx->regs[5].name = "status"; + ctx->regs[5].offset = XDMA_STATUS; + + ctx->regset.regs = ctx->regs; + ctx->regset.nregs = XDMA_NUM_DEBUGFS_REGS; + ctx->regset.base = ctx->base; + + debugfs_create_regset32("regs", 0444, ctx->debugfs_dir, &ctx->regset); +} +#else +static void aspeed_xdma_init_debugfs(struct aspeed_xdma *ctx) +{ +} + +#endif /* IS_ENABLED(CONFIG_DEBUG_FS) */ + static void aspeed_xdma_free_vga_blks(struct aspeed_xdma *ctx) { struct aspeed_xdma_vga_blk *free; @@ -786,6 +878,8 @@ static int aspeed_xdma_probe(struct platform_device *pdev) device_create_file(dev, &dev_attr_use_bmc); device_create_file(dev, &dev_attr_use_vga); + aspeed_xdma_init_debugfs(ctx); + return 0; } @@ -793,6 +887,8 @@ static int aspeed_xdma_remove(struct platform_device *pdev) { struct aspeed_xdma *ctx = platform_get_drvdata(pdev); + debugfs_remove_recursive(ctx->debugfs_dir); + device_remove_file(ctx->dev, &dev_attr_use_vga); device_remove_file(ctx->dev, &dev_attr_use_bmc); -- 1.8.3.1