6 files changed, 12 insertions, 9 deletions

diff --git a/src/soc/intel/apollolake/acpi/pmc_ipc.asl b/src/soc/intel/apollolake/acpi/pmc_ipc.asl
index 7611a2db97..b41a21aa93 100644
--- a/src/soc/intel/apollolake/acpi/pmc_ipc.asl
+++ b/src/soc/intel/apollolake/acpi/pmc_ipc.asl
@@ -30,7 +30,7 @@ scope (\_SB) {
 		Method (_CRS, 0x0, NotSerialized)
 		{
 			CreateDwordField (^RBUF, ^IBAR._BAS, IBAS)
-			Store (PMC_BAR0, IBAS)
+			Store (PCH_PWRM_BASE_ADDRESS, IBAS)
 
 			CreateDwordField (^RBUF, ^MDAT._BAS, MDBA)
 			Store (MCH_BASE_ADDRESS + MAILBOX_DATA, MDBA)
diff --git a/src/soc/intel/apollolake/bootblock/bootblock.c b/src/soc/intel/apollolake/bootblock/bootblock.c
index 14e9b11ad2..fe0cb9377a 100644
--- a/src/soc/intel/apollolake/bootblock/bootblock.c
+++ b/src/soc/intel/apollolake/bootblock/bootblock.c
@@ -62,7 +62,7 @@ static void enable_pmcbar(void)
 	pci_devfn_t pmc = PCH_DEV_PMC;
 
 	/* Set PMC base addresses and enable decoding. */
-	pci_write_config32(pmc, PCI_BASE_ADDRESS_0, PMC_BAR0);
+	pci_write_config32(pmc, PCI_BASE_ADDRESS_0, PCH_PWRM_BASE_ADDRESS);
 	pci_write_config32(pmc, PCI_BASE_ADDRESS_1, 0);	/* 64-bit BAR */
 	pci_write_config32(pmc, PCI_BASE_ADDRESS_2, PMC_BAR1);
 	pci_write_config32(pmc, PCI_BASE_ADDRESS_3, 0);	/* 64-bit BAR */
diff --git a/src/soc/intel/apollolake/include/soc/iomap.h b/src/soc/intel/apollolake/include/soc/iomap.h
index 5e5b40e2e1..e92227bc1d 100644
--- a/src/soc/intel/apollolake/include/soc/iomap.h
+++ b/src/soc/intel/apollolake/include/soc/iomap.h
@@ -25,7 +25,7 @@
 #define ACPI_PMIO_CST_REG	(ACPI_BASE_ADDRESS + 0x14)
 
 /* Accesses to these BARs are hardcoded in FSP */
-#define PMC_BAR0			0xfe042000
+#define PCH_PWRM_BASE_ADDRESS		0xfe042000
 #define PMC_BAR1			0xfe044000
 #define PMC_BAR0_SIZE			(8 * KiB)
 
diff --git a/src/soc/intel/apollolake/include/soc/pm.h b/src/soc/intel/apollolake/include/soc/pm.h
index bc50b87d45..01efaff43a 100644
--- a/src/soc/intel/apollolake/include/soc/pm.h
+++ b/src/soc/intel/apollolake/include/soc/pm.h
@@ -235,6 +235,9 @@ struct chipset_power_state {
 
 void pch_log_state(void);
 
+/* Get base address PMC memory mapped registers. */
+uint8_t *pmc_mmio_regs(void);
+
 /* STM Support */
 uint16_t get_pmbase(void);
 
diff --git a/src/soc/intel/apollolake/pmc.c b/src/soc/intel/apollolake/pmc.c
index 959fb53710..4bb622951d 100644
--- a/src/soc/intel/apollolake/pmc.c
+++ b/src/soc/intel/apollolake/pmc.c
@@ -15,7 +15,7 @@
 int pmc_soc_get_resources(struct pmc_resource_config *cfg)
 {
 	cfg->pwrmbase_offset = PCI_BASE_ADDRESS_0;
-	cfg->pwrmbase_addr = PMC_BAR0;
+	cfg->pwrmbase_addr = PCH_PWRM_BASE_ADDRESS;
 	cfg->pwrmbase_size = PMC_BAR0_SIZE;
 	cfg->abase_offset = PCI_BASE_ADDRESS_4;
 	cfg->abase_addr = ACPI_BASE_ADDRESS;
diff --git a/src/soc/intel/apollolake/pmutil.c b/src/soc/intel/apollolake/pmutil.c
index 06c2d63729..fbb2345653 100644
--- a/src/soc/intel/apollolake/pmutil.c
+++ b/src/soc/intel/apollolake/pmutil.c
@@ -24,14 +24,14 @@
 
 #include "chip.h"
 
-static uintptr_t read_pmc_mmio_bar(void)
+uint8_t *pmc_mmio_regs(void)
 {
-	return PMC_BAR0;
+	return (void *)(uintptr_t)PCH_PWRM_BASE_ADDRESS;
 }
 
 uintptr_t soc_read_pmc_base(void)
 {
-	return read_pmc_mmio_bar();
+	return (uintptr_t)pmc_mmio_regs();
 }
 
 uint32_t *soc_pmc_etr_addr(void)
@@ -153,7 +153,7 @@ void soc_get_gpi_gpe_configs(uint8_t *dw0, uint8_t *dw1, uint8_t *dw2)
 
 void soc_fill_power_state(struct chipset_power_state *ps)
 {
-	uintptr_t pmc_bar0 = read_pmc_mmio_bar();
+	uintptr_t pmc_bar0 = soc_read_pmc_base();
 
 	ps->tco1_sts = tco_read_reg(TCO1_STS);
 	ps->tco2_sts = tco_read_reg(TCO2_STS);
@@ -200,7 +200,7 @@ int soc_get_rtc_failed(void)
 
 int vbnv_cmos_failed(void)
 {
-	uintptr_t pmc_bar = read_pmc_mmio_bar();
+	uintptr_t pmc_bar = soc_read_pmc_base();
 	uint32_t gen_pmcon1 = read32((void *)(pmc_bar + GEN_PMCON1));
 	int rtc_failure = rtc_failed(gen_pmcon1);