Merge branch '2020-10-23-revert-xen-changes'

I had inadvertently merged the Xen series before everything was fully
happy with the board maintainer.  Revert the series.

4 files changed, 5 insertions, 43 deletions

diff --git a/arch/arm/include/asm/xen/hypercall.h b/arch/arm/include/asm/xen/hypercall.h
index 121ccfcc60..a4fd077079 100644
--- a/arch/arm/include/asm/xen/hypercall.h
+++ b/arch/arm/include/asm/xen/hypercall.h
@@ -19,10 +19,4 @@ int HYPERVISOR_sched_op(int cmd, void *arg);
 int HYPERVISOR_event_channel_op(int cmd, void *arg);
 unsigned long HYPERVISOR_hvm_op(int op, void *arg);
 int HYPERVISOR_memory_op(unsigned int cmd, void *arg);
-
-static inline void xen_debug_putc(int c)
-{
-	register int v __asm__ ("x0") = c;
-	__asm__ __volatile__("hvc 0xfffe" : "=r" (v) : "0" (v));
-}
 #endif /* _ASM_ARM_XEN_HYPERCALL_H */
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index b6ba702bd3..b4805a2e4e 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -401,19 +401,11 @@ config DEBUG_UART_MTK
 	  driver will be available until the real driver model serial is
 	  running.
 
-config DEBUG_UART_XEN
-	bool "XEN Hypervisor Console"
-	depends on XEN_SERIAL
-	help
-	  Select this to enable a debug UART using the serial_xen driver. You
-	  will not have to provide any parameters to make this work. The driver
-          will be available until the real driver-model serial is running.
-
 endchoice
 
 config DEBUG_UART_BASE
 	hex "Base address of UART"
-	depends on DEBUG_UART && !DEBUG_UART_XEN
+	depends on DEBUG_UART
 	default 0 if DEBUG_UART_SANDBOX
 	help
 	  This is the base address of your UART for memory-mapped UARTs.
@@ -423,7 +415,7 @@ config DEBUG_UART_BASE
 
 config DEBUG_UART_CLOCK
 	int "UART input clock"
-	depends on DEBUG_UART && !DEBUG_UART_XEN
+	depends on DEBUG_UART
 	default 0 if DEBUG_UART_SANDBOX
 	help
 	  The UART input clock determines the speed of the internal UART
@@ -435,7 +427,7 @@ config DEBUG_UART_CLOCK
 
 config DEBUG_UART_SHIFT
 	int "UART register shift"
-	depends on DEBUG_UART && !DEBUG_UART_XEN
+	depends on DEBUG_UART
 	default 0 if DEBUG_UART
 	help
 	  Some UARTs (notably ns16550) support different register layouts
diff --git a/drivers/serial/serial_xen.c b/drivers/serial/serial_xen.c
index 34c90ece40..ba6504b947 100644
--- a/drivers/serial/serial_xen.c
+++ b/drivers/serial/serial_xen.c
@@ -5,7 +5,6 @@
  */
 #include <common.h>
 #include <cpu_func.h>
-#include <debug_uart.h>
 #include <dm.h>
 #include <serial.h>
 #include <watchdog.h>
@@ -16,14 +15,11 @@
 #include <xen/events.h>
 
 #include <xen/interface/sched.h>
-#include <xen/interface/xen.h>
 #include <xen/interface/hvm/hvm_op.h>
 #include <xen/interface/hvm/params.h>
 #include <xen/interface/io/console.h>
 #include <xen/interface/io/ring.h>
 
-#include <asm/xen/hypercall.h>
-
 DECLARE_GLOBAL_DATA_PTR;
 
 u32 console_evtchn;
@@ -179,22 +175,8 @@ U_BOOT_DRIVER(serial_xen) = {
 	.priv_auto_alloc_size	= sizeof(struct xen_uart_priv),
 	.probe			= xen_serial_probe,
 	.ops			= &xen_serial_ops,
+#if !CONFIG_IS_ENABLED(OF_CONTROL)
 	.flags			= DM_FLAG_PRE_RELOC,
-};
-
-#if defined(CONFIG_DEBUG_UART_XEN)
-static inline void _debug_uart_init(void) {}
-
-static inline void _debug_uart_putc(int c)
-{
-#if CONFIG_IS_ENABLED(ARM)
-	xen_debug_putc(c);
-#else
-	/* the type cast should work on LE only */
-	HYPERVISOR_console_io(CONSOLEIO_write, 1, (char *)&ch);
 #endif
-}
-
-DEBUG_UART_FUNCS
+};
 
-#endif
diff --git a/include/xen/interface/xen.h b/include/xen/interface/xen.h
index a7c8ed781b..eec8ab75b9 100644
--- a/include/xen/interface/xen.h
+++ b/include/xen/interface/xen.h
@@ -76,12 +76,6 @@
 #define __HYPERVISOR_arch_6               54
 #define __HYPERVISOR_arch_7               55
 
-/*
- * Commands to HYPERVISOR_console_io().
- */
-#define CONSOLEIO_write         0
-#define CONSOLEIO_read          1
-
 #ifndef __ASSEMBLY__
 
 typedef u16 domid_t;