Patchwork powerpc: print cores passed to firmware in decimal

login
register
mail settings
Submitter Michael Neuling
Date July 22, 2010, 5:15 a.m.
Message ID <4553.1279775749@neuling.org>
Download mbox | patch
Permalink /patch/59542/
State Superseded
Headers show

Comments

Michael Neuling - July 22, 2010, 5:15 a.m.
Currently we look pretty stupid when printing out the number of cores
passed to FW

  Max number of cores passed to firmware: 0x0000000000000080

So I've change this to print in decimal:

  Max number of cores passed to firmware: 128 (NR_CPUS = 256)

This required adding a prom_print_dec() function. 

Signed-off-by: Michael Neuling <mikey@neuling.org>
--
Anton suggested printing it in EBCDIC, but I nixed that.

 arch/powerpc/kernel/prom_init.c |   32 +++++++++++++++++++++++++++++---
 1 files changed, 29 insertions(+), 3 deletions(-)
Segher Boessenkool - July 22, 2010, 3:11 p.m.
> +		case 'i':
> +			++q;
> +			v = va_arg(args, unsigned long);
> +			prom_print_dec(v);
> +			break;

Unsigned long should be "%lu".


Segher
Jesse Larrew - July 22, 2010, 9:09 p.m.
On 07/22/2010 12:15 AM, Michael Neuling wrote:
> @@ -869,12 +895,12 @@ static void __init prom_send_capabilities(void)
>   		cores = (u32 *)PTRRELOC(&ibm_architecture_vec[IBM_ARCH_VEC_NRCORES_OFFSET]);
>   		if (*cores != NR_CPUS) {
>   			prom_printf("WARNING ! "
> -				    "ibm_architecture_vec structure inconsistent: 0x%x !\n",
> +				    "ibm_architecture_vec structure inconsistent: 0x%i !\n",
>   				    *cores);
>    

Since we're changing from hex to decimal, we shouldn't print the "0x".

Sincerely,

Patch

diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index 3b6f8ae..4428d26 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -311,6 +311,27 @@  static void __init prom_print_hex(unsigned long val)
 	call_prom("write", 3, 1, _prom->stdout, buf, nibbles);
 }
 
+/* max number of decimal digits in an unsigned long */
+#define UL_DIGITS 21
+static void __init prom_print_dec(unsigned long val)
+{
+	int i, size;
+	char buf[UL_DIGITS+1];
+	struct prom_t *_prom = &RELOC(prom);
+
+	for (i = UL_DIGITS-1; i >= 0;  i--) {
+		buf[i] = (val % 10) + '0';
+		val = val/10;
+		if (val == 0)
+			break;
+	}
+	/* shift stuff down */
+	size = UL_DIGITS - i;
+	for (i = 0 ; i < size ; i++)
+		buf[i] = buf[i + UL_DIGITS - size];
+	buf[size+1] = '\0';
+	call_prom("write", 3, 1, _prom->stdout, buf, size);
+}
 
 static void __init prom_printf(const char *format, ...)
 {
@@ -350,6 +371,11 @@  static void __init prom_printf(const char *format, ...)
 			v = va_arg(args, unsigned long);
 			prom_print_hex(v);
 			break;
+		case 'i':
+			++q;
+			v = va_arg(args, unsigned long);
+			prom_print_dec(v);
+			break;
 		}
 	}
 }
@@ -869,12 +895,12 @@  static void __init prom_send_capabilities(void)
 		cores = (u32 *)PTRRELOC(&ibm_architecture_vec[IBM_ARCH_VEC_NRCORES_OFFSET]);
 		if (*cores != NR_CPUS) {
 			prom_printf("WARNING ! "
-				    "ibm_architecture_vec structure inconsistent: 0x%x !\n",
+				    "ibm_architecture_vec structure inconsistent: 0x%i !\n",
 				    *cores);
 		} else {
 			*cores = DIV_ROUND_UP(NR_CPUS, prom_count_smt_threads());
-			prom_printf("Max number of cores passed to firmware: 0x%x\n",
-				    (unsigned long)*cores);
+			prom_printf("Max number of cores passed to firmware: %i (NR_CPUS = %i)\n",
+				    *cores, NR_CPUS);
 		}
 
 		/* try calling the ibm,client-architecture-support method */