[coreboot-gerrit] Change in coreboot[master]: nb/intel/sandybridge/raminit: Add 100MHz refclock support

[Martin Roth (Code Review)]

Martin Roth has submitted this change and it was merged. ( https://review.coreboot.org/17607 )

Change subject: nb/intel/sandybridge/raminit: Add 100MHz refclock support
......................................................................


nb/intel/sandybridge/raminit: Add 100MHz refclock support

Add support for 100MHz reference clock on ivybridge.
Allows to use more frequencies than sandybridge.

Tested on Lenovo T430 (Intel IvyBridge) on DDR3-1800.

Change-Id: I780d34ded2c1e3737ae1af685c8c2da832842e7c
Signed-off-by: Patrick Rudolph <siro at das-labor.org>
Reviewed-on: https://review.coreboot.org/17607
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth at google.com>
---
M src/northbridge/intel/sandybridge/raminit_ivy.c
1 file changed, 40 insertions(+), 3 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Martin Roth: Looks good to me, approved



diff --git a/src/northbridge/intel/sandybridge/raminit_ivy.c b/src/northbridge/intel/sandybridge/raminit_ivy.c
index cee7edd..5cdfe89 100644
--- a/src/northbridge/intel/sandybridge/raminit_ivy.c
+++ b/src/northbridge/intel/sandybridge/raminit_ivy.c
@@ -19,6 +19,8 @@
 #include <console/usb.h>
 #include <cpu/x86/msr.h>
 #include <delay.h>
+#include <arch/io.h>
+#include <device/pci_ops.h>
 #include "raminit_native.h"
 #include "raminit_common.h"
 
@@ -429,14 +431,20 @@
 
 static void dram_freq(ramctr_timing * ctrl)
 {
+	bool ref_100mhz_support;
+	u32 reg32;
+
 	if (ctrl->tCK > TCK_400MHZ) {
 		printk (BIOS_ERR, "DRAM frequency is under lowest supported "
 				"frequency (400 MHz). Increasing to 400 MHz as last resort");
 		ctrl->tCK = TCK_400MHZ;
 	}
 
-	/* TODO: implement 100Mhz refclock */
-	ctrl->base_freq = 133;
+	/* 100 Mhz reference clock supported */
+	reg32 = pci_read_config32(PCI_DEV(0, 0, 0), CAPID0_B);
+	ref_100mhz_support = !!((reg32 >> 21) & 0x7);
+	printk(BIOS_DEBUG, "100MHz reference clock support: %s\n",
+		   ref_100mhz_support ? "yes" : "no");
 
 	while (1) {
 		u8 val2;
@@ -444,20 +452,47 @@
 
 		/* Step 1 - Set target PCU frequency */
 
-		if (ctrl->tCK <= TCK_1066MHZ) {
+		if (ctrl->tCK <= TCK_1200MHZ) {
+			ctrl->tCK = TCK_1200MHZ;
+			ctrl->base_freq = 100;
+		} else if (ctrl->tCK <= TCK_1100MHZ) {
+			ctrl->tCK = TCK_1100MHZ;
+			ctrl->base_freq = 100;
+		} else if (ctrl->tCK <= TCK_1066MHZ) {
 			ctrl->tCK = TCK_1066MHZ;
+			ctrl->base_freq = 133;
+		} else if (ctrl->tCK <= TCK_1000MHZ) {
+			ctrl->tCK = TCK_1000MHZ;
+			ctrl->base_freq = 100;
 		} else if (ctrl->tCK <= TCK_933MHZ) {
 			ctrl->tCK = TCK_933MHZ;
+			ctrl->base_freq = 133;
+		} else if (ctrl->tCK <= TCK_900MHZ) {
+			ctrl->tCK = TCK_900MHZ;
+			ctrl->base_freq = 100;
 		} else if (ctrl->tCK <= TCK_800MHZ) {
 			ctrl->tCK = TCK_800MHZ;
+			ctrl->base_freq = 133;
+		} else if (ctrl->tCK <= TCK_700MHZ) {
+			ctrl->tCK = TCK_700MHZ;
+			ctrl->base_freq = 100;
 		} else if (ctrl->tCK <= TCK_666MHZ) {
 			ctrl->tCK = TCK_666MHZ;
+			ctrl->base_freq = 133;
 		} else if (ctrl->tCK <= TCK_533MHZ) {
 			ctrl->tCK = TCK_533MHZ;
+			ctrl->base_freq = 133;
 		} else if (ctrl->tCK <= TCK_400MHZ) {
 			ctrl->tCK = TCK_400MHZ;
+			ctrl->base_freq = 133;
 		} else {
 			die ("No lock frequency found");
+		}
+
+		if (!ref_100mhz_support && ctrl->base_freq == 100) {
+			/* Skip unsupported frequency. */
+			ctrl->tCK++;
+			continue;
 		}
 
 		/* Frequency multiplier.  */
@@ -473,6 +508,8 @@
 
 		/* Step 2 - Select frequency in the MCU */
 		reg1 = FRQ;
+		if (ctrl->base_freq == 100)
+			reg1 |= 0x100; /* Enable 100Mhz REF clock */
 		reg1 |= 0x80000000;	// set running bit
 		MCHBAR32(MC_BIOS_REQ) = reg1;
 		int i=0;

-- 
To view, visit https://review.coreboot.org/17607
To unsubscribe, visit https://review.coreboot.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I780d34ded2c1e3737ae1af685c8c2da832842e7c
Gerrit-PatchSet: 7
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Owner: Patrick Rudolph <siro at das-labor.org>
Gerrit-Reviewer: Arthur Heymans <arthur at aheymans.xyz>
Gerrit-Reviewer: Martin Roth <martinroth at google.com>
Gerrit-Reviewer: Patrick Rudolph <siro at das-labor.org>
Gerrit-Reviewer: Paul Menzel <paulepanter at users.sourceforge.net>
Gerrit-Reviewer: build bot (Jenkins)