Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fcf5036f authored by Michael Ellerman's avatar Michael Ellerman
Browse files

powerpc/4xx/ocm: Fix fix for phys_addr_t printf warnings



My recent commit to fix the printf warnings in ocm.c got the format
specifier wrong, because I copied it from the documentation without
realising the square brackets are not meant as literals.

This results in the address being suffixed with a literal "[p]".

Actually tested this time:

  # cat info /sys/kernel/debug/ppc4xx_ocm
  PhysAddr     : 0x0000000400040000
  ...
  NC.PhysAddr  : 0x0000000400040000
  ...
  C.PhysAddr   : 0x0000000000000000

Fixes: 52b88fa1 ("powerpc/4xx/ocm: Fix phys_addr_t printf warnings")
Reported-by: default avatarChristian Lamparter <chunkeey@gmail.com>
Tested-by: default avatarChristian Lamparter <chunkeey@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 6bca5159
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -237,12 +237,12 @@ static int ocm_debugfs_show(struct seq_file *m, void *v)
			continue;

		seq_printf(m, "PPC4XX OCM   : %d\n", ocm->index);
		seq_printf(m, "PhysAddr     : %pa[p]\n", &(ocm->phys));
		seq_printf(m, "PhysAddr     : %pa\n", &(ocm->phys));
		seq_printf(m, "MemTotal     : %d Bytes\n", ocm->memtotal);
		seq_printf(m, "MemTotal(NC) : %d Bytes\n", ocm->nc.memtotal);
		seq_printf(m, "MemTotal(C)  : %d Bytes\n\n", ocm->c.memtotal);

		seq_printf(m, "NC.PhysAddr  : %pa[p]\n", &(ocm->nc.phys));
		seq_printf(m, "NC.PhysAddr  : %pa\n", &(ocm->nc.phys));
		seq_printf(m, "NC.VirtAddr  : 0x%p\n", ocm->nc.virt);
		seq_printf(m, "NC.MemTotal  : %d Bytes\n", ocm->nc.memtotal);
		seq_printf(m, "NC.MemFree   : %d Bytes\n", ocm->nc.memfree);
@@ -252,7 +252,7 @@ static int ocm_debugfs_show(struct seq_file *m, void *v)
							blk->size, blk->owner);
		}

		seq_printf(m, "\nC.PhysAddr   : %pa[p]\n", &(ocm->c.phys));
		seq_printf(m, "\nC.PhysAddr   : %pa\n", &(ocm->c.phys));
		seq_printf(m, "C.VirtAddr   : 0x%p\n", ocm->c.virt);
		seq_printf(m, "C.MemTotal   : %d Bytes\n", ocm->c.memtotal);
		seq_printf(m, "C.MemFree    : %d Bytes\n", ocm->c.memfree);