From 1c896512cb783adfb82930c9ebd0421de245858f Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Thu, 6 Sep 2018 20:53:44 -0600 Subject: compat: arch-namespace certain includes Signed-off-by: Jason A. Donenfeld --- src/compat/Kbuild.include | 16 ++--- src/compat/fpu-x86/include/asm/fpu/api.h | 1 + src/compat/fpu/include/asm/fpu/api.h | 1 - .../intel-family-x86/include/asm/intel-family.h | 73 ++++++++++++++++++++++ src/compat/intel-family/include/asm/intel-family.h | 73 ---------------------- src/compat/neon-arm/include/asm/neon.h | 7 +++ src/compat/neon/include/asm/neon.h | 7 --- src/compat/simd-x86/include/asm/simd.h | 1 + src/compat/simd/include/asm/simd.h | 1 - 9 files changed, 90 insertions(+), 90 deletions(-) create mode 100644 src/compat/fpu-x86/include/asm/fpu/api.h delete mode 100644 src/compat/fpu/include/asm/fpu/api.h create mode 100644 src/compat/intel-family-x86/include/asm/intel-family.h delete mode 100644 src/compat/intel-family/include/asm/intel-family.h create mode 100644 src/compat/neon-arm/include/asm/neon.h delete mode 100644 src/compat/neon/include/asm/neon.h create mode 100644 src/compat/simd-x86/include/asm/simd.h delete mode 100644 src/compat/simd/include/asm/simd.h (limited to 'src') diff --git a/src/compat/Kbuild.include b/src/compat/Kbuild.include index 974c0d3..04ffdeb 100644 --- a/src/compat/Kbuild.include +++ b/src/compat/Kbuild.include @@ -25,16 +25,16 @@ ccflags-y += -I$(src)/compat/dst_cache/include wireguard-y += compat/dst_cache/dst_cache.o endif -ifeq ($(wildcard $(srctree)/arch/x86/include/asm/intel-family.h),) -ccflags-y += -I$(src)/compat/intel-family/include +ifeq ($(wildcard $(srctree)/arch/x86/include/asm/intel-family.h)$(CONFIG_X86),y) +ccflags-y += -I$(src)/compat/intel-family-x86/include endif -ifeq ($(wildcard $(srctree)/arch/x86/include/asm/fpu/api.h),) -ccflags-y += -I$(src)/compat/fpu/include +ifeq ($(wildcard $(srctree)/arch/x86/include/asm/fpu/api.h)$(CONFIG_X86),y) +ccflags-y += -I$(src)/compat/fpu-x86/include endif -ifeq ($(wildcard $(srctree)/arch/x86/include/asm/simd.h),) -ccflags-y += -I$(src)/compat/simd/include +ifeq ($(wildcard $(srctree)/arch/x86/include/asm/simd.h)$(CONFIG_X86),y) +ccflags-y += -I$(src)/compat/simd-x86/include endif ifeq ($(wildcard $(srctree)/include/net/udp_tunnel.h),) @@ -48,10 +48,10 @@ wireguard-y += compat/memneq/memneq.o endif ifeq ($(wildcard $(srctree)/arch/arm/include/asm/neon.h)$(CONFIG_ARM),y) -ccflags-y += -I$(src)/compat/neon/include +ccflags-y += -I$(src)/compat/neon-arm/include endif ifeq ($(wildcard $(srctree)/arch/arm64/include/asm/neon.h)$(CONFIG_ARM64),y) -ccflags-y += -I$(src)/compat/neon/include +ccflags-y += -I$(src)/compat/neon-arm/include endif ifeq ($(CONFIG_X86_64),y) diff --git a/src/compat/fpu-x86/include/asm/fpu/api.h b/src/compat/fpu-x86/include/asm/fpu/api.h new file mode 100644 index 0000000..f3f9117 --- /dev/null +++ b/src/compat/fpu-x86/include/asm/fpu/api.h @@ -0,0 +1 @@ +#include diff --git a/src/compat/fpu/include/asm/fpu/api.h b/src/compat/fpu/include/asm/fpu/api.h deleted file mode 100644 index f3f9117..0000000 --- a/src/compat/fpu/include/asm/fpu/api.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/src/compat/intel-family-x86/include/asm/intel-family.h b/src/compat/intel-family-x86/include/asm/intel-family.h new file mode 100644 index 0000000..35a6bc4 --- /dev/null +++ b/src/compat/intel-family-x86/include/asm/intel-family.h @@ -0,0 +1,73 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ASM_X86_INTEL_FAMILY_H +#define _ASM_X86_INTEL_FAMILY_H + +/* + * "Big Core" Processors (Branded as Core, Xeon, etc...) + * + * The "_X" parts are generally the EP and EX Xeons, or the + * "Extreme" ones, like Broadwell-E. + * + * Things ending in "2" are usually because we have no better + * name for them. There's no processor called "SILVERMONT2". + */ + +#define INTEL_FAM6_CORE_YONAH 0x0E + +#define INTEL_FAM6_CORE2_MEROM 0x0F +#define INTEL_FAM6_CORE2_MEROM_L 0x16 +#define INTEL_FAM6_CORE2_PENRYN 0x17 +#define INTEL_FAM6_CORE2_DUNNINGTON 0x1D + +#define INTEL_FAM6_NEHALEM 0x1E +#define INTEL_FAM6_NEHALEM_G 0x1F /* Auburndale / Havendale */ +#define INTEL_FAM6_NEHALEM_EP 0x1A +#define INTEL_FAM6_NEHALEM_EX 0x2E + +#define INTEL_FAM6_WESTMERE 0x25 +#define INTEL_FAM6_WESTMERE_EP 0x2C +#define INTEL_FAM6_WESTMERE_EX 0x2F + +#define INTEL_FAM6_SANDYBRIDGE 0x2A +#define INTEL_FAM6_SANDYBRIDGE_X 0x2D +#define INTEL_FAM6_IVYBRIDGE 0x3A +#define INTEL_FAM6_IVYBRIDGE_X 0x3E + +#define INTEL_FAM6_HASWELL_CORE 0x3C +#define INTEL_FAM6_HASWELL_X 0x3F +#define INTEL_FAM6_HASWELL_ULT 0x45 +#define INTEL_FAM6_HASWELL_GT3E 0x46 + +#define INTEL_FAM6_BROADWELL_CORE 0x3D +#define INTEL_FAM6_BROADWELL_GT3E 0x47 +#define INTEL_FAM6_BROADWELL_X 0x4F +#define INTEL_FAM6_BROADWELL_XEON_D 0x56 + +#define INTEL_FAM6_SKYLAKE_MOBILE 0x4E +#define INTEL_FAM6_SKYLAKE_DESKTOP 0x5E +#define INTEL_FAM6_SKYLAKE_X 0x55 +#define INTEL_FAM6_KABYLAKE_MOBILE 0x8E +#define INTEL_FAM6_KABYLAKE_DESKTOP 0x9E + +/* "Small Core" Processors (Atom) */ + +#define INTEL_FAM6_ATOM_PINEVIEW 0x1C +#define INTEL_FAM6_ATOM_LINCROFT 0x26 +#define INTEL_FAM6_ATOM_PENWELL 0x27 +#define INTEL_FAM6_ATOM_CLOVERVIEW 0x35 +#define INTEL_FAM6_ATOM_CEDARVIEW 0x36 +#define INTEL_FAM6_ATOM_SILVERMONT1 0x37 /* BayTrail/BYT / Valleyview */ +#define INTEL_FAM6_ATOM_SILVERMONT2 0x4D /* Avaton/Rangely */ +#define INTEL_FAM6_ATOM_AIRMONT 0x4C /* CherryTrail / Braswell */ +#define INTEL_FAM6_ATOM_MERRIFIELD 0x4A /* Tangier */ +#define INTEL_FAM6_ATOM_MOOREFIELD 0x5A /* Anniedale */ +#define INTEL_FAM6_ATOM_GOLDMONT 0x5C +#define INTEL_FAM6_ATOM_DENVERTON 0x5F /* Goldmont Microserver */ +#define INTEL_FAM6_ATOM_GEMINI_LAKE 0x7A + +/* Xeon Phi */ + +#define INTEL_FAM6_XEON_PHI_KNL 0x57 /* Knights Landing */ +#define INTEL_FAM6_XEON_PHI_KNM 0x85 /* Knights Mill */ + +#endif /* _ASM_X86_INTEL_FAMILY_H */ diff --git a/src/compat/intel-family/include/asm/intel-family.h b/src/compat/intel-family/include/asm/intel-family.h deleted file mode 100644 index 35a6bc4..0000000 --- a/src/compat/intel-family/include/asm/intel-family.h +++ /dev/null @@ -1,73 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _ASM_X86_INTEL_FAMILY_H -#define _ASM_X86_INTEL_FAMILY_H - -/* - * "Big Core" Processors (Branded as Core, Xeon, etc...) - * - * The "_X" parts are generally the EP and EX Xeons, or the - * "Extreme" ones, like Broadwell-E. - * - * Things ending in "2" are usually because we have no better - * name for them. There's no processor called "SILVERMONT2". - */ - -#define INTEL_FAM6_CORE_YONAH 0x0E - -#define INTEL_FAM6_CORE2_MEROM 0x0F -#define INTEL_FAM6_CORE2_MEROM_L 0x16 -#define INTEL_FAM6_CORE2_PENRYN 0x17 -#define INTEL_FAM6_CORE2_DUNNINGTON 0x1D - -#define INTEL_FAM6_NEHALEM 0x1E -#define INTEL_FAM6_NEHALEM_G 0x1F /* Auburndale / Havendale */ -#define INTEL_FAM6_NEHALEM_EP 0x1A -#define INTEL_FAM6_NEHALEM_EX 0x2E - -#define INTEL_FAM6_WESTMERE 0x25 -#define INTEL_FAM6_WESTMERE_EP 0x2C -#define INTEL_FAM6_WESTMERE_EX 0x2F - -#define INTEL_FAM6_SANDYBRIDGE 0x2A -#define INTEL_FAM6_SANDYBRIDGE_X 0x2D -#define INTEL_FAM6_IVYBRIDGE 0x3A -#define INTEL_FAM6_IVYBRIDGE_X 0x3E - -#define INTEL_FAM6_HASWELL_CORE 0x3C -#define INTEL_FAM6_HASWELL_X 0x3F -#define INTEL_FAM6_HASWELL_ULT 0x45 -#define INTEL_FAM6_HASWELL_GT3E 0x46 - -#define INTEL_FAM6_BROADWELL_CORE 0x3D -#define INTEL_FAM6_BROADWELL_GT3E 0x47 -#define INTEL_FAM6_BROADWELL_X 0x4F -#define INTEL_FAM6_BROADWELL_XEON_D 0x56 - -#define INTEL_FAM6_SKYLAKE_MOBILE 0x4E -#define INTEL_FAM6_SKYLAKE_DESKTOP 0x5E -#define INTEL_FAM6_SKYLAKE_X 0x55 -#define INTEL_FAM6_KABYLAKE_MOBILE 0x8E -#define INTEL_FAM6_KABYLAKE_DESKTOP 0x9E - -/* "Small Core" Processors (Atom) */ - -#define INTEL_FAM6_ATOM_PINEVIEW 0x1C -#define INTEL_FAM6_ATOM_LINCROFT 0x26 -#define INTEL_FAM6_ATOM_PENWELL 0x27 -#define INTEL_FAM6_ATOM_CLOVERVIEW 0x35 -#define INTEL_FAM6_ATOM_CEDARVIEW 0x36 -#define INTEL_FAM6_ATOM_SILVERMONT1 0x37 /* BayTrail/BYT / Valleyview */ -#define INTEL_FAM6_ATOM_SILVERMONT2 0x4D /* Avaton/Rangely */ -#define INTEL_FAM6_ATOM_AIRMONT 0x4C /* CherryTrail / Braswell */ -#define INTEL_FAM6_ATOM_MERRIFIELD 0x4A /* Tangier */ -#define INTEL_FAM6_ATOM_MOOREFIELD 0x5A /* Anniedale */ -#define INTEL_FAM6_ATOM_GOLDMONT 0x5C -#define INTEL_FAM6_ATOM_DENVERTON 0x5F /* Goldmont Microserver */ -#define INTEL_FAM6_ATOM_GEMINI_LAKE 0x7A - -/* Xeon Phi */ - -#define INTEL_FAM6_XEON_PHI_KNL 0x57 /* Knights Landing */ -#define INTEL_FAM6_XEON_PHI_KNM 0x85 /* Knights Mill */ - -#endif /* _ASM_X86_INTEL_FAMILY_H */ diff --git a/src/compat/neon-arm/include/asm/neon.h b/src/compat/neon-arm/include/asm/neon.h new file mode 100644 index 0000000..980d831 --- /dev/null +++ b/src/compat/neon-arm/include/asm/neon.h @@ -0,0 +1,7 @@ +#ifndef _ARCH_ARM_ASM_NEON +#define _ARCH_ARM_ASM_NEON +#define kernel_neon_begin() \ + BUILD_BUG_ON_MSG(1, "This kernel does not support ARM NEON") +#define kernel_neon_end() \ + BUILD_BUG_ON_MSG(1, "This kernel does not support ARM NEON") +#endif diff --git a/src/compat/neon/include/asm/neon.h b/src/compat/neon/include/asm/neon.h deleted file mode 100644 index 980d831..0000000 --- a/src/compat/neon/include/asm/neon.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef _ARCH_ARM_ASM_NEON -#define _ARCH_ARM_ASM_NEON -#define kernel_neon_begin() \ - BUILD_BUG_ON_MSG(1, "This kernel does not support ARM NEON") -#define kernel_neon_end() \ - BUILD_BUG_ON_MSG(1, "This kernel does not support ARM NEON") -#endif diff --git a/src/compat/simd-x86/include/asm/simd.h b/src/compat/simd-x86/include/asm/simd.h new file mode 100644 index 0000000..f3f9117 --- /dev/null +++ b/src/compat/simd-x86/include/asm/simd.h @@ -0,0 +1 @@ +#include diff --git a/src/compat/simd/include/asm/simd.h b/src/compat/simd/include/asm/simd.h deleted file mode 100644 index f3f9117..0000000 --- a/src/compat/simd/include/asm/simd.h +++ /dev/null @@ -1 +0,0 @@ -#include -- cgit v1.2.3