[PATCH 1/2] x86/cpu/hygon: Introduce macros for hygon family numbers

[Chaohong Guo]

Consolidate all magic numbers of hygon CPUs into a header file,
The macros describe the family/model numbers of hygon CPUs.

Signed-off-by: Chaohong Guo <guochaohong@xxxxxxxxxxxxxx>
Co-developed-by: Zhiquan Li <lizhiquan@xxxxxxxxxxxxxx>
Signed-off-by: Zhiquan Li <lizhiquan@xxxxxxxxxxxxxx>
---
 arch/x86/include/asm/cpu_device_id.h   |  2 ++
 arch/x86/include/asm/processor-hygon.h | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 arch/x86/include/asm/processor-hygon.h

diff --git a/arch/x86/include/asm/cpu_device_id.h b/arch/x86/include/asm/cpu_device_id.h
index c62d8fae52c3..447837d15f87 100644
--- a/arch/x86/include/asm/cpu_device_id.h
+++ b/arch/x86/include/asm/cpu_device_id.h
@@ -44,6 +44,8 @@
 #include <asm/intel-family.h>
 /* And the X86_VENDOR_* ones */
 #include <asm/processor.h>
+/* Hygon HFM model defines */
+#include <asm/processor-hygon.h>
 
 /* Centaur FAM6 models */
 #define X86_CENTAUR_FAM6_C7_A		0xa
diff --git a/arch/x86/include/asm/processor-hygon.h b/arch/x86/include/asm/processor-hygon.h
new file mode 100644
index 000000000000..08150e3ea379
--- /dev/null
+++ b/arch/x86/include/asm/processor-hygon.h
@@ -0,0 +1,20 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * The helpers to support Hygon CPU specific code path.
+ */
+
+#ifndef _ASM_X86_PROCESSOR_HYGON_H
+#define _ASM_X86_PROCESSOR_HYGON_H
+
+#include <asm/processor.h>
+
+#define	HFM(_family, _model)	VFM_MAKE(X86_VENDOR_HYGON, _family, _model)
+
+#define	HYGON_F18_M04		HFM(0x18, 4)
+#define	HYGON_F18_M06		HFM(0x18, 6)
+#define	HYGON_F18_M07		HFM(0x18, 7)
+
+
+#define	HYGON_7447V		HYGON_F18_M07
+
+#endif /*  _ASM_X86_PROCESSOR_HYGON_H */
-- 
2.18.2