diff options
author | Timothy Pearson <tpearson@raptorengineeringinc.com> | 2015-06-25 15:28:23 -0500 |
---|---|---|
committer | Jonathan A. Kollasch <jakllsch@kollasch.net> | 2015-11-14 23:38:10 +0100 |
commit | 0e545c66a3d1b0a18e9cd0a1bdc34d89e82e0667 (patch) | |
tree | 8fb168364f2066795b6b25c1fb395f944ef82408 /src/northbridge/amd/amdmct/mct | |
parent | 92bcaa2226ff8fe16f2144358b3ba310da555a2c (diff) | |
download | coreboot-0e545c66a3d1b0a18e9cd0a1bdc34d89e82e0667.tar.xz |
northbridge/amd/amdfam10: Properly indicate node and channel in SMBIOS tables
Change-Id: Ie7278745358daf0c78cdb9c579db5291a1a2a0cb
Signed-off-by: Timothy Pearson <tpearson@raptorengineeringinc.com>
Reviewed-on: http://review.coreboot.org/12004
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/northbridge/amd/amdmct/mct')
-rw-r--r-- | src/northbridge/amd/amdmct/mct/mct_d.c | 12 | ||||
-rw-r--r-- | src/northbridge/amd/amdmct/mct/mct_d.h | 7 |
2 files changed, 17 insertions, 2 deletions
diff --git a/src/northbridge/amd/amdmct/mct/mct_d.c b/src/northbridge/amd/amdmct/mct/mct_d.c index 91d929a8bb..0e59e1d2a0 100644 --- a/src/northbridge/amd/amdmct/mct/mct_d.c +++ b/src/northbridge/amd/amdmct/mct/mct_d.c @@ -232,6 +232,18 @@ restartinit: pDCTstat->dev_nbmisc = PA_NBMISC(Node); pDCTstat->NodeSysBase = node_sys_base; + if (mctGet_NVbits(NV_PACK_TYPE) == PT_GR) { + uint32_t dword; + pDCTstat->Dual_Node_Package = 1; + + /* Get the internal node number */ + dword = Get_NB32(pDCTstat->dev_nbmisc, 0xe8); + dword = (dword >> 30) & 0x3; + pDCTstat->Internal_Node_ID = dword; + } else { + pDCTstat->Dual_Node_Package = 0; + } + print_tx("mctAutoInitMCT_D: mct_init Node ", Node); mct_init(pMCTstat, pDCTstat); mctNodeIDDebugPort_D(); diff --git a/src/northbridge/amd/amdmct/mct/mct_d.h b/src/northbridge/amd/amdmct/mct/mct_d.h index 3845a87058..552681feb7 100644 --- a/src/northbridge/amd/amdmct/mct/mct_d.h +++ b/src/northbridge/amd/amdmct/mct/mct_d.h @@ -287,8 +287,11 @@ struct MCTStatStruc { struct DCTStatStruc { /* A per Node structure*/ /* DCTStatStruct_F - start */ - u8 Node_ID; /* Node ID of current controller*/ - u8 ErrCode; /* Current error condition of Node + u8 Node_ID; /* Node ID of current controller*/ + uint8_t Internal_Node_ID; /* Internal Node ID of the current controller */ + uint8_t Dual_Node_Package; /* 1=Dual node package (G34) */ + uint8_t stopDCT; /* Set if the DCT will be stopped */ + u8 ErrCode; /* Current error condition of Node 0= no error 1= Variance Error, DCT is running but not in an optimal configuration. 2= Stop Error, DCT is NOT running |