Patchwork [13/18] cpu: msr: print format using inttypes

login
register
mail settings
Submitter Colin King
Date Sept. 23, 2012, 7:03 p.m.
Message ID <1348427041-4913-14-git-send-email-colin.king@canonical.com>
Download mbox | patch
Permalink /patch/186267/
State Accepted
Headers show

Comments

Colin King - Sept. 23, 2012, 7:03 p.m.
From: Colin Ian King <colin.king@canonical.com>

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 src/cpu/msr/msr.c |   30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)
Keng-Yu Lin - Sept. 27, 2012, 9:13 a.m.
On Mon, Sep 24, 2012 at 3:03 AM, Colin King <colin.king@canonical.com> wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>  src/cpu/msr/msr.c |   30 +++++++++++++++++-------------
>  1 file changed, 17 insertions(+), 13 deletions(-)
>
> diff --git a/src/cpu/msr/msr.c b/src/cpu/msr/msr.c
> index edb0aee..0b3f6b0 100644
> --- a/src/cpu/msr/msr.c
> +++ b/src/cpu/msr/msr.c
> @@ -18,6 +18,7 @@
>   */
>
>  #include "fwts.h"
> +#include <inttypes.h>
>
>  #ifdef FWTS_ARCH_INTEL
>
> @@ -139,20 +140,21 @@ static int msr_consistent_check(fwts_framework *fw,
>
>         if (inconsistent_count > 0) {
>                 fwts_failed(fw, level, "MSRCPUsInconsistent",
> -                       "MSR %s (0x%x) has %d inconsistent values across %d CPUs for (shift: %d mask: 0x%llx).",
> -                       msr_name, (int)msr,
> -                       inconsistent_count, ncpus, shift,
> -                       (unsigned long long)mask);
> +                       "MSR %s (0x%" PRIx32 ") has %d inconsistent values across "
> +                       "%d CPUs for (shift: %d mask: 0x%" PRIx64 ").",
> +                       msr_name, msr, inconsistent_count,
> +                       ncpus, shift, mask);
>
>                 for (cpu=1; cpu<ncpus; cpu++) {
>                         if (inconsistent[cpu])
> -                               fwts_log_info(fw, "MSR CPU 0 -> 0x%llx vs CPU %d -> 0x%llx",
> -                                       (unsigned long long)vals[0], cpu,
> -                                       (unsigned long long)vals[cpu]);
> +                               fwts_log_info(fw, "MSR CPU 0 -> 0x%" PRIx64
> +                                       " vs CPU %d -> 0x%" PRIx64,
> +                                       vals[0], cpu, vals[cpu]);
>                 }
>         } else {
> -               fwts_passed(fw, "MSR %s (0x%x) (mask:%llx) was consistent across %d CPUs.",
> -                       msr_name, (int)msr, (unsigned long long)mask, ncpus);
> +               fwts_passed(fw, "MSR %s (0x%" PRIx32 ") (mask:%" PRIx64 ") "
> +                       "was consistent across %d CPUs.",
> +                       msr_name, msr, mask, ncpus);
>                 if (callback)
>                         callback(fw, vals[0]);
>         }
> @@ -215,10 +217,11 @@ static int msr_smrr(fwts_framework *fw)
>                                 uint64_t type = val & 7;
>                                 if ((physbase & 0x7fffff) != 0)
>                                         fwts_failed(fw, LOG_LEVEL_HIGH, "MSRSMRR_PHYSBASE8MBBoundary",
> -                                               "SMRR: SMRR_PHYSBASE is NOT on an 8MB boundary: %llx.", (unsigned long long)physbase);
> +                                               "SMRR: SMRR_PHYSBASE is NOT on an 8MB boundary: %" PRIx64 ".",
> +                                               physbase);
>                                 if (type != 6)
>                                         fwts_failed(fw, LOG_LEVEL_HIGH, "MSRSMRR_TYPE",
> -                                               "SMRR: SMRR_TYPE is 0x%x, should be 0x6 (Write-Back).", (int)type);
> +                                               "SMRR: SMRR_TYPE is 0x%" PRIx64 ", should be 0x6 (Write-Back).", type);
>                         }
>                         if (fwts_cpu_readmsr(0, 0x1f3, &val) == FWTS_OK) {
>                                 uint64_t physmask = val & 0xfffff000;
> @@ -226,8 +229,9 @@ static int msr_smrr(fwts_framework *fw)
>
>                                 if (physmask < 0x80000) {
>                                         fwts_failed(fw, LOG_LEVEL_HIGH, "MSRSMRRRegion",
> -                                               "SMRR: region needs to be at least 8MB, SMRR_PHYSMASK = %llx.",
> -                                               (unsigned long long) physmask);
> +                                               "SMRR: region needs to be at least 8MB, "
> +                                               "SMRR_PHYSMASK = %" PRIx64 ".",
> +                                               physmask);
>                                 }
>                                 if (!valid)
>                                         fwts_failed(fw, LOG_LEVEL_HIGH, "MSRSMRRValidBit",
> --
> 1.7.10.4
>
Acked-by: Keng-Yu Lin <kengyu@canonical.com>
Ivan Hu - Oct. 2, 2012, 2:35 a.m.
On 09/24/2012 03:03 AM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>   src/cpu/msr/msr.c |   30 +++++++++++++++++-------------
>   1 file changed, 17 insertions(+), 13 deletions(-)
>
> diff --git a/src/cpu/msr/msr.c b/src/cpu/msr/msr.c
> index edb0aee..0b3f6b0 100644
> --- a/src/cpu/msr/msr.c
> +++ b/src/cpu/msr/msr.c
> @@ -18,6 +18,7 @@
>    */
>
>   #include "fwts.h"
> +#include <inttypes.h>
>
>   #ifdef FWTS_ARCH_INTEL
>
> @@ -139,20 +140,21 @@ static int msr_consistent_check(fwts_framework *fw,
>
>   	if (inconsistent_count > 0) {
>   		fwts_failed(fw, level, "MSRCPUsInconsistent",
> -			"MSR %s (0x%x) has %d inconsistent values across %d CPUs for (shift: %d mask: 0x%llx).",
> -			msr_name, (int)msr,
> -			inconsistent_count, ncpus, shift,
> -			(unsigned long long)mask);
> +			"MSR %s (0x%" PRIx32 ") has %d inconsistent values across "
> +			"%d CPUs for (shift: %d mask: 0x%" PRIx64 ").",
> +			msr_name, msr, inconsistent_count,
> +			ncpus, shift, mask);
>
>   		for (cpu=1; cpu<ncpus; cpu++) {
>   			if (inconsistent[cpu])
> -				fwts_log_info(fw, "MSR CPU 0 -> 0x%llx vs CPU %d -> 0x%llx",
> -					(unsigned long long)vals[0], cpu,
> -					(unsigned long long)vals[cpu]);
> +				fwts_log_info(fw, "MSR CPU 0 -> 0x%" PRIx64
> +					" vs CPU %d -> 0x%" PRIx64,
> +					vals[0], cpu, vals[cpu]);
>   		}
>   	} else {
> -		fwts_passed(fw, "MSR %s (0x%x) (mask:%llx) was consistent across %d CPUs.",
> -			msr_name, (int)msr, (unsigned long long)mask, ncpus);
> +		fwts_passed(fw, "MSR %s (0x%" PRIx32 ") (mask:%" PRIx64 ") "
> +			"was consistent across %d CPUs.",
> +			msr_name, msr, mask, ncpus);
>   		if (callback)
>   			callback(fw, vals[0]);
>   	}
> @@ -215,10 +217,11 @@ static int msr_smrr(fwts_framework *fw)
>   				uint64_t type = val & 7;
>   				if ((physbase & 0x7fffff) != 0)
>   					fwts_failed(fw, LOG_LEVEL_HIGH, "MSRSMRR_PHYSBASE8MBBoundary",
> -						"SMRR: SMRR_PHYSBASE is NOT on an 8MB boundary: %llx.", (unsigned long long)physbase);
> +						"SMRR: SMRR_PHYSBASE is NOT on an 8MB boundary: %" PRIx64 ".",
> +						physbase);
>   				if (type != 6)
>   					fwts_failed(fw, LOG_LEVEL_HIGH, "MSRSMRR_TYPE",
> -						"SMRR: SMRR_TYPE is 0x%x, should be 0x6 (Write-Back).", (int)type);
> +						"SMRR: SMRR_TYPE is 0x%" PRIx64 ", should be 0x6 (Write-Back).", type);
>   			}
>   			if (fwts_cpu_readmsr(0, 0x1f3, &val) == FWTS_OK) {
>   				uint64_t physmask = val & 0xfffff000;
> @@ -226,8 +229,9 @@ static int msr_smrr(fwts_framework *fw)
>
>   				if (physmask < 0x80000) {
>   					fwts_failed(fw, LOG_LEVEL_HIGH, "MSRSMRRRegion",
> -						"SMRR: region needs to be at least 8MB, SMRR_PHYSMASK = %llx.",
> -						(unsigned long long) physmask);
> +						"SMRR: region needs to be at least 8MB, "
> +						"SMRR_PHYSMASK = %" PRIx64 ".",
> +						physmask);
>   				}
>   				if (!valid)
>   					fwts_failed(fw, LOG_LEVEL_HIGH, "MSRSMRRValidBit",
>

Acked-by: Ivan Hu <ivan.hu@canonical.com>

Patch

diff --git a/src/cpu/msr/msr.c b/src/cpu/msr/msr.c
index edb0aee..0b3f6b0 100644
--- a/src/cpu/msr/msr.c
+++ b/src/cpu/msr/msr.c
@@ -18,6 +18,7 @@ 
  */
 
 #include "fwts.h"
+#include <inttypes.h>
 
 #ifdef FWTS_ARCH_INTEL
 
@@ -139,20 +140,21 @@  static int msr_consistent_check(fwts_framework *fw,
 
 	if (inconsistent_count > 0) {
 		fwts_failed(fw, level, "MSRCPUsInconsistent",
-			"MSR %s (0x%x) has %d inconsistent values across %d CPUs for (shift: %d mask: 0x%llx).",
-			msr_name, (int)msr,
-			inconsistent_count, ncpus, shift,
-			(unsigned long long)mask);
+			"MSR %s (0x%" PRIx32 ") has %d inconsistent values across "
+			"%d CPUs for (shift: %d mask: 0x%" PRIx64 ").",
+			msr_name, msr, inconsistent_count,
+			ncpus, shift, mask);
 
 		for (cpu=1; cpu<ncpus; cpu++) {
 			if (inconsistent[cpu])
-				fwts_log_info(fw, "MSR CPU 0 -> 0x%llx vs CPU %d -> 0x%llx",
-					(unsigned long long)vals[0], cpu,
-					(unsigned long long)vals[cpu]);
+				fwts_log_info(fw, "MSR CPU 0 -> 0x%" PRIx64
+					" vs CPU %d -> 0x%" PRIx64,
+					vals[0], cpu, vals[cpu]);
 		}
 	} else {
-		fwts_passed(fw, "MSR %s (0x%x) (mask:%llx) was consistent across %d CPUs.",
-			msr_name, (int)msr, (unsigned long long)mask, ncpus);
+		fwts_passed(fw, "MSR %s (0x%" PRIx32 ") (mask:%" PRIx64 ") "
+			"was consistent across %d CPUs.",
+			msr_name, msr, mask, ncpus);
 		if (callback)
 			callback(fw, vals[0]);
 	}
@@ -215,10 +217,11 @@  static int msr_smrr(fwts_framework *fw)
 				uint64_t type = val & 7;
 				if ((physbase & 0x7fffff) != 0)
 					fwts_failed(fw, LOG_LEVEL_HIGH, "MSRSMRR_PHYSBASE8MBBoundary",
-						"SMRR: SMRR_PHYSBASE is NOT on an 8MB boundary: %llx.", (unsigned long long)physbase);
+						"SMRR: SMRR_PHYSBASE is NOT on an 8MB boundary: %" PRIx64 ".",
+						physbase);
 				if (type != 6)
 					fwts_failed(fw, LOG_LEVEL_HIGH, "MSRSMRR_TYPE",
-						"SMRR: SMRR_TYPE is 0x%x, should be 0x6 (Write-Back).", (int)type);
+						"SMRR: SMRR_TYPE is 0x%" PRIx64 ", should be 0x6 (Write-Back).", type);
 			}
 			if (fwts_cpu_readmsr(0, 0x1f3, &val) == FWTS_OK) {
 				uint64_t physmask = val & 0xfffff000;
@@ -226,8 +229,9 @@  static int msr_smrr(fwts_framework *fw)
 
 				if (physmask < 0x80000) {
 					fwts_failed(fw, LOG_LEVEL_HIGH, "MSRSMRRRegion",
-						"SMRR: region needs to be at least 8MB, SMRR_PHYSMASK = %llx.",
-						(unsigned long long) physmask);
+						"SMRR: region needs to be at least 8MB, "
+						"SMRR_PHYSMASK = %" PRIx64 ".",
+						physmask);
 				}
 				if (!valid)
 					fwts_failed(fw, LOG_LEVEL_HIGH, "MSRSMRRValidBit",