linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/2] powerpc/4xx/ocm: Fix phys_addr_t printf warnings
@ 2019-01-01  3:56 Michael Ellerman
  2019-01-01  3:56 ` [PATCH 2/2] powerpc/configs: Add PPC4xx_OCM to ppc40x_defconfig Michael Ellerman
                   ` (2 more replies)
  0 siblings, 3 replies; 9+ messages in thread
From: Michael Ellerman @ 2019-01-01  3:56 UTC (permalink / raw)
  To: linuxppc-dev; +Cc: chunkeey

Currently the code produces several warnings, eg:

  arch/powerpc/platforms/4xx/ocm.c:240:38: error: format '%llx'
  expects argument of type 'long long unsigned int', but argument 3
  has type 'phys_addr_t {aka unsigned int}'
     seq_printf(m, "PhysAddr     : 0x%llx\n", ocm->phys);
                                   ~~~^     ~~~~~~~~~

Fix it by using the special %pa[p] format for printing phys_addr_t.
Note we need to pass the value by reference for the special specifier
to work.

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
---
 arch/powerpc/platforms/4xx/ocm.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/powerpc/platforms/4xx/ocm.c b/arch/powerpc/platforms/4xx/ocm.c
index c22b099c42f1..a1aaa1569d7c 100644
--- a/arch/powerpc/platforms/4xx/ocm.c
+++ b/arch/powerpc/platforms/4xx/ocm.c
@@ -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     : 0x%llx\n", ocm->phys);
+		seq_printf(m, "PhysAddr     : %pa[p]\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  : 0x%llx\n", ocm->nc.phys);
+		seq_printf(m, "NC.PhysAddr  : %pa[p]\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   : 0x%llx\n", ocm->c.phys);
+		seq_printf(m, "\nC.PhysAddr   : %pa[p]\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);
-- 
2.17.2


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [PATCH 2/2] powerpc/configs: Add PPC4xx_OCM to ppc40x_defconfig
  2019-01-01  3:56 [PATCH 1/2] powerpc/4xx/ocm: Fix phys_addr_t printf warnings Michael Ellerman
@ 2019-01-01  3:56 ` Michael Ellerman
  2019-01-01 16:52 ` [PATCH 1/2] powerpc/4xx/ocm: Fix phys_addr_t printf warnings LEROY Christophe
  2019-01-02 11:31 ` [1/2] " Michael Ellerman
  2 siblings, 0 replies; 9+ messages in thread
From: Michael Ellerman @ 2019-01-01  3:56 UTC (permalink / raw)
  To: linuxppc-dev; +Cc: chunkeey

There was recently a compilation break to this driver, but we didn't
notice because none of our defconfigs have it enabled. Fix that.

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
---
 arch/powerpc/configs/ppc40x_defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/powerpc/configs/ppc40x_defconfig b/arch/powerpc/configs/ppc40x_defconfig
index 10fb1df63b46..689d7e276769 100644
--- a/arch/powerpc/configs/ppc40x_defconfig
+++ b/arch/powerpc/configs/ppc40x_defconfig
@@ -85,3 +85,4 @@ CONFIG_CRYPTO_ECB=y
 CONFIG_CRYPTO_PCBC=y
 CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_DES=y
+CONFIG_PPC4xx_OCM=y
-- 
2.17.2


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* Re: [PATCH 1/2] powerpc/4xx/ocm: Fix phys_addr_t printf warnings
  2019-01-01  3:56 [PATCH 1/2] powerpc/4xx/ocm: Fix phys_addr_t printf warnings Michael Ellerman
  2019-01-01  3:56 ` [PATCH 2/2] powerpc/configs: Add PPC4xx_OCM to ppc40x_defconfig Michael Ellerman
@ 2019-01-01 16:52 ` LEROY Christophe
  2019-01-02 11:12   ` Michael Ellerman
  2019-01-02 11:31 ` [1/2] " Michael Ellerman
  2 siblings, 1 reply; 9+ messages in thread
From: LEROY Christophe @ 2019-01-01 16:52 UTC (permalink / raw)
  To: Michael Ellerman; +Cc: linuxppc-dev, chunkeey

Michael Ellerman <mpe@ellerman.id.au> a écrit :

> Currently the code produces several warnings, eg:
>
>   arch/powerpc/platforms/4xx/ocm.c:240:38: error: format '%llx'
>   expects argument of type 'long long unsigned int', but argument 3
>   has type 'phys_addr_t {aka unsigned int}'
>      seq_printf(m, "PhysAddr     : 0x%llx\n", ocm->phys);
>                                    ~~~^     ~~~~~~~~~
>
> Fix it by using the special %pa[p] format for printing phys_addr_t.
> Note we need to pass the value by reference for the special specifier
> to work.

When I fixed the same problem in prom.c, you suggested to simply cast  
it to unsigned long long. Is this a better solution ?

Christophe

>
> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
> ---
>  arch/powerpc/platforms/4xx/ocm.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/powerpc/platforms/4xx/ocm.c  
> b/arch/powerpc/platforms/4xx/ocm.c
> index c22b099c42f1..a1aaa1569d7c 100644
> --- a/arch/powerpc/platforms/4xx/ocm.c
> +++ b/arch/powerpc/platforms/4xx/ocm.c
> @@ -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     : 0x%llx\n", ocm->phys);
> +		seq_printf(m, "PhysAddr     : %pa[p]\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  : 0x%llx\n", ocm->nc.phys);
> +		seq_printf(m, "NC.PhysAddr  : %pa[p]\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   : 0x%llx\n", ocm->c.phys);
> +		seq_printf(m, "\nC.PhysAddr   : %pa[p]\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);
> --
> 2.17.2



^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH 1/2] powerpc/4xx/ocm: Fix phys_addr_t printf warnings
  2019-01-01 16:52 ` [PATCH 1/2] powerpc/4xx/ocm: Fix phys_addr_t printf warnings LEROY Christophe
@ 2019-01-02 11:12   ` Michael Ellerman
  0 siblings, 0 replies; 9+ messages in thread
From: Michael Ellerman @ 2019-01-02 11:12 UTC (permalink / raw)
  To: LEROY Christophe; +Cc: linuxppc-dev, chunkeey

LEROY Christophe <christophe.leroy@c-s.fr> writes:

> Michael Ellerman <mpe@ellerman.id.au> a écrit :
>
>> Currently the code produces several warnings, eg:
>>
>>   arch/powerpc/platforms/4xx/ocm.c:240:38: error: format '%llx'
>>   expects argument of type 'long long unsigned int', but argument 3
>>   has type 'phys_addr_t {aka unsigned int}'
>>      seq_printf(m, "PhysAddr     : 0x%llx\n", ocm->phys);
>>                                    ~~~^     ~~~~~~~~~
>>
>> Fix it by using the special %pa[p] format for printing phys_addr_t.
>> Note we need to pass the value by reference for the special specifier
>> to work.
>
> When I fixed the same problem in prom.c, you suggested to simply cast  
> it to unsigned long long. Is this a better solution ?

Did I?

Oh you mean here:
  https://patchwork.ozlabs.org/patch/1012875/


Yeah I was just commenting on the ifdef, I didn't actually realise it
was a phys_addr_t that was the cause of the problem.

So yeah I guess it is preferable to use %pa[p] in prom.c as well.

cheers

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [1/2] powerpc/4xx/ocm: Fix phys_addr_t printf warnings
  2019-01-01  3:56 [PATCH 1/2] powerpc/4xx/ocm: Fix phys_addr_t printf warnings Michael Ellerman
  2019-01-01  3:56 ` [PATCH 2/2] powerpc/configs: Add PPC4xx_OCM to ppc40x_defconfig Michael Ellerman
  2019-01-01 16:52 ` [PATCH 1/2] powerpc/4xx/ocm: Fix phys_addr_t printf warnings LEROY Christophe
@ 2019-01-02 11:31 ` Michael Ellerman
  2019-01-04 20:46   ` Christian Lamparter
  2 siblings, 1 reply; 9+ messages in thread
From: Michael Ellerman @ 2019-01-02 11:31 UTC (permalink / raw)
  To: Michael Ellerman, linuxppc-dev; +Cc: chunkeey

On Tue, 2019-01-01 at 03:56:00 UTC, Michael Ellerman wrote:
> Currently the code produces several warnings, eg:
> 
>   arch/powerpc/platforms/4xx/ocm.c:240:38: error: format '%llx'
>   expects argument of type 'long long unsigned int', but argument 3
>   has type 'phys_addr_t {aka unsigned int}'
>      seq_printf(m, "PhysAddr     : 0x%llx\n", ocm->phys);
>                                    ~~~^     ~~~~~~~~~
> 
> Fix it by using the special %pa[p] format for printing phys_addr_t.
> Note we need to pass the value by reference for the special specifier
> to work.
> 
> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

Series applied to powerpc fixes.

https://git.kernel.org/powerpc/c/52b88fa1e8c7bae03bb691178a9f8b

cheers

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [1/2] powerpc/4xx/ocm: Fix phys_addr_t printf warnings
  2019-01-02 11:31 ` [1/2] " Michael Ellerman
@ 2019-01-04 20:46   ` Christian Lamparter
  2019-01-08  9:54     ` Michael Ellerman
  0 siblings, 1 reply; 9+ messages in thread
From: Christian Lamparter @ 2019-01-04 20:46 UTC (permalink / raw)
  To: linuxppc-dev

On Wednesday, January 2, 2019 12:31:50 PM CET Michael Ellerman wrote:
> On Tue, 2019-01-01 at 03:56:00 UTC, Michael Ellerman wrote:
> > Currently the code produces several warnings, eg:
> > 
> >   arch/powerpc/platforms/4xx/ocm.c:240:38: error: format '%llx'
> >   expects argument of type 'long long unsigned int', but argument 3
> >   has type 'phys_addr_t {aka unsigned int}'
> >      seq_printf(m, "PhysAddr     : 0x%llx\n", ocm->phys);
> >                                    ~~~^     ~~~~~~~~~
> > 
> > Fix it by using the special %pa[p] format for printing phys_addr_t.
> > Note we need to pass the value by reference for the special specifier
> > to work.
> > 
> > Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
> 
> Series applied to powerpc fixes.
> 
> https://git.kernel.org/powerpc/c/52b88fa1e8c7bae03bb691178a9f8b

Well, I guess I'm a late. I had issues with the getting 4.20+
crosscompiled on debian with make-kpkg. 

Nevertheless, I finally got a working kernel and 
on the MyBook Live APM82181:

---
root@mbl:/sys/kernel/debug# cat ppc4xx_ocm/info 
PPC4XX OCM   : 1
PhysAddr     : 0x0000000400040000[p]
MemTotal     : 32768 Bytes
MemTotal(NC) : 32768 Bytes
MemTotal(C)  : 0 Bytes

NC.PhysAddr  : 0x0000000400040000[p]
NC.VirtAddr  : 0x6bc84b36
NC.MemTotal  : 32768 Bytes
NC.MemFree   : 32768 Bytes

C.PhysAddr   : 0x0000000000000000[p]
C.VirtAddr   : 0x  (null)
C.MemTotal   : 0 Bytes
C.MemFree    : 0 Bytes
---

Yes, nobody is using the ocm. Though I do have a patch
for the crypto4xx and emac.



^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [1/2] powerpc/4xx/ocm: Fix phys_addr_t printf warnings
  2019-01-04 20:46   ` Christian Lamparter
@ 2019-01-08  9:54     ` Michael Ellerman
  2019-01-08 17:21       ` Christian Lamparter
  0 siblings, 1 reply; 9+ messages in thread
From: Michael Ellerman @ 2019-01-08  9:54 UTC (permalink / raw)
  To: Christian Lamparter, linuxppc-dev

Christian Lamparter <chunkeey@gmail.com> writes:
> On Wednesday, January 2, 2019 12:31:50 PM CET Michael Ellerman wrote:
>> On Tue, 2019-01-01 at 03:56:00 UTC, Michael Ellerman wrote:
>> > Currently the code produces several warnings, eg:
>> > 
>> >   arch/powerpc/platforms/4xx/ocm.c:240:38: error: format '%llx'
>> >   expects argument of type 'long long unsigned int', but argument 3
>> >   has type 'phys_addr_t {aka unsigned int}'
>> >      seq_printf(m, "PhysAddr     : 0x%llx\n", ocm->phys);
>> >                                    ~~~^     ~~~~~~~~~
>> > 
>> > Fix it by using the special %pa[p] format for printing phys_addr_t.
>> > Note we need to pass the value by reference for the special specifier
>> > to work.
>> > 
>> > Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
>> 
>> Series applied to powerpc fixes.
>> 
>> https://git.kernel.org/powerpc/c/52b88fa1e8c7bae03bb691178a9f8b
>
> Well, I guess I'm a late. I had issues with the getting 4.20+
> crosscompiled on debian with make-kpkg. 
>
> Nevertheless, I finally got a working kernel and 
> on the MyBook Live APM82181:
>
> ---
> root@mbl:/sys/kernel/debug# cat ppc4xx_ocm/info 
> PPC4XX OCM   : 1
> PhysAddr     : 0x0000000400040000[p]
> MemTotal     : 32768 Bytes
> MemTotal(NC) : 32768 Bytes
> MemTotal(C)  : 0 Bytes
>
> NC.PhysAddr  : 0x0000000400040000[p]
> NC.VirtAddr  : 0x6bc84b36
> NC.MemTotal  : 32768 Bytes
> NC.MemFree   : 32768 Bytes
>
> C.PhysAddr   : 0x0000000000000000[p]
> C.VirtAddr   : 0x  (null)
> C.MemTotal   : 0 Bytes
> C.MemFree    : 0 Bytes

Oh right, I'm an idiot :)

The docs say:

Physical address types phys_addr_t
----------------------------------

	%pa[p]	0x01234567 or 0x0123456789abcdef


And if you grep for that there's eg:

  drivers/ntb/test/ntb_tool.c:                     "Window Size    \t%pa[p]\n",

So I just literally copied that.

But it's trying to indicate that the p is optional.

This should fix it, I won't merge it until you've tested it this time :)

cheers


diff --git a/arch/powerpc/platforms/4xx/ocm.c b/arch/powerpc/platforms/4xx/ocm.c
index a1aaa1569d7c..f0e488d97567 100644
--- a/arch/powerpc/platforms/4xx/ocm.c
+++ b/arch/powerpc/platforms/4xx/ocm.c
@@ -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);

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* Re: [1/2] powerpc/4xx/ocm: Fix phys_addr_t printf warnings
  2019-01-08  9:54     ` Michael Ellerman
@ 2019-01-08 17:21       ` Christian Lamparter
  2019-01-11 13:10         ` Michael Ellerman
  0 siblings, 1 reply; 9+ messages in thread
From: Christian Lamparter @ 2019-01-08 17:21 UTC (permalink / raw)
  To: Michael Ellerman; +Cc: linuxppc-dev

On Tuesday, January 8, 2019 10:54:28 AM CET Michael Ellerman wrote:
> Christian Lamparter <chunkeey@gmail.com> writes:
> > On Wednesday, January 2, 2019 12:31:50 PM CET Michael Ellerman wrote:
> >> On Tue, 2019-01-01 at 03:56:00 UTC, Michael Ellerman wrote:
> >> > Currently the code produces several warnings, eg:
> >> > 
> >> >   arch/powerpc/platforms/4xx/ocm.c:240:38: error: format '%llx'
> >> >   expects argument of type 'long long unsigned int', but argument 3
> >> >   has type 'phys_addr_t {aka unsigned int}'
> >> >      seq_printf(m, "PhysAddr     : 0x%llx\n", ocm->phys);
> >> >                                    ~~~^     ~~~~~~~~~
> >> > 
> >> > Fix it by using the special %pa[p] format for printing phys_addr_t.
> >> > Note we need to pass the value by reference for the special specifier
> >> > to work.
> >> > 
> >> > Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
> >> 
> >> Series applied to powerpc fixes.
> >> 
> >> https://git.kernel.org/powerpc/c/52b88fa1e8c7bae03bb691178a9f8b
> >
> > Well, I guess I'm a late. I had issues with the getting 4.20+
> > crosscompiled on debian with make-kpkg. 
> >
> > Nevertheless, I finally got a working kernel and 
> > on the MyBook Live APM82181:
> >
> > ---
> > root@mbl:/sys/kernel/debug# cat ppc4xx_ocm/info 
> > PPC4XX OCM   : 1
> > PhysAddr     : 0x0000000400040000[p]
> > MemTotal     : 32768 Bytes
> > MemTotal(NC) : 32768 Bytes
> > MemTotal(C)  : 0 Bytes
> >
> > NC.PhysAddr  : 0x0000000400040000[p]
> > NC.VirtAddr  : 0x6bc84b36
> > NC.MemTotal  : 32768 Bytes
> > NC.MemFree   : 32768 Bytes
> >
> > C.PhysAddr   : 0x0000000000000000[p]
> > C.VirtAddr   : 0x  (null)
> > C.MemTotal   : 0 Bytes
> > C.MemFree    : 0 Bytes
> 
> Oh right, I'm an idiot :)
> 
> The docs say:
> 
> Physical address types phys_addr_t
> ----------------------------------
> 
> 	%pa[p]	0x01234567 or 0x0123456789abcdef
> 
> 
> And if you grep for that there's eg:
> 
>   drivers/ntb/test/ntb_tool.c:                     "Window Size    \t%pa[p]\n",
> 
> So I just literally copied that.
> 
> But it's trying to indicate that the p is optional.
> 
> This should fix it, I won't merge it until you've tested it this time :)
> 
> cheers
> 
> 
> diff --git a/arch/powerpc/platforms/4xx/ocm.c b/arch/powerpc/platforms/4xx/ocm.c
> index a1aaa1569d7c..f0e488d97567 100644
> --- a/arch/powerpc/platforms/4xx/ocm.c
> +++ b/arch/powerpc/platforms/4xx/ocm.c
> @@ -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);

Ok, with the patch applied it now looks like:

|root@mbl:/sys/kernel/debug/ppc4xx_ocm# cat info 
|PPC4XX OCM   : 1
|PhysAddr     : 0x0000000400040000
|MemTotal     : 32768 Bytes
|MemTotal(NC) : 32768 Bytes
|MemTotal(C)  : 0 Bytes
|
|NC.PhysAddr  : 0x0000000400040000
|NC.VirtAddr  : 0x54f5bce2
|NC.MemTotal  : 32768 Bytes
|NC.MemFree   : 32768 Bytes
|
|C.PhysAddr   : 0x0000000000000000
|C.VirtAddr   : 0x  (null)
|C.MemTotal   : 0 Bytes
|C.MemFree    : 0 Bytes

... just as expected. ;)

Thanks,
Christian



^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [1/2] powerpc/4xx/ocm: Fix phys_addr_t printf warnings
  2019-01-08 17:21       ` Christian Lamparter
@ 2019-01-11 13:10         ` Michael Ellerman
  0 siblings, 0 replies; 9+ messages in thread
From: Michael Ellerman @ 2019-01-11 13:10 UTC (permalink / raw)
  To: Christian Lamparter; +Cc: linuxppc-dev

Christian Lamparter <chunkeey@gmail.com> writes:
> On Tuesday, January 8, 2019 10:54:28 AM CET Michael Ellerman wrote:
>> Christian Lamparter <chunkeey@gmail.com> writes:
...
>> diff --git a/arch/powerpc/platforms/4xx/ocm.c b/arch/powerpc/platforms/4xx/ocm.c
>> index a1aaa1569d7c..f0e488d97567 100644
>> --- a/arch/powerpc/platforms/4xx/ocm.c
>> +++ b/arch/powerpc/platforms/4xx/ocm.c
>> @@ -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);
>
> Ok, with the patch applied it now looks like:
>
> |root@mbl:/sys/kernel/debug/ppc4xx_ocm# cat info 
> |PPC4XX OCM   : 1
> |PhysAddr     : 0x0000000400040000
> |MemTotal     : 32768 Bytes
> |MemTotal(NC) : 32768 Bytes
> |MemTotal(C)  : 0 Bytes
> |
> |NC.PhysAddr  : 0x0000000400040000
> |NC.VirtAddr  : 0x54f5bce2
> |NC.MemTotal  : 32768 Bytes
> |NC.MemFree   : 32768 Bytes
> |
> |C.PhysAddr   : 0x0000000000000000
> |C.VirtAddr   : 0x  (null)
> |C.MemTotal   : 0 Bytes
> |C.MemFree    : 0 Bytes
>
> ... just as expected. ;)

Thanks.

cheers

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2019-01-11 13:11 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-01  3:56 [PATCH 1/2] powerpc/4xx/ocm: Fix phys_addr_t printf warnings Michael Ellerman
2019-01-01  3:56 ` [PATCH 2/2] powerpc/configs: Add PPC4xx_OCM to ppc40x_defconfig Michael Ellerman
2019-01-01 16:52 ` [PATCH 1/2] powerpc/4xx/ocm: Fix phys_addr_t printf warnings LEROY Christophe
2019-01-02 11:12   ` Michael Ellerman
2019-01-02 11:31 ` [1/2] " Michael Ellerman
2019-01-04 20:46   ` Christian Lamparter
2019-01-08  9:54     ` Michael Ellerman
2019-01-08 17:21       ` Christian Lamparter
2019-01-11 13:10         ` Michael Ellerman

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).