Split debug_descriptor out into own include file

Message ID 20180608044707.30417-1-stewart@linux.ibm.com
State Accepted
Headers show
Series
  • Split debug_descriptor out into own include file
Related show

Commit Message

Stewart Smith June 8, 2018, 4:47 a.m.
We only touch it in limited places, let's simplify skiboot.h

Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
---
 core/console-log.c         |  1 +
 core/init.c                |  1 +
 core/trace.c               |  1 +
 hw/ipmi/ipmi-sel.c         |  1 +
 hw/p8-i2c.c                |  1 +
 include/debug_descriptor.h | 55 ++++++++++++++++++++++++++++++++++++++
 include/skiboot.h          | 35 ------------------------
 platforms/ibm-fsp/common.c |  1 +
 8 files changed, 61 insertions(+), 35 deletions(-)
 create mode 100644 include/debug_descriptor.h

Comments

Stewart Smith June 19, 2018, 5:44 a.m. | #1
Stewart Smith <stewart@linux.ibm.com> writes:
> We only touch it in limited places, let's simplify skiboot.h
>
> Signed-off-by: Stewart Smith <stewart@linux.ibm.com>

Merged to master as of b1dee4a43dc3b10e89355964c8cd1f6e26447837

Patch

diff --git a/core/console-log.c b/core/console-log.c
index 642b39ca7988..dd23027dd2de 100644
--- a/core/console-log.c
+++ b/core/console-log.c
@@ -26,6 +26,7 @@ 
 #include "stdio.h"
 #include "console.h"
 #include "timebase.h"
+#include <debug_descriptor.h>
 
 static int vprlog(int log_level, const char *fmt, va_list ap)
 {
diff --git a/core/init.c b/core/init.c
index 3b887a24d11c..51af54ff17e5 100644
--- a/core/init.c
+++ b/core/init.c
@@ -52,6 +52,7 @@ 
 #include <imc.h>
 #include <dts.h>
 #include <sbe-p9.h>
+#include <debug_descriptor.h>
 
 enum proc_gen proc_gen;
 unsigned int pcie_max_link_speed;
diff --git a/core/trace.c b/core/trace.c
index ef7c2ca05ae1..d4e1b1d0d245 100644
--- a/core/trace.c
+++ b/core/trace.c
@@ -25,6 +25,7 @@ 
 #include <processor.h>
 #include <skiboot.h>
 #include <opal-api.h>
+#include <debug_descriptor.h>
 
 #define DEBUG_TRACES
 
diff --git a/hw/ipmi/ipmi-sel.c b/hw/ipmi/ipmi-sel.c
index 466fcb2608d8..54cc597d9dee 100644
--- a/hw/ipmi/ipmi-sel.c
+++ b/hw/ipmi/ipmi-sel.c
@@ -25,6 +25,7 @@ 
 #include <errorlog.h>
 #include <pel.h>
 #include <opal-msg.h>
+#include <debug_descriptor.h>
 
 /* OEM SEL fields */
 #define SEL_OEM_ID_0		0x55
diff --git a/hw/p8-i2c.c b/hw/p8-i2c.c
index 1bcd7cc8b420..cf3875c2e754 100644
--- a/hw/p8-i2c.c
+++ b/hw/p8-i2c.c
@@ -28,6 +28,7 @@ 
 #include <opal-msg.h>
 #include <errorlog.h>
 #include <centaur.h>
+#include <debug_descriptor.h>
 
 DEFINE_LOG_ENTRY(OPAL_RC_I2C_INIT, OPAL_PLATFORM_ERR_EVT, OPAL_I2C,
 		 OPAL_IO_SUBSYSTEM, OPAL_PREDICTIVE_ERR_DEGRADED_PERF,
diff --git a/include/debug_descriptor.h b/include/debug_descriptor.h
new file mode 100644
index 000000000000..619f49374385
--- /dev/null
+++ b/include/debug_descriptor.h
@@ -0,0 +1,55 @@ 
+/* Copyright 2013-2018 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * 	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __DEBUG_DESCRIPTOR_H
+#define __DEBUG_DESCRIPTOR_H
+
+#define OPAL_BOOT_COMPLETE 0x1
+/* Debug descriptor. This structure is pointed to by the word at offset
+ * 0x80 in the sapphire binary
+ */
+struct debug_descriptor {
+	u8	eye_catcher[8];	/* "OPALdbug" */
+#define DEBUG_DESC_VERSION	1
+	u32	version;
+	u8	console_log_levels;	/* high 4 bits in memory,
+					 * low 4 bits driver (e.g. uart). */
+	u8	state_flags; /* various state flags - OPAL_BOOT_COMPLETE etc */
+	u16	reserved2;
+	u32	reserved[2];
+
+	/* Memory console */
+	u64	memcons_phys;
+	u32	memcons_tce;
+	u32	memcons_obuf_tce;
+	u32	memcons_ibuf_tce;
+
+	/* Traces */
+	u64	trace_mask;
+	u32	num_traces;
+#define DEBUG_DESC_MAX_TRACES	256
+	u64	trace_phys[DEBUG_DESC_MAX_TRACES];
+	u32	trace_size[DEBUG_DESC_MAX_TRACES];
+	u32	trace_tce[DEBUG_DESC_MAX_TRACES];
+};
+extern struct debug_descriptor debug_descriptor;
+
+static inline bool opal_booting(void)
+{
+	return !(debug_descriptor.state_flags & OPAL_BOOT_COMPLETE);
+}
+
+#endif
diff --git a/include/skiboot.h b/include/skiboot.h
index b4bdf37795dd..989565c1f8b5 100644
--- a/include/skiboot.h
+++ b/include/skiboot.h
@@ -63,41 +63,6 @@  static inline bool is_rodata(const void *p)
 }
 #endif
 
-#define OPAL_BOOT_COMPLETE 0x1
-/* Debug descriptor. This structure is pointed to by the word at offset
- * 0x80 in the sapphire binary
- */
-struct debug_descriptor {
-	u8	eye_catcher[8];	/* "OPALdbug" */
-#define DEBUG_DESC_VERSION	1
-	u32	version;
-	u8	console_log_levels;	/* high 4 bits in memory,
-					 * low 4 bits driver (e.g. uart). */
-	u8	state_flags; /* various state flags - OPAL_BOOT_COMPLETE etc */
-	u16	reserved2;
-	u32	reserved[2];
-
-	/* Memory console */
-	u64	memcons_phys;
-	u32	memcons_tce;
-	u32	memcons_obuf_tce;
-	u32	memcons_ibuf_tce;
-
-	/* Traces */
-	u64	trace_mask;
-	u32	num_traces;
-#define DEBUG_DESC_MAX_TRACES	256
-	u64	trace_phys[DEBUG_DESC_MAX_TRACES];
-	u32	trace_size[DEBUG_DESC_MAX_TRACES];
-	u32	trace_tce[DEBUG_DESC_MAX_TRACES];
-};
-extern struct debug_descriptor debug_descriptor;
-
-static inline bool opal_booting(void)
-{
-	return !(debug_descriptor.state_flags & OPAL_BOOT_COMPLETE);
-}
-
 /* Console logging
  * Update console_get_level() if you add here
  */
diff --git a/platforms/ibm-fsp/common.c b/platforms/ibm-fsp/common.c
index 87afbb6aeef7..d7433e31dcf7 100644
--- a/platforms/ibm-fsp/common.c
+++ b/platforms/ibm-fsp/common.c
@@ -22,6 +22,7 @@ 
 #include <console.h>
 #include <hostservices.h>
 #include <ipmi.h>
+#include <debug_descriptor.h>
 
 #include "ibm-fsp.h"