From a27902c1838836b3fb00cd660ce37a4f20bd7991 Mon Sep 17 00:00:00 2001 From: Jean-Sébastien Pédron Date: Fri, 10 Feb 2023 16:38:43 +0100 Subject: linuxkpi: Define `cpu_data(cpu)` `cpu_data(cpu)` evaluates to a `struct cpuinfo_x86` filled with attributes of the given CPU number. The CPU number is an index in the `__cpu_data[]` array with MAXCPU entries. On FreeBSD, we simply initialize all of them like we do with `boot_cpu_data`. While here, we add the `x86_model` field to the `struct cpuinfo_x86`. We use `CPUID_TO_MODEL()` to set it. At the same time, we fix the value of `x86` which should have been set to the CPU family. It was using the same implementation as `CPUID_TO_MODEL()` before. It now uses `CPUID_TO_FAMILY()`. Reviewed by: manu Approved by: manu Differential Revision: https://reviews.freebsd.org/D38542 --- sys/compat/linuxkpi/common/include/asm/intel-family.h | 3 +++ sys/compat/linuxkpi/common/include/asm/processor.h | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 sys/compat/linuxkpi/common/include/asm/intel-family.h (limited to 'sys/compat/linuxkpi/common/include/asm') diff --git a/sys/compat/linuxkpi/common/include/asm/intel-family.h b/sys/compat/linuxkpi/common/include/asm/intel-family.h new file mode 100644 index 000000000000..1dae979b3c5e --- /dev/null +++ b/sys/compat/linuxkpi/common/include/asm/intel-family.h @@ -0,0 +1,3 @@ +/* Public domain. */ + +#define INTEL_FAM6_ROCKETLAKE 0xA7 diff --git a/sys/compat/linuxkpi/common/include/asm/processor.h b/sys/compat/linuxkpi/common/include/asm/processor.h index 86d4ab9de98f..9e784396c63a 100644 --- a/sys/compat/linuxkpi/common/include/asm/processor.h +++ b/sys/compat/linuxkpi/common/include/asm/processor.h @@ -35,11 +35,14 @@ #if defined(__i386__) || defined(__amd64__) struct cpuinfo_x86 { uint8_t x86; + uint8_t x86_model; uint16_t x86_clflush_size; uint16_t x86_max_cores; }; extern struct cpuinfo_x86 boot_cpu_data; +extern struct cpuinfo_x86 __cpu_data[]; +#define cpu_data(cpu) __cpu_data[cpu] #endif #define cpu_relax() cpu_spinwait() -- cgit v1.3