From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=AGA0=PN=lists.ozlabs.org=openbmc-bounces+openbmc=archiver.kernel.org@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id BE2CCC433FE
	for <openbmc@archiver.kernel.org>; Mon, 25 Oct 2021 10:08:04 +0000 (UTC)
Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by mail.kernel.org (Postfix) with ESMTPS id 267F660240
	for <openbmc@archiver.kernel.org>; Mon, 25 Oct 2021 10:08:03 +0000 (UTC)
DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 267F660240
Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=aspeedtech.com
Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.ozlabs.org
Received: from boromir.ozlabs.org (localhost [IPv6:::1])
	by lists.ozlabs.org (Postfix) with ESMTP id 4Hd9cy4hRcz2yfr
	for <openbmc@archiver.kernel.org>; Mon, 25 Oct 2021 21:08:02 +1100 (AEDT)
Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized)
 smtp.mailfrom=aspeedtech.com (client-ip=211.20.114.71;
 helo=twspam01.aspeedtech.com; envelope-from=jammy_huang@aspeedtech.com;
 receiver=<UNKNOWN>)
Received: from twspam01.aspeedtech.com (twspam01.aspeedtech.com
 [211.20.114.71])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by lists.ozlabs.org (Postfix) with ESMTPS id 4Hd9cR1cRtz2xCx;
 Mon, 25 Oct 2021 21:07:33 +1100 (AEDT)
Received: from mail.aspeedtech.com ([192.168.0.24])
 by twspam01.aspeedtech.com with ESMTP id 19P9idqG002949;
 Mon, 25 Oct 2021 17:44:39 +0800 (GMT-8)
 (envelope-from jammy_huang@aspeedtech.com)
Received: from [192.168.2.115] (192.168.2.115) by TWMBX02.aspeed.com
 (192.168.0.24) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 25 Oct
 2021 18:06:57 +0800
Message-ID: <fb73dfde-e7a3-8cb9-9a3b-7d85804cb134@aspeedtech.com>
Date: Mon, 25 Oct 2021 18:06:57 +0800
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101
 Thunderbird/91.2.0
Subject: Re: [PATCH v2] media: aspeed: add debugfs
Content-Language: en-US
To: Greg KH <gregkh@linuxfoundation.org>
References: <20210929090024.8499-1-jammy_huang@aspeedtech.com>
 <YXZj+m/fdYyPsIIK@kroah.com>
From: Jammy Huang <jammy_huang@aspeedtech.com>
In-Reply-To: <YXZj+m/fdYyPsIIK@kroah.com>
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 8bit
X-Originating-IP: [192.168.2.115]
X-ClientProxiedBy: TWMBX02.aspeed.com (192.168.0.24) To TWMBX02.aspeed.com
 (192.168.0.24)
X-DNSRBL: 
X-MAIL: twspam01.aspeedtech.com 19P9idqG002949
X-BeenThere: openbmc@lists.ozlabs.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Development list for OpenBMC <openbmc.lists.ozlabs.org>
List-Unsubscribe: <https://lists.ozlabs.org/options/openbmc>,
 <mailto:openbmc-request@lists.ozlabs.org?subject=unsubscribe>
List-Archive: <http://lists.ozlabs.org/pipermail/openbmc/>
List-Post: <mailto:openbmc@lists.ozlabs.org>
List-Help: <mailto:openbmc-request@lists.ozlabs.org?subject=help>
List-Subscribe: <https://lists.ozlabs.org/listinfo/openbmc>,
 <mailto:openbmc-request@lists.ozlabs.org?subject=subscribe>
Cc: BMC-SW <BMC-SW@aspeedtech.com>,
 "linux-aspeed@lists.ozlabs.org" <linux-aspeed@lists.ozlabs.org>,
 "andrew@aj.id.au" <andrew@aj.id.au>,
 "openbmc@lists.ozlabs.org" <openbmc@lists.ozlabs.org>,
 "eajames@linux.ibm.com" <eajames@linux.ibm.com>,
 "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
 "mchehab@kernel.org" <mchehab@kernel.org>,
 "linux-arm-kernel@lists.infradead.org" <linux-arm-kernel@lists.infradead.org>,
 "linux-media@vger.kernel.org" <linux-media@vger.kernel.org>
Errors-To: openbmc-bounces+openbmc=archiver.kernel.org@lists.ozlabs.org
Sender: "openbmc"
 <openbmc-bounces+openbmc=archiver.kernel.org@lists.ozlabs.org>

Dear Greg,

Yes, you are right. I will update accordingly.


On 2021/10/25 下午 03:59, Greg KH wrote:
> On Wed, Sep 29, 2021 at 05:00:25PM +0800, Jammy Huang wrote:
>> To show video real-time information as below:
>>
>> Caputre:
>>    Signal              : Unlock
>>    Width               : 1920
>>    Height              : 1080
>>    FRC                 : 30
>>
>> Performance:
>>    Frame#              : 0
>>    Frame Duration      :
>>      Now               : 0
>>      Min               : 0
>>      Max               : 0
>>    FPS(ms)             : 0
>>
>> Change-Id: I483740c4df6db07a9261c18440472a0356512bb7
>> Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com>
>> ---
>>   drivers/media/platform/aspeed-video.c | 101 ++++++++++++++++++++++++++
>>   1 file changed, 101 insertions(+)
>>
>> diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c
>> index 8b3939b8052d..c5c413844441 100644
>> --- a/drivers/media/platform/aspeed-video.c
>> +++ b/drivers/media/platform/aspeed-video.c
>> @@ -21,6 +21,8 @@
>>   #include <linux/videodev2.h>
>>   #include <linux/wait.h>
>>   #include <linux/workqueue.h>
>> +#include <linux/debugfs.h>
>> +#include <linux/ktime.h>
>>   #include <media/v4l2-ctrls.h>
>>   #include <media/v4l2-dev.h>
>>   #include <media/v4l2-device.h>
>> @@ -203,6 +205,14 @@ struct aspeed_video_buffer {
>>   	struct list_head link;
>>   };
>>   
>> +struct aspeed_video_perf {
>> +	ktime_t last_sample;
>> +	u32 totaltime;
>> +	u32 duration;
>> +	u32 duration_min;
>> +	u32 duration_max;
>> +};
>> +
>>   #define to_aspeed_video_buffer(x) \
>>   	container_of((x), struct aspeed_video_buffer, vb)
>>   
>> @@ -241,6 +251,8 @@ struct aspeed_video {
>>   	unsigned int frame_left;
>>   	unsigned int frame_right;
>>   	unsigned int frame_top;
>> +
>> +	struct aspeed_video_perf perf;
>>   };
>>   
>>   #define to_aspeed_video(x) container_of((x), struct aspeed_video, v4l2_dev)
>> @@ -444,6 +456,16 @@ static void aspeed_video_write(struct aspeed_video *video, u32 reg, u32 val)
>>   		readl(video->base + reg));
>>   }
>>   
>> +static void update_perf(struct aspeed_video_perf *p)
>> +{
>> +	p->duration =
>> +		ktime_to_ms(ktime_sub(ktime_get(),  p->last_sample));
>> +	p->totaltime += p->duration;
>> +
>> +	p->duration_max = max(p->duration, p->duration_max);
>> +	p->duration_min = min(p->duration, p->duration_min);
>> +}
>> +
>>   static int aspeed_video_start_frame(struct aspeed_video *video)
>>   {
>>   	dma_addr_t addr;
>> @@ -482,6 +504,8 @@ static int aspeed_video_start_frame(struct aspeed_video *video)
>>   	aspeed_video_update(video, VE_INTERRUPT_CTRL, 0,
>>   			    VE_INTERRUPT_COMP_COMPLETE);
>>   
>> +	video->perf.last_sample = ktime_get();
>> +
>>   	aspeed_video_update(video, VE_SEQ_CTRL, 0,
>>   			    VE_SEQ_CTRL_TRIG_CAPTURE | VE_SEQ_CTRL_TRIG_COMP);
>>   
>> @@ -600,6 +624,8 @@ static irqreturn_t aspeed_video_irq(int irq, void *arg)
>>   		u32 frame_size = aspeed_video_read(video,
>>   						   VE_JPEG_COMP_SIZE_READ_BACK);
>>   
>> +		update_perf(&video->perf);
>> +
>>   		spin_lock(&video->lock);
>>   		clear_bit(VIDEO_FRAME_INPRG, &video->flags);
>>   		buf = list_first_entry_or_null(&video->buffers,
>> @@ -760,6 +786,7 @@ static void aspeed_video_get_resolution(struct aspeed_video *video)
>>   	det->width = MIN_WIDTH;
>>   	det->height = MIN_HEIGHT;
>>   	video->v4l2_input_status = V4L2_IN_ST_NO_SIGNAL;
>> +	memset(&video->perf, 0, sizeof(video->perf));
>>   
>>   	do {
>>   		if (tries) {
>> @@ -1450,6 +1477,8 @@ static int aspeed_video_start_streaming(struct vb2_queue *q,
>>   	struct aspeed_video *video = vb2_get_drv_priv(q);
>>   
>>   	video->sequence = 0;
>> +	video->perf.duration_max = 0;
>> +	video->perf.duration_min = 0xffffffff;
>>   
>>   	rc = aspeed_video_start_frame(video);
>>   	if (rc) {
>> @@ -1517,6 +1546,72 @@ static const struct vb2_ops aspeed_video_vb2_ops = {
>>   	.buf_queue =  aspeed_video_buf_queue,
>>   };
>>   
>> +#ifdef CONFIG_DEBUG_FS
>> +static int aspeed_video_debugfs_show(struct seq_file *s, void *data)
>> +{
>> +	struct aspeed_video *v = s->private;
>> +
>> +	seq_puts(s, "\n");
>> +
>> +	seq_printf(s, "  %-20s:\t%s\n", "Signal",
>> +		   v->v4l2_input_status ? "Unlock" : "Lock");
>> +	seq_printf(s, "  %-20s:\t%d\n", "Width", v->pix_fmt.width);
>> +	seq_printf(s, "  %-20s:\t%d\n", "Height", v->pix_fmt.height);
>> +	seq_printf(s, "  %-20s:\t%d\n", "FRC", v->frame_rate);
>> +
>> +	seq_puts(s, "\n");
>> +
>> +	seq_puts(s, "Performance:\n");
>> +	seq_printf(s, "  %-20s:\t%d\n", "Frame#", v->sequence);
>> +	seq_printf(s, "  %-20s:\n", "Frame Duration");
>> +	seq_printf(s, "    %-18s:\t%d\n", "Now", v->perf.duration);
>> +	seq_printf(s, "    %-18s:\t%d\n", "Min", v->perf.duration_min);
>> +	seq_printf(s, "    %-18s:\t%d\n", "Max", v->perf.duration_max);
>> +	seq_printf(s, "  %-20s:\t%d\n", "FPS(ms)", 1000/(v->perf.totaltime/v->sequence));
>> +
>> +
>> +	return 0;
>> +}
>> +
>> +int aspeed_video_proc_open(struct inode *inode, struct file *file)
>> +{
>> +	return single_open(file, aspeed_video_debugfs_show, inode->i_private);
>> +}
>> +
>> +static struct file_operations aspeed_video_debugfs_ops = {
>> +	.owner   = THIS_MODULE,
>> +	.open    = aspeed_video_proc_open,
>> +	.read    = seq_read,
>> +	.llseek  = seq_lseek,
>> +	.release = single_release,
>> +};
>> +
>> +static struct dentry *debugfs_entry;
>> +
>> +static void aspeed_video_debugfs_remove(struct aspeed_video *video)
>> +{
>> +	debugfs_remove_recursive(debugfs_entry);
>> +	debugfs_entry = NULL;
>> +}
>> +
>> +static int aspeed_video_debugfs_create(struct aspeed_video *video)
>> +{
>> +	debugfs_entry = debugfs_create_file(DEVICE_NAME, 0444, NULL,
>> +						   video,
>> +						   &aspeed_video_debugfs_ops);
>> +	if (!debugfs_entry)
>> +		aspeed_video_debugfs_remove(video);
> This check will never happen, why are you making it?
>
> There's no need to care if debugfs works or not, just create the file
> and move on.  This function should not return anything.
>
>> +
>> +	return debugfs_entry == NULL ? -EIO : 0;
>> +}
>> +#else
>> +static void aspeed_video_debugfs_remove(struct aspeed_video *video) { }
>> +static int aspeed_video_debugfs_create(struct aspeed_video *video)
>> +{
>> +	return 0;
>> +}
>> +#endif /* CONFIG_DEBUG_FS */
>> +
>>   static int aspeed_video_setup_video(struct aspeed_video *video)
>>   {
>>   	const u64 mask = ~(BIT(V4L2_JPEG_CHROMA_SUBSAMPLING_444) |
>> @@ -1708,6 +1803,10 @@ static int aspeed_video_probe(struct platform_device *pdev)
>>   		return rc;
>>   	}
>>   
>> +	rc = aspeed_video_debugfs_create(video);
>> +	if (rc)
>> +		dev_err(video->dev, "debugfs create failed\n");
> As proof of this, you don't care if this doesn't work, you just print
> out a message that was already printed out :(
>
> thanks,
>
> greg k-h

-- 
--
Best Regards
Jammy