X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fcpuid%2Ftest%2Frun.c;h=6afb9fa4a291b49d1f6986de80e6914975b14ccf;hb=6977745243a4bdd351e1565f2749872bb927709e;hp=83b90f37ebd346c6c08a3bf9f33efa7fef3771d7;hpb=0e528772db367034b41b693336ffee8bc765a62f;p=ccan

diff --git a/ccan/cpuid/test/run.c b/ccan/cpuid/test/run.c
index 83b90f37..6afb9fa4 100644
--- a/ccan/cpuid/test/run.c
+++ b/ccan/cpuid/test/run.c
@@ -10,36 +10,14 @@ int main(void)
 		return 1;
 	}
 
-	char cputype[12];
-	if (cpuid_sprintf_cputype(cpuid_get_cpu_type(), cputype))
-		printf ("Vendor ID: %s\n", cputype);
-
-	char buf[48];
-	cpuid(CPU_PROC_BRAND_STRING, (uint32_t *)buf);
-	printf ("Processor Brand: %s\n", buf);
-
-	uint32_t procinfo[8];
-	cpuid(CPU_PROCINFO_AND_FEATUREBITS, procinfo);
-	printf("Stepping: %d Model: 0x%X Family: %d extended model: %d extended family: %d\n",
-		procinfo[0], procinfo[1], procinfo[2], procinfo[3], procinfo[4]);
-
-	printf ("Highest extended function supported: %#010x\n", cpuid_highest_ext_func_supported());
-
-	uint32_t phys_virt[2];
-	cpuid(CPU_VIRT_PHYS_ADDR_SIZES, phys_virt);
-	printf ("Physical address size: %d\nVirtual address size: %d\n", phys_virt[0], phys_virt[1]);
-
-	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]);
-
-	uint32_t l2c[3];
-	cpuid(CPU_EXTENDED_L2_CACHE_FEATURES, l2c);
-	printf("L2 Line size: %u bytes\tAssociativity: %02xh\tCache Size: %u KB\n",
-		l2c[0], l2c[1], l2c[2]);
+	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;
 }