summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShaunak Saha <shaunak.saha@intel.com>2016-07-12 01:22:33 -0700
committerDuncan Laurie <dlaurie@chromium.org>2016-07-28 20:13:34 +0200
commitcd9e1e423f1cf0cf6b38ce51d21e78fc14e9818b (patch)
treea5321027e32abf183459ac0fd61b1ca51722776d
parent5dd2b18540ed5beb272e79820f0d29f88e392b83 (diff)
intel/apollolake: Update gnvs for dptf
This patch updates dptf variable in gnvs based on device configuration by reading the device tree structure. BUG=chrome-os-partner:53096 TEST=Verify that the thermal zones are enumerated under /sys/class/thermal in Amenia and Reef board. Navigate to /sys/class/thermal, and verify that a thermal zone of type TCPU exists there. Change-Id: I8ab34cdc94d8cdc840b02347569a9f07688e92cd Signed-off-by: Shaunak Saha <shaunak.saha@intel.com> Reviewed-on: https://review.coreboot.org/15620 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@chromium.org>
-rw-r--r--src/soc/intel/apollolake/acpi.c14
-rw-r--r--src/soc/intel/apollolake/chip.h3
2 files changed, 17 insertions, 0 deletions
diff --git a/src/soc/intel/apollolake/acpi.c b/src/soc/intel/apollolake/acpi.c
index a38c377553..262e140e6c 100644
--- a/src/soc/intel/apollolake/acpi.c
+++ b/src/soc/intel/apollolake/acpi.c
@@ -27,6 +27,8 @@
#include <soc/iomap.h>
#include <soc/pm.h>
#include <soc/nvs.h>
+#include <soc/pci_devs.h>
+#include "chip.h"
#define CSTATE_RES(address_space, width, offset, address) \
{ \
@@ -146,6 +148,15 @@ unsigned long southbridge_write_acpi_tables(device_t device,
static void acpi_create_gnvs(struct global_nvs_t *gnvs)
{
+ struct soc_intel_apollolake_config *cfg;
+ struct device *dev = NB_DEV_ROOT;
+
+ if (!dev || !dev->chip_info) {
+ printk(BIOS_ERR, "BUG! Could not find SOC devicetree config\n");
+ return;
+ }
+ cfg = dev->chip_info;
+
if (IS_ENABLED(CONFIG_CONSOLE_CBMEM))
gnvs->cbmc = (uintptr_t)cbmem_find(CBMEM_ID_CONSOLE);
@@ -154,6 +165,9 @@ static void acpi_create_gnvs(struct global_nvs_t *gnvs)
chromeos_init_vboot(&gnvs->chromeos);
gnvs->chromeos.vbt2 = ACTIVE_ECFW_RO;
}
+
+ /* Enable DPTF based on mainboard configuration */
+ gnvs->dpte = cfg->dptf_enable;
}
void southbridge_inject_dsdt(device_t device)
diff --git a/src/soc/intel/apollolake/chip.h b/src/soc/intel/apollolake/chip.h
index a1df4810ca..37b1cc0a1e 100644
--- a/src/soc/intel/apollolake/chip.h
+++ b/src/soc/intel/apollolake/chip.h
@@ -102,6 +102,9 @@ struct soc_intel_apollolake_config {
/* Configure LPSS S0ix Enable */
uint8_t lpss_s0ix_enable;
+
+ /* Enable DPTF support */
+ int dptf_enable;
};
#endif /* _SOC_APOLLOLAKE_CHIP_H_ */