[PATCH 5/16] cell: spu management xmon routines

[PATCH 5/16] cell: spu management xmon routines

[Geoff Levand]

This fixes the xmon support to be compatable with the
split spu platform code.


Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>

---

Michael,

I split this out so we can discuss it if needed.

-Geoff

 arch/powerpc/xmon/xmon.c |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

Index: cell--common--6/arch/powerpc/xmon/xmon.c
===================================================================
--- cell--common--6.orig/arch/powerpc/xmon/xmon.c
+++ cell--common--6/arch/powerpc/xmon/xmon.c
@@ -2769,8 +2769,6 @@
 
 	DUMP_FIELD(spu, "0x%x", number);
 	DUMP_FIELD(spu, "%s", name);
-	DUMP_FIELD(spu, "%s", devnode->full_name);
-	DUMP_FIELD(spu, "0x%x", nid);
 	DUMP_FIELD(spu, "0x%lx", local_store_phys);
 	DUMP_FIELD(spu, "0x%p", local_store);
 	DUMP_FIELD(spu, "0x%lx", ls_size);
@@ -2794,12 +2792,8 @@
 	DUMP_FIELD(spu, "0x%x", problem->spu_runcntl_RW);
 	DUMP_FIELD(spu, "0x%x", problem->spu_status_R);
 	DUMP_FIELD(spu, "0x%x", problem->spu_npc_RW);
-	DUMP_FIELD(spu, "0x%p", priv1);
-
-	if (spu->priv1)
-		DUMP_FIELD(spu, "0x%lx", priv1->mfc_sr1_RW);
-
 	DUMP_FIELD(spu, "0x%p", priv2);
+	DUMP_FIELD(spu, "0x%p", pdata);
 }
 
 static int do_spu_cmd(void)

Re: [PATCH 5/16] cell: spu management xmon routines

[Michael Ellerman]

[-- Attachment #1: Type: text/plain, Size: 1860 bytes --]

On Thu, 2006-11-16 at 19:42 -0800, Geoff Levand wrote:
> This fixes the xmon support to be compatable with the
> split spu platform code.
> 
> 
> Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
> 
> ---
> 
> Michael,
> 
> I split this out so we can discuss it if needed.

Looks ok at least for now. Maybe we could add a FW_FEATURE, or use an
existing one, and just use that in the xmon code to work out whether we
try to dump the pdata as a sony_pdata or of_pdata.


Acked-by: Michael Ellerman <michael@ellerman.id.au>

>  arch/powerpc/xmon/xmon.c |    8 +-------
>  1 file changed, 1 insertion(+), 7 deletions(-)
> 
> Index: cell--common--6/arch/powerpc/xmon/xmon.c
> ===================================================================
> --- cell--common--6.orig/arch/powerpc/xmon/xmon.c
> +++ cell--common--6/arch/powerpc/xmon/xmon.c
> @@ -2769,8 +2769,6 @@
>  
>  	DUMP_FIELD(spu, "0x%x", number);
>  	DUMP_FIELD(spu, "%s", name);
> -	DUMP_FIELD(spu, "%s", devnode->full_name);
> -	DUMP_FIELD(spu, "0x%x", nid);
>  	DUMP_FIELD(spu, "0x%lx", local_store_phys);
>  	DUMP_FIELD(spu, "0x%p", local_store);
>  	DUMP_FIELD(spu, "0x%lx", ls_size);
> @@ -2794,12 +2792,8 @@
>  	DUMP_FIELD(spu, "0x%x", problem->spu_runcntl_RW);
>  	DUMP_FIELD(spu, "0x%x", problem->spu_status_R);
>  	DUMP_FIELD(spu, "0x%x", problem->spu_npc_RW);
> -	DUMP_FIELD(spu, "0x%p", priv1);
> -
> -	if (spu->priv1)
> -		DUMP_FIELD(spu, "0x%lx", priv1->mfc_sr1_RW);
> -
>  	DUMP_FIELD(spu, "0x%p", priv2);
> +	DUMP_FIELD(spu, "0x%p", pdata);
>  }
>  
>  static int do_spu_cmd(void)
-- 
Michael Ellerman
OzLabs, IBM Australia Development Lab

wwweb: http://michael.ellerman.id.au
phone: +61 2 6212 1183 (tie line 70 21183)

We do not inherit the earth from our ancestors,
we borrow it from our children. - S.M.A.R.T Person

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]