summaryrefslogtreecommitdiffstats
path: root/resources/libreboot/patch/kgpe-d16/0049-northbridge-amd-amdmct-Skip-DCT-config-write-to-Flas.patch
diff options
context:
space:
mode:
authorFrancis Rowe <info@gluglug.org.uk>2015-10-18 19:12:53 (EDT)
committer Francis Rowe <info@gluglug.org.uk>2015-10-18 21:32:36 (EDT)
commit0622df6194dbb1b2120743c0fd1cc5e72c380128 (patch)
tree4c858b8c5667fe001a9907ae0578b4ec28a8f513 /resources/libreboot/patch/kgpe-d16/0049-northbridge-amd-amdmct-Skip-DCT-config-write-to-Flas.patch
parent5999dba5f71f1c05040a551d2420ab8c7f3a9da4 (diff)
downloadlibreboot-0622df6194dbb1b2120743c0fd1cc5e72c380128.zip
libreboot-0622df6194dbb1b2120743c0fd1cc5e72c380128.tar.gz
libreboot-0622df6194dbb1b2120743c0fd1cc5e72c380128.tar.bz2
KGPE-D16: update patch set (also update coreboot and vboot)
Also contains other fixes from coreboot, like: * 551cff0 Derive lvds_dual_channel from EDID timings. ^ makes single/dual channel LVDS selection on GM45 automatic * 26fc544 lenovo/t60: Enable native intel gfx init. ^ was being maintained in libreboot, now upstreamed so not needed Framebuffer mode was disabled for the KGPE-D16, because only text-mode works at the moment.
Diffstat (limited to 'resources/libreboot/patch/kgpe-d16/0049-northbridge-amd-amdmct-Skip-DCT-config-write-to-Flas.patch')
-rw-r--r--resources/libreboot/patch/kgpe-d16/0049-northbridge-amd-amdmct-Skip-DCT-config-write-to-Flas.patch101
1 files changed, 0 insertions, 101 deletions
diff --git a/resources/libreboot/patch/kgpe-d16/0049-northbridge-amd-amdmct-Skip-DCT-config-write-to-Flas.patch b/resources/libreboot/patch/kgpe-d16/0049-northbridge-amd-amdmct-Skip-DCT-config-write-to-Flas.patch
deleted file mode 100644
index eff8374..0000000
--- a/resources/libreboot/patch/kgpe-d16/0049-northbridge-amd-amdmct-Skip-DCT-config-write-to-Flas.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 3632ae70a8596e983588296158045552a0fdf33e Mon Sep 17 00:00:00 2001
-From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date: Mon, 8 Jun 2015 19:54:56 -0500
-Subject: [PATCH 049/146] northbridge/amd/amdmct: Skip DCT config write to
- Flash if unchanged
-
----
- src/northbridge/amd/amdmct/mct_ddr3/mct_d.c | 3 +++
- src/northbridge/amd/amdmct/mct_ddr3/mct_d.h | 1 +
- src/northbridge/amd/amdmct/mct_ddr3/s3utils.c | 21 +++++++++++++++++++--
- 3 files changed, 23 insertions(+), 2 deletions(-)
-
-diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mct_d.c b/src/northbridge/amd/amdmct/mct_ddr3/mct_d.c
-index 1442340..6d8c23e 100644
---- a/src/northbridge/amd/amdmct/mct_ddr3/mct_d.c
-+++ b/src/northbridge/amd/amdmct/mct_ddr3/mct_d.c
-@@ -1358,6 +1358,7 @@ restartinit:
-
- printk(BIOS_DEBUG, "mctAutoInitMCT_D: Restoring DCT configuration from NVRAM\n");
- restore_mct_information_from_nvram(0);
-+ pMCTstat->GStatus |= 1 << GSB_ConfigRestored;
-
- printk(BIOS_DEBUG, "mctAutoInitMCT_D: mct_ForceNBPState0_Dis_Fam15\n");
- for (Node = 0; Node < MAX_NODES_SUPPORTED; Node++) {
-@@ -2080,6 +2081,8 @@ static void DQSTiming_D(struct MCTStatStruc *pMCTstat,
-
- if (is_fam15h())
- exit_training_mode_fam15(pMCTstat, pDCTstatA);
-+
-+ pMCTstat->GStatus |= 1 << GSB_ConfigRestored;
- }
-
- /* FIXME - currently uses calculated value TrainMaxReadLatency_D(pMCTstat, pDCTstatA); */
-diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mct_d.h b/src/northbridge/amd/amdmct/mct_ddr3/mct_d.h
-index 539ecc3..adf89b2 100644
---- a/src/northbridge/amd/amdmct/mct_ddr3/mct_d.h
-+++ b/src/northbridge/amd/amdmct/mct_ddr3/mct_d.h
-@@ -316,6 +316,7 @@ struct MCTStatStruc {
- #define GSB_SpIntRemapHole 16 /* Special condition for Node Interleave and HW remapping*/
- #define GSB_EnDIMMSpareNW 17 /* Indicates that DIMM Spare can be used without a warm reset */
- /* NOTE: This is a local bit used by memory code */
-+#define GSB_ConfigRestored 18 /* Training configuration was restored from NVRAM */
-
- /*===============================================================================
- Local DCT Status structure (a structure for each DCT)
-diff --git a/src/northbridge/amd/amdmct/mct_ddr3/s3utils.c b/src/northbridge/amd/amdmct/mct_ddr3/s3utils.c
-index 24f78b2..4c0e58d 100644
---- a/src/northbridge/amd/amdmct/mct_ddr3/s3utils.c
-+++ b/src/northbridge/amd/amdmct/mct_ddr3/s3utils.c
-@@ -213,7 +213,7 @@ static uint32_t read_config32_dct_nbpstate(device_t dev, uint8_t node, uint8_t d
- return pci_read_config32(dev, reg);
- }
-
--static void copy_cbmem_spd_data_to_save_variable(struct amd_s3_persistent_data* persistent_data)
-+static void copy_cbmem_spd_data_to_save_variable(struct amd_s3_persistent_data* persistent_data, uint8_t * restored)
- {
- uint8_t node;
- uint8_t dimm;
-@@ -236,6 +236,13 @@ static void copy_cbmem_spd_data_to_save_variable(struct amd_s3_persistent_data*
- for (node = 0; node < MAX_NODES_SUPPORTED; node++)
- for (channel = 0; channel < 2; channel++)
- persistent_data->node[node].memclk[channel] = mem_info->dct_stat[node].Speed;
-+
-+ if (restored) {
-+ if (mem_info->mct_stat.GStatus & (1 << GSB_ConfigRestored))
-+ *restored = 1;
-+ else
-+ *restored = 0;
-+ }
- }
-
- void copy_mct_data_to_save_variable(struct amd_s3_persistent_data* persistent_data)
-@@ -1034,6 +1041,7 @@ void restore_mct_data_from_save_variable(struct amd_s3_persistent_data* persiste
- int8_t save_mct_information_to_nvram(void)
- {
- uint8_t nvram;
-+ uint8_t restored = 0;
-
- if (acpi_is_wakeup_s3())
- return 0;
-@@ -1055,7 +1063,16 @@ int8_t save_mct_information_to_nvram(void)
- copy_mct_data_to_save_variable(persistent_data);
-
- /* Save RAM SPD data at the same time */
-- copy_cbmem_spd_data_to_save_variable(persistent_data);
-+ copy_cbmem_spd_data_to_save_variable(persistent_data, &restored);
-+
-+ if (restored) {
-+ /* Allow training bypass if DIMM configuration is unchanged on next boot */
-+ nvram = 1;
-+ set_option("allow_spd_nvram_cache_restore", &nvram);
-+
-+ printk(BIOS_DEBUG, "Hardware configuration unchanged since last boot; skipping write\n");
-+ return 0;
-+ }
-
- /* Obtain CBFS file offset */
- s3nv_offset = get_s3nv_file_offset();
---
-1.7.9.5
-