From d33cbf1803d0fc465c1bbef1da58beeb2628643e Mon Sep 17 00:00:00 2001 From: Lean Sheng Tan Date: Fri, 14 Apr 2023 14:19:19 +0200 Subject: [PATCH] soc/intel/xeon_sp/spr: Remove stale call to xeonsp_init_cpu_config This fixes the Jenkins build error when building INTEL_ARCHERCITY_CRB that was caused by the API change in commit 36e6f9bc047f86e1628c8c41d3ac16d80fb344de. This patch removes the broken API function and also adds package_id log print same as previous commit mentioned above. Signed-off-by: Lean Sheng Tan Change-Id: I89e14b40186007ab0290b24cd6bd58015be376b6 Reviewed-on: https://review.coreboot.org/c/coreboot/+/74436 Reviewed-by: Arthur Heymans Tested-by: build bot (Jenkins) Reviewed-by: Sean Rhodes --- src/soc/intel/xeon_sp/spr/cpu.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/soc/intel/xeon_sp/spr/cpu.c b/src/soc/intel/xeon_sp/spr/cpu.c index 47873f5300..2ed8e2290a 100644 --- a/src/soc/intel/xeon_sp/spr/cpu.c +++ b/src/soc/intel/xeon_sp/spr/cpu.c @@ -78,8 +78,9 @@ static void each_cpu_init(struct device *cpu) { msr_t msr; - printk(BIOS_SPEW, "%s dev: %s, cpu: %lu, apic_id: 0x%x\n", __func__, dev_path(cpu), - cpu_index(), cpu->path.apic.apic_id); + printk(BIOS_SPEW, "%s dev: %s, cpu: %lu, apic_id: 0x%x, package_id: 0x%x\n", + __func__, dev_path(cpu), cpu_index(), cpu->path.apic.apic_id, + cpu->path.apic.package_id); /* * Enable PWR_PERF_PLTFRM_OVR and PROCHOT_LOCK. @@ -275,7 +276,4 @@ void mp_init_cpus(struct bus *bus) if (mp_init_with_smm(bus, &mp_ops) < 0) printk(BIOS_ERR, "MP initialization failure.\n"); - - /* update numa domain for all cpu devices */ - xeonsp_init_cpu_config(); }