Patch set updated for coreboot: soc/intel/apollolake: add LPDDR4 sku selection support

[Aaron Durbin]

Aaron Durbin ([e-mail]) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15559

-gerrit

commit 7c0f1dfc2b6f300e655a3775ac4952b9a538b05a
Author: Aaron Durbin 
Date:   Wed Jul 6 22:45:57 2016 -0500

soc/intel/apollolake: add LPDDR4 sku selection support

Instead of having all the mainboards put similar logic
    into their own code provide common mechanism for memory
    SKU selection. A function, meminit_lpddr4_by_sku(), is
    added that selects the proper configuration based on the
    SKU id and configuration passed in. LPDDR4 speed as well
    as DRAM device density configuration is associated for
    each logical channel per SKU id.

BUG=chrome-os-partner:54949
    BRANCH=None
    TEST=Built and used on reef for memory config.

Change-Id: Ifc6a734040bb61a58bc3d4c128a6420a71245c6c
    Signed-off-by: Aaron Durbin 
---
 src/soc/intel/apollolake/include/soc/meminit.h | 20 ++++++++++++++++
 src/soc/intel/apollolake/meminit.c             | 32 ++++++++++++++++++++++++++
 2 files changed, 52 insertions(+)

diff --git a/src/soc/intel/apollolake/include/soc/meminit.h b/src/soc/intel/apollolake/include/soc/meminit.h
index 14b1ef5..94c9032 100644
--- a/src/soc/intel/apollolake/include/soc/meminit.h
+++ b/src/soc/intel/apollolake/include/soc/meminit.h
@@ -16,6 +16,7 @@
 #ifndef _SOC_APOLLOLAKE_MEMINIT_H_
 #define _SOC_APOLLOLAKE_MEMINIT_H_

+#include <stddef.h>
 #include <stdint.h>

/*
@@ -94,4 +95,23 @@ void meminit_lpddr4_enable_channel(struct FSP_M_CONFIG *cfg, int logical_chan,
    				int device_density,
    				const struct lpddr4_swizzle_cfg *scfg);

+struct lpddr4_sku {
+	int speed;
+	int ch0_density;
+	int ch1_density;
+};
+
+struct lpddr4_cfg {
+	const struct lpddr4_sku *skus;
+	size_t num_skus;
+	const struct lpddr4_swizzle_cfg *swizzle_config;
+};
+
+/*
+ * Initialize LPDDR4 settings by the provided lpddr4_cfg information and sku id.
+ * The sku id is an index into the sku array within the lpddr4_cfg struct.
+ */
+void meminit_lpddr4_by_sku(struct FSP_M_CONFIG *cfg,
+				const struct lpddr4_cfg *lpcfg, size_t sku_id);
+
 #endif /* _SOC_APOLLOLAKE_MEMINIT_H_ */
diff --git a/src/soc/intel/apollolake/meminit.c b/src/soc/intel/apollolake/meminit.c
index 8b661c9..8954769 100644
--- a/src/soc/intel/apollolake/meminit.c
+++ b/src/soc/intel/apollolake/meminit.c
@@ -211,3 +211,35 @@ void meminit_lpddr4_enable_channel(struct FSP_M_CONFIG *cfg, int logical_chan,
    	break;
    }
 }
+
+void meminit_lpddr4_by_sku(struct FSP_M_CONFIG *cfg,
+				const struct lpddr4_cfg *lpcfg, size_t sku_id)
+{
+	const struct lpddr4_sku *sku;
+
+	if (sku_id >= lpcfg->num_skus) {
+		printk(BIOS_ERR, "Too few LPDDR4 SKUs: 0x%zx/0x%zx\n",
+			sku_id, lpcfg->num_skus);
+		return;
+	}
+
+	printk(BIOS_INFO, "LPDDR4 SKU id = 0x%zx\n", sku_id);
+
+	sku = &lpcfg->skus[sku_id];
+
+	meminit_lpddr4(cfg, sku->speed);
+
+	if (sku->ch0_density) {
+		printk(BIOS_INFO, "LPDDR4 Ch0 density = %d\n",
+			sku->ch0_density);
+		meminit_lpddr4_enable_channel(cfg, LP4_LCH0, sku->ch0_density,
+						lpcfg->swizzle_config);
+	}
+
+	if (sku->ch1_density) {
+		printk(BIOS_INFO, "LPDDR4 Ch1 density = %d\n",
+			sku->ch1_density);
+		meminit_lpddr4_enable_channel(cfg, LP4_LCH1, sku->ch1_density,
+						lpcfg->swizzle_config);
+	}
+}