git: b2c860060ccd - main - linuxkpi: Add asm/processor.h

The branch main has been updated by manu:

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

commit b2c860060ccd6020f313f48107694ef207acfc9a
Author:     Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2022-08-09 12:21:09 +0000
Commit:     Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2022-08-18 07:46:43 +0000

    linuxkpi: Add asm/processor.h
    
    Also fill the boot_cpu_data struct as drm needs it.
    
    Reviewed by:    bz
    Obtained from:  drm-kmod
    Sponsored by:   Beckhoff Automation GmbH & Co. KG
    Differential Revision:  https://reviews.freebsd.org/D36107
---
 sys/compat/linuxkpi/common/include/asm/processor.h | 46 ++++++++++++++++++++++
 sys/compat/linuxkpi/common/src/linux_compat.c      |  4 ++
 2 files changed, 50 insertions(+)

diff --git a/sys/compat/linuxkpi/common/include/asm/processor.h b/sys/compat/linuxkpi/common/include/asm/processor.h
new file mode 100644
index 000000000000..450192750612
--- /dev/null
+++ b/sys/compat/linuxkpi/common/include/asm/processor.h
@@ -0,0 +1,46 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2021 Vladimir Kondratyev <wulf@FreeBSD.org>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _LINUXKPI_ASM_PROCESSOR_H_
+#define	_LINUXKPI_ASM_PROCESSOR_H_
+
+#include <sys/types.h>
+#include <machine/cpufunc.h>
+#include <machine/cpu.h>
+
+#if defined(__i386__) || defined(__amd64__)
+struct cpuinfo_x86 {
+	uint8_t		x86;
+	uint16_t	x86_clflush_size;
+};
+
+#define	cpu_relax()	cpu_spinwait()
+
+extern struct cpuinfo_x86	boot_cpu_data;
+#endif
+
+#endif	/* _LINUXKPI_ASM_PROCESSOR_H_ */
diff --git a/sys/compat/linuxkpi/common/src/linux_compat.c b/sys/compat/linuxkpi/common/src/linux_compat.c
index 8644f67762d9..89d2728ce28e 100644
--- a/sys/compat/linuxkpi/common/src/linux_compat.c
+++ b/sys/compat/linuxkpi/common/src/linux_compat.c
@@ -97,6 +97,7 @@ __FBSDID("$FreeBSD$");
 
 #if defined(__i386__) || defined(__amd64__)
 #include <asm/smp.h>
+#include <asm/processor.h>
 #endif
 
 SYSCTL_NODE(_compat, OID_AUTO, linuxkpi, CTLFLAG_RW | CTLFLAG_MPSAFE, 0,
@@ -2730,6 +2731,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;
 #endif
 
 static void
@@ -2740,6 +2742,8 @@ linux_compat_init(void *arg)
 
 #if defined(__i386__) || defined(__amd64__)
 	linux_cpu_has_clflush = (cpu_feature & CPUID_CLFSH);
+	boot_cpu_data.x86_clflush_size = cpu_clflush_line_size;
+	boot_cpu_data.x86 = ((cpu_id & 0xf0000) >> 12) | ((cpu_id & 0xf0) >> 4);
 #endif
 	rw_init(&linux_vma_lock, "lkpi-vma-lock");