summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTimothy Pearson <tpearson@raptorengineeringinc.com>2016-04-10 16:02:42 -0500
committerTimothy Pearson <tpearson@raptorengineeringinc.com>2016-04-11 23:25:23 +0200
commitc13866fd405213fd5ca4fed6a14bed80909df03e (patch)
treecacea85d921b0c10a3e5cdbf7d4aee36e5058a82 /src
parentd1b6ff80c017e671c1e2229ee0d659e491ab53f5 (diff)
downloadcoreboot-c13866fd405213fd5ca4fed6a14bed80909df03e.tar.xz
sb/amd/sp5100: Apply Sx State Settings per RPR v3.02
Change-Id: Iacf84ac7de4362e523ad9d8aa7309eecd5277480 Signed-off-by: Timothy Pearson <tpearson@raptorengineeringinc.com> Reviewed-on: https://review.coreboot.org/14308 Reviewed-by: Martin Roth <martinroth@google.com> Tested-by: build bot (Jenkins) Tested-by: Raptor Engineering Automated Test Stand <noreply@raptorengineeringinc.com>
Diffstat (limited to 'src')
-rw-r--r--src/southbridge/amd/sb700/early_setup.c64
1 files changed, 37 insertions, 27 deletions
diff --git a/src/southbridge/amd/sb700/early_setup.c b/src/southbridge/amd/sb700/early_setup.c
index aae845fbf2..755a161509 100644
--- a/src/southbridge/amd/sb700/early_setup.c
+++ b/src/southbridge/amd/sb700/early_setup.c
@@ -607,40 +607,50 @@ static void sb700_pmio_por_init(void)
byte |= 0x20;
pmio_write(0x66, byte);
- /* RPR2.31 PM_TURN_OFF_MSG during ASF Shutdown. */
- if (get_sb700_revision(pci_locate_device(PCI_ID(0x1002, 0x4385), 0)) <= 0x12) {
+ if (IS_ENABLED(CONFIG_SOUTHBRIDGE_AMD_SUBTYPE_SP5100)) {
+ /* RPR 2.11 Sx State Settings */
byte = pmio_read(0x65);
- byte &= ~(1 << 7);
+ byte &= ~(1 << 7); /* SpecialFunc = 0 */
pmio_write(0x65, byte);
- byte = pmio_read(0x75);
- byte &= 0xc0;
- byte |= 0x05;
- pmio_write(0x75, byte);
-
- byte = pmio_read(0x52);
- byte &= 0xc0;
- byte |= 0x08;
- pmio_write(0x52, byte);
+ byte = pmio_read(0x68);
+ byte |= 1 << 2; /* MaskApicEn = 1 */
+ pmio_write(0x68, byte);
} else {
- byte = pmio_read(0xD7);
- byte |= 1 << 0;
- pmio_write(0xD7, byte);
-
- byte = pmio_read(0x65);
- byte |= 1 << 7;
- pmio_write(0x65, byte);
+ /* RPR2.31 PM_TURN_OFF_MSG during ASF Shutdown. */
+ if (get_sb700_revision(pci_locate_device(PCI_ID(0x1002, 0x4385), 0)) <= 0x12) {
+ byte = pmio_read(0x65);
+ byte &= ~(1 << 7);
+ pmio_write(0x65, byte);
+
+ byte = pmio_read(0x75);
+ byte &= 0xc0;
+ byte |= 0x05;
+ pmio_write(0x75, byte);
+
+ byte = pmio_read(0x52);
+ byte &= 0xc0;
+ byte |= 0x08;
+ pmio_write(0x52, byte);
+ } else {
+ byte = pmio_read(0xD7);
+ byte |= 1 << 0;
+ pmio_write(0xD7, byte);
- byte = pmio_read(0x75);
- byte &= 0xc0;
- byte |= 0x01;
- pmio_write(0x75, byte);
+ byte = pmio_read(0x65);
+ byte |= 1 << 7;
+ pmio_write(0x65, byte);
- byte = pmio_read(0x52);
- byte &= 0xc0;
- byte |= 0x02;
- pmio_write(0x52, byte);
+ byte = pmio_read(0x75);
+ byte &= 0xc0;
+ byte |= 0x01;
+ pmio_write(0x75, byte);
+ byte = pmio_read(0x52);
+ byte &= 0xc0;
+ byte |= 0x02;
+ pmio_write(0x52, byte);
+ }
}
/* Watch Dog Timer Control