Move skiboot internal things from opal.h to opal-api.h

This is probably not the best collection of things in the world,
but it means that opal.h is much closer to being directly usable
by an OS.

This triggers a bunch of #include fixes throughout the tree.

Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>

32 files changed, 37 insertions, 0 deletions

diff --git a/hw/cec.c b/hw/cec.c
index d8d1354..6c0fea8 100644
--- a/hw/cec.c
+++ b/hw/cec.c
@@ -19,6 +19,7 @@
 #include <p7ioc.h>
 #include <p5ioc2.h>
 #include <interrupts.h>
+#include <opal-api.h>
 
 /*
  * Note: This file os only used on P7/P7+
diff --git a/hw/chiptod.c b/hw/chiptod.c
index 22dfaec..1e3448b 100644
--- a/hw/chiptod.c
+++ b/hw/chiptod.c
@@ -24,6 +24,7 @@
 #include <io.h>
 #include <cpu.h>
 #include <timebase.h>
+#include <opal-api.h>
 
 /* TOD chip XSCOM addresses */
 #define TOD_TTYPE_0			0x00040011
diff --git a/hw/fake-rtc.c b/hw/fake-rtc.c
index f0764db..06b6135 100644
--- a/hw/fake-rtc.c
+++ b/hw/fake-rtc.c
@@ -16,6 +16,7 @@
 
 #include <skiboot.h>
 #include <opal.h>
+#include <opal-api.h>
 #include <mem_region.h>
 
 uint32_t *fake_ymd;
diff --git a/hw/fsp/fsp-codeupdate.c b/hw/fsp/fsp-codeupdate.c
index 0d50f0c..3ace928 100644
--- a/hw/fsp/fsp-codeupdate.c
+++ b/hw/fsp/fsp-codeupdate.c
@@ -22,6 +22,7 @@
 #include <device.h>
 #include <ccan/endian/endian.h>
 #include <errorlog.h>
+#include <opal-api.h>
 
 #include "fsp-codeupdate.h"
 
diff --git a/hw/fsp/fsp-console.c b/hw/fsp/fsp-console.c
index 2dc5058..d77d086 100644
--- a/hw/fsp/fsp-console.c
+++ b/hw/fsp/fsp-console.c
@@ -23,6 +23,7 @@
 #include <fsp.h>
 #include <console.h>
 #include <opal.h>
+#include <opal-api.h>
 #include <timebase.h>
 #include <device.h>
 #include <fsp-sysparam.h>
diff --git a/hw/fsp/fsp-dpo.c b/hw/fsp/fsp-dpo.c
index 610c7c3..d3967a3 100644
--- a/hw/fsp/fsp-dpo.c
+++ b/hw/fsp/fsp-dpo.c
@@ -23,6 +23,7 @@
 #include <stdio.h>
 #include <timebase.h>
 #include <opal.h>
+#include <opal-api.h>
 #include <opal-msg.h>
 
 #define PREFIX "FSPDPO: "
diff --git a/hw/fsp/fsp-dump.c b/hw/fsp/fsp-dump.c
index 9f0a693..941224f 100644
--- a/hw/fsp/fsp-dump.c
+++ b/hw/fsp/fsp-dump.c
@@ -41,6 +41,7 @@
 #include <device.h>
 #include <skiboot.h>
 #include <errorlog.h>
+#include <opal-api.h>
 
 /*
  * Max outstanding dumps to retrieve
diff --git a/hw/fsp/fsp-elog-read.c b/hw/fsp/fsp-elog-read.c
index 435612e..7ec7742 100644
--- a/hw/fsp/fsp-elog-read.c
+++ b/hw/fsp/fsp-elog-read.c
@@ -53,6 +53,7 @@
 #include <errno.h>
 #include <psi.h>
 #include <fsp-elog.h>
+#include <opal-api.h>
 
 /*
  * Maximum number of entries that are pre-allocated
diff --git a/hw/fsp/fsp-elog-write.c b/hw/fsp/fsp-elog-write.c
index dd71712..eaf3225 100644
--- a/hw/fsp/fsp-elog-write.c
+++ b/hw/fsp/fsp-elog-write.c
@@ -33,6 +33,7 @@
 #include <timebase.h>
 #include <pel.h>
 #include <pool.h>
+#include <opal-api.h>
 
 static LIST_HEAD(elog_write_to_fsp_pending);
 static LIST_HEAD(elog_write_to_host_pending);
diff --git a/hw/fsp/fsp-epow.c b/hw/fsp/fsp-epow.c
index 3979bb2..dba05cb 100644
--- a/hw/fsp/fsp-epow.c
+++ b/hw/fsp/fsp-epow.c
@@ -23,6 +23,7 @@
 #include <stdio.h>
 #include <spcn.h>
 #include <opal.h>
+#include <opal-api.h>
 #include <opal-msg.h>
 
 #include "fsp-epow.h"
diff --git a/hw/fsp/fsp-mdst-table.c b/hw/fsp/fsp-mdst-table.c
index b220fbe..318c6b0 100644
--- a/hw/fsp/fsp-mdst-table.c
+++ b/hw/fsp/fsp-mdst-table.c
@@ -29,6 +29,7 @@
 #include <fsp.h>
 #include <psi.h>
 #include <opal.h>
+#include <opal-api.h>
 #include <lock.h>
 #include <skiboot.h>
 #include <errorlog.h>
diff --git a/hw/fsp/fsp-nvram.c b/hw/fsp/fsp-nvram.c
index 257cdd6..87a774a 100644
--- a/hw/fsp/fsp-nvram.c
+++ b/hw/fsp/fsp-nvram.c
@@ -17,6 +17,7 @@
 #include <skiboot.h>
 #include <fsp.h>
 #include <opal.h>
+#include <opal-api.h>
 #include <lock.h>
 #include <device.h>
 #include <errorlog.h>
diff --git a/hw/fsp/fsp-op-panel.c b/hw/fsp/fsp-op-panel.c
index 18cdd28..93d1266 100644
--- a/hw/fsp/fsp-op-panel.c
+++ b/hw/fsp/fsp-op-panel.c
@@ -18,6 +18,7 @@
 #include <fsp.h>
 #include <lock.h>
 #include <opal.h>
+#include <opal-api.h>
 #include <device.h>
 #include <processor.h>
 #include <opal-msg.h>
diff --git a/hw/fsp/fsp-rtc.c b/hw/fsp/fsp-rtc.c
index 0650902..6c9258f 100644
--- a/hw/fsp/fsp-rtc.c
+++ b/hw/fsp/fsp-rtc.c
@@ -20,6 +20,7 @@
 #include <timebase.h>
 #include <time.h>
 #include <time-utils.h>
+#include <opal-api.h>
 #include <opal-msg.h>
 #include <errorlog.h>
 #include <device.h>
diff --git a/hw/fsp/fsp-sensor.c b/hw/fsp/fsp-sensor.c
index c40ba23..39e4e8e 100644
--- a/hw/fsp/fsp-sensor.c
+++ b/hw/fsp/fsp-sensor.c
@@ -34,6 +34,7 @@
 #include <lock.h>
 #include <device.h>
 #include <spcn.h>
+#include <opal-api.h>
 #include <opal-msg.h>
 #include<errorlog.h>
 
diff --git a/hw/fsp/fsp-surveillance.c b/hw/fsp/fsp-surveillance.c
index dab3f31..138ff3f 100644
--- a/hw/fsp/fsp-surveillance.c
+++ b/hw/fsp/fsp-surveillance.c
@@ -20,6 +20,7 @@
 #include <timebase.h>
 #include <fsp-sysparam.h>
 #include <errorlog.h>
+#include <opal-api.h>
 
 static bool fsp_surv_state = false;
 static bool fsp_surv_ack_pending = false;
diff --git a/hw/fsp/fsp-sysparam.c b/hw/fsp/fsp-sysparam.c
index d017e4d..083c465 100644
--- a/hw/fsp/fsp-sysparam.c
+++ b/hw/fsp/fsp-sysparam.c
@@ -16,6 +16,7 @@
 #include <skiboot.h>
 #include <fsp.h>
 #include <opal.h>
+#include <opal-api.h>
 #include <device.h>
 #include <lock.h>
 #include <processor.h>
diff --git a/hw/fsp/fsp.c b/hw/fsp/fsp.c
index fcffbfd..fdc4ffb 100644
--- a/hw/fsp/fsp.c
+++ b/hw/fsp/fsp.c
@@ -36,6 +36,7 @@
 #include <cpu.h>
 #include <errorlog.h>
 #include <opal.h>
+#include <opal-api.h>
 #include <opal-msg.h>
 
 DEFINE_LOG_ENTRY(OPAL_RC_FSP_POLL_TIMEOUT, OPAL_PLATFORM_ERR_EVT, OPAL_FSP,
diff --git a/hw/ipmi/ipmi-fru.c b/hw/ipmi/ipmi-fru.c
index 49a7e0f..8728e33 100644
--- a/hw/ipmi/ipmi-fru.c
+++ b/hw/ipmi/ipmi-fru.c
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
+#include <skiboot.h>
 #include <stdlib.h>
+#include <string.h>
 #include <ipmi.h>
 #include <lock.h>
 #include <opal.h>
diff --git a/hw/ipmi/ipmi-opal.c b/hw/ipmi/ipmi-opal.c
index 4a90468..92e9ac5 100644
--- a/hw/ipmi/ipmi-opal.c
+++ b/hw/ipmi/ipmi-opal.c
@@ -15,9 +15,11 @@
  */
 
 #include <stdlib.h>
+#include <string.h>
 #include <ipmi.h>
 #include <lock.h>
 #include <opal.h>
+#include <opal-api.h>
 #include <device.h>
 #include <ccan/list/list.h>
 
diff --git a/hw/ipmi/ipmi-power.c b/hw/ipmi/ipmi-power.c
index 05c0e4c..f14a0c9 100644
--- a/hw/ipmi/ipmi-power.c
+++ b/hw/ipmi/ipmi-power.c
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include <skiboot.h>
 #include <stdlib.h>
 #include <ipmi.h>
 #include <opal.h>
diff --git a/hw/ipmi/ipmi-rtc.c b/hw/ipmi/ipmi-rtc.c
index ffb33ed..46271e2 100644
--- a/hw/ipmi/ipmi-rtc.c
+++ b/hw/ipmi/ipmi-rtc.c
@@ -15,11 +15,13 @@
  */
 
 #include <stdlib.h>
+#include <string.h>
 #include <ipmi.h>
 #include <time.h>
 #include <time-utils.h>
 #include <device.h>
 #include <opal.h>
+#include <opal-api.h>
 #include <rtc.h>
 
 static enum {idle, waiting, updated, error} time_status;
diff --git a/hw/ipmi/ipmi-sel.c b/hw/ipmi/ipmi-sel.c
index d6f7f47..3f9462a 100644
--- a/hw/ipmi/ipmi-sel.c
+++ b/hw/ipmi/ipmi-sel.c
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
+#include <skiboot.h>
 #include <stdlib.h>
+#include <string.h>
 #include <ipmi.h>
 #include <device.h>
 #include <opal.h>
diff --git a/hw/lpc-uart.c b/hw/lpc-uart.c
index 2e6114a..b73f69c 100644
--- a/hw/lpc-uart.c
+++ b/hw/lpc-uart.c
@@ -18,6 +18,7 @@
 #include <lpc.h>
 #include <console.h>
 #include <opal.h>
+#include <opal-api.h>
 #include <device.h>
 #include <interrupts.h>
 #include <processor.h>
diff --git a/hw/lpc.c b/hw/lpc.c
index e2e848b..b6d9a63 100644
--- a/hw/lpc.c
+++ b/hw/lpc.c
@@ -22,6 +22,7 @@
 #include <lpc.h>
 #include <timebase.h>
 #include <errorlog.h>
+#include <opal-api.h>
 
 DEFINE_LOG_ENTRY(OPAL_RC_LPC_READ, OPAL_PLATFORM_ERR_EVT, OPAL_LPC,
 		 OPAL_MISC_SUBSYSTEM, OPAL_PREDICTIVE_ERR_GENERAL,
diff --git a/hw/p7ioc-phb.c b/hw/p7ioc-phb.c
index 34ee683..99528f5 100644
--- a/hw/p7ioc-phb.c
+++ b/hw/p7ioc-phb.c
@@ -24,6 +24,7 @@
 #include <pci-cfg.h>
 #include <interrupts.h>
 #include <opal.h>
+#include <opal-api.h>
 #include <ccan/str/str.h>
 
 #define PHBDBG(p, fmt, a...)	prlog(PR_DEBUG, "PHB%d: " fmt, \
diff --git a/hw/p7ioc.c b/hw/p7ioc.c
index 9aa6480..5cb9f14 100644
--- a/hw/p7ioc.c
+++ b/hw/p7ioc.c
@@ -19,6 +19,7 @@
 #include <p7ioc-regs.h>
 #include <cec.h>
 #include <opal.h>
+#include <opal-api.h>
 #include <io.h>
 #include <vpd.h>
 #include <interrupts.h>
diff --git a/hw/p8-i2c.c b/hw/p8-i2c.c
index 3e5334c..4068024 100644
--- a/hw/p8-i2c.c
+++ b/hw/p8-i2c.c
@@ -17,6 +17,8 @@
 #undef DEBUG
 
 #include <opal.h>
+#include <skiboot.h>
+#include <mem_region-malloc.h>
 #include <lock.h>
 #include <chip.h>
 #include <i2c.h>
diff --git a/hw/phb3.c b/hw/phb3.c
index c07d2eb..b27bac3 100644
--- a/hw/phb3.c
+++ b/hw/phb3.c
@@ -35,6 +35,7 @@
 #include <vpd.h>
 #include <interrupts.h>
 #include <opal.h>
+#include <opal-api.h>
 #include <cpu.h>
 #include <device.h>
 #include <ccan/str/str.h>
diff --git a/hw/psi.c b/hw/psi.c
index 70403fd..5225656 100644
--- a/hw/psi.c
+++ b/hw/psi.c
@@ -21,6 +21,7 @@
 #include <psi.h>
 #include <fsp.h>
 #include <opal.h>
+#include <opal-api.h>
 #include <gx.h>
 #include <interrupts.h>
 #include <cpu.h>
diff --git a/hw/slw.c b/hw/slw.c
index 38c781f..3f3f649 100644
--- a/hw/slw.c
+++ b/hw/slw.c
@@ -28,6 +28,7 @@
 #include <timebase.h>
 #include <errorlog.h>
 #include <libfdt/libfdt.h>
+#include <opal-api.h>
 
 #ifdef __HAVE_LIBPORE__
 #include <p8_pore_table_gen_api.H>
diff --git a/hw/xscom.c b/hw/xscom.c
index 94e088c..33c04b1 100644
--- a/hw/xscom.c
+++ b/hw/xscom.c
@@ -22,6 +22,7 @@
 #include <chip.h>
 #include <centaur.h>
 #include <errorlog.h>
+#include <opal-api.h>
 
 /* Mask of bits to clear in HMER before an access */
 #define HMER_CLR_MASK	(~(SPR_HMER_XSCOM_FAIL | \