summaryrefslogtreecommitdiffstats
path: root/resources/libreboot/patch/kgpe-d16/0071-northbridge-amd-amdfam10-Properly-indicate-node-and-.patch
diff options
context:
space:
mode:
authorFrancis Rowe <info@gluglug.org.uk>2015-11-06 02:45:49 (EST)
committer Francis Rowe <info@gluglug.org.uk>2015-11-06 03:01:51 (EST)
commit60453ff2cbd1befe24959fba1d24f734406444e3 (patch)
tree74a6080455b2b00184fbc4a00503188032773986 /resources/libreboot/patch/kgpe-d16/0071-northbridge-amd-amdfam10-Properly-indicate-node-and-.patch
parent51f5487e7d2c8809bdc7690fe26948064257b34d (diff)
downloadlibreboot-60453ff2cbd1befe24959fba1d24f734406444e3.zip
libreboot-60453ff2cbd1befe24959fba1d24f734406444e3.tar.gz
libreboot-60453ff2cbd1befe24959fba1d24f734406444e3.tar.bz2
Update coreboot to new version (use latest stable kgpe-d16 tree)
Diffstat (limited to 'resources/libreboot/patch/kgpe-d16/0071-northbridge-amd-amdfam10-Properly-indicate-node-and-.patch')
-rw-r--r--resources/libreboot/patch/kgpe-d16/0071-northbridge-amd-amdfam10-Properly-indicate-node-and-.patch120
1 files changed, 0 insertions, 120 deletions
diff --git a/resources/libreboot/patch/kgpe-d16/0071-northbridge-amd-amdfam10-Properly-indicate-node-and-.patch b/resources/libreboot/patch/kgpe-d16/0071-northbridge-amd-amdfam10-Properly-indicate-node-and-.patch
deleted file mode 100644
index 460ea7d..0000000
--- a/resources/libreboot/patch/kgpe-d16/0071-northbridge-amd-amdfam10-Properly-indicate-node-and-.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From ad1418509321ae8765b2e4692f10e5becc28073e Mon Sep 17 00:00:00 2001
-From: Timothy Pearson <tpearson@raptorengineeringinc.com>
-Date: Thu, 25 Jun 2015 15:28:23 -0500
-Subject: [PATCH 071/139] northbridge/amd/amdfam10: Properly indicate node and
- channel in SMBIOS tables
-
-Change-Id: Ie7278745358daf0c78cdb9c579db5291a1a2a0cb
-Signed-off-by: Timothy Pearson <tpearson@raptorengineeringinc.com>
----
- src/northbridge/amd/amdfam10/northbridge.c | 7 ++++++-
- src/northbridge/amd/amdmct/mct/mct_d.c | 12 ++++++++++++
- src/northbridge/amd/amdmct/mct/mct_d.h | 7 +++++--
- src/northbridge/amd/amdmct/mct_ddr3/mct_d.c | 12 ++++++++++++
- src/northbridge/amd/amdmct/mct_ddr3/mct_d.h | 8 +++++---
- 5 files changed, 40 insertions(+), 6 deletions(-)
-
-diff --git a/src/northbridge/amd/amdfam10/northbridge.c b/src/northbridge/amd/amdfam10/northbridge.c
-index 3fc31c0..95e902d 100644
---- a/src/northbridge/amd/amdfam10/northbridge.c
-+++ b/src/northbridge/amd/amdfam10/northbridge.c
-@@ -1207,7 +1207,12 @@ static int amdfam10_get_smbios_data17(int* count, int handle, int parent_handle,
- t->attributes = 0;
- t->attributes |= ranks & 0xf; /* rank number is stored in the lowest 4 bits of the attributes field */
- t->form_factor = MEMORY_FORMFACTOR_DIMM;
-- snprintf(string_buffer, sizeof (string_buffer), "NODE %d DIMM_%s%d", node, (slot & 0x1)?"B":"A", (slot >> 1) + 1);
-+ if (mem_info->dct_stat[node].Dual_Node_Package) {
-+ snprintf(string_buffer, sizeof (string_buffer), "NODE %d DIMM_%s%d", node >> 1,
-+ (mem_info->dct_stat[node].Internal_Node_ID)?((slot & 0x1)?"D":"C"):((slot & 0x1)?"B":"A"), (slot >> 1) + 1);
-+ } else {
-+ snprintf(string_buffer, sizeof (string_buffer), "NODE %d DIMM_%s%d", node, (slot & 0x1)?"B":"A", (slot >> 1) + 1);
-+ }
- t->device_locator = smbios_add_string(t->eos, string_buffer);
- if (IS_ENABLED(CONFIG_DIMM_DDR2))
- t->memory_type = MEMORY_TYPE_DDR2;
-diff --git a/src/northbridge/amd/amdmct/mct/mct_d.c b/src/northbridge/amd/amdmct/mct/mct_d.c
-index be0af65..c805d41 100644
---- a/src/northbridge/amd/amdmct/mct/mct_d.c
-+++ b/src/northbridge/amd/amdmct/mct/mct_d.c
-@@ -236,6 +236,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 6b6194d..7569300 100644
---- a/src/northbridge/amd/amdmct/mct/mct_d.h
-+++ b/src/northbridge/amd/amdmct/mct/mct_d.h
-@@ -291,8 +291,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
-diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mct_d.c b/src/northbridge/amd/amdmct/mct_ddr3/mct_d.c
-index fadb353..573c0af 100644
---- a/src/northbridge/amd/amdmct/mct_ddr3/mct_d.c
-+++ b/src/northbridge/amd/amdmct/mct_ddr3/mct_d.c
-@@ -1389,6 +1389,18 @@ restartinit:
- pDCTstat->dev_nbctl = PA_NBCTL(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;
-+ }
-+
- printk(BIOS_DEBUG, "mctAutoInitMCT_D: mct_init Node %d\n", Node);
- mct_init(pMCTstat, pDCTstat);
- mctNodeIDDebugPort_D();
-diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mct_d.h b/src/northbridge/amd/amdmct/mct_ddr3/mct_d.h
-index ac8c934..8c9da47 100644
---- a/src/northbridge/amd/amdmct/mct_ddr3/mct_d.h
-+++ b/src/northbridge/amd/amdmct/mct_ddr3/mct_d.h
-@@ -335,9 +335,11 @@ struct amd_spd_node_data {
-
- struct DCTStatStruc { /* A per Node structure*/
- /* DCTStatStruct_F - start */
-- u8 Node_ID; /* Node ID of current controller */
-- uint8_t stopDCT; /* Set if the DCT will be stopped */
-- 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
---
-1.9.1
-