indications for oprofile in compact mode

indications for oprofile in compact mode

[torez]

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



[-- Attachment #2: Indications oprofile in compact mode.txt --]
[-- Type: text/plain, Size: 2041 bytes --]

This patch allows Performance monitoring driver to detect when
operating in PowerPC compliance mode.

use patch -p0 to apply.

==========================================================================
diff -urN linux-2.6.26-rc7.orig/arch/powerpc/kernel/cputable.c linux-2.6.26-rc7/arch/powerpc/kernel/cputable.c
--- linux-2.6.26-rc7.orig/arch/powerpc/kernel/cputable.c	2008-07-07 11:37:40.000000000 -0500
+++ linux-2.6.26-rc7/arch/powerpc/kernel/cputable.c	2008-07-07 11:27:09.000000000 -0500
@@ -352,6 +352,7 @@
 		.icache_bsize		= 128,
 		.dcache_bsize		= 128,
 		.machine_check		= machine_check_generic,
+		.oprofile_cpu_type	= "ppc64/compat-power5+",
 		.platform		= "power5+",
 	},
 	{	/* Power6 */
@@ -383,6 +384,7 @@
 		.icache_bsize		= 128,
 		.dcache_bsize		= 128,
 		.machine_check		= machine_check_generic,
+		.oprofile_cpu_type	= "ppc64/compat-power6",
 		.platform		= "power6",
 	},
 	{	/* 2.06-compliant processor, i.e. Power7 "architected" mode */
@@ -394,6 +396,7 @@
 		.icache_bsize		= 128,
 		.dcache_bsize		= 128,
 		.machine_check		= machine_check_generic,
+		.oprofile_cpu_type	= "ppc64/compat-power7",
 		.platform		= "power7",
 	},
 	{	/* Power7 */
@@ -1593,6 +1596,12 @@
 			 * from the real PVR with a new value obtained
 			 * using a logical PVR value, don't modify the
 			 * performance monitor fields.
+			 * The performance monitor sub-system needs to have
+			 * access to the values from the real PVR, but, at 
+			 * the same time it needs to be aware it may be running
+			 * in compatibility mode. We we are changing the values
+			 * for the real PVR to those of the compatibility PVR,
+			 * change the oprofile_cpu_type field as well.
 			 */
 			if (t->num_pmcs && !s->num_pmcs) {
 				t->cpu_name = s->cpu_name;
@@ -1603,6 +1612,8 @@
 				t->cpu_setup = s->cpu_setup;
 				t->cpu_restore = s->cpu_restore;
 				t->platform = s->platform;
+				if (t->oprofile_cpu_type == NULL)
+					t->oprofile_cpu_type = s->oprofile_cpu_type;
 			} else
 				*t = *s;
 			*PTRRELOC(&cur_cpu_spec) = &the_cpu_spec;

Re: indications for oprofile in compact mode

[Josh Boyer]

On Mon, 2008-07-07 at 14:00 -0500, torez wrote:
> plain text document attachment (Indications oprofile in compact
> mode.txt)

Please don't send patches at attachments.

> This patch allows Performance monitoring driver to detect when
> operating in PowerPC compliance mode.

And why is that needed?  The reason should be included in the changelog
for the patch.

> use patch -p0 to apply.

This seems wrong.  The patch looks like a -p1 to me.

You're missing your Signed-off-by line.  See
Documentation/SubmittingPatches.

> 
> ==========================================================================
> diff -urN linux-2.6.26-rc7.orig/arch/powerpc/kernel/cputable.c linux-2.6.26-rc7/arch/powerpc/kernel/cputable.c
> --- linux-2.6.26-rc7.orig/arch/powerpc/kernel/cputable.c	2008-07-07 11:37:40.000000000 -0500
> +++ linux-2.6.26-rc7/arch/powerpc/kernel/cputable.c	2008-07-07 11:27:09.000000000 -0500
> @@ -352,6 +352,7 @@
>  		.icache_bsize		= 128,
>  		.dcache_bsize		= 128,
>  		.machine_check		= machine_check_generic,
> +		.oprofile_cpu_type	= "ppc64/compat-power5+",
>  		.platform		= "power5+",
>  	},
>  	{	/* Power6 */
> @@ -383,6 +384,7 @@
>  		.icache_bsize		= 128,
>  		.dcache_bsize		= 128,
>  		.machine_check		= machine_check_generic,
> +		.oprofile_cpu_type	= "ppc64/compat-power6",
>  		.platform		= "power6",
>  	},
>  	{	/* 2.06-compliant processor, i.e. Power7 "architected" mode */
> @@ -394,6 +396,7 @@
>  		.icache_bsize		= 128,
>  		.dcache_bsize		= 128,
>  		.machine_check		= machine_check_generic,
> +		.oprofile_cpu_type	= "ppc64/compat-power7",
>  		.platform		= "power7",
>  	},
>  	{	/* Power7 */
> @@ -1593,6 +1596,12 @@
>  			 * from the real PVR with a new value obtained
>  			 * using a logical PVR value, don't modify the
>  			 * performance monitor fields.
> +			 * The performance monitor sub-system needs to have
> +			 * access to the values from the real PVR, but, at 
> +			 * the same time it needs to be aware it may be running
> +			 * in compatibility mode. We we are changing the values
                                                When ^ ?

> +			 * for the real PVR to those of the compatibility PVR,
> +			 * change the oprofile_cpu_type field as well.

You might want to change the original comment to not say "...don't
modify the performance monitor fields."  Your addition explains why, but
it doesn't flow well with the original comment.

josh