commit 868679fe96bacd27a045ffea5961ed7c8e81da33
author Andrey Petrov <andrey.petrov@intel.com> Thu May 12 19:11:48 2016 -0700
committer Aaron Durbin <adurbin@chromium.org> Wed May 18 07:03:44 2016 +0200
tree 6b2ecfab5de90a19d6d0e33bbc06f7bf16eb75ca
parent dc4ae11366eedea20b8b2c530cdd830a3e256ef2

soc/intel/apollolake: Take advantage of common opregion code

Change-Id: I2d16336513bcd5a0544a6b68b609e40dd7c141fb
Signed-off-by: Andrey Petrov <andrey.petrov@intel.com>
Reviewed-on: https://review.coreboot.org/14807
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>

src/soc/intel/apollolake/chip.c

diff --git a/src/soc/intel/apollolake/chip.c b/src/soc/intel/apollolake/chip.c
index 6e0a90f..f56e1f2 100644
--- a/src/soc/intel/apollolake/chip.c
+++ b/src/soc/intel/apollolake/chip.c
@@ -27,11 +27,15 @@
 #include <memrange.h>
 #include <soc/iomap.h>
 #include <soc/cpu.h>
+#include <soc/intel/common/vbt.h>
 #include <soc/nvs.h>
 #include <soc/pci_devs.h>
 
 #include "chip.h"
 
+static void *vbt;
+static struct region_device vbt_rdev;
+
 static void pci_domain_set_resources(device_t dev)
 {
        assign_resources(dev->link_list);
@@ -69,6 +73,10 @@
 	struct range_entry range;
 	struct global_nvs_t *gnvs;
 
+	/* Save VBT info and mapping */
+	if (locate_vbt(&vbt_rdev) != CB_ERR)
+		vbt = rdev_mmap_full(&vbt_rdev);
+
 	/* TODO: tigten this resource range */
 	/* TODO: fix for S3 resume, as this would corrupt OS memory */
 	range_entry_init(&range, 0x200000, 4ULL*GiB, 0);
@@ -78,13 +86,19 @@
 	gnvs = cbmem_add(CBMEM_ID_ACPI_GNVS, sizeof(*gnvs));
 }
 
+static void soc_final(void *data)
+{
+	if (vbt)
+		rdev_munmap(&vbt_rdev, vbt);
+}
+
 void platform_fsp_silicon_init_params_cb(struct FSPS_UPD *silupd)
 {
         struct FSP_S_CONFIG *silconfig = &silupd->FspsConfig;
 	static struct soc_intel_apollolake_config *cfg;
 
 	/* Load VBT before devicetree-specific config. */
-	silconfig->GraphicsConfigPtr = fsp_load_vbt();
+	silconfig->GraphicsConfigPtr = (uintptr_t)vbt;
 
 	struct device *dev = NB_DEV_ROOT;
 	if (!dev || !dev->chip_info) {
@@ -111,7 +125,8 @@
 struct chip_operations soc_intel_apollolake_ops = {
 	CHIP_NAME("Intel Apollolake SOC")
 	.enable_dev = &enable_dev,
-	.init = &soc_init
+	.init = &soc_init,
+	.final = &soc_final
 };
 
 static void fsp_notify_dummy(void *arg)