summaryrefslogtreecommitdiffstats
path: root/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/kgpe-d16/0140-cpu-amd-family_10h-family_15h-Fix-link-type-detectio.patch
diff options
context:
space:
mode:
authorFrancis Rowe <info@gluglug.org.uk>2016-03-08 01:00:09 (EST)
committer Francis Rowe <info@gluglug.org.uk>2016-03-08 02:32:32 (EST)
commitdfa21bb8ee01eac21a2acee79011a634cb67e373 (patch)
tree21cd4f855aa03db13abba91400ad3be212b11602 /resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/kgpe-d16/0140-cpu-amd-family_10h-family_15h-Fix-link-type-detectio.patch
parent2e5e505da125f9d90dd63c1cbcb08bf5316b21ae (diff)
downloadlibreboot-dfa21bb8ee01eac21a2acee79011a634cb67e373.zip
libreboot-dfa21bb8ee01eac21a2acee79011a634cb67e373.tar.gz
libreboot-dfa21bb8ee01eac21a2acee79011a634cb67e373.tar.bz2
Update coreboot (kgpe-d16,kcma-d8,kfsn4-dre,d510mo,ga-g41m-es2l)
Update to the latest coreboot and vboot versions at the time of writing: coreboot 2a3434757ef425dbdfedf1fc69e1a033a6e7310d vboot d187cd3fc792f8bcefbee4587c83eafbd08441fc
Diffstat (limited to 'resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/kgpe-d16/0140-cpu-amd-family_10h-family_15h-Fix-link-type-detectio.patch')
-rw-r--r--resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/kgpe-d16/0140-cpu-amd-family_10h-family_15h-Fix-link-type-detectio.patch158
1 files changed, 0 insertions, 158 deletions
diff --git a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/kgpe-d16/0140-cpu-amd-family_10h-family_15h-Fix-link-type-detectio.patch b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/kgpe-d16/0140-cpu-amd-family_10h-family_15h-Fix-link-type-detectio.patch
deleted file mode 100644
index 3cd24a1..0000000
--- a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/kgpe-d16/0140-cpu-amd-family_10h-family_15h-Fix-link-type-detectio.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-From 3e7456a5999ae840e95b054908057e19b40aaf40 Mon Sep 17 00:00:00 2001
-From: Timothy Pearson <tpearson@raptorengineeringinc.com>
-Date: Mon, 7 Sep 2015 22:26:55 -0500
-Subject: [PATCH 140/143] cpu/amd/family_10h-family_15h: Fix link type
- detection and XCS buffer count setup
-
-Change-Id: If63dd97f070df4aab25a1e1a34df4b1112fff4b1
-Signed-off-by: Timothy Pearson <tpearson@raptorengineeringinc.com>
----
- src/cpu/amd/family_10h-family_15h/fidvid.c | 2 +-
- src/cpu/amd/family_10h-family_15h/init_cpus.c | 33 ++++++++++++++-----------
- 2 files changed, 20 insertions(+), 15 deletions(-)
-
-diff --git a/src/cpu/amd/family_10h-family_15h/fidvid.c b/src/cpu/amd/family_10h-family_15h/fidvid.c
-index 7453ad4..f4ca888 100644
---- a/src/cpu/amd/family_10h-family_15h/fidvid.c
-+++ b/src/cpu/amd/family_10h-family_15h/fidvid.c
-@@ -379,7 +379,7 @@ static u32 nb_clk_did(int node, uint64_t cpuRev, uint8_t procPkg) {
- u8 link0isGen3 = 0;
- u8 offset;
- if (AMD_CpuFindCapability(node, 0, &offset)) {
-- link0isGen3 = (AMD_checkLinkType(node, 0, offset) & HTPHY_LINKTYPE_HT3 );
-+ link0isGen3 = (AMD_checkLinkType(node, offset) & HTPHY_LINKTYPE_HT3 );
- }
- /* FIXME: NB_CLKDID should be 101b for AMD_DA_C2 in package
- S1g3 in link Gen3 mode, but I don't know how to tell
-diff --git a/src/cpu/amd/family_10h-family_15h/init_cpus.c b/src/cpu/amd/family_10h-family_15h/init_cpus.c
-index a0c5f93..344dab0 100644
---- a/src/cpu/amd/family_10h-family_15h/init_cpus.c
-+++ b/src/cpu/amd/family_10h-family_15h/init_cpus.c
-@@ -845,7 +845,7 @@ static BOOL AMD_CpuFindCapability(u8 node, u8 cap_count, u8 * offset)
- *
- * Returns the link characteristic mask.
- */
--static u32 AMD_checkLinkType(u8 node, u8 link, u8 regoff)
-+static u32 AMD_checkLinkType(u8 node, u8 regoff)
- {
- uint32_t val;
- uint32_t val2;
-@@ -876,7 +876,7 @@ static u32 AMD_checkLinkType(u8 node, u8 link, u8 regoff)
- linktype |= HTPHY_LINKTYPE_HT1;
-
- /* Check ganged */
-- val = pci_read_config32(NODE_PCI(node, 0), (link << 2) + 0x170);
-+ val = pci_read_config32(NODE_PCI(node, 0), (((regoff - 0x80) / 0x20) << 2) + 0x170);
-
- if (val & 1)
- linktype |= HTPHY_LINKTYPE_GANGED;
-@@ -1119,7 +1119,7 @@ static void cpuSetAMDPCI(u8 node)
- */
- for (j = 0; j < 4; j++) {
- if (AMD_CpuFindCapability(node, j, &offset)) {
-- if (AMD_checkLinkType(node, j, offset)
-+ if (AMD_checkLinkType(node, offset)
- & fam10_htphy_default[i].linktype) {
- AMD_SetHtPhyRegister(node, j,
- i);
-@@ -1217,6 +1217,7 @@ static void cpuSetAMDPCI(u8 node)
- pci_write_config32(NODE_PCI(node, 3), 0x1a0, dword);
-
- uint8_t link;
-+ uint8_t link_real;
- uint8_t ganged;
- uint8_t iolink;
- uint8_t probe_filter_enabled = !!dual_node;
-@@ -1238,8 +1239,9 @@ static void cpuSetAMDPCI(u8 node)
-
- for (link = 0; link < 4; link++) {
- if (AMD_CpuFindCapability(node, link, &offset)) {
-- ganged = !!(pci_read_config32(NODE_PCI(node, 0), (link << 2) + 0x170) & 0x1);
-- iolink = !!(AMD_checkLinkType(node, link, offset) & HTPHY_LINKTYPE_NONCOHERENT);
-+ link_real = (offset - 0x80) / 0x20;
-+ ganged = !!(pci_read_config32(NODE_PCI(node, 0), (link_real << 2) + 0x170) & 0x1);
-+ iolink = !!(AMD_checkLinkType(node, offset) & HTPHY_LINKTYPE_NONCOHERENT);
-
- if (!iolink && ganged) {
- if (probe_filter_enabled) {
-@@ -1335,7 +1337,7 @@ static void cpuSetAMDPCI(u8 node)
- np_req_cmd = 12;
- }
-
-- dword = pci_read_config32(NODE_PCI(node, 0), (link * 0x20) + 0x94);
-+ dword = pci_read_config32(NODE_PCI(node, 0), (link_real * 0x20) + 0x94);
- dword &= ~(0x3 << 27); /* IsocRspData = isoc_rsp_data */
- dword |= ((isoc_rsp_data & 0x3) << 27);
- dword &= ~(0x3 << 25); /* IsocNpReqData = isoc_np_req_data */
-@@ -1346,9 +1348,9 @@ static void cpuSetAMDPCI(u8 node)
- dword |= ((isoc_preq & 0x7) << 19);
- dword &= ~(0x7 << 16); /* IsocNpReqCmd = isoc_np_req_cmd */
- dword |= ((isoc_np_req_cmd & 0x7) << 16);
-- pci_write_config32(NODE_PCI(node, 0), (link * 0x20) + 0x94, dword);
-+ pci_write_config32(NODE_PCI(node, 0), (link_real * 0x20) + 0x94, dword);
-
-- dword = pci_read_config32(NODE_PCI(node, 0), (link * 0x20) + 0x90);
-+ dword = pci_read_config32(NODE_PCI(node, 0), (link_real * 0x20) + 0x90);
- dword &= ~(0x1 << 31); /* LockBc = 0x1 */
- dword |= ((0x1 & 0x1) << 31);
- dword &= ~(0x7 << 25); /* FreeData = free_data */
-@@ -1367,7 +1369,7 @@ static void cpuSetAMDPCI(u8 node)
- dword |= ((preq & 0x7) << 5);
- dword &= ~(0x1f << 0); /* NpReqCmd = np_req_cmd */
- dword |= ((np_req_cmd & 0x1f) << 0);
-- pci_write_config32(NODE_PCI(node, 0), (link * 0x20) + 0x90, dword);
-+ pci_write_config32(NODE_PCI(node, 0), (link_real * 0x20) + 0x90, dword);
- }
- }
-
-@@ -1390,8 +1392,9 @@ static void cpuSetAMDPCI(u8 node)
-
- for (link = 0; link < 4; link++) {
- if (AMD_CpuFindCapability(node, link, &offset)) {
-- ganged = !!(pci_read_config32(NODE_PCI(node, 0), (link << 2) + 0x170) & 0x1);
-- iolink = !!(AMD_checkLinkType(node, link, offset) & HTPHY_LINKTYPE_NONCOHERENT);
-+ link_real = (offset - 0x80) / 0x20;
-+ ganged = !!(pci_read_config32(NODE_PCI(node, 0), (link_real << 2) + 0x170) & 0x1);
-+ iolink = !!(AMD_checkLinkType(node, offset) & HTPHY_LINKTYPE_NONCOHERENT);
-
- /* Set defaults */
- isoc_rsp_tok_1 = 0;
-@@ -1619,7 +1622,7 @@ static void cpuSetAMDPCI(u8 node)
- }
- }
-
-- dword = pci_read_config32(NODE_PCI(node, 3), (link << 2) + 0x148);
-+ dword = pci_read_config32(NODE_PCI(node, 3), (link_real << 2) + 0x148);
- dword &= ~(0x3 << 30); /* FreeTok[3:2] = free_tokens[3:2] */
- dword |= (((free_tokens >> 2) & 0x3) << 30);
- dword &= ~(0x1 << 28); /* IsocRspTok1 = isoc_rsp_tok_1 */
-@@ -1652,7 +1655,7 @@ static void cpuSetAMDPCI(u8 node)
- dword |= (((preq_tok_0) & 0x3) << 2);
- dword &= ~(0x3 << 0); /* ReqTok0 = req_tok_0 */
- dword |= (((req_tok_0) & 0x3) << 0);
-- pci_write_config32(NODE_PCI(node, 3), (link << 2) + 0x148, dword);
-+ pci_write_config32(NODE_PCI(node, 3), (link_real << 2) + 0x148, dword);
- }
- }
-
-@@ -1698,6 +1701,7 @@ static void cpuSetAMDPCI(u8 node)
- }
-
- uint8_t link;
-+ uint8_t link_real;
- uint8_t isochronous;
- uint8_t isochronous_link_present;
-
-@@ -1706,7 +1710,8 @@ static void cpuSetAMDPCI(u8 node)
- if (revision & AMD_FAM15_ALL) {
- for (link = 0; link < 4; link++) {
- if (AMD_CpuFindCapability(node, link, &offset)) {
-- isochronous = (pci_read_config32(NODE_PCI(node, 0), (link * 0x20) + 0x84) >> 12) & 0x1;
-+ link_real = (offset - 0x80) / 0x20;
-+ isochronous = (pci_read_config32(NODE_PCI(node, 0), (link_real * 0x20) + 0x84) >> 12) & 0x1;
-
- if (isochronous)
- isochronous_link_present = 1;
---
-1.7.9.5
-