[coreboot-gerrit] Patch set updated for coreboot: nb/intel/sandybridge: Start PEG link training

[Patrick Rudolph (siro@das-labor.org)]

Patrick Rudolph (siro at das-labor.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/11917

-gerrit

commit e7894521ec5293091f453f509dc5a8f76caeedfe
Author: Patrick Rudolph <siro at das-labor.org>
Date:   Thu Oct 15 11:09:15 2015 +0200

    nb/intel/sandybridge: Start PEG link training
    
    Issue observed:
    The PCIe Root port shows up in GNU/Linux but no PCIe device
    is being detected.
    
    Test system:
    * Gigabyte GA-B75M-D3H (Intel Pentium CPU G2130)
    * Lenovo T530 (Intel Core i5-3320M CPU)
    
    Problem description:
    The PEG Root port link training on Ivy Bridge needs to be manually started.
    
    Problem solution:
    The bits are set in early_init to meet PCIe reset timeout of 100msec.
    The bits should be set in PCI device enable function, but this causes the
    PCI enumeration to not detect the card, as it's still booting. Adding
    a fixed delay of 100msec resolves this problem, but this would
    increase boot time.
    Don't run the code on MRC path as it has its own PEG initilization code.
    
    Tested with:
    * Nvidia NVS 5400M (PCIe2)
    * ATI Radeon HD4780 (PCIe2)
    * Nvidia GeForce 8600 GT (PCIe1)
    
    Untested:
    * PCIe3 devices
    
    Final test results:
    The PEG device shows up under GNU/Linux and can be used without issues.
    
    Change-Id: Id8cfc43e5c4630b0ac217d98bb857c3308e6015b
    Signed-off-by: Patrick Rudolph <siro at das-labor.org>
---
 src/northbridge/intel/sandybridge/early_init.c | 42 ++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/src/northbridge/intel/sandybridge/early_init.c b/src/northbridge/intel/sandybridge/early_init.c
index 81bf9d5..97a2cef 100644
--- a/src/northbridge/intel/sandybridge/early_init.c
+++ b/src/northbridge/intel/sandybridge/early_init.c
@@ -148,6 +148,39 @@ static void sandybridge_setup_graphics(void)
 	MCHBAR32(0x5418) = reg32;
 }
 
+/* PEG on IvyBridge+ needs a special startup sequence.
+ * As the MRC has its own initialization code skip it.
+ */
+static void start_peg_link_training(void)
+{
+#ifdef CONFIG_NORTHBRIDGE_INTEL_IVYBRIDGE
+	u32 tmp;
+	u32 deven;
+
+	deven = pci_read_config32(PCI_DEV(0, 0, 0), DEVEN);
+
+	if (deven & DEVEN_PEG10) {
+		tmp = pci_read_config32(PCI_DEV(0, 1, 0), 0xC24) & ~(1 << 16);
+		pci_write_config32(PCI_DEV(0, 1, 0), 0xC24, tmp | (1 << 5));
+	}
+
+	if (deven & DEVEN_PEG11) {
+		tmp = pci_read_config32(PCI_DEV(0, 1, 1), 0xC24) & ~(1 << 16);
+		pci_write_config32(PCI_DEV(0, 1, 1), 0xC24, tmp | (1 << 5));
+	}
+
+	if (deven & DEVEN_PEG12) {
+		tmp = pci_read_config32(PCI_DEV(0, 1, 2), 0xC24) & ~(1 << 16);
+		pci_write_config32(PCI_DEV(0, 1, 2), 0xC24, tmp | (1 << 5));
+	}
+
+	if (deven & DEVEN_PEG60) {
+		tmp = pci_read_config32(PCI_DEV(0, 6, 0), 0xC24) & ~(1 << 16);
+		pci_write_config32(PCI_DEV(0, 6, 0), 0xC24, tmp | (1 << 5));
+	}
+#endif
+}
+
 void sandybridge_early_initialization(int chipset_type)
 {
 	u32 capid0_a;
@@ -177,6 +210,15 @@ void sandybridge_early_initialization(int chipset_type)
 	pci_write_config32(PCI_DEV(0, 0, 0), DEVEN, deven);
 
 	sandybridge_setup_graphics();
+
+	/* Write magic value to start PEG link training.
+	 * This should be done in PCI device enumeration, but
+	 * the PCIe specification requires to wait at least 100msec
+	 * after reset for devices to come up.
+	 * As we don't want to increase boot time, enable it early and
+	 * assume the PEG is up as soon as PCI enumeration starts.
+	 * TODO: use time stamps to ensure the timings are met */
+	start_peg_link_training();
 }
 
 void northbridge_romstage_finalize(int s3resume)