X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fcpuid%2Ftest%2Frun.c;h=6afb9fa4a291b49d1f6986de80e6914975b14ccf;hp=c77fd25f87face6a4dc74a501b140132764413fc;hb=dbbefec6973725d9a16c82747e0c7ce8e5e6c4f2;hpb=a87884aabba198a1d44e22f89c5477f1b8167ffd

diff --git a/ccan/cpuid/test/run.c b/ccan/cpuid/test/run.c
index c77fd25f..6afb9fa4 100644
--- a/ccan/cpuid/test/run.c
+++ b/ccan/cpuid/test/run.c
@@ -10,47 +10,14 @@ int main(void)
 		return 1;
 	}
 
-	printf ("Vendor ID: %s\n", cpuid_get_cpu_type_string (cpuid_get_cpu_type ()));
-
-	char buf[48];
-	cpuid(CPU_PROC_BRAND_STRING, (uint32_t *)buf);
-	printf ("Processor Brand: %s\n", buf);
-
-	printf ("Highest extended function supported: %#010x\n", cpuid_highest_ext_func_supported());
-
-	union {
-		struct {
-			uint32_t phys_bits : 8;
-			uint32_t virt_bits : 8;
-			uint32_t reserved  : 16;
-		};
-		uint32_t w;
-	} s;
-	cpuid(CPU_VIRT_PHYS_ADDR_SIZES, &s.w);
-	printf ("Physical address size: %d\nVirtual: %d\n", s.phys_bits, s.virt_bits);
-
-	uint32_t extfeatures[2];
-	cpuid(CPU_EXTENDED_PROC_INFO_FEATURE_BITS, extfeatures);
-	printf ("Extended processor info and feature bits: %d %d\n", extfeatures[0], extfeatures[1]);
-
-	union {
-		struct {
-			uint32_t line_size : 8;
-			uint32_t reserved : 4;
-			uint32_t assoc : 4;
-			uint32_t cache_size : 16;
-		};
-
-		uint32_t w;
-	} l2c;
-
-	cpuid(CPU_EXTENDED_L2_CACHE_FEATURES, &l2c.w);
-	printf ("L2 Cache Size: %u KB\tLine Size: %u bytes\tAssociativity: %02xh\n",
-			l2c.cache_size, l2c.line_size, l2c.assoc);
+	uint32_t info = CPUID_HIGHEST_EXTENDED_FUNCTION_SUPPORTED | CPUID_EXTENDED_L2_CACHE_FEATURES | CPUID_VIRT_PHYS_ADDR_SIZES
+			| CPUID_PROCINFO_AND_FEATUREBITS;
+	uint32_t featureset = CPUID_FEAT_ECX_ALL | CPUID_FEAT_EDX_ALL;
+	if (!cpuid_write_info(info, featureset, NULL)) {
+		printf("Failed to write CPU information!\n");
+		return 1;
+	}
 
-	uint32_t invalid;
-	cpuid(0x0ffffffUL, &invalid);
-	printf ("Testing invalid: %#010x\n", invalid);
+	printf("Wrote CPU information\n");
 	return 0;
 }
-