[PATCH v2 0/6] Cleanups and Documentation

15 views
Skip to first unread message

andreas...@st.oth-regensburg.de

unread,
Oct 21, 2016, 5:36:40 PM10/21/16
to jailho...@googlegroups.com, Jan Kiszka
From: Andreas Koelbl <Andreas Koelbl andreas...@st.oth-regensburg.de>

Those patches are mostly cleanups:
- consistent naming of uart components like config and filenames
- consistent naming of stubs
- move panic_cpu variables to the appropriate position
- Documentation of the hypervisor configuration

since v1:
- only clean up UART code and don't touch the jailhouse configuration
- rebase to next (arm64 was merged in the meanwhile)

Andreas

Andreas Kölbl (6):
Rename uart_pl011.h to uart-pl011.h and dbg-write-pl011.c to
uart-pl011.c
arm: Rename debug.h to uart.h
arm: Rename CONFIG_UART_OXPCIE952 to CONFIG_SERIAL_OXPCIE952
arm: rename smp.c to smp-stubs.c
core: Move panic_cpu and panic_in_progress to control.c
Documentation: how to configure jailhouse

Documentation/hypervisor-configuration.txt | 60 ++++++++++++++++++++++
hypervisor/arch/arm-common/dbg-write.c | 3 +-
.../arm-common/{dbg-write-pl011.c => uart-pl011.c} | 2 +-
hypervisor/arch/arm/Makefile | 4 +-
hypervisor/arch/arm/include/asm/uart-8250-dw.h | 2 +-
.../arm/include/asm/{uart_pl011.h => uart-pl011.h} | 2 +-
hypervisor/arch/arm/include/asm/uart-tegra.h | 2 +-
.../arch/arm/include/asm/{debug.h => uart.h} | 6 +--
hypervisor/arch/arm/{smp.c => smp-stubs.c} | 0
hypervisor/arch/x86/dbg-write.c | 2 +-
hypervisor/control.c | 3 ++
hypervisor/include/jailhouse/control.h | 3 ++
hypervisor/include/jailhouse/printk.h | 3 --
hypervisor/printk.c | 4 +-
inmates/demos/x86/32-bit-demo.c | 2 +-
inmates/demos/x86/apic-demo.c | 2 +-
inmates/demos/x86/e1000-demo.c | 2 +-
inmates/demos/x86/ioapic-demo.c | 2 +-
inmates/demos/x86/pci-demo.c | 2 +-
inmates/demos/x86/smp-demo.c | 2 +-
inmates/demos/x86/tiny-demo.c | 2 +-
inmates/lib/arm/printk.c | 2 +-
inmates/lib/arm/uart-pl011.c | 2 +-
inmates/lib/x86/printk.c | 2 +-
24 files changed, 89 insertions(+), 27 deletions(-)
create mode 100644 Documentation/hypervisor-configuration.txt
rename hypervisor/arch/arm-common/{dbg-write-pl011.c => uart-pl011.c} (94%)
rename hypervisor/arch/arm/include/asm/{uart_pl011.h => uart-pl011.h} (99%)
rename hypervisor/arch/arm/include/asm/{debug.h => uart.h} (86%)
rename hypervisor/arch/arm/{smp.c => smp-stubs.c} (100%)

--
2.10.0

andreas...@st.oth-regensburg.de

unread,
Oct 21, 2016, 5:36:41 PM10/21/16
to jailho...@googlegroups.com, Jan Kiszka
From: Andreas Kölbl <andreas...@st.oth-regensburg.de>

This header is only included by concrete uart drivers. Furthermore, it
only declares the the abstract uart_chip structure. Naming it debug.h
might be misleading.

Signed-off-by: Andreas Kölbl <andreas...@st.oth-regensburg.de>
---
hypervisor/arch/arm-common/dbg-write.c | 2 +-
hypervisor/arch/arm/include/asm/uart-8250-dw.h | 2 +-
hypervisor/arch/arm/include/asm/uart-pl011.h | 2 +-
hypervisor/arch/arm/include/asm/uart-tegra.h | 2 +-
hypervisor/arch/arm/include/asm/{debug.h => uart.h} | 6 +++---
inmates/lib/arm/printk.c | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
rename hypervisor/arch/arm/include/asm/{debug.h => uart.h} (86%)

diff --git a/hypervisor/arch/arm-common/dbg-write.c b/hypervisor/arch/arm-common/dbg-write.c
index 076821b..8de0103 100644
--- a/hypervisor/arch/arm-common/dbg-write.c
+++ b/hypervisor/arch/arm-common/dbg-write.c
@@ -13,7 +13,7 @@
#include <jailhouse/entry.h>
#include <jailhouse/printk.h>
#include <jailhouse/processor.h>
-#include <asm/debug.h>
+#include <asm/uart.h>

static struct uart_chip uart;

diff --git a/hypervisor/arch/arm/include/asm/uart-8250-dw.h b/hypervisor/arch/arm/include/asm/uart-8250-dw.h
index 9c6c27f..a06923a 100644
--- a/hypervisor/arch/arm/include/asm/uart-8250-dw.h
+++ b/hypervisor/arch/arm/include/asm/uart-8250-dw.h
@@ -12,7 +12,7 @@

#include <jailhouse/mmio.h>
#include <jailhouse/processor.h>
-#include <asm/debug.h>
+#include <asm/uart.h>

#define UART_TX 0x0
#define UART_DLL 0x0
diff --git a/hypervisor/arch/arm/include/asm/uart-pl011.h b/hypervisor/arch/arm/include/asm/uart-pl011.h
index d4c4017..4ced3c7 100644
--- a/hypervisor/arch/arm/include/asm/uart-pl011.h
+++ b/hypervisor/arch/arm/include/asm/uart-pl011.h
@@ -13,7 +13,7 @@
#ifndef _JAILHOUSE_ASM_DEBUG_PL011_H
#define _JAILHOUSE_ASM_DEBUG_PL011_H

-#include <asm/debug.h>
+#include <asm/uart.h>
#include <asm/processor.h>

#define UART_CLK 24000000
diff --git a/hypervisor/arch/arm/include/asm/uart-tegra.h b/hypervisor/arch/arm/include/asm/uart-tegra.h
index 0c0b254..ecac543 100644
--- a/hypervisor/arch/arm/include/asm/uart-tegra.h
+++ b/hypervisor/arch/arm/include/asm/uart-tegra.h
@@ -12,7 +12,7 @@

#include <jailhouse/mmio.h>
#include <jailhouse/processor.h>
-#include <asm/debug.h>
+#include <asm/uart.h>

#define UART_TX 0x0
#define UART_DLL 0x0
diff --git a/hypervisor/arch/arm/include/asm/debug.h b/hypervisor/arch/arm/include/asm/uart.h
similarity index 86%
rename from hypervisor/arch/arm/include/asm/debug.h
rename to hypervisor/arch/arm/include/asm/uart.h
index 02c6f48..8bcb242 100644
--- a/hypervisor/arch/arm/include/asm/debug.h
+++ b/hypervisor/arch/arm/include/asm/uart.h
@@ -10,8 +10,8 @@
* the COPYING file in the top-level directory.
*/

-#ifndef JAILHOUSE_ASM_DEBUG_H_
-#define JAILHOUSE_ASM_DEBUG_H_
+#ifndef JAILHOUSE_ASM_UART_H_
+#define JAILHOUSE_ASM_UART_H_

#ifndef __ASSEMBLY__

@@ -30,4 +30,4 @@ struct uart_chip {
void uart_chip_init(struct uart_chip *chip);

#endif /* !__ASSEMBLY__ */
-#endif /* !JAILHOUSE_ASM_DEBUG_H_ */
+#endif /* !JAILHOUSE_ASM_UART_H_ */
diff --git a/inmates/lib/arm/printk.c b/inmates/lib/arm/printk.c
index 874dada..3ede5cf 100644
--- a/inmates/lib/arm/printk.c
+++ b/inmates/lib/arm/printk.c
@@ -11,7 +11,7 @@
*/

#include <inmate.h>
-#include <asm/debug.h>
+#include <asm/uart.h>
#include <stdarg.h>

static struct uart_chip chip;
--
2.10.0

andreas...@st.oth-regensburg.de

unread,
Oct 21, 2016, 5:36:41 PM10/21/16
to jailho...@googlegroups.com, Jan Kiszka
From: Andreas Kölbl <andreas...@st.oth-regensburg.de>

All configuration parameters for serial drivers are prefixed by CONFIF_UART_*,
except of OXPCIE952. In order to get consistency, CONFIG_UART_OXPCIE952 should
be renamed to CONFIG_SERIAL_OXPCIE952

Signed-off-by: Andreas Kölbl <andreas...@st.oth-regensburg.de>
---
hypervisor/arch/x86/dbg-write.c | 2 +-
inmates/demos/x86/32-bit-demo.c | 2 +-
inmates/demos/x86/apic-demo.c | 2 +-
inmates/demos/x86/e1000-demo.c | 2 +-
inmates/demos/x86/ioapic-demo.c | 2 +-
inmates/demos/x86/pci-demo.c | 2 +-
inmates/demos/x86/smp-demo.c | 2 +-
inmates/demos/x86/tiny-demo.c | 2 +-
inmates/lib/x86/printk.c | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/hypervisor/arch/x86/dbg-write.c b/hypervisor/arch/x86/dbg-write.c
index fdbe95a..045ce65 100644
--- a/hypervisor/arch/x86/dbg-write.c
+++ b/hypervisor/arch/x86/dbg-write.c
@@ -89,7 +89,7 @@ static void uart_init(void)
}

uart_reg_out(UART_LCR, UART_LCR_DLAB);
-#ifdef CONFIG_UART_OXPCIE952
+#ifdef CONFIG_SERIAL_OXPCIE952
outb(0x22, uart_base + UART_DLL);
#else
uart_reg_out(UART_DLL, 1);
diff --git a/inmates/demos/x86/32-bit-demo.c b/inmates/demos/x86/32-bit-demo.c
index c0dc5a7..e95c7e9 100644
--- a/inmates/demos/x86/32-bit-demo.c
+++ b/inmates/demos/x86/32-bit-demo.c
@@ -15,7 +15,7 @@

#include <inmate.h>

-#ifdef CONFIG_UART_OXPCIE952
+#ifdef CONFIG_SERIAL_OXPCIE952
#define UART_BASE 0xe000
#else
#define UART_BASE 0x2f8
diff --git a/inmates/demos/x86/apic-demo.c b/inmates/demos/x86/apic-demo.c
index 57f8975..272a5d1 100644
--- a/inmates/demos/x86/apic-demo.c
+++ b/inmates/demos/x86/apic-demo.c
@@ -17,7 +17,7 @@ CMDLINE_BUFFER(CMDLINE_BUFFER_SIZE);

#define POLLUTE_CACHE_SIZE (512 * 1024)

-#ifdef CONFIG_UART_OXPCIE952
+#ifdef CONFIG_SERIAL_OXPCIE952
#define UART_BASE 0xe010
#else
#define UART_BASE 0x3f8
diff --git a/inmates/demos/x86/e1000-demo.c b/inmates/demos/x86/e1000-demo.c
index e60152f..33b353b 100644
--- a/inmates/demos/x86/e1000-demo.c
+++ b/inmates/demos/x86/e1000-demo.c
@@ -17,7 +17,7 @@

#include <inmate.h>

-#ifdef CONFIG_UART_OXPCIE952
+#ifdef CONFIG_SERIAL_OXPCIE952
#define UART_BASE 0xe000
#else
#define UART_BASE 0x2f8
diff --git a/inmates/demos/x86/ioapic-demo.c b/inmates/demos/x86/ioapic-demo.c
index 9357a1b..28023fd 100644
--- a/inmates/demos/x86/ioapic-demo.c
+++ b/inmates/demos/x86/ioapic-demo.c
@@ -22,7 +22,7 @@

#include <inmate.h>

-#ifdef CONFIG_UART_OXPCIE952
+#ifdef CONFIG_SERIAL_OXPCIE952
#define UART_BASE 0xe000
#else
#define UART_BASE 0x2f8
diff --git a/inmates/demos/x86/pci-demo.c b/inmates/demos/x86/pci-demo.c
index fb85bc2..5f00d31 100644
--- a/inmates/demos/x86/pci-demo.c
+++ b/inmates/demos/x86/pci-demo.c
@@ -17,7 +17,7 @@

#include <inmate.h>

-#ifdef CONFIG_UART_OXPCIE952
+#ifdef CONFIG_SERIAL_OXPCIE952
#define UART_BASE 0xe000
#else
#define UART_BASE 0x2f8
diff --git a/inmates/demos/x86/smp-demo.c b/inmates/demos/x86/smp-demo.c
index a5567be..29c509d 100644
--- a/inmates/demos/x86/smp-demo.c
+++ b/inmates/demos/x86/smp-demo.c
@@ -12,7 +12,7 @@

#include <inmate.h>

-#ifdef CONFIG_UART_OXPCIE952
+#ifdef CONFIG_SERIAL_OXPCIE952
#define UART_BASE 0xe000
#else
#define UART_BASE 0x2f8
diff --git a/inmates/demos/x86/tiny-demo.c b/inmates/demos/x86/tiny-demo.c
index 8e1a077..0c00d91 100644
--- a/inmates/demos/x86/tiny-demo.c
+++ b/inmates/demos/x86/tiny-demo.c
@@ -12,7 +12,7 @@

#include <inmate.h>

-#ifdef CONFIG_UART_OXPCIE952
+#ifdef CONFIG_SERIAL_OXPCIE952
#define UART_BASE 0xe000
#else
#define UART_BASE 0x2f8
diff --git a/inmates/lib/x86/printk.c b/inmates/lib/x86/printk.c
index 78271e1..d5451eb 100644
--- a/inmates/lib/x86/printk.c
+++ b/inmates/lib/x86/printk.c
@@ -52,7 +52,7 @@ void printk(const char *fmt, ...)
if (!inited) {
inited = true;
outb(UART_LCR_DLAB, printk_uart_base + UART_LCR);
-#ifdef CONFIG_UART_OXPCIE952
+#ifdef CONFIG_SERIAL_OXPCIE952
outb(0x22, printk_uart_base + UART_DLL);
#else
outb(1, printk_uart_base + UART_DLL);
--
2.10.0

andreas...@st.oth-regensburg.de

unread,
Oct 21, 2016, 5:36:42 PM10/21/16
to jailho...@googlegroups.com, Jan Kiszka
From: Andreas Kölbl <andreas...@st.oth-regensburg.de>

Those variables were defined in printk.c. control.c is a better home for
them.
---
hypervisor/arch/arm-common/dbg-write.c | 1 +
hypervisor/control.c | 3 +++
hypervisor/include/jailhouse/control.h | 3 +++
hypervisor/include/jailhouse/printk.h | 3 ---
hypervisor/printk.c | 4 +---
5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/hypervisor/arch/arm-common/dbg-write.c b/hypervisor/arch/arm-common/dbg-write.c
index 8de0103..c89b2df 100644
--- a/hypervisor/arch/arm-common/dbg-write.c
+++ b/hypervisor/arch/arm-common/dbg-write.c
@@ -10,6 +10,7 @@
* the COPYING file in the top-level directory.
*/

+#include <jailhouse/control.h>
#include <jailhouse/entry.h>
#include <jailhouse/printk.h>
#include <jailhouse/processor.h>
diff --git a/hypervisor/control.c b/hypervisor/control.c
index bdb8eae..1c53a84 100644
--- a/hypervisor/control.c
+++ b/hypervisor/control.c
@@ -33,6 +33,9 @@ struct cell root_cell;
static DEFINE_SPINLOCK(shutdown_lock);
static unsigned int num_cells = 1;

+volatile unsigned long panic_in_progress;
+unsigned long panic_cpu = -1;
+
/**
* CPU set iterator.
* @param cpu Previous CPU ID.
diff --git a/hypervisor/include/jailhouse/control.h b/hypervisor/include/jailhouse/control.h
index bfc5cc9..cb98456 100644
--- a/hypervisor/include/jailhouse/control.h
+++ b/hypervisor/include/jailhouse/control.h
@@ -18,6 +18,9 @@
#define SHUTDOWN_NONE 0
#define SHUTDOWN_STARTED 1

+extern volatile unsigned long panic_in_progress;
+extern unsigned long panic_cpu;
+
/**
* @defgroup Control Control Subsystem
*
diff --git a/hypervisor/include/jailhouse/printk.h b/hypervisor/include/jailhouse/printk.h
index c226352..fc60a55 100644
--- a/hypervisor/include/jailhouse/printk.h
+++ b/hypervisor/include/jailhouse/printk.h
@@ -12,9 +12,6 @@

#include <jailhouse/types.h>

-extern volatile unsigned long panic_in_progress;
-extern unsigned long panic_cpu;
-
void printk(const char *fmt, ...);

void panic_printk(const char *fmt, ...);
diff --git a/hypervisor/printk.c b/hypervisor/printk.c
index 8d17a9f..61d2f7a 100644
--- a/hypervisor/printk.c
+++ b/hypervisor/printk.c
@@ -11,15 +11,13 @@
*/

#include <stdarg.h>
+#include <jailhouse/control.h>
#include <jailhouse/printk.h>
#include <jailhouse/processor.h>
#include <jailhouse/string.h>
#include <asm/bitops.h>
#include <asm/spinlock.h>

-volatile unsigned long panic_in_progress;
-unsigned long panic_cpu = -1;
-
static DEFINE_SPINLOCK(printk_lock);

#define console_write(msg) arch_dbg_write(msg)
--
2.10.0

andreas...@st.oth-regensburg.de

unread,
Oct 21, 2016, 5:36:42 PM10/21/16
to jailho...@googlegroups.com, Jan Kiszka
From: Andreas Kölbl <andreas...@st.oth-regensburg.de>

Add the suffix -stubs to smp.c to make it more obvious that the file
only contains stubs. Use a consistent naming for stubs (cf. cat-stubs).

Signed-off-by: Andreas Kölbl <andreas...@st.oth-regensburg.de>
---
hypervisor/arch/arm/Makefile | 2 +-
hypervisor/arch/arm/{smp.c => smp-stubs.c} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename hypervisor/arch/arm/{smp.c => smp-stubs.c} (100%)

diff --git a/hypervisor/arch/arm/Makefile b/hypervisor/arch/arm/Makefile
index 87805cd..f073926 100644
--- a/hypervisor/arch/arm/Makefile
+++ b/hypervisor/arch/arm/Makefile
@@ -19,7 +19,7 @@ always := built-in.o
COMMON := ../arm-common

obj-y := entry.o exception.o setup.o control.o traps.o mmio.o
-obj-y += mmu_hyp.o caches.o smp.o
+obj-y += mmu_hyp.o caches.o smp-stubs.o
obj-y += $(COMMON)/dbg-write.o $(COMMON)/lib.o $(COMMON)/psci.o
obj-y += $(COMMON)/paging.o $(COMMON)/mmu_cell.o
obj-y += $(COMMON)/irqchip.o $(COMMON)/gic-common.o
diff --git a/hypervisor/arch/arm/smp.c b/hypervisor/arch/arm/smp-stubs.c
similarity index 100%
rename from hypervisor/arch/arm/smp.c
rename to hypervisor/arch/arm/smp-stubs.c
--
2.10.0

andreas...@st.oth-regensburg.de

unread,
Oct 21, 2016, 5:36:43 PM10/21/16
to jailho...@googlegroups.com, Jan Kiszka
From: Andreas Kölbl <andreas...@st.oth-regensburg.de>

There is no documentation on how to configure jailhouse for a specific
platform. A documentation describing all available 'config.h' parameters
is created.

Signed-off-by: Andreas Kölbl <andreas...@st.oth-regensburg.de>
---
Documentation/hypervisor-configuration.txt | 60 ++++++++++++++++++++++++++++++
1 file changed, 60 insertions(+)
create mode 100644 Documentation/hypervisor-configuration.txt

diff --git a/Documentation/hypervisor-configuration.txt b/Documentation/hypervisor-configuration.txt
new file mode 100644
index 0000000..8903e44
--- /dev/null
+++ b/Documentation/hypervisor-configuration.txt
@@ -0,0 +1,60 @@
+Hypervisor Configuration
+========================
+
+The Jailhouse Hypervisor supports various static compile-time configuration
+parameters, such as different UART drivers, platform specific settings and
+debugging options.
+
+Those settings can optionally be defined in config.h in the project root
+directory.
+
+Jailhouse derives config.mk from this file that makes symbols available
+for the kbuild system.
+
+Available configuration options
+-------------------------------
+
+General configuration parameters
+CONFIG_TRACE_ERROR /* Trace jailhouse errors to serial console */
+
+X86 specific
+CONFIG_SERIAL_OXPCIE952 /* OXPCIE952 serial interface */
+
+ARM specific
+CONFIG_ARM_GIC_V2 /* ARM Generic Interrupt Controller */
+CONFIG_ARM_GIC_V3 /* ARM Generic Interrupt Controller version 3 */
+
+CONFIG_MACH_TEGRA124 /* Tegra124 platform */
+CONFIG_MACH_SUN7I /* Sun7I platform */
+CONFIG_MACH_VEXPRESS /* Versatile Express platform */
+
+CONFIG_SERIAL_TEGRA /* Tegra serial interface */
+CONFIG_SERIAL_AMBA_PL011 /* AMBA_PL011 serial interface */
+CONFIG_SERIAL_8250_DW /* 8250 serial interface */
+
+Examples for different platform configurations
+==============================================
+
+Jetson TK1
+----------
+#define CONFIG_ARM_GIC_V2 1
+#define CONFIG_MACH_TEGRA124 1
+#define CONFIG_SERIAL_TEGRA 1
+
+Banana Pi
+---------
+#define CONFIG_ARM_GIC_V2 1
+#define CONFIG_MACH_SUN7I 1
+#define CONFIG_SERIAL_8250_DW 1
+
+ARM-Opteron A1100
+----------------------
+#define CONFIG_MACH_AMD_SEATTLE 1
+#define CONFIG_SERIAL_AMBA_PL011 1
+#define JAILHOUSE_BASE 0x82fc000000
+
+HiKey 6220
+----------
+#define CONFIG_MACH_HI6220 1
+#define CONFIG_SERIAL_AMBA_PL011 1
+#define JAILHOUSE_BASE 0x7c000000
--
2.10.0

Jan Kiszka

unread,
Oct 28, 2016, 12:02:42 PM10/28/16
to andreas...@st.oth-regensburg.de, jailho...@googlegroups.com
On 2016-10-21 23:36, andreas...@st.oth-regensburg.de wrote:
> From: Andreas Kölbl <andreas...@st.oth-regensburg.de>
>
> Those variables were defined in printk.c. control.c is a better home for
> them.

Ack - but missing signed-off.

Jan

Jan Kiszka

unread,
Oct 28, 2016, 12:04:08 PM10/28/16
to andreas...@st.oth-regensburg.de, jailho...@googlegroups.com
On 2016-10-21 23:36, andreas...@st.oth-regensburg.de wrote:
> From: Andreas Kölbl <andreas...@st.oth-regensburg.de>
>
> There is no documentation on how to configure jailhouse for a specific
> platform. A documentation describing all available 'config.h' parameters
> is created.

Let's hold our breath for the moment until we know if kconfig can be an
alternative.

Jan

Jan Kiszka

unread,
Oct 28, 2016, 12:08:55 PM10/28/16
to andreas...@st.oth-regensburg.de, jailho...@googlegroups.com
On 2016-10-21 23:36, andreas...@st.oth-regensburg.de wrote:
> From: Andreas Kölbl <andreas...@st.oth-regensburg.de>
>
> All configuration parameters for serial drivers are prefixed by CONFIF_UART_*,
> except of OXPCIE952. In order to get consistency, CONFIG_UART_OXPCIE952 should
> be renamed to CONFIG_SERIAL_OXPCIE952

Applying because this is a valid cleanup. But I hope we can actually get
rid of this switch on the long run.

For the core, debug_console should take a divider as parameter (requires
some own struct jailhouse_debug_console). And the inmates are probably
better off when we introduce "serial_base" and "serial_divider" command
line parameters.

Thanks,
Jan

Jan Kiszka

unread,
Oct 28, 2016, 12:10:15 PM10/28/16
to andreas...@st.oth-regensburg.de, jailho...@googlegroups.com
On 2016-10-21 23:36, andreas...@st.oth-regensburg.de wrote:
> From: Andreas Koelbl <Andreas Koelbl andreas...@st.oth-regensburg.de>
>
> Those patches are mostly cleanups:
> - consistent naming of uart components like config and filenames
> - consistent naming of stubs
> - move panic_cpu variables to the appropriate position
> - Documentation of the hypervisor configuration
>
> since v1:
> - only clean up UART code and don't touch the jailhouse configuration
> - rebase to next (arm64 was merged in the meanwhile)
>
> Andreas
>
> Andreas Kölbl (6):
> Rename uart_pl011.h to uart-pl011.h and dbg-write-pl011.c to
> uart-pl011.c
> arm: Rename debug.h to uart.h
> arm: Rename CONFIG_UART_OXPCIE952 to CONFIG_SERIAL_OXPCIE952
> arm: rename smp.c to smp-stubs.c

Thanks, applied up to here...

> core: Move panic_cpu and panic_in_progress to control.c

...and will include this one as well once I got the signed-off.

Jan

andreas...@st.oth-regensburg.de

unread,
Oct 29, 2016, 11:58:07 AM10/29/16
to jailho...@googlegroups.com, Jan Kiszka
From: Andreas Kölbl <andreas...@st.oth-regensburg.de>

This patch adds the ARM64 board support packages to the README as supported.

Signed-off-by: Andreas Kölbl <andreas...@st.oth-regensburg.de>
---
README.md | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2882172..d2e5063 100644
--- a/README.md
+++ b/README.md
@@ -119,7 +119,9 @@ ARM architecture:

- at least 2 logical CPUs

- - Board support:
+ - ARMv8 support
+
+ - ARM board:

- Banana Pi ([see more](Documentation/setup-on-banana-pi-arm-board.md))

@@ -128,6 +130,12 @@ ARM architecture:
- ARM Versatile Express with Cortex-A15 or A7 cores
(includes ARM Fast Model)

+ - ARM64 board:
+
+ - AMD Seattle / SoftIron Overdrive 3000
+
+ - LeMaker HiKey
+
On x86, hardware capabilities can be validated by running

jailhouse hardware check sysconfig.cell
--
2.10.1

andreas...@st.oth-regensburg.de

unread,
Oct 29, 2016, 11:58:07 AM10/29/16
to jailho...@googlegroups.com, Jan Kiszka
From: Andreas Kölbl <andreas...@st.oth-regensburg.de>

Those variables were defined in printk.c. control.c is a better home for
them.

Signed-off-by: Andreas Kölbl <Andreas Kölbl andreas...@st.oth-regensburg.de>
--
2.10.1

Jan Kiszka

unread,
Oct 29, 2016, 12:14:01 PM10/29/16
to andreas...@st.oth-regensburg.de, jailho...@googlegroups.com
Applied - though with minor reordering to clarify that ARMv8 is an
alternative to ARMv7.

Applied the other patch as well.

Thanks,
Jan
Reply all
Reply to author
Forward
0 new messages