summaryrefslogtreecommitdiff
path: root/src/soc/intel
diff options
context:
space:
mode:
authorDuncan Laurie <dlaurie@chromium.org>2016-09-19 19:20:19 -0700
committerDuncan Laurie <dlaurie@chromium.org>2016-09-19 19:20:19 -0700
commitbf2c8c6a4723eefb0824375555a2aa245a958077 (patch)
tree6f060e8feef4cec37b0085e878769136686e59ee /src/soc/intel
parent6d412c7b81dd5d2429a1c11fe11c359c9833d71b (diff)
downloadcoreboot-bf2c8c6a4723eefb0824375555a2aa245a958077.tar.xz
Revert "soc/intel/apollolake: Initialize GPEs in bootblock"
This reverts commit 5e3dad66227bba4be9365ee76d00231bb5577b56.
Diffstat (limited to 'src/soc/intel')
-rw-r--r--src/soc/intel/apollolake/bootblock/bootblock.c3
-rw-r--r--src/soc/intel/apollolake/include/soc/pm.h1
-rw-r--r--src/soc/intel/apollolake/pmc.c60
-rw-r--r--src/soc/intel/apollolake/pmutil.c58
4 files changed, 59 insertions, 63 deletions
diff --git a/src/soc/intel/apollolake/bootblock/bootblock.c b/src/soc/intel/apollolake/bootblock/bootblock.c
index 28a912818f..3015d17079 100644
--- a/src/soc/intel/apollolake/bootblock/bootblock.c
+++ b/src/soc/intel/apollolake/bootblock/bootblock.c
@@ -182,7 +182,4 @@ void bootblock_soc_early_init(void)
enable_spibar();
cache_bios_region();
-
- /* Initialize GPE for use as interrupt status */
- pmc_gpe_init();
}
diff --git a/src/soc/intel/apollolake/include/soc/pm.h b/src/soc/intel/apollolake/include/soc/pm.h
index dd9e5265a1..2c12c8d28e 100644
--- a/src/soc/intel/apollolake/include/soc/pm.h
+++ b/src/soc/intel/apollolake/include/soc/pm.h
@@ -206,7 +206,6 @@ void enable_gpe(uint32_t mask);
void disable_gpe(uint32_t mask);
void disable_all_gpe(void);
uintptr_t get_pmc_mmio_bar(void);
-void pmc_gpe_init(void);
void global_reset_enable(bool enable);
void global_reset_lock(void);
diff --git a/src/soc/intel/apollolake/pmc.c b/src/soc/intel/apollolake/pmc.c
index 20c9492026..c58314494c 100644
--- a/src/soc/intel/apollolake/pmc.c
+++ b/src/soc/intel/apollolake/pmc.c
@@ -65,6 +65,65 @@ static void set_resources(device_t dev)
report_resource_stored(dev, res, " ACPI BAR");
}
+static void pmc_gpe_init(void)
+{
+ uint32_t gpio_cfg = 0;
+ uint32_t gpio_cfg_reg;
+ uint8_t dw1, dw2, dw3;
+ const struct soc_intel_apollolake_config *config;
+
+ struct device *dev = NB_DEV_ROOT;
+ if (!dev || !dev->chip_info) {
+ printk(BIOS_ERR, "BUG! Could not find SOC devicetree config\n");
+ return;
+ }
+ config = dev->chip_info;
+
+ uintptr_t pmc_bar = get_pmc_mmio_bar();
+
+ const uint32_t gpio_cfg_mask =
+ (GPE0_DWX_MASK << GPE0_DW1_SHIFT) |
+ (GPE0_DWX_MASK << GPE0_DW2_SHIFT) |
+ (GPE0_DWX_MASK << GPE0_DW3_SHIFT);
+
+ /* Assign to local variable */
+ dw1 = config->gpe0_dw1;
+ dw2 = config->gpe0_dw2;
+ dw3 = config->gpe0_dw3;
+
+ /* Making sure that bad values don't bleed into the other fields */
+ dw1 &= GPE0_DWX_MASK;
+ dw2 &= GPE0_DWX_MASK;
+ dw3 &= GPE0_DWX_MASK;
+
+ /* Route the GPIOs to the GPE0 block. Determine that all values
+ * are different, and if they aren't use the reset values.
+ * DW0 is reserved/unused */
+ if (dw1 == dw2 || dw2 == dw3) {
+ printk(BIOS_INFO, "PMC: Using default GPE route.\n");
+ gpio_cfg = read32((void *)pmc_bar + GPIO_GPE_CFG);
+
+ dw1 = (gpio_cfg >> GPE0_DW1_SHIFT) & GPE0_DWX_MASK;
+ dw2 = (gpio_cfg >> GPE0_DW2_SHIFT) & GPE0_DWX_MASK;
+ dw3 = (gpio_cfg >> GPE0_DW3_SHIFT) & GPE0_DWX_MASK;
+ } else {
+ gpio_cfg |= (uint32_t)dw1 << GPE0_DW1_SHIFT;
+ gpio_cfg |= (uint32_t)dw2 << GPE0_DW2_SHIFT;
+ gpio_cfg |= (uint32_t)dw3 << GPE0_DW3_SHIFT;
+ }
+
+ gpio_cfg_reg = read32((void *)pmc_bar + GPIO_GPE_CFG) & ~gpio_cfg_mask;
+ gpio_cfg_reg |= gpio_cfg & gpio_cfg_mask;
+
+ write32((void *)pmc_bar + GPIO_GPE_CFG, gpio_cfg_reg);
+
+ /* Set the routes in the GPIO communities as well. */
+ gpio_route_gpe(dw1, dw2, dw3);
+
+ /* Reset the power state in cbmem as routing */
+ fixup_power_state();
+}
+
static void pch_set_acpi_mode(void)
{
if (IS_ENABLED(CONFIG_HAVE_SMI_HANDLER) && !acpi_is_wakeup_s3()) {
@@ -133,7 +192,6 @@ static void pmc_init(struct device *dev)
/* Set up GPE configuration */
pmc_gpe_init();
- fixup_power_state();
pch_set_acpi_mode();
if (cfg != NULL)
diff --git a/src/soc/intel/apollolake/pmutil.c b/src/soc/intel/apollolake/pmutil.c
index 2aef18c8e6..39edc45886 100644
--- a/src/soc/intel/apollolake/pmutil.c
+++ b/src/soc/intel/apollolake/pmutil.c
@@ -29,7 +29,6 @@
#include <device/device.h>
#include <device/pci.h>
#include <vboot/vboot_common.h>
-#include "chip.h"
static uintptr_t read_pmc_mmio_bar(void)
{
@@ -463,60 +462,3 @@ void poweroff(void)
if (!ENV_SMM)
halt();
}
-
-void pmc_gpe_init(void)
-{
- uint32_t gpio_cfg = 0;
- uint32_t gpio_cfg_reg;
- uint8_t dw1, dw2, dw3;
- ROMSTAGE_CONST struct soc_intel_apollolake_config *config;
-
- /* Look up the device in devicetree */
- ROMSTAGE_CONST struct device *dev = dev_find_slot(0, NB_DEVFN);
- if (!dev || !dev->chip_info) {
- printk(BIOS_ERR, "BUG! Could not find SOC devicetree config\n");
- return;
- }
- config = dev->chip_info;
-
- uintptr_t pmc_bar = get_pmc_mmio_bar();
-
- const uint32_t gpio_cfg_mask =
- (GPE0_DWX_MASK << GPE0_DW1_SHIFT) |
- (GPE0_DWX_MASK << GPE0_DW2_SHIFT) |
- (GPE0_DWX_MASK << GPE0_DW3_SHIFT);
-
- /* Assign to local variable */
- dw1 = config->gpe0_dw1;
- dw2 = config->gpe0_dw2;
- dw3 = config->gpe0_dw3;
-
- /* Making sure that bad values don't bleed into the other fields */
- dw1 &= GPE0_DWX_MASK;
- dw2 &= GPE0_DWX_MASK;
- dw3 &= GPE0_DWX_MASK;
-
- /* Route the GPIOs to the GPE0 block. Determine that all values
- * are different, and if they aren't use the reset values.
- * DW0 is reserved/unused */
- if (dw1 == dw2 || dw2 == dw3) {
- printk(BIOS_INFO, "PMC: Using default GPE route.\n");
- gpio_cfg = read32((void *)pmc_bar + GPIO_GPE_CFG);
-
- dw1 = (gpio_cfg >> GPE0_DW1_SHIFT) & GPE0_DWX_MASK;
- dw2 = (gpio_cfg >> GPE0_DW2_SHIFT) & GPE0_DWX_MASK;
- dw3 = (gpio_cfg >> GPE0_DW3_SHIFT) & GPE0_DWX_MASK;
- } else {
- gpio_cfg |= (uint32_t)dw1 << GPE0_DW1_SHIFT;
- gpio_cfg |= (uint32_t)dw2 << GPE0_DW2_SHIFT;
- gpio_cfg |= (uint32_t)dw3 << GPE0_DW3_SHIFT;
- }
-
- gpio_cfg_reg = read32((void *)pmc_bar + GPIO_GPE_CFG) & ~gpio_cfg_mask;
- gpio_cfg_reg |= gpio_cfg & gpio_cfg_mask;
-
- write32((void *)pmc_bar + GPIO_GPE_CFG, gpio_cfg_reg);
-
- /* Set the routes in the GPIO communities as well. */
- gpio_route_gpe(dw1, dw2, dw3);
-}