--- corebootv2/src/cpu/amd/car/cache_as_ram.inc (Arbeitskopie) +++ corebootv2/src/cpu/amd/car/cache_as_ram.inc (working copy) @@ -27,10 +27,10 @@ /* for CAR_FAM10 */ #define CacheSizeAPStack 0x400 /* 1K */ -#define jmp_if_k8(x) comisd %xmm1, %xmm2; jnz x +#define jmp_if_k8(x) comisd %xmm1, %xmm2; jb x #define CPUID_MASK 0x0ff00f00 -#define CPUID_MASK_FAM10 0x00100f00 +#define CPUID_VAL_FAM10_ROTATED 0x0f000010 #include #include @@ -60,9 +60,12 @@ cvtsi2sd %ebx, %xmm3 movl $0x01, %eax cpuid + /* base family is bits 8..11, extended family is bits 20..27 */ andl $CPUID_MASK, %eax + /* reorder bits for easier comparison by value */ + rol %eax, $16 cvtsi2sd %eax, %xmm1 - movl $CPUID_MASK_FAM10, %eax + movl $CPUID_VAL_FAM10_ROTATED, %eax cvtsi2sd %eax, %xmm2 cvtsd2si %xmm3, %ebx