From patchwork Fri Dec 1 14:04:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 172500 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp1142101vqy; Fri, 1 Dec 2023 06:05:11 -0800 (PST) X-Google-Smtp-Source: AGHT+IFMvShxAFo6XzP2fUgs+DXfvTAeQ7L8dNJI6K93mWSXbD+mO7Tjv52+DYY1cg/+M8X65Ijl X-Received: by 2002:a17:903:607:b0:1cf:8a91:a84e with SMTP id kg7-20020a170903060700b001cf8a91a84emr20758046plb.50.1701439511000; Fri, 01 Dec 2023 06:05:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701439510; cv=none; d=google.com; s=arc-20160816; b=OmJ6TwZ8uaxSR+5Ff//fK5KIJPHBfkbEnVdFOZvLMQn9TFQQTOauXbtYfyeyRDDVVR xMQ8s4rwkOZwG2HjPGIeWJFJd0CDMnp9AE1hTKJaXCAKRHQS6hE/sPIrQ4F8ViaAX4x5 66c1SCFYQjyD5IfhzB8VdPWfd08swczvKAOuoCSEIUQTPhCm6oVR/GaU41lzSv3dQiB2 96t4Ffa90n87JCSY1PQyptj0ai7rneDPlF2sBLMge9cFZmOi82tA9+UK2SCGbOuBdvlK zwpXOBAF96wtQ/95zx0nZLXHeU/YONr0N8Wkj88CQBE0wJNMLBZnL8Y96CORzUmiAwt6 DSKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=VFR8SzIqEOONJ6ks4L5si9xhBm/E8JQcQXpiokDIIuI=; fh=I4RLCLw/dMKPX9xPZZ8+mL0LeKDitseWF0AaQr+3mks=; b=DE43xkLO76B2tOilutC4hxO2xp8Jyh1EF3rI5Zr3FaP+ailEjBaTgD/DHQpKqTv6SA 5Lk94a5c1xmd+0BwI99uOnIiUrz6/TIfFKaVnhu14yWI3LKYW5SAuRvuR2gAjC+wPJJk LM0yL5J9LMtGaChvc9IijnFWSPgEbtARkRSXIDZvw9DketjY8CnwnIns34CTZIi0x7+Y Iyj3D7DX9CZa8xta852qmVcxx94uI4ilqJSlWIEM95oqMiVk2s2yAgf1s8m8d+vKwsh6 ai1446Q12u1I4/gM2E7SjB47xf9UHFcxljHSxW8jhKX4uzDlEnTadrLXx/P2w+vKIMUe mYTw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b="Bs4yQcW/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id c14-20020a170903234e00b001d044978d7esi2729302plh.598.2023.12.01.06.05.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Dec 2023 06:05:10 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b="Bs4yQcW/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 05A92836E269; Fri, 1 Dec 2023 06:05:00 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1379098AbjLAOEv (ORCPT + 99 others); Fri, 1 Dec 2023 09:04:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56240 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1379060AbjLAOEu (ORCPT ); Fri, 1 Dec 2023 09:04:50 -0500 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9F6D094; Fri, 1 Dec 2023 06:04:56 -0800 (PST) Received: from pyrite.hamster-moth.ts.net (h175-177-049-156.catv02.itscom.jp [175.177.49.156]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 22F67138C; Fri, 1 Dec 2023 15:04:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1701439457; bh=6zAIEj5ay2gT7+AvgvT+WUyzdRwwv76PYE4uLNb3qOg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Bs4yQcW/vUdx9xaVmGD7CpLkHEu69wWuVl/djvZU0fy+fZTmDBUhNtZ6czqnNIUPs aM1PGitQ4siHqyu2UvsLCVLdAXLNbiG2JcPzLNTDHDBj5CZhF0NJ5R8ZKW+DSb8sKo gMcrmimq8GEvoBE0Pn+B+/SeLldJcmSmUX1T9/3Q= From: Paul Elder To: linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org Cc: laurent.pinchart@ideasonboard.com, kieran.bingham@ideasonboard.com, tomi.valkeinen@ideasonboard.com, umang.jain@ideasonboard.com, Paul Elder , Dafna Hirschfeld , Mauro Carvalho Chehab , Heiko Stuebner , linux-arm-kernel@lists.infradead.org (moderated list:ARM/Rockchip SoC support), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v2 1/4] media: rkisp1: regs: Consolidate MI interrupt wrap fields Date: Fri, 1 Dec 2023 23:04:30 +0900 Message-Id: <20231201140433.2126011-2-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231201140433.2126011-1-paul.elder@ideasonboard.com> References: <20231201140433.2126011-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Fri, 01 Dec 2023 06:05:00 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784088636653727555 X-GMAIL-MSGID: 1784088636653727555 Consolidate the wraparound fields in the memory interface interrupt status registers, so that it can be more succinctly expressed by taking the stream ID (main or self) as a parameter. Signed-off-by: Paul Elder Reviewed-by: Kieran Bingham Reviewed-by: Laurent Pinchart --- drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h index 350f452e676f..bea69a0d766a 100644 --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h @@ -172,12 +172,9 @@ #define RKISP1_CIF_MI_FRAME(stream) BIT((stream)->id) #define RKISP1_CIF_MI_MBLK_LINE BIT(2) #define RKISP1_CIF_MI_FILL_MP_Y BIT(3) -#define RKISP1_CIF_MI_WRAP_MP_Y BIT(4) -#define RKISP1_CIF_MI_WRAP_MP_CB BIT(5) -#define RKISP1_CIF_MI_WRAP_MP_CR BIT(6) -#define RKISP1_CIF_MI_WRAP_SP_Y BIT(7) -#define RKISP1_CIF_MI_WRAP_SP_CB BIT(8) -#define RKISP1_CIF_MI_WRAP_SP_CR BIT(9) +#define RKISP1_CIF_MI_WRAP_Y(stream) BIT(4 + (stream)->id * 3) +#define RKISP1_CIF_MI_WRAP_CB(stream) BIT(5 + (stream)->id * 3) +#define RKISP1_CIF_MI_WRAP_CR(stream) BIT(6 + (stream)->id * 3) #define RKISP1_CIF_MI_DMA_READY BIT(11) /* MI_STATUS */ From patchwork Fri Dec 1 14:04:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 172501 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp1142142vqy; Fri, 1 Dec 2023 06:05:14 -0800 (PST) X-Google-Smtp-Source: AGHT+IHFpb07rloB4ip6vW7ndTiiAX/sy6EcVAsBFxmrKfj8pqHEr9r6iRfH4RuEINHHlhkpgOY3 X-Received: by 2002:a05:6a00:2190:b0:6cd:fda4:b57c with SMTP id h16-20020a056a00219000b006cdfda4b57cmr2672845pfi.15.1701439513652; Fri, 01 Dec 2023 06:05:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701439513; cv=none; d=google.com; s=arc-20160816; b=xsSShwiJFxb/QgoIvrC8m7nw91/g/tyQYqXesWoUJSCsGKGKr0Z0IufRJ60rp9GsH5 9WItvJM1P4bYx5UsO3uHxCw1bXu9GGrb+WsXWPpTn7lRZJRN7vemDvrYCCDUiSS/Dw/t DgNCT3cIh1t5V/IQ6HtGU3mTEavpOt1IFphFlrkotWOFO34tyGXic3MRYcyfQeYaALml r2FW6jd97TIZPyoAykK3RSy9QfL0Jt5UBfZCZH9ZAQHy9yN9N5fZ3TcMv1WunAeUikrI PM5pT03UpJTapLRRHN3Uf2bK/1PnhD8ua2OE9XV/lRZ9FT4qZPN+NCQJ6DaUCIN8Hlj6 OLjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=u8uzoOZqDr+Dg8oZJeDFBZYVMXOdSPyGupQb2yLgWW4=; fh=zrfhwYqK3v7+0qLNkzAy3gisHg4j69MIGE7UPruxbVs=; b=oLPXYjj8XH3KSTs9JLs60LHepIHbYuVjMl822ZC1hMkPyIUWsRHlMIzjwXN7xs907R frlp9t3S9TZC1jfxFl4CKKNCh6FOFJ2/n/4eOjtXzq8ySBERgwHycnb39BkhnYHvLdMh hcn1ULkLPhxYLWNQY/bl1c2ZXRh7bmBos3egFzxE53d+Th0cJRgy4Bj0wyLVv8G67TIU FlW+VgRkDOD5d0Wsq/WeKzSSwqU8uFPtrCoPTuOwXfZtaoVcB86mTkj6eiuTNkKh1Qwy oTXYfIBZ3oe90++eFitzDMBWqYc7plHiq7n2t6VRSvZVMjmfkq/DKdFVehaUgPVp/Ec/ CCZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b=Bn5kQflY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id n185-20020a6327c2000000b005c2188ae892si3504761pgn.583.2023.12.01.06.05.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Dec 2023 06:05:13 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b=Bn5kQflY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 9D179810683B; Fri, 1 Dec 2023 06:05:05 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1379106AbjLAOE4 (ORCPT + 99 others); Fri, 1 Dec 2023 09:04:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42024 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1379060AbjLAOEy (ORCPT ); Fri, 1 Dec 2023 09:04:54 -0500 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D796094; Fri, 1 Dec 2023 06:05:00 -0800 (PST) Received: from pyrite.hamster-moth.ts.net (h175-177-049-156.catv02.itscom.jp [175.177.49.156]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id E3A3118A2; Fri, 1 Dec 2023 15:04:17 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1701439462; bh=GCySINWmuCR5JodNHhNRp4B30t3rx5GHASe7kUWliPk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Bn5kQflYY6ZjgS3HSwJuWGk06QH7hZbvaEufHauqZ8LtlOMT0f3Ob9ErzD5scA+MX i+DjWr/Z8tjLamXiSMxFBHzBdYekA3spRIeZiAMLD2E15GempKuwoQNWg5Gmi/yQCh Nw7LbxSuHjE/MCUOV1LqL//sPyfgn8pSkDDCloVo= From: Paul Elder To: linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org Cc: laurent.pinchart@ideasonboard.com, kieran.bingham@ideasonboard.com, tomi.valkeinen@ideasonboard.com, umang.jain@ideasonboard.com, Paul Elder , Alexander Stein , Dafna Hirschfeld , Mauro Carvalho Chehab , Heiko Stuebner , linux-arm-kernel@lists.infradead.org (moderated list:ARM/Rockchip SoC support), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v2 2/4] media: rkisp1: debug: Add register dump for IS Date: Fri, 1 Dec 2023 23:04:31 +0900 Message-Id: <20231201140433.2126011-3-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231201140433.2126011-1-paul.elder@ideasonboard.com> References: <20231201140433.2126011-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Fri, 01 Dec 2023 06:05:05 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784088639524621626 X-GMAIL-MSGID: 1784088639524621626 Add register dump for the ISP image stabilizer module to debugfs. This helps debugging issues related to digital zoom. Signed-off-by: Paul Elder Tested-by: Alexander Stein Reviewed-by: Kieran Bingham Signed-off-by: Laurent Pinchart --- Changes in v2: - Move from IS debugfs file into the ISP debugfs file drivers/media/platform/rockchip/rkisp1/rkisp1-debug.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-debug.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-debug.c index 71df3dc95e6f..d2fbed42164e 100644 --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-debug.c +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-debug.c @@ -92,6 +92,10 @@ static int rkisp1_debug_dump_isp_regs_show(struct seq_file *m, void *p) RKISP1_DEBUG_REG(ISP_FLAGS_SHD), RKISP1_DEBUG_REG(ISP_RIS), RKISP1_DEBUG_REG(ISP_ERR), + RKISP1_DEBUG_SHD_REG(ISP_IS_H_OFFS), + RKISP1_DEBUG_SHD_REG(ISP_IS_V_OFFS), + RKISP1_DEBUG_SHD_REG(ISP_IS_H_SIZE), + RKISP1_DEBUG_SHD_REG(ISP_IS_V_SIZE), { /* Sentinel */ }, }; struct rkisp1_device *rkisp1 = m->private; From patchwork Fri Dec 1 14:04:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 172502 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp1142376vqy; Fri, 1 Dec 2023 06:05:26 -0800 (PST) X-Google-Smtp-Source: AGHT+IE2Zem+ZOjaFqHmeRs+dpk8vVNAL+HUOQE06nWx4+UN1n+a4ZyJL/BNy2Ozc4mQEI4DiQRF X-Received: by 2002:a05:6820:80b:b0:57b:86f5:701c with SMTP id bg11-20020a056820080b00b0057b86f5701cmr3043606oob.4.1701439525901; Fri, 01 Dec 2023 06:05:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701439525; cv=none; d=google.com; s=arc-20160816; b=kdkv0j57J9U2pP727uUcRQKprGW+WbOmfQQEDYlekb2P1LSUFFXtIeDJ872ITdEOwy gZ/q8yNlMyeJNGax3y+qoQ5TRKZxpeCe+61PNYG9DzIWbfLotU7hFwkzgl+OXlra+erY lOMqldjqBbAmbUMQE3P1qS5RkvJLQy7mDSV0fEbXgP6OCx+Nmj97Tyj4IIvg5dTLBxlT fyhdzuzON5Kj6seaLUg/o5LIYIOLaxBPT9Up4FUBLu7SuYvbFUrlFAVWwc6WO5+mWiGW Bca4sgg5HqK+w9+OSqF1Utf24HtsDSlhn5KcNk+vcsIleIG1GtNqDaw95L8DsX9WikSK Pgsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=RuLDE5oTha4iVxMSLYf2kZe12POzxrIv3GC7XFQ/GhE=; fh=zrfhwYqK3v7+0qLNkzAy3gisHg4j69MIGE7UPruxbVs=; b=yok/kwWyncS/bjgVE8RSPBN/vS9zNbelnRwv2CIaK6RurbzNsDVOXBA0AlOuRs63iJ NVmIGD6vIC76AqL3BijV/R6FlPW25esPbkfatpOhngkSv1wOBNYQvHA2hKrSDgcvj4zE Bud9mPOKgeBoKkhVberMV8PxxUNoQ8lQIlBEzqEYj6Vl60Cr8ww6+mMEqjEcMtSqgkIp vM8WxPwkLtZjVUSuB2QPBMusOaoP+F3NO8kda6XZbwj6ARRpi5WDF345zdXTDvFvI8uD 17HcHkjMde7dQZSVu4fx4SYqEDjrUwxq+v1UhbgUSKvXza/mvsvEOuXZ3fUCZRexS3fS LAUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b=qa1SZLwH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id b3-20020a4a3403000000b0058400ae8feesi1282867ooa.75.2023.12.01.06.05.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Dec 2023 06:05:25 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b=qa1SZLwH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 6F0808106868; Fri, 1 Dec 2023 06:05:12 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1379107AbjLAOFD (ORCPT + 99 others); Fri, 1 Dec 2023 09:05:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42150 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1379114AbjLAOE7 (ORCPT ); Fri, 1 Dec 2023 09:04:59 -0500 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 57CAE1B2; Fri, 1 Dec 2023 06:05:05 -0800 (PST) Received: from pyrite.hamster-moth.ts.net (h175-177-049-156.catv02.itscom.jp [175.177.49.156]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id D4D64FAD; Fri, 1 Dec 2023 15:04:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1701439467; bh=MFcStENnnolCSllpVqU3n3QSpfDjGV2JE1o/1bWj2kw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qa1SZLwHWB9/IALx/ETlJuQtmJcmv5BtbnooiP5QzYVp2ZvlKKBZCcfPb68UruJXw ivdpwxsKhv0P/FQovfBYBo5c0pAAqsN+bsLefogBotizdxhN02TTJzA/bL4c4GqbGu nU6qoldIDPqXTwj+U8f2MxesCQRgs4fsohKGDDy0= From: Paul Elder To: linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org Cc: laurent.pinchart@ideasonboard.com, kieran.bingham@ideasonboard.com, tomi.valkeinen@ideasonboard.com, umang.jain@ideasonboard.com, Paul Elder , Alexander Stein , Dafna Hirschfeld , Mauro Carvalho Chehab , Heiko Stuebner , linux-arm-kernel@lists.infradead.org (moderated list:ARM/Rockchip SoC support), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v2 3/4] media: rkisp1: debug: Count completed frame interrupts Date: Fri, 1 Dec 2023 23:04:32 +0900 Message-Id: <20231201140433.2126011-4-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231201140433.2126011-1-paul.elder@ideasonboard.com> References: <20231201140433.2126011-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Fri, 01 Dec 2023 06:05:12 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784088652019861838 X-GMAIL-MSGID: 1784088652019861838 Add a counter to debugfs to count the number of frame-end interrupts. Signed-off-by: Paul Elder Reviewed-by: Alexander Stein Reviewed-by: Kieran Bingham Reviewed-by: Laurent Pinchart --- drivers/media/platform/rockchip/rkisp1/rkisp1-common.h | 1 + drivers/media/platform/rockchip/rkisp1/rkisp1-debug.c | 2 ++ drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c | 2 ++ 3 files changed, 5 insertions(+) diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h index 1e7cea1bea5e..be69173958a4 100644 --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h @@ -417,6 +417,7 @@ struct rkisp1_debug { unsigned long stats_error; unsigned long stop_timeout[2]; unsigned long frame_drop[2]; + unsigned long complete_frames; }; /* diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-debug.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-debug.c index d2fbed42164e..79cda589d935 100644 --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-debug.c +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-debug.c @@ -221,6 +221,8 @@ void rkisp1_debug_init(struct rkisp1_device *rkisp1) &debug->frame_drop[RKISP1_MAINPATH]); debugfs_create_ulong("sp_frame_drop", 0444, debug->debugfs_dir, &debug->frame_drop[RKISP1_SELFPATH]); + debugfs_create_ulong("complete_frames", 0444, debug->debugfs_dir, + &debug->complete_frames); debugfs_create_file("input_status", 0444, debug->debugfs_dir, rkisp1, &rkisp1_debug_input_status_fops); diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c index 88ca8b2283b7..bd3acd926410 100644 --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c @@ -989,6 +989,8 @@ irqreturn_t rkisp1_isp_isr(int irq, void *ctx) if (status & RKISP1_CIF_ISP_FRAME) { u32 isp_ris; + rkisp1->debug.complete_frames++; + /* New frame from the sensor received */ isp_ris = rkisp1_read(rkisp1, RKISP1_CIF_ISP_RIS); if (isp_ris & RKISP1_STATS_MEAS_MASK) From patchwork Fri Dec 1 14:04:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 172503 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp1142655vqy; Fri, 1 Dec 2023 06:05:42 -0800 (PST) X-Google-Smtp-Source: AGHT+IH7rC3RVqqPFaVnb5SgKHTB7N4jl8ffj92Wp33wgV25xRJ9OK0e/K87QXD4AJ16GQeucxU5 X-Received: by 2002:a05:6a21:1a2:b0:18b:d207:d84d with SMTP id le34-20020a056a2101a200b0018bd207d84dmr30225833pzb.0.1701439542383; Fri, 01 Dec 2023 06:05:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701439542; cv=none; d=google.com; s=arc-20160816; b=XSU54dGvTNgwtFPYlybJvpdVsFzWXSdalpg14xj6d/kdJVMZhkTZnvuR0j1KsOUbZY AhNyRpYEaewJD/xuSQBMBCyU5+V3sE+UFql/JGT8vuymCudQsk3GRWgHJp9c6zhsLohO ZG/flHMj2u+0+83nVIYLsixJm8kWcF7wuBbyE3oxQ6v4CRZA0Tp9+KSdiyg1OMSfFjEv 8Gc1HF9f/0mNNB4pRbC2tk04sx04pBS8CqL5xA2X5Ic7y8hOxOq/IFG8mEdFueyhDZgd 4AYXAbNgiKU6rURSuk2OQBA+r0lTgmc5fTSPRMDpTNpN6A5Gec9vTXrIBPdMqlOJ8y6x SQsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Gc98IDl4f3dpcClMUSqp20voJP/FNj3pQCT54gqb67M=; fh=I4RLCLw/dMKPX9xPZZ8+mL0LeKDitseWF0AaQr+3mks=; b=TpM0RfdezvVsU8v9FmjOR7lo7orMirnz1E+2k6yLE5pkXySgxor4HDKJtGyjQyhtXl QmkQnfLhIy3vD/Hoo9QzaH9/vYcOSqsRjwO1faqFohZO7uDOPFhUIpenIa7abFR7q/2V 7Pd6Exa6AbZ3rVfuCnjvCJCAPty3sCwvyE97bjSeak0SmBdXBqdO1HZjto0m3DlufgDK gmZQDJwg0aK3LGnAbAnhCdQycswTrE1XH2L4Xa4Yi5ACcoP2Wmsdh/srWaUN+aUAgyXd ZZStXeQ9Lc8dSJ/o1+sE63H5EVZrFHsGbitFOc59lya0l7cIYReqIBBvc6961v2WWUXL Wr7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b=qbcU8xmd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id cm7-20020a056a00338700b006bc3f09ea03si3328185pfb.301.2023.12.01.06.05.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Dec 2023 06:05:42 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b=qbcU8xmd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id B3322810687A; Fri, 1 Dec 2023 06:05:16 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1379126AbjLAOFF (ORCPT + 99 others); Fri, 1 Dec 2023 09:05:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42064 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1379120AbjLAOFE (ORCPT ); Fri, 1 Dec 2023 09:05:04 -0500 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 78E0F1B2; Fri, 1 Dec 2023 06:05:10 -0800 (PST) Received: from pyrite.hamster-moth.ts.net (h175-177-049-156.catv02.itscom.jp [175.177.49.156]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 177711AC0; Fri, 1 Dec 2023 15:04:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1701439472; bh=ZafNoeEiTkEMR2Mskz+/jeQsiJ1/6DAgbgEgbXTgowE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qbcU8xmdrlGoFSKZSapRmFb5mN6wxgBgyBtw3jGhhvjuWlMyiSa3xr/86Uw8GAyc3 jIgWdDs+AnUSdDqrBDx5zx+kJJbVg37eWM/B0SEUXZCpvuJIzKJAp3bW01smF0ezfB X4PgbnegCsiBOt1IpV5NOnpwqyloJ4o4C13LJLlM= From: Paul Elder To: linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org Cc: laurent.pinchart@ideasonboard.com, kieran.bingham@ideasonboard.com, tomi.valkeinen@ideasonboard.com, umang.jain@ideasonboard.com, Paul Elder , Dafna Hirschfeld , Mauro Carvalho Chehab , Heiko Stuebner , linux-arm-kernel@lists.infradead.org (moderated list:ARM/Rockchip SoC support), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v2 4/4] media: rkisp1: debug: Consolidate counter debugfs files Date: Fri, 1 Dec 2023 23:04:33 +0900 Message-Id: <20231201140433.2126011-5-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231201140433.2126011-1-paul.elder@ideasonboard.com> References: <20231201140433.2126011-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Fri, 01 Dec 2023 06:05:16 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784088669099433030 X-GMAIL-MSGID: 1784088669099433030 Consolidate all the debugfs files that were each a single counter into a single "counters" file. While at it, reset the counters at stream on time to make it easier for to interpret the values in userspace. Signed-off-by: Paul Elder Reviewed-by: Kieran Bingham --- New in v2 .../platform/rockchip/rkisp1/rkisp1-capture.c | 2 + .../platform/rockchip/rkisp1/rkisp1-common.h | 4 ++ .../platform/rockchip/rkisp1/rkisp1-debug.c | 69 ++++++++++++------- 3 files changed, 50 insertions(+), 25 deletions(-) diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c index c6d7e01c8949..67b2e94dfd67 100644 --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c @@ -1030,6 +1030,8 @@ rkisp1_vb2_start_streaming(struct vb2_queue *queue, unsigned int count) struct media_entity *entity = &cap->vnode.vdev.entity; int ret; + rkisp1_debug_reset_counters(cap->rkisp1); + mutex_lock(&cap->rkisp1->stream_lock); ret = video_device_pipeline_start(&cap->vnode.vdev, &cap->rkisp1->pipe); diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h index be69173958a4..789259fb304a 100644 --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h @@ -599,9 +599,13 @@ int rkisp1_params_register(struct rkisp1_device *rkisp1); void rkisp1_params_unregister(struct rkisp1_device *rkisp1); #if IS_ENABLED(CONFIG_DEBUG_FS) +void rkisp1_debug_reset_counters(struct rkisp1_device *rkisp1); void rkisp1_debug_init(struct rkisp1_device *rkisp1); void rkisp1_debug_cleanup(struct rkisp1_device *rkisp1); #else +static inline void rkisp1_debug_reset_counters(struct rkisp1_device *rkisp1) +{ +} static inline void rkisp1_debug_init(struct rkisp1_device *rkisp1) { } diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-debug.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-debug.c index 79cda589d935..4358ed1367ed 100644 --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-debug.c +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-debug.c @@ -25,6 +25,11 @@ struct rkisp1_debug_register { const char * const name; }; +struct rkisp1_debug_counter { + const char * const name; + unsigned long *value; +}; + #define RKISP1_DEBUG_REG(name) { RKISP1_CIF_##name, 0, #name } #define RKISP1_DEBUG_SHD_REG(name) { \ RKISP1_CIF_##name, RKISP1_CIF_##name##_SHD, #name \ @@ -191,6 +196,43 @@ static int rkisp1_debug_input_status_show(struct seq_file *m, void *p) } DEFINE_SHOW_ATTRIBUTE(rkisp1_debug_input_status); +static int rkisp1_debug_counters_show(struct seq_file *m, void *p) +{ + struct rkisp1_device *rkisp1 = m->private; + struct rkisp1_debug *debug = &rkisp1->debug; + + const struct rkisp1_debug_counter counters[] = { + { "data_loss", &debug->data_loss }, + { "outform_size_err", &debug->outform_size_error }, + { "img_stabilization_size_error", &debug->img_stabilization_size_error }, + { "inform_size_error", &debug->inform_size_error }, + { "irq_delay", &debug->irq_delay }, + { "mipi_error", &debug->mipi_error }, + { "stats_error", &debug->stats_error }, + { "mp_stop_timeout", &debug->stop_timeout[RKISP1_MAINPATH] }, + { "sp_stop_timeout", &debug->stop_timeout[RKISP1_SELFPATH] }, + { "mp_frame_drop", &debug->frame_drop[RKISP1_MAINPATH] }, + { "sp_frame_drop", &debug->frame_drop[RKISP1_SELFPATH] }, + { "complete_frames", &debug->complete_frames }, + { /* Sentinel */ }, + }; + + const struct rkisp1_debug_counter *counter = counters; + + for (; counter->name; ++counter) + seq_printf(m, "%s: %lu\n", counter->name, *counter->value); + + return 0; +} +DEFINE_SHOW_ATTRIBUTE(rkisp1_debug_counters); + +void rkisp1_debug_reset_counters(struct rkisp1_device *rkisp1) +{ + struct dentry *debugfs_dir = rkisp1->debug.debugfs_dir; + memset(&rkisp1->debug, 0, sizeof(rkisp1->debug)); + rkisp1->debug.debugfs_dir = debugfs_dir; +} + void rkisp1_debug_init(struct rkisp1_device *rkisp1) { struct rkisp1_debug *debug = &rkisp1->debug; @@ -198,31 +240,8 @@ void rkisp1_debug_init(struct rkisp1_device *rkisp1) debug->debugfs_dir = debugfs_create_dir(dev_name(rkisp1->dev), NULL); - debugfs_create_ulong("data_loss", 0444, debug->debugfs_dir, - &debug->data_loss); - debugfs_create_ulong("outform_size_err", 0444, debug->debugfs_dir, - &debug->outform_size_error); - debugfs_create_ulong("img_stabilization_size_error", 0444, - debug->debugfs_dir, - &debug->img_stabilization_size_error); - debugfs_create_ulong("inform_size_error", 0444, debug->debugfs_dir, - &debug->inform_size_error); - debugfs_create_ulong("irq_delay", 0444, debug->debugfs_dir, - &debug->irq_delay); - debugfs_create_ulong("mipi_error", 0444, debug->debugfs_dir, - &debug->mipi_error); - debugfs_create_ulong("stats_error", 0444, debug->debugfs_dir, - &debug->stats_error); - debugfs_create_ulong("mp_stop_timeout", 0444, debug->debugfs_dir, - &debug->stop_timeout[RKISP1_MAINPATH]); - debugfs_create_ulong("sp_stop_timeout", 0444, debug->debugfs_dir, - &debug->stop_timeout[RKISP1_SELFPATH]); - debugfs_create_ulong("mp_frame_drop", 0444, debug->debugfs_dir, - &debug->frame_drop[RKISP1_MAINPATH]); - debugfs_create_ulong("sp_frame_drop", 0444, debug->debugfs_dir, - &debug->frame_drop[RKISP1_SELFPATH]); - debugfs_create_ulong("complete_frames", 0444, debug->debugfs_dir, - &debug->complete_frames); + debugfs_create_file("counters", 0444, debug->debugfs_dir, rkisp1, + &rkisp1_debug_counters_fops); debugfs_create_file("input_status", 0444, debug->debugfs_dir, rkisp1, &rkisp1_debug_input_status_fops);