Change in coreboot[master]: soc/intel: Move pmc_mmio_regs() declaration to common/

[Nico Huber (Code Review)]

Attention is currently required from: Michael Niewöhner.
Hello Michael Niewöhner,

I'd like you to do a code review. Please visit

https://review.coreboot.org/c/coreboot/+/58388

to review the following change.

Change subject: soc/intel: Move pmc_mmio_regs() declaration to common/
......................................................................

soc/intel: Move pmc_mmio_regs() declaration to common/

Change-Id: I9c6690d1002c81d87fc4e2d5565e08648a53931e
Signed-off-by: Nico Huber 
---
M src/soc/intel/alderlake/include/soc/pm.h
M src/soc/intel/cannonlake/include/soc/pm.h
A src/soc/intel/common/block/include/intelblocks/pmc_soc.h
M src/soc/intel/common/block/pmc/pmclib.c
M src/soc/intel/elkhartlake/include/soc/pm.h
M src/soc/intel/icelake/include/soc/pm.h
M src/soc/intel/jasperlake/include/soc/pm.h
M src/soc/intel/skylake/include/soc/pm.h
M src/soc/intel/tigerlake/include/soc/pm.h
M src/soc/intel/xeon_sp/include/soc/pm.h
10 files changed, 20 insertions(+), 24 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/88/58388/1

diff --git a/src/soc/intel/alderlake/include/soc/pm.h b/src/soc/intel/alderlake/include/soc/pm.h
index b65b24d..68b715d 100644
--- a/src/soc/intel/alderlake/include/soc/pm.h
+++ b/src/soc/intel/alderlake/include/soc/pm.h
@@ -133,6 +133,7 @@
 #if !defined(__ACPI__)

#include <acpi/acpi.h>
+#include <intelblocks/pmc_soc.h>
 #include <soc/gpe.h>
 #include <soc/iomap.h>
 #include <soc/smbus.h>
@@ -153,9 +154,6 @@
    uint32_t prev_sleep_state;
 } __packed;

-/* Get base address PMC memory mapped registers. */
-uint8_t *pmc_mmio_regs(void);
-
 /* Get base address of TCO I/O registers. */
 uint16_t smbus_tco_regs(void);

diff --git a/src/soc/intel/cannonlake/include/soc/pm.h b/src/soc/intel/cannonlake/include/soc/pm.h
index 59b2ba0..d085112 100644
--- a/src/soc/intel/cannonlake/include/soc/pm.h
+++ b/src/soc/intel/cannonlake/include/soc/pm.h
@@ -127,6 +127,7 @@
 #if !defined(__ACPI__)

#include <acpi/acpi.h>
+#include <intelblocks/pmc_soc.h>
 #include <soc/gpe.h>
 #include <soc/iomap.h>
 #include <soc/smbus.h>
@@ -146,9 +147,6 @@
    uint32_t prev_sleep_state;
 } __packed;

-/* Get base address PMC memory mapped registers. */
-uint8_t *pmc_mmio_regs(void);
-
 /* Get base address of TCO I/O registers. */
 uint16_t smbus_tco_regs(void);

diff --git a/src/soc/intel/common/block/include/intelblocks/pmc_soc.h b/src/soc/intel/common/block/include/intelblocks/pmc_soc.h
new file mode 100644
index 0000000..fc57d61
--- /dev/null
+++ b/src/soc/intel/common/block/include/intelblocks/pmc_soc.h
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#ifndef SOC_INTEL_COMMON_BLOCK_PMC_SOC_H
+#define SOC_INTEL_COMMON_BLOCK_PMC_SOC_H
+
+#include <stdint.h>
+
+/* Get base address PMC memory mapped registers. */
+uint8_t *pmc_mmio_regs(void);
+
+#endif
diff --git a/src/soc/intel/common/block/pmc/pmclib.c b/src/soc/intel/common/block/pmc/pmclib.c
index 6c756b1..bda9982 100644
--- a/src/soc/intel/common/block/pmc/pmclib.c
+++ b/src/soc/intel/common/block/pmc/pmclib.c
@@ -9,6 +9,7 @@
 #include <cpu/x86/smm.h>
 #include <console/console.h>
 #include <halt.h>
+#include <intelblocks/pmc_soc.h>
 #include <intelblocks/pmclib.h>
 #include <intelblocks/gpio.h>
 #include <intelblocks/tco.h>
diff --git a/src/soc/intel/elkhartlake/include/soc/pm.h b/src/soc/intel/elkhartlake/include/soc/pm.h
index 6ebbbfa..7a5b72e 100644
--- a/src/soc/intel/elkhartlake/include/soc/pm.h
+++ b/src/soc/intel/elkhartlake/include/soc/pm.h
@@ -127,6 +127,7 @@
 #if !defined(__ACPI__)

#include <acpi/acpi.h>
+#include <intelblocks/pmc_soc.h>
 #include <soc/gpe.h>
 #include <soc/iomap.h>
 #include <soc/smbus.h>
@@ -146,9 +147,6 @@
    uint32_t prev_sleep_state;
 } __packed;

-/* Get base address PMC memory mapped registers. */
-uint8_t *pmc_mmio_regs(void);
-
 /* Get base address of TCO I/O registers. */
 uint16_t smbus_tco_regs(void);

diff --git a/src/soc/intel/icelake/include/soc/pm.h b/src/soc/intel/icelake/include/soc/pm.h
index ad2beff..d557a84 100644
--- a/src/soc/intel/icelake/include/soc/pm.h
+++ b/src/soc/intel/icelake/include/soc/pm.h
@@ -127,6 +127,7 @@
 #if !defined(__ACPI__)

#include <acpi/acpi.h>
+#include <intelblocks/pmc_soc.h>
 #include <soc/gpe.h>
 #include <soc/iomap.h>
 #include <soc/smbus.h>
@@ -146,9 +147,6 @@
    uint32_t prev_sleep_state;
 } __packed;

-/* Get base address PMC memory mapped registers. */
-uint8_t *pmc_mmio_regs(void);
-
 /* Get base address of TCO I/O registers. */
 uint16_t smbus_tco_regs(void);

diff --git a/src/soc/intel/jasperlake/include/soc/pm.h b/src/soc/intel/jasperlake/include/soc/pm.h
index 11d6663..16c2cda 100644
--- a/src/soc/intel/jasperlake/include/soc/pm.h
+++ b/src/soc/intel/jasperlake/include/soc/pm.h
@@ -127,6 +127,7 @@
 #if !defined(__ACPI__)

#include <acpi/acpi.h>
+#include <intelblocks/pmc_soc.h>
 #include <soc/gpe.h>
 #include <soc/iomap.h>
 #include <soc/smbus.h>
@@ -146,9 +147,6 @@
    uint32_t prev_sleep_state;
 } __packed;

-/* Get base address PMC memory mapped registers. */
-uint8_t *pmc_mmio_regs(void);
-
 /* Get base address of TCO I/O registers. */
 uint16_t smbus_tco_regs(void);

diff --git a/src/soc/intel/skylake/include/soc/pm.h b/src/soc/intel/skylake/include/soc/pm.h
index a577724..70cd71c 100644
--- a/src/soc/intel/skylake/include/soc/pm.h
+++ b/src/soc/intel/skylake/include/soc/pm.h
@@ -5,6 +5,7 @@

#include <acpi/acpi.h>
 #include <device/mmio.h>
+#include <intelblocks/pmc_soc.h>
 #include <soc/gpe.h>
 #include <soc/iomap.h>
 #include <soc/pmc.h>
@@ -155,9 +156,6 @@
    uint32_t prev_sleep_state;
 } __packed;

-/* Get base address PMC memory mapped registers. */
-uint8_t *pmc_mmio_regs(void);
-
 /* Set the DISB after DRAM init */
 void pmc_set_disb(void);

diff --git a/src/soc/intel/tigerlake/include/soc/pm.h b/src/soc/intel/tigerlake/include/soc/pm.h
index d62e8ad..427dcb3 100644
--- a/src/soc/intel/tigerlake/include/soc/pm.h
+++ b/src/soc/intel/tigerlake/include/soc/pm.h
@@ -133,6 +133,7 @@
 #if !defined(__ACPI__)

#include <acpi/acpi.h>
+#include <intelblocks/pmc.h>
 #include <soc/gpe.h>
 #include <soc/iomap.h>
 #include <soc/smbus.h>
@@ -153,9 +154,6 @@
    uint32_t prev_sleep_state;
 } __packed;

-/* Get base address PMC memory mapped registers. */
-uint8_t *pmc_mmio_regs(void);
-
 /* Get base address of TCO I/O registers. */
 uint16_t smbus_tco_regs(void);

diff --git a/src/soc/intel/xeon_sp/include/soc/pm.h b/src/soc/intel/xeon_sp/include/soc/pm.h
index b4d6df9..0b903ec 100644
--- a/src/soc/intel/xeon_sp/include/soc/pm.h
+++ b/src/soc/intel/xeon_sp/include/soc/pm.h
@@ -4,6 +4,7 @@
 #define _SOC_PM_H_

#include <acpi/acpi.h>
+#include <intelblocks/pmc.h>
 #include <soc/gpe.h>
 #include <soc/iomap.h>
 #include <soc/pmc.h>
@@ -114,9 +115,6 @@
    uint32_t prev_sleep_state;
 } __packed;

-/* Get base address PMC memory mapped registers. */
-uint8_t *pmc_mmio_regs(void);
-
 uint16_t get_pmbase(void);

void pmc_lock_smi(void);