git: a27902c18388 - main - linuxkpi: Define `cpu_data(cpu)`

The branch main has been updated by dumbbell (ports committer):

URL: https://cgit.FreeBSD.org/src/commit/?id=a27902c1838836b3fb00cd660ce37a4f20bd7991

commit a27902c1838836b3fb00cd660ce37a4f20bd7991
Author:     Jean-Sébastien Pédron <dumbbell@FreeBSD.org>
AuthorDate: 2023-02-10 15:38:43 +0000
Commit:     Jean-Sébastien Pédron <dumbbell@FreeBSD.org>
CommitDate: 2023-02-13 21:09:32 +0000

    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 +++
 sys/compat/linuxkpi/common/src/linux_compat.c         | 11 ++++++++++-
 3 files changed, 16 insertions(+), 1 deletion(-)

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()
diff --git a/sys/compat/linuxkpi/common/src/linux_compat.c b/sys/compat/linuxkpi/common/src/linux_compat.c
index 30cc094a5222..8a2473e82d66 100644
--- a/sys/compat/linuxkpi/common/src/linux_compat.c
+++ b/sys/compat/linuxkpi/common/src/linux_compat.c
@@ -2745,6 +2745,7 @@ io_mapping_create_wc(resource_size_t base, unsigned long size)
 #if defined(__i386__) || defined(__amd64__)
 bool linux_cpu_has_clflush;
 struct cpuinfo_x86 boot_cpu_data;
+struct cpuinfo_x86 __cpu_data[MAXCPU];
 #endif
 
 cpumask_t *
@@ -2767,7 +2768,15 @@ linux_compat_init(void *arg)
 	linux_cpu_has_clflush = (cpu_feature & CPUID_CLFSH);
 	boot_cpu_data.x86_clflush_size = cpu_clflush_line_size;
 	boot_cpu_data.x86_max_cores = mp_ncpus;
-	boot_cpu_data.x86 = ((cpu_id & 0xf0000) >> 12) | ((cpu_id & 0xf0) >> 4);
+	boot_cpu_data.x86 = CPUID_TO_FAMILY(cpu_id);
+	boot_cpu_data.x86_model = CPUID_TO_MODEL(cpu_id);
+
+	for (i = 0; i < MAXCPU; i++) {
+		__cpu_data[i].x86_clflush_size = cpu_clflush_line_size;
+		__cpu_data[i].x86_max_cores = mp_ncpus;
+		__cpu_data[i].x86 = CPUID_TO_FAMILY(cpu_id);
+		__cpu_data[i].x86_model = CPUID_TO_MODEL(cpu_id);
+	}
 #endif
 	rw_init(&linux_vma_lock, "lkpi-vma-lock");