From 332c3b27d250b16b4a2844f228459d8f0dc5b35c Mon Sep 17 00:00:00 2001
From: Jincheng Li <jincheng.li@intel.com>
Date: Fri, 21 Jun 2024 19:35:14 +0800
Subject: [PATCH] soc/intel/xeon_sp/gnr: Move CPU ID definition to common
 header

Change-Id: I816c6f68840c122fbc37085e31a1b0368a819f4a
Signed-off-by: Jincheng Li <jincheng.li@intel.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/84313
Reviewed-by: Lean Sheng Tan <sheng.tan@9elements.com>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/include/cpu/intel/cpu_ids.h             | 2 ++
 src/soc/intel/xeon_sp/gnr/cpu.c             | 1 -
 src/soc/intel/xeon_sp/gnr/include/soc/cpu.h | 9 ---------
 src/soc/intel/xeon_sp/gnr/soc_util.c        | 2 +-
 4 files changed, 3 insertions(+), 11 deletions(-)
 delete mode 100644 src/soc/intel/xeon_sp/gnr/include/soc/cpu.h

diff --git a/src/include/cpu/intel/cpu_ids.h b/src/include/cpu/intel/cpu_ids.h
index ad66025d5f..9ef74b9e3f 100644
--- a/src/include/cpu/intel/cpu_ids.h
+++ b/src/include/cpu/intel/cpu_ids.h
@@ -57,6 +57,8 @@
 #define CPUID_SAPPHIRERAPIDS_SP_E3	0x806f6
 #define CPUID_SAPPHIRERAPIDS_SP_E4	0x806f7
 #define CPUID_SAPPHIRERAPIDS_SP_Ex	0x806f8
+#define CPUID_GRANITERAPIDS		0xA06D0
+#define CPUID_SIERRAFOREST		0xA06F0
 #define CPUID_ELKHARTLAKE_A0		0x90660
 #define CPUID_ELKHARTLAKE_B0		0x90661
 #define CPUID_ALDERLAKE_A0		0x90670
diff --git a/src/soc/intel/xeon_sp/gnr/cpu.c b/src/soc/intel/xeon_sp/gnr/cpu.c
index 43120b33cc..9502865926 100644
--- a/src/soc/intel/xeon_sp/gnr/cpu.c
+++ b/src/soc/intel/xeon_sp/gnr/cpu.c
@@ -6,7 +6,6 @@
 #include <cpu/x86/mtrr.h>
 #include <intelblocks/cpulib.h>
 #include <intelblocks/mp_init.h>
-#include <soc/cpu.h>
 #include <soc/soc_util.h>
 #include <soc/util.h>
 
diff --git a/src/soc/intel/xeon_sp/gnr/include/soc/cpu.h b/src/soc/intel/xeon_sp/gnr/include/soc/cpu.h
deleted file mode 100644
index 76d33195f8..0000000000
--- a/src/soc/intel/xeon_sp/gnr/include/soc/cpu.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#ifndef _SOC_CPU_H
-#define _SOC_CPU_H
-
-#define CPUID_GRANITERAPIDS	0xA06D0
-#define CPUID_SIERRAFOREST	0xA06F0
-
-#endif
diff --git a/src/soc/intel/xeon_sp/gnr/soc_util.c b/src/soc/intel/xeon_sp/gnr/soc_util.c
index 7ea65c213c..9d8e815f8e 100644
--- a/src/soc/intel/xeon_sp/gnr/soc_util.c
+++ b/src/soc/intel/xeon_sp/gnr/soc_util.c
@@ -1,13 +1,13 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <assert.h>
+#include <cpu/intel/cpu_ids.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <fsp/util.h>
 #include <soc/util.h>
 #include <soc/acpi.h>
 #include <soc/chip_common.h>
-#include <soc/cpu.h>
 #include <soc/pci_devs.h>
 #include <soc/soc_util.h>
 #include <stdlib.h>