[PATCH 1/4] [TESTS] arm32/arm64: Enable busybox microcom for all Linux Guests

[Anup Patel]

The busybox microcom is very useful tool to connecting to a serial
port on Linux Guest hence we enable it in busybox defconfig for
all Linux Guests

Signed-off-by: Anup Patel <an...@brainfault.org>
---
tests/arm32/common/busybox/busybox-1.21.1_defconfig | 10 +++++-----
tests/arm64/common/busybox/busybox-1.21.0_defconfig | 10 +++++-----
2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/arm32/common/busybox/busybox-1.21.1_defconfig b/tests/arm32/common/busybox/busybox-1.21.1_defconfig
index 9f51e0a..aeff4b9 100644
--- a/tests/arm32/common/busybox/busybox-1.21.1_defconfig
+++ b/tests/arm32/common/busybox/busybox-1.21.1_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Busybox version: 1.21.1
-# Fri Jan 29 11:56:23 2016
+# Thu Feb 4 22:05:04 2016
#
CONFIG_HAVE_DOT_CONFIG=y

@@ -62,9 +62,9 @@ CONFIG_STATIC=y
# CONFIG_FEATURE_INDIVIDUAL is not set
# CONFIG_FEATURE_SHARED_BUSYBOX is not set
CONFIG_LFS=y
-CONFIG_CROSS_COMPILER_PREFIX="arm-none-linux-gnueabi-"
+CONFIG_CROSS_COMPILER_PREFIX=""
CONFIG_SYSROOT=""
-CONFIG_EXTRA_CFLAGS="-marm -mabi=aapcs-linux"
+CONFIG_EXTRA_CFLAGS=""
CONFIG_EXTRA_LDFLAGS=""
CONFIG_EXTRA_LDLIBS=""

@@ -688,7 +688,7 @@ CONFIG_FEATURE_CROND_DIR=""
CONFIG_DEVMEM=y
# CONFIG_EJECT is not set
# CONFIG_FEATURE_EJECT_SCSI is not set
-# CONFIG_FBSPLASH is not set
+CONFIG_FBSPLASH=y
# CONFIG_FLASHCP is not set
# CONFIG_FLASH_LOCK is not set
# CONFIG_FLASH_UNLOCK is not set
@@ -709,7 +709,7 @@ CONFIG_MAKEDEVS=y
# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
CONFIG_FEATURE_MAKEDEVS_TABLE=y
# CONFIG_MAN is not set
-# CONFIG_MICROCOM is not set
+CONFIG_MICROCOM=y
# CONFIG_MOUNTPOINT is not set
# CONFIG_MT is not set
# CONFIG_RAIDAUTORUN is not set
diff --git a/tests/arm64/common/busybox/busybox-1.21.0_defconfig b/tests/arm64/common/busybox/busybox-1.21.0_defconfig
index 81479ab..5d428e9 100644
--- a/tests/arm64/common/busybox/busybox-1.21.0_defconfig
+++ b/tests/arm64/common/busybox/busybox-1.21.0_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Busybox version: 1.21.0
-# Fri Jan 29 12:01:33 2016
+# Thu Feb 4 22:06:56 2016
#
CONFIG_HAVE_DOT_CONFIG=y

@@ -62,9 +62,9 @@ CONFIG_STATIC=y
# CONFIG_FEATURE_INDIVIDUAL is not set
# CONFIG_FEATURE_SHARED_BUSYBOX is not set
CONFIG_LFS=y
-CONFIG_CROSS_COMPILER_PREFIX="aarch64-linux-gnu-"
+CONFIG_CROSS_COMPILER_PREFIX=""
CONFIG_SYSROOT=""
-CONFIG_EXTRA_CFLAGS="-mlittle-endian"
+CONFIG_EXTRA_CFLAGS=""
CONFIG_EXTRA_LDFLAGS=""
CONFIG_EXTRA_LDLIBS=""

@@ -688,7 +688,7 @@ CONFIG_FEATURE_CROND_DIR=""
CONFIG_DEVMEM=y
# CONFIG_EJECT is not set
# CONFIG_FEATURE_EJECT_SCSI is not set
-# CONFIG_FBSPLASH is not set
+CONFIG_FBSPLASH=y
# CONFIG_FLASHCP is not set
# CONFIG_FLASH_LOCK is not set
# CONFIG_FLASH_UNLOCK is not set
@@ -709,7 +709,7 @@ CONFIG_MAKEDEVS=y
# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
CONFIG_FEATURE_MAKEDEVS_TABLE=y
# CONFIG_MAN is not set
-# CONFIG_MICROCOM is not set
+CONFIG_MICROCOM=y
# CONFIG_MOUNTPOINT is not set
# CONFIG_MT is not set
# CONFIG_RAIDAUTORUN is not set
--
1.9.1

[Anup Patel]

This patch enables CONFIG_VSDAEMON_MTERM in all defconfigs.

Signed-off-by: Anup Patel <an...@brainfault.org>
---

arch/arm/configs/generic-v5-defconfig | 1 +
arch/arm/configs/generic-v6-defconfig | 1 +
arch/arm/configs/generic-v7-defconfig | 1 +
arch/arm/configs/generic-v7-ve-defconfig | 1 +
arch/arm/configs/generic-v8-defconfig | 1 +
arch/arm/configs/imx6-defconfig | 1 +
arch/x86/configs/x86_64_generic-defconfig | 1 +
7 files changed, 7 insertions(+)

diff --git a/arch/arm/configs/generic-v5-defconfig b/arch/arm/configs/generic-v5-defconfig
index d42173d..5e97fe2 100644
--- a/arch/arm/configs/generic-v5-defconfig
+++ b/arch/arm/configs/generic-v5-defconfig
@@ -14,6 +14,7 @@ CONFIG_VDISPLAY=y
CONFIG_VINPUT=y
CONFIG_VSDAEMON=y
CONFIG_VSDAEMON_CHARDEV=y
+CONFIG_VSDAEMON_MTERM=y
CONFIG_VTEMU=y
CONFIG_VFS=y
CONFIG_VFS_EXT4=y
diff --git a/arch/arm/configs/generic-v6-defconfig b/arch/arm/configs/generic-v6-defconfig
index ffcf3a7..b6b8f3b 100644
--- a/arch/arm/configs/generic-v6-defconfig
+++ b/arch/arm/configs/generic-v6-defconfig
@@ -16,6 +16,7 @@ CONFIG_VINPUT=y
CONFIG_VSCREEN=y
CONFIG_VSDAEMON=y
CONFIG_VSDAEMON_CHARDEV=y
+CONFIG_VSDAEMON_MTERM=y
CONFIG_VTEMU=y
CONFIG_VFS=y
CONFIG_VFS_EXT4=y
diff --git a/arch/arm/configs/generic-v7-defconfig b/arch/arm/configs/generic-v7-defconfig
index df58acb..fb73899 100644
--- a/arch/arm/configs/generic-v7-defconfig
+++ b/arch/arm/configs/generic-v7-defconfig
@@ -18,6 +18,7 @@ CONFIG_VINPUT=y
CONFIG_VSCREEN=y
CONFIG_VSDAEMON=y
CONFIG_VSDAEMON_CHARDEV=y
+CONFIG_VSDAEMON_MTERM=y
CONFIG_VTEMU=y
CONFIG_VFS=y
CONFIG_VFS_EXT4=y
diff --git a/arch/arm/configs/generic-v7-ve-defconfig b/arch/arm/configs/generic-v7-ve-defconfig
index b8ddc99..b2dc284 100644
--- a/arch/arm/configs/generic-v7-ve-defconfig
+++ b/arch/arm/configs/generic-v7-ve-defconfig
@@ -17,6 +17,7 @@ CONFIG_VINPUT=y
CONFIG_VSCREEN=y
CONFIG_VSDAEMON=y
CONFIG_VSDAEMON_CHARDEV=y
+CONFIG_VSDAEMON_MTERM=y
CONFIG_VTEMU=y
CONFIG_VFS=y
CONFIG_VFS_EXT4=y
diff --git a/arch/arm/configs/generic-v8-defconfig b/arch/arm/configs/generic-v8-defconfig
index b832335..d9557ab 100644
--- a/arch/arm/configs/generic-v8-defconfig
+++ b/arch/arm/configs/generic-v8-defconfig
@@ -18,6 +18,7 @@ CONFIG_VINPUT=y
CONFIG_VSCREEN=y
CONFIG_VSDAEMON=y
CONFIG_VSDAEMON_CHARDEV=y
+CONFIG_VSDAEMON_MTERM=y
CONFIG_VTEMU=y
CONFIG_VFS=y
CONFIG_VFS_EXT4=y
diff --git a/arch/arm/configs/imx6-defconfig b/arch/arm/configs/imx6-defconfig
index 1366943..8f9b903 100644
--- a/arch/arm/configs/imx6-defconfig
+++ b/arch/arm/configs/imx6-defconfig
@@ -55,6 +55,7 @@ CONFIG_NET_STACK=y
CONFIG_NET_STACK_LWIP=y
CONFIG_VSDAEMON=y
CONFIG_VSDAEMON_CHARDEV=y
+CONFIG_VSDAEMON_MTERM=y
CONFIG_VSDAEMON_TELNET=y
CONFIG_VTEMU=y
CONFIG_VFS=y
diff --git a/arch/x86/configs/x86_64_generic-defconfig b/arch/x86/configs/x86_64_generic-defconfig
index e606a6d..ac83b27 100644
--- a/arch/x86/configs/x86_64_generic-defconfig
+++ b/arch/x86/configs/x86_64_generic-defconfig
@@ -49,6 +49,7 @@ CONFIG_VINPUT=y
# CONFIG_VINPUT_KEYMAP_TR is not set
CONFIG_VSDAEMON=y
CONFIG_VSDAEMON_CHARDEV=y
+CONFIG_VSDAEMON_MTERM=y
CONFIG_VTEMU=y
CONFIG_VFS=y
CONFIG_VFS_EXT4=y
--
1.9.1

[Anup Patel]

This patch updates cmd_vsdaemon_usage() for newly added mterm transport.

Signed-off-by: Anup Patel <an...@brainfault.org>
---

commands/cmd_vsdaemon.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/commands/cmd_vsdaemon.c b/commands/cmd_vsdaemon.c
index f9e5ca9..fcd1a69 100644
--- a/commands/cmd_vsdaemon.c
+++ b/commands/cmd_vsdaemon.c
@@ -43,6 +43,8 @@ static void cmd_vsdaemon_usage(struct vmm_chardev *cdev)
vmm_cprintf(cdev, " vsdaemon list\n");
vmm_cprintf(cdev, " vsdaemon create <transport_name>"
" <vserial_name> <daemon_name> ...\n");
+ vmm_cprintf(cdev, " vsdaemon create mterm"
+ " <vserial_name> <daemon_name>\n");
vmm_cprintf(cdev, " vsdaemon create chardev"
" <vserial_name> <daemon_name> <chardev_name>\n");
vmm_cprintf(cdev, " vsdaemon create telnet"
--
1.9.1

[Anup Patel]

The SMP spin address can be beyound 4GB on ARM64 SoC but the
current smp_spin_table assumes clear address and release address
to be 32bit.

This patch fixes smp_spin_table for ARM64 by assuming clear
address and release address to be 64bit.

Signed-off-by: Anup Patel <an...@brainfault.org>
---

arch/arm/board/common/smp_spin_table.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/arch/arm/board/common/smp_spin_table.c b/arch/arm/board/common/smp_spin_table.c
index b69f317..2a0a501 100644
--- a/arch/arm/board/common/smp_spin_table.c
+++ b/arch/arm/board/common/smp_spin_table.c
@@ -74,7 +74,11 @@ extern u8 _start_secondary;
static int __init smp_spin_table_cpu_prepare(unsigned int cpu)
{
int rc;
+#ifdef CONFIG_ARM64
u32 val = 0;
+#else
+ u64 val = 0;
+#endif
physical_addr_t _start_secondary_pa;
#ifndef CONFIG_ARM64
const struct vmm_cpumask *mask = get_cpu_mask(cpu);
@@ -92,7 +96,7 @@ static int __init smp_spin_table_cpu_prepare(unsigned int cpu)
arch_wmb();
val = ~0x0;
vmm_host_memory_write(clear_addr[cpu],
- &val, sizeof (u32), FALSE);
+ &val, sizeof(val), FALSE);
}

/* Write to release address */
@@ -100,7 +104,7 @@ static int __init smp_spin_table_cpu_prepare(unsigned int cpu)
arch_wmb();
val = _start_secondary_pa;
vmm_host_memory_write(release_addr[cpu],
- &val, sizeof (u32), FALSE);
+ &val, sizeof(val), FALSE);
}

#ifdef CONFIG_ARM64
--
1.9.1

[Anup Patel]

Applied this patch on xvisor-next tree.

Regards,
Anup

[Anup Patel]

[Anup Patel]

[Anup Patel]