[coreboot-gerrit] Patch set updated for coreboot: drivers/intel/fsp2_0: Add FSP-S support

[Alexandru Gagniuc (mr.nuke.me@gmail.com)]

Alexandru Gagniuc (mr.nuke.me at gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13345

-gerrit

commit 5f03c7943ecea1a13731a0db7179ad26e415cf67
Author: Andrey Petrov <andrey.petrov at intel.com>
Date:   Thu Nov 5 13:00:34 2015 -0800

    drivers/intel/fsp2_0: Add FSP-S support
    
    This implements loading FSP-S blob and calling into Silicon Init
    API
    
    Change-Id: Ib3242d31e550efbbbf1a4c388997a0bbc4a465b1
    Signed-off-by: Andrey Petrov <andrey.petrov at intel.com>
---
 src/drivers/intel/fsp2_0/Makefile.inc   |  4 ++-
 src/drivers/intel/fsp2_0/silicon_init.c | 59 +++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/src/drivers/intel/fsp2_0/Makefile.inc b/src/drivers/intel/fsp2_0/Makefile.inc
index 763b46d..ef0cae8 100644
--- a/src/drivers/intel/fsp2_0/Makefile.inc
+++ b/src/drivers/intel/fsp2_0/Makefile.inc
@@ -1,7 +1,9 @@
-
 romstage-y += util.c
 romstage-y += memory_init.c
 
+ramstage-y += silicon_init.c
+ramstage-y += util.c
+
 CPPFLAGS_common += -I$(src)/drivers/intel/fsp2_0/include
 
 cbfs-files-$(CONFIG_ADD_FSP_BINARIES) += blobs/fsp-m.bin
diff --git a/src/drivers/intel/fsp2_0/silicon_init.c b/src/drivers/intel/fsp2_0/silicon_init.c
new file mode 100644
index 0000000..a6011c9
--- /dev/null
+++ b/src/drivers/intel/fsp2_0/silicon_init.c
@@ -0,0 +1,59 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2015 Intel Corp.
+ * (Written by Andrey Petrov <andrey.petrov at intel.com> for Intel Corp.)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <arch/cpu.h>
+#include <console/console.h>
+#include <fsp/api.h>
+#include <fsp/util.h>
+#include <string.h>
+
+typedef asmlinkage enum fsp_status (*fsp_silicon_init_fn)
+				   (struct SILICON_INIT_UPD *upd);
+
+
+static enum fsp_status do_silicon_init(struct fsp_header *hdr)
+{
+	struct SILICON_INIT_UPD silicon_upd;
+	fsp_silicon_init_fn silicon_init;
+	void *upd_region;
+	enum fsp_status status;
+
+	upd_region = (void*)(hdr->cfg_region_offset + hdr->image_base);
+
+	/* populate upd with defaults */
+	memcpy(&silicon_upd, upd_region, sizeof(silicon_upd));
+
+	silicon_init = (void *)(hdr->image_base + hdr->silicon_init_entry_offset);
+
+	/* give a chance to populate entries */
+	platform_fsp_silicon_init_params_cb(&silicon_upd);
+
+	status = silicon_init(&silicon_upd);
+	printk(BIOS_DEBUG, "FspSiliconInit returned 0x%08x\n", status);
+	return status;
+}
+
+enum fsp_status fsp_silicon_init(void)
+{
+	struct fsp_header hdr;
+
+	if (fsp_load_binary(&hdr, "blobs/fsp-s.bin") != CB_SUCCESS)
+		return FSP_NOT_FOUND;
+
+	return do_silicon_init(&hdr);
+}
+
+__attribute__((weak))
+void platform_fsp_silicon_init_params_cb(struct SILICON_INIT_UPD *silupd)
+{
+	printk(BIOS_DEBUG, "WEAK: %s called\n", __func__);
+}