diff options
author | Francis Rowe <info@gluglug.org.uk> | 2015-10-19 00:12:53 +0100 |
---|---|---|
committer | Francis Rowe <info@gluglug.org.uk> | 2015-10-19 02:32:36 +0100 |
commit | 0622df6194dbb1b2120743c0fd1cc5e72c380128 (patch) | |
tree | 4c858b8c5667fe001a9907ae0578b4ec28a8f513 /resources/libreboot/patch/kgpe-d16/0057-southbridge-amd-sr5650-Fix-GPP3a-link-training-in-hi.patch | |
parent | 5999dba5f71f1c05040a551d2420ab8c7f3a9da4 (diff) | |
download | librebootfr-0622df6194dbb1b2120743c0fd1cc5e72c380128.tar.gz librebootfr-0622df6194dbb1b2120743c0fd1cc5e72c380128.zip |
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/0057-southbridge-amd-sr5650-Fix-GPP3a-link-training-in-hi.patch')
-rw-r--r-- | resources/libreboot/patch/kgpe-d16/0057-southbridge-amd-sr5650-Fix-GPP3a-link-training-in-hi.patch | 85 |
1 files changed, 85 insertions, 0 deletions
diff --git a/resources/libreboot/patch/kgpe-d16/0057-southbridge-amd-sr5650-Fix-GPP3a-link-training-in-hi.patch b/resources/libreboot/patch/kgpe-d16/0057-southbridge-amd-sr5650-Fix-GPP3a-link-training-in-hi.patch new file mode 100644 index 00000000..dc2ad905 --- /dev/null +++ b/resources/libreboot/patch/kgpe-d16/0057-southbridge-amd-sr5650-Fix-GPP3a-link-training-in-hi.patch @@ -0,0 +1,85 @@ +From c6ad4c2dc41378273147690741de931ca2f292f5 Mon Sep 17 00:00:00 2001 +From: Timothy Pearson <tpearson@raptorengineeringinc.com> +Date: Fri, 12 Jun 2015 19:43:38 -0500 +Subject: [PATCH 057/139] southbridge/amd/sr5650: Fix GPP3a link training in + higher width modes + +Change-Id: I7503ae42eb8bc91411413ef2cc7e7a723df7091a +Signed-off-by: Timothy Pearson <tpearson@raptorengineeringinc.com> +--- + src/southbridge/amd/sr5650/pcie.c | 51 ++++++++++++++++++++++++++++++++++++--- + 1 file changed, 47 insertions(+), 4 deletions(-) + +diff --git a/src/southbridge/amd/sr5650/pcie.c b/src/southbridge/amd/sr5650/pcie.c +index d306b5a..79f2a5f 100644 +--- a/src/southbridge/amd/sr5650/pcie.c ++++ b/src/southbridge/amd/sr5650/pcie.c +@@ -249,7 +249,7 @@ static void switching_gpp3a_configurations(device_t nb_dev, device_t sb_dev) + reg |= 0xFF0BAA0; + break; + default: /* shouldn't be here. */ +- printk(BIOS_DEBUG, "Warning:gpp3a_configuration is not correct. Check you devicetree.cb\n"); ++ printk(BIOS_DEBUG, "Warning:gpp3a_configuration is not correct. Check your devicetree.cb\n"); + break; + } + nbmisc_write_index(nb_dev, 0x26, reg); +@@ -722,10 +722,53 @@ void sr5650_gpp_sb_init(device_t nb_dev, device_t dev, u32 port) + + /* check port enable */ + if (cfg->port_enable & (1 << port)) { +- PcieReleasePortTraining(nb_dev, dev, port); ++ uint32_t hw_port = port; ++ switch (cfg->gpp3a_configuration) { ++ case 0x1: /* 4:2:0:0:0:0 */ ++ if (hw_port == 9) ++ hw_port = 4 + 1; ++ break; ++ case 0x2: /* 4:1:1:0:0:0 */ ++ if (hw_port == 9) ++ hw_port = 4 + 1; ++ else if (hw_port == 10) ++ hw_port = 4 + 2; ++ break; ++ case 0xc: /* 2:2:2:0:0:0 */ ++ if (hw_port == 6) ++ hw_port = 4 + 1; ++ else if (hw_port == 9) ++ hw_port = 4 + 2; ++ break; ++ case 0xa: /* 2:2:1:1:0:0 */ ++ if (hw_port == 6) ++ hw_port = 4 + 1; ++ else if (hw_port == 9) ++ hw_port = 4 + 2; ++ else if (hw_port == 10) ++ hw_port = 4 + 3; ++ break; ++ case 0x4: /* 2:1:1:1:1:0 */ ++ if (hw_port == 6) ++ hw_port = 4 + 1; ++ else if (hw_port == 7) ++ hw_port = 4 + 2; ++ else if (hw_port == 9) ++ hw_port = 4 + 3; ++ else if (hw_port == 10) ++ hw_port = 4 + 4; ++ break; ++ case 0xb: /* 1:1:1:1:1:1 */ ++ break; ++ default: /* shouldn't be here. */ ++ printk(BIOS_WARNING, "invalid gpp3a_configuration\n"); ++ return; ++ } ++ PcieReleasePortTraining(nb_dev, dev, hw_port); + if (!(AtiPcieCfg.Config & PCIE_GPP_COMPLIANCE)) { +- u8 res = PcieTrainPort(nb_dev, dev, port); +- printk(BIOS_DEBUG, "PcieTrainPort port=0x%x result=%d\n", port, res); ++ u8 res = PcieTrainPort(nb_dev, dev, hw_port); ++ printk(BIOS_DEBUG, "PcieTrainPort port=0x%x hw_port=0x%x result=%d\n", ++ port, hw_port, res); + if (res) { + AtiPcieCfg.PortDetect |= 1 << port; + } else { +-- +1.9.1 + |