[coreboot] New patch to review for coreboot: fa0ab5c agesa fam15 northbridge: change lapic_id to accommodate two CPUs

Siyuan Wang (wangsiyuanbuaa@gmail.com) gerrit at coreboot.org
Fri Sep 7 11:24:43 CEST 2012


Siyuan Wang (wangsiyuanbuaa at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1498

-gerrit

commit fa0ab5c0cfb876f686ab834f63e3c4943a1caa9e
Author: Siyuan Wang <wangsiyuanbuaa at gmail.com>
Date:   Fri Sep 7 19:03:24 2012 +0800

    agesa fam15 northbridge: change lapic_id to accommodate two CPUs
    
    According to http://review.coreboot.org/gitweb?p=coreboot.git;a=blob;f=src/vendorcode/amd/agesa/f15/Proc/CPU/cpuApicUtilities.c;hb=HEAD#l273 line 273,
    adjust apic id to accommodate two CPUs.
    The Tyan S8226 has two CPU sockets, and the current code just finds one CPU's cores.
    we adjust apic_id in cpu_bus_scan so as to find all CPUs.
    
    Change-Id: Ib3263fc6f5508f744b81e8e388fde9ccd9b51851
    Signed-off-by: Siyuan Wang <SiYuan.Wang at amd.com>
    Signed-off-by: Siyuan Wang <wangsiyuanbuaa at gmail.com>
---
 src/northbridge/amd/agesa/family15/northbridge.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/northbridge/amd/agesa/family15/northbridge.c b/src/northbridge/amd/agesa/family15/northbridge.c
index da67af4..c4fc6a8 100644
--- a/src/northbridge/amd/agesa/family15/northbridge.c
+++ b/src/northbridge/amd/agesa/family15/northbridge.c
@@ -1047,7 +1047,6 @@ static u32 cpu_bus_scan(device_t dev, u32 max)
 
 		for (j = 0; j <= siblings; j++ ) {
 			extern CONST OPTIONS_CONFIG_TOPOLOGY ROMDATA TopologyConfiguration;
-			u32 modules = TopologyConfiguration.PlatformNumberOfModules;
 			u32 lapicid_start = 0;
 
 			/*
@@ -1071,7 +1070,7 @@ static u32 cpu_bus_scan(device_t dev, u32 max)
 				lapicid_start = (lapicid_start + 1) * core_max;
 				printk(BIOS_SPEW, "lpaicid_start=0x%x ", lapicid_start);
 			}
-			u32 apic_id = (lapicid_start * (i/modules + 1)) + ((i % modules) ? (j + (siblings + 1)) : j);
+			u32 apic_id = (i * core_max) + j + lapicid_start;
 			printk(BIOS_SPEW, "node 0x%x core 0x%x apicid=0x%x\n",
 					i, j, apic_id);
 




More information about the coreboot mailing list