Skip to contentSkip to conversation

add KERN_LEVEL to printk

PATCH In review Bernard Zhao 2 participants 7 messages Nov 11, 2020

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

cover add KERN_LEVEL to printk

Hi:

When call printk, set the KERN_LEVEL is suggested by the community. This patch sereies add KERN_* level to printk which do not set this level.

Bernard Zhao (5):
adreno/a2xx_gpu.c: add KERN_LEVEL to printk
adreno/a3xx_gpu.c: add KERN_LEVEL to printk
adreno/a4xx_gpu.c: add KERN_LEVEL to printk
adreno/a5xx_gpu.c: add KERN_LEVEL to printk
adreno/adreno_gpu.c: add KERN_LEVEL to printk

 drivers/gpu/drm/msm/adreno/a2xx_gpu.c   |  4 ++--
 drivers/gpu/drm/msm/adreno/a3xx_gpu.c   |  4 ++--
 drivers/gpu/drm/msm/adreno/a4xx_gpu.c   |  6 +++---
 drivers/gpu/drm/msm/adreno/a5xx_gpu.c   |  2 +-
 drivers/gpu/drm/msm/adreno/adreno_gpu.c | 12 ++++++------
 5 files changed, 14 insertions(+), 14 deletions(-)
Signature · 1 line
2.29.0
#1 lore raw

PATCH 1/5 adreno/a2xx_gpu.c: add KERN_LEVEL to printk

Add KERN_LEVEL to printk.

---
 drivers/gpu/drm/msm/adreno/a2xx_gpu.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/msm/adreno/a2xx_gpu.c +2 -2
index 7e82c41a85f1..33b45d237e56 100644
@@ -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);
 }
Signature · 1 line
2.29.0
#2 lore raw

PATCH 2/5 adreno/a3xx_gpu.c: add KERN_LEVEL to printk

In reply to Bernard Zhao

Add KERN_LEVEL to printk.

---
 drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/msm/adreno/a3xx_gpu.c +2 -2
index f29c77d9cd42..64c9a9448f53 100644
@@ -356,7 +356,7 @@ static void a3xx_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));
 	}
 
@@ -459,7 +459,7 @@ static const unsigned int a3xx_registers[] = {
 /* would be nice to not have to duplicate the _show() stuff with printk(): */
 static void a3xx_dump(struct msm_gpu *gpu)
 {
-	printk("status:   %08x\n",
+	printk(KERN_DEBUG "status:   %08x\n",
 			gpu_read(gpu, REG_A3XX_RBBM_STATUS));
 	adreno_dump(gpu);
 }
Signature · 1 line
2.29.0
#3 lore raw

PATCH 3/5 adreno/a4xx_gpu.c: add KERN_LEVEL to printk

In reply to Bernard Zhao

Add KERN_LEVEL to printk.

---
 drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/msm/adreno/a4xx_gpu.c +3 -3
index 2b93b33b05e4..2206b3b4b191 100644
@@ -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);
 }
Signature · 1 line
2.29.0
#4 lore raw

PATCH 4/5 adreno/a5xx_gpu.c: add KERN_LEVEL to printk

In reply to Bernard Zhao

Add KERN_LEVEL to printk.

---
 drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/adreno/a5xx_gpu.c +1 -1
index d6804a802355..c3ac78a32caf 100644
@@ -847,7 +847,7 @@ static void a5xx_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_A5XX_CP_SCRATCH_REG(i)));
 	}
 
Signature · 1 line
2.29.0
#5 lore raw

PATCH 5/5 adreno/adreno_gpu.c: add KERN_LEVEL to printk

In reply to Bernard Zhao

Add KERN_LEVEL to printk.

---
 drivers/gpu/drm/msm/adreno/adreno_gpu.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/msm/adreno/adreno_gpu.c +6 -6
index 458b5b26d3c2..be752db5abed 100644
@@ -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);
 		}
 	}
 }
Signature · 1 line
2.29.0
#6 lore raw
In reply to Bernard Zhao

Hi

Am 11.11.20 um 09:31 schrieb Bernard Zhao:

Quoted 5 lines

Hi:

When call printk, set the KERN_LEVEL is suggested by the community. This patch sereies add KERN_* level to printk which do not set this level.

I have no say on the msm driver, but IMHO a much better change would be a conversion to drm_dbg(), drm_err(), etc.

Best regards
Thomas

Quoted 15 lines

Bernard Zhao (5):
adreno/a2xx_gpu.c: add KERN_LEVEL to printk
adreno/a3xx_gpu.c: add KERN_LEVEL to printk
adreno/a4xx_gpu.c: add KERN_LEVEL to printk
adreno/a5xx_gpu.c: add KERN_LEVEL to printk
adreno/adreno_gpu.c: add KERN_LEVEL to printk

 drivers/gpu/drm/msm/adreno/a2xx_gpu.c   |  4 ++--
 drivers/gpu/drm/msm/adreno/a3xx_gpu.c   |  4 ++--
 drivers/gpu/drm/msm/adreno/a4xx_gpu.c   |  6 +++---
 drivers/gpu/drm/msm/adreno/a5xx_gpu.c   |  2 +-
 drivers/gpu/drm/msm/adreno/adreno_gpu.c | 12 ++++++------
 5 files changed, 14 insertions(+), 14 deletions(-)
Signature · 10 lines
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel