From patchwork Wed Nov 11 08:31:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernard Zhao X-Patchwork-Id: 323003 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5945CC388F9 for ; Wed, 11 Nov 2020 08:32:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0F90B206FB for ; Wed, 11 Nov 2020 08:32:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726001AbgKKIcF (ORCPT ); Wed, 11 Nov 2020 03:32:05 -0500 Received: from m176115.mail.qiye.163.com ([59.111.176.115]:48884 "EHLO m176115.mail.qiye.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725899AbgKKIcF (ORCPT ); Wed, 11 Nov 2020 03:32:05 -0500 Received: from ubuntu.localdomain (unknown [157.0.31.124]) by m176115.mail.qiye.163.com (Hmail) with ESMTPA id 9D687667349; Wed, 11 Nov 2020 16:32:01 +0800 (CST) From: Bernard Zhao To: Rob Clark , Sean Paul , David Airlie , Daniel Vetter , Jordan Crouse , Bernard Zhao , Bjorn Andersson , Brian Masney , Shawn Guo , Eric Anholt , Thomas Zimmermann , Sam Ravnborg , "Gustavo A. R. Silva" , Emil Velikov , Jonathan Marek , Dave Airlie , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/5] adreno/a2xx_gpu.c: add KERN_LEVEL to printk Date: Wed, 11 Nov 2020 00:31:18 -0800 Message-Id: <20201111083131.39817-2-bernard@vivo.com> X-Mailer: git-send-email 2.29.0 In-Reply-To: <20201111083131.39817-1-bernard@vivo.com> References: <20201111083131.39817-1-bernard@vivo.com> MIME-Version: 1.0 X-HM-Spam-Status: e1kfGhgUHx5ZQUtXWQgYFAkeWUFZS1VLWVdZKFlBSE83V1ktWUFJV1kPCR oVCBIfWUFZQ0JLHktPHktDSk9LVkpNS05LQ0hOSUpCQk9VEwETFhoSFyQUDg9ZV1kWGg8SFR0UWU FZT0tIVUpKS0hKQ1VLWQY+ X-HM-Sender-Digest: e1kMHhlZQR0aFwgeV1kSHx4VD1lBWUc6MRg6ITo4Tz8uDRcDFggeCQMW DjwKCRNVSlVKTUtOS0NITklJT09CVTMWGhIXVRkeCRUaCR87DRINFFUYFBZFWVdZEgtZQVlKTkxV S1VISlVKSU9ZV1kIAVlBSEpOQjcG X-HM-Tid: 0a75b66ee38f9373kuws9d687667349 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Add KERN_LEVEL to printk. Signed-off-by: Bernard Zhao --- drivers/gpu/drm/msm/adreno/a2xx_gpu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a2xx_gpu.c b/drivers/gpu/drm/msm/adreno/a2xx_gpu.c index 7e82c41a85f1..33b45d237e56 100644 --- a/drivers/gpu/drm/msm/adreno/a2xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a2xx_gpu.c @@ -252,7 +252,7 @@ static void a2xx_recover(struct msm_gpu *gpu) adreno_dump_info(gpu); for (i = 0; i < 8; i++) { - printk("CP_SCRATCH_REG%d: %u\n", i, + printk(KERN_DEBUG "CP_SCRATCH_REG%d: %u\n", i, gpu_read(gpu, REG_AXXX_CP_SCRATCH_REG0 + i)); } @@ -429,7 +429,7 @@ static const unsigned int a225_registers[] = { /* would be nice to not have to duplicate the _show() stuff with printk(): */ static void a2xx_dump(struct msm_gpu *gpu) { - printk("status: %08x\n", + printk(KERN_DEBUG "status: %08x\n", gpu_read(gpu, REG_A2XX_RBBM_STATUS)); adreno_dump(gpu); } From patchwork Wed Nov 11 08:31:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernard Zhao X-Patchwork-Id: 323002 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 33776C4742C for ; Wed, 11 Nov 2020 08:32:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DB672206F1 for ; Wed, 11 Nov 2020 08:32:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725899AbgKKIca (ORCPT ); Wed, 11 Nov 2020 03:32:30 -0500 Received: from m176115.mail.qiye.163.com ([59.111.176.115]:52408 "EHLO m176115.mail.qiye.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725468AbgKKIca (ORCPT ); Wed, 11 Nov 2020 03:32:30 -0500 Received: from ubuntu.localdomain (unknown [157.0.31.124]) by m176115.mail.qiye.163.com (Hmail) with ESMTPA id E00F76672D5; Wed, 11 Nov 2020 16:32:26 +0800 (CST) From: Bernard Zhao To: Rob Clark , Sean Paul , David Airlie , Daniel Vetter , Jordan Crouse , Bernard Zhao , Bjorn Andersson , Brian Masney , Shawn Guo , Eric Anholt , Thomas Zimmermann , Sam Ravnborg , "Gustavo A. R. Silva" , Emil Velikov , Jonathan Marek , Dave Airlie , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/5] adreno/a4xx_gpu.c: add KERN_LEVEL to printk Date: Wed, 11 Nov 2020 00:31:20 -0800 Message-Id: <20201111083131.39817-4-bernard@vivo.com> X-Mailer: git-send-email 2.29.0 In-Reply-To: <20201111083131.39817-1-bernard@vivo.com> References: <20201111083131.39817-1-bernard@vivo.com> MIME-Version: 1.0 X-HM-Spam-Status: e1kfGhgUHx5ZQUtXWQgYFAkeWUFZS1VLWVdZKFlBSE83V1ktWUFJV1kPCR oVCBIfWUFZTRlPTB8ZHh1IT0seVkpNS05LQ0hOT0xITkJVEwETFhoSFyQUDg9ZV1kWGg8SFR0UWU FZT0tIVUpKS0hKQ1VLWQY+ X-HM-Sender-Digest: e1kMHhlZQR0aFwgeV1kSHx4VD1lBWUc6Mgg6EBw4TT8vThcXSwg9CANJ Sk0KC0lVSlVKTUtOS0NITk9MQ0hDVTMWGhIXVRkeCRUaCR87DRINFFUYFBZFWVdZEgtZQVlKTkxV S1VISlVKSU9ZV1kIAVlBSE9DQzcG X-HM-Tid: 0a75b66f46949373kuwse00f76672d5 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Add KERN_LEVEL to printk. Signed-off-by: Bernard Zhao --- drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a4xx_gpu.c b/drivers/gpu/drm/msm/adreno/a4xx_gpu.c index 2b93b33b05e4..2206b3b4b191 100644 --- a/drivers/gpu/drm/msm/adreno/a4xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a4xx_gpu.c @@ -355,7 +355,7 @@ static void a4xx_recover(struct msm_gpu *gpu) adreno_dump_info(gpu); for (i = 0; i < 8; i++) { - printk("CP_SCRATCH_REG%d: %u\n", i, + printk(KERN_DEBUG "CP_SCRATCH_REG%d: %u\n", i, gpu_read(gpu, REG_AXXX_CP_SCRATCH_REG0 + i)); } @@ -409,7 +409,7 @@ static irqreturn_t a4xx_irq(struct msm_gpu *gpu) if (status & A4XX_INT0_CP_REG_PROTECT_FAULT) { uint32_t reg = gpu_read(gpu, REG_A4XX_CP_PROTECT_STATUS); - printk("CP | Protected mode error| %s | addr=%x\n", + printk(KERN_DEBUG "CP | Protected mode error| %s | addr=%x\n", reg & (1 << 24) ? "WRITE" : "READ", (reg & 0xFFFFF) >> 2); } @@ -565,7 +565,7 @@ static struct msm_gpu_state *a4xx_gpu_state_get(struct msm_gpu *gpu) static void a4xx_dump(struct msm_gpu *gpu) { - printk("status: %08x\n", + printk(KERN_DEBUG "status: %08x\n", gpu_read(gpu, REG_A4XX_RBBM_STATUS)); adreno_dump(gpu); } From patchwork Wed Nov 11 08:31:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernard Zhao X-Patchwork-Id: 323001 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5EB35C388F9 for ; Wed, 11 Nov 2020 08:32:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 146E5205CA for ; Wed, 11 Nov 2020 08:32:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726275AbgKKIc4 (ORCPT ); Wed, 11 Nov 2020 03:32:56 -0500 Received: from m176115.mail.qiye.163.com ([59.111.176.115]:55774 "EHLO m176115.mail.qiye.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726287AbgKKIc4 (ORCPT ); Wed, 11 Nov 2020 03:32:56 -0500 Received: from ubuntu.localdomain (unknown [157.0.31.124]) by m176115.mail.qiye.163.com (Hmail) with ESMTPA id EA409666B88; Wed, 11 Nov 2020 16:32:50 +0800 (CST) From: Bernard Zhao To: Rob Clark , Sean Paul , David Airlie , Daniel Vetter , Jordan Crouse , Bernard Zhao , Bjorn Andersson , Brian Masney , Shawn Guo , Eric Anholt , Thomas Zimmermann , Sam Ravnborg , "Gustavo A. R. Silva" , Emil Velikov , Jonathan Marek , Dave Airlie , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/5] adreno/adreno_gpu.c: add KERN_LEVEL to printk Date: Wed, 11 Nov 2020 00:31:22 -0800 Message-Id: <20201111083131.39817-6-bernard@vivo.com> X-Mailer: git-send-email 2.29.0 In-Reply-To: <20201111083131.39817-1-bernard@vivo.com> References: <20201111083131.39817-1-bernard@vivo.com> MIME-Version: 1.0 X-HM-Spam-Status: e1kfGhgUHx5ZQUtXWQgYFAkeWUFZS1VLWVdZKFlBSE83V1ktWUFJV1kPCR oVCBIfWUFZSEpIHk8YSR9MGBhPVkpNS05LQ0hOTEpIS0xVEwETFhoSFyQUDg9ZV1kWGg8SFR0UWU FZT0tIVUpKS0hKQ1VLWQY+ X-HM-Sender-Digest: e1kMHhlZQR0aFwgeV1kSHx4VD1lBWUc6NDY6Hgw*CT8fERcISw84DwtI OUwKFD1VSlVKTUtOS0NITkxKTE5CVTMWGhIXVRkeCRUaCR87DRINFFUYFBZFWVdZEgtZQVlKTkxV S1VISlVKSU9ZV1kIAVlBT0pOQzcG X-HM-Tid: 0a75b66fa42d9373kuwsea409666b88 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Add KERN_LEVEL to printk. Signed-off-by: Bernard Zhao --- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c index 458b5b26d3c2..be752db5abed 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c @@ -725,7 +725,7 @@ void adreno_dump_info(struct msm_gpu *gpu) struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu); int i; - printk("revision: %d (%d.%d.%d.%d)\n", + printk(KERN_DEBUG "revision: %d (%d.%d.%d.%d)\n", adreno_gpu->info->revn, adreno_gpu->rev.core, adreno_gpu->rev.major, adreno_gpu->rev.minor, adreno_gpu->rev.patchid); @@ -733,12 +733,12 @@ void adreno_dump_info(struct msm_gpu *gpu) for (i = 0; i < gpu->nr_rings; i++) { struct msm_ringbuffer *ring = gpu->rb[i]; - printk("rb %d: fence: %d/%d\n", i, + printk(KERN_DEBUG "rb %d: fence: %d/%d\n", i, ring->memptrs->fence, ring->seqno); - printk("rptr: %d\n", get_rptr(adreno_gpu, ring)); - printk("rb wptr: %d\n", get_wptr(ring)); + printk(KERN_DEBUG "rptr: %d\n", get_rptr(adreno_gpu, ring)); + printk(KERN_DEBUG "rb wptr: %d\n", get_wptr(ring)); } } @@ -752,7 +752,7 @@ void adreno_dump(struct msm_gpu *gpu) return; /* dump these out in a form that can be parsed by demsm: */ - printk("IO:region %s 00000000 00020000\n", gpu->name); + printk(KERN_DEBUG "IO:region %s 00000000 00020000\n", gpu->name); for (i = 0; adreno_gpu->registers[i] != ~0; i += 2) { uint32_t start = adreno_gpu->registers[i]; uint32_t end = adreno_gpu->registers[i+1]; @@ -760,7 +760,7 @@ void adreno_dump(struct msm_gpu *gpu) for (addr = start; addr <= end; addr++) { uint32_t val = gpu_read(gpu, addr); - printk("IO:R %08x %08x\n", addr<<2, val); + printk(KERN_DEBUG "IO:R %7x %08x\n", addr<<2, val); } } }