From 1956a00953d8eac277b0eb508fcfe60c8f4e1141 Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Tue, 30 Oct 2018 22:31:40 -0600 Subject: soc/amd/stoneyridge: Fix get_cpu_count() In commit 41baf0c3ff (soc/amd/stoneyridge: Remove dev_find_slot where possible), the register being read was changed accidentally from HT_DEV (Device 18h, Func 0) to NB_DEV (Device 18h, Func 5) This doesn't return the correct value, and causes Grunt to reboot. BUG=b:118721473 TEST=Boot grunt Change-Id: I7b73358a074dd27639aafead7c8b39f0fad5685f Signed-off-by: Martin Roth Reviewed-on: https://review.coreboot.org/29367 Tested-by: build bot (Jenkins) Reviewed-by: Daniel Kurtz Reviewed-by: Richard Spiegel Reviewed-by: Raul Rangel --- src/soc/amd/stoneyridge/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/soc') diff --git a/src/soc/amd/stoneyridge/cpu.c b/src/soc/amd/stoneyridge/cpu.c index 6cb59a955d..1d9804d99c 100644 --- a/src/soc/amd/stoneyridge/cpu.c +++ b/src/soc/amd/stoneyridge/cpu.c @@ -55,7 +55,7 @@ static void pre_mp_init(void) static int get_cpu_count(void) { - return (pci_read_config16(SOC_NB_DEV, D18F0_CPU_CNT) & CPU_CNT_MASK) + return (pci_read_config16(SOC_HT_DEV, D18F0_CPU_CNT) & CPU_CNT_MASK) + 1; } -- cgit v1.2.3