[Skiboot] [PATCH v2 09/14] console: add opal_con_ops API

[Oliver O'Halloran]

Adds a new structure that contains the implementations of the various
OPAL console handlers. This is intended to replace the existing ad-hoc
mechanism where the OPAL call handlers are overwritten in the OPAL
console driver's init function.

Currently this just moves the site where the OPAL call handlers are
overwritten to inside of console.c, but it is intended to give us a
mechanism for implementing features such as pointer validation for the
OPAL console calls without having to manually update each driver.

This also helps to clarify differences between the internal (skiboot)
console and the external (OPAL) console.

Signed-off-by: Oliver O'Halloran <oohall at gmail.com>
---
 core/console.c    | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 include/console.h | 25 +++++++++++++++++++++++++
 2 files changed, 75 insertions(+)

diff --git a/core/console.c b/core/console.c
index b053e491e351..85ca462988ca 100644
--- a/core/console.c
+++ b/core/console.c
@@ -31,8 +31,13 @@ static char *con_buf = (char *)INMEM_CON_START;
 static size_t con_in;
 static size_t con_out;
 static bool con_wrapped;
+
+/* Internal console driver ops */
 static struct con_ops *con_driver;
 
+/* External (OPAL) console driver ops */
+static struct opal_con_ops *opal_con_driver = &dummy_opal_con;
+
 static struct lock con_lock = LOCK_UNLOCKED;
 
 /* This is mapped via TCEs so we keep it alone in a page */
@@ -303,6 +308,12 @@ void console_complete_flush(void)
 	}
 }
 
+/*
+ * set_console()
+ *
+ * This sets the driver used internally by Skiboot. This is different to the
+ * OPAL console driver.
+ */
 void set_console(struct con_ops *driver)
 {
 	con_driver = driver;
@@ -310,6 +321,45 @@ void set_console(struct con_ops *driver)
 		flush_console();
 }
 
+/*
+ * set_opal_console()
+ *
+ * Configure the console driver to handle the console provided by the OPAL API.
+ * They are different to the above in that they are typically buffered, and used
+ * by the host OS rather than skiboot.
+ */
+static bool opal_cons_init = false;
+
+void set_opal_console(struct opal_con_ops *driver)
+{
+	assert(!opal_cons_init);
+	opal_con_driver = driver;
+}
+
+void init_opal_console(void)
+{
+	assert(!opal_cons_init);
+	opal_cons_init = true;
+
+	if (dummy_console_enabled() && opal_con_driver != &dummy_opal_con) {
+		prlog(PR_WARNING, "OPAL: Dummy console forced, %s ignored\n",
+		      opal_con_driver->name);
+
+		opal_con_driver = &dummy_opal_con;
+	}
+
+	prlog(PR_NOTICE, "OPAL: Using %s\n", opal_con_driver->name);
+
+	if (opal_con_driver->init)
+		opal_con_driver->init();
+
+	opal_register(OPAL_CONSOLE_READ, opal_con_driver->read, 3);
+	opal_register(OPAL_CONSOLE_WRITE, opal_con_driver->write, 3);
+	opal_register(OPAL_CONSOLE_FLUSH, opal_con_driver->flush, 1);
+	opal_register(OPAL_CONSOLE_WRITE_BUFFER_SPACE,
+			opal_con_driver->space, 2);
+}
+
 void memcons_add_properties(void)
 {
 	uint64_t addr = (u64)&memcons;
diff --git a/include/console.h b/include/console.h
index 6a80bef96c7a..41be064f27cb 100644
--- a/include/console.h
+++ b/include/console.h
@@ -54,10 +54,35 @@ struct con_ops {
 	int64_t (*flush)(void);
 };
 
+struct opal_con_ops {
+	const char *name;
+
+	/*
+	 * OPAL console driver specific init function.
+	 */
+	void (*init)(void);
+
+	int64_t (*write)(int64_t term, int64_t *len, const uint8_t *buf);
+	int64_t (*read)(int64_t term, int64_t *len, uint8_t *buf);
+
+	/*
+	 * returns the amount of space available in the console write buffer
+	 */
+	int64_t (*space)(int64_t term_number, int64_t *length);
+
+	/*
+	 * Forces the write buffer to be flushed by the driver
+	 */
+	int64_t (*flush)(int64_t term_number);
+};
+
 extern bool dummy_console_enabled(void);
 extern void force_dummy_console(void);
 extern bool flush_console(void);
+
 extern void set_console(struct con_ops *driver);
+extern void set_opal_console(struct opal_con_ops *driver);
+extern void init_opal_console(void);
 
 extern void console_complete_flush(void);
 
-- 
2.7.4