[coreboot-gerrit] New patch to review for coreboot: a1821ff Broadwell: Synchronization with FRC for Root Port Power Management

[Stefan Reinauer (stefan.reinauer@coreboot.org)]

Stefan Reinauer (stefan.reinauer at coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9463

-gerrit

commit a1821ff4c990121cf95e802addd21b6bed981123
Author: Kenji Chen <kenji.chen at intel.com>
Date:   Sat Oct 4 02:59:06 2014 +0800

    Broadwell: Synchronization with FRC for Root Port Power Management
    
    Signed-off-by: Stefan Reinauer <reinauer at chromium.org>
    Original-Commit-Id: 1717505a3fdf41c5972b1c929872577247f9e3b5
    Original-BUG=chrome-os-partner:31424
    Original-TEST=Build a image and run on Samus proto boards to confirm if the
    Original-settings are applied correctly.
    Original-Signed-off-by: Kenji Chen <kenji.chen at intel.com>
    Original-Change-Id: I8138507506771148420a585fd12897a3bfe91916
    Original-Reviewed-on: https://chromium-review.googlesource.com/221387
    Original-Reviewed-by: Duncan Laurie <dlaurie at chromium.org>
    
    Change-Id: I9147da86ce26ce7ef1c7034bc3dde0b27b63befa
---
 src/soc/intel/broadwell/pcie.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/soc/intel/broadwell/pcie.c b/src/soc/intel/broadwell/pcie.c
index c1aa910..bb237be 100644
--- a/src/soc/intel/broadwell/pcie.c
+++ b/src/soc/intel/broadwell/pcie.c
@@ -173,11 +173,14 @@ static void root_port_init_config(device_t dev)
 
 	pcie_update_cfg(dev, 0x418, 0, 0x02000430);
 
-	/* set RP0 PCICFG E2h[5:4] = 11b before configuring ASPM */
 	if (root_port_is_first(dev)) {
+		/*
+		 * set RP0 PCICFG E2h[5:4] = 11b and E1h[6] = 1
+		 * before configuring ASPM
+		 */
 		id = 0xe0 + (u8)(RCBA32(RPFN) & 0x07);
 		pch_iobp_exec(0xE00000E0, IOBP_PCICFG_READ, id, &data, &resp);
-		data |= (0x30 << 16);
+		data |= ((0x30 << 16) | (0x40 << 8));
 		pch_iobp_exec(0xE00000E0, IOBP_PCICFG_WRITE, id, &data, &resp);
 	}
 
@@ -265,7 +268,11 @@ static void pcie_enable_clock_gating(void)
 		}
 		/* Per-Port CLKREQ# handling. */
 		if (gpio_is_native(18 + rp - 1))
-			pcie_update_cfg(dev, 0x420, ~0, (3 << 29));
+			/*
+			 * In addition to D28Fx PCICFG 420h[30:29] = 11b,
+			 * set 420h[17] = 0b and 420[0] = 1b for L1 SubState.
+			 */
+			pcie_update_cfg(dev, 0x420, ~0x20000, (3 << 29) | 1);
 
 		/* Configure shared resource clock gating. */
 		if (rp == 1 || rp == 5 || rp == 6)