Follow up to "Add new board: Xen guest for ARM64" series
Subsystems (2)
v2 cover Follow up to "Add new board: Xen guest for ARM64" series
From: Anastasiia Lukianenko <[email protected]>
Removed unnecessary defines, fixed code style errors and added maintainers to XEN section.
Regards,
Anastasiia Lukianenko
Changes since v1:
=================
1. Removed CONFIG_BOARD_EARLY_INIT_F define and board_early_init_f function
2. Removed duplicates from MAINTAINERS file
3. Cleaned xenguest_arm64_defconfig
4. Coding style cleanup
Anastasiia Lukianenko (5):
board: xen: Remove unnecessary CONFIG_BOARD_EARLY_INIT_F define and
board_early_init_f function
MAINTAINERS: Add maintainers to XEN section
board: xen: Remove CONFIG_CMD_RUN define and clean
xenguest_arm64_defconfig
board: xen: Remove unnecessary CONFIG_INITRD_TAG and
CONFIG_CMDLINE_TAG
xen: Code style conformity
MAINTAINERS | 16 +++++ board/xen/xenguest_arm64/MAINTAINERS | 3 +- board/xen/xenguest_arm64/xenguest_arm64.c | 5 -- configs/xenguest_arm64_defconfig | 75 ++++++++--------------- drivers/xen/gnttab.c | 3 +- drivers/xen/pvblock.c | 12 ++-- include/configs/xenguest_arm64.h | 7 --- include/xen/gnttab.h | 3 +- lib/sscanf.c | 3 +- 9 files changed, 56 insertions(+), 71 deletions(-)
Signature · 1 line
2.17.1
PATCH v2 1/5 board: xen: Remove unnecessary CONFIG_BOARD_EARLY_INIT_F define and board_early_init_f function
From: Anastasiia Lukianenko <[email protected]>
--- board/xen/xenguest_arm64/xenguest_arm64.c | 5 ----- include/configs/xenguest_arm64.h | 2 -- 2 files changed, 7 deletions(-)
board/xen/xenguest_arm64/xenguest_arm64.c +0 -5
@@ -184,11 +184,6 @@ int ft_board_setup(void *blob, struct bd_info *bd)return 0 ; } -int board_early_init_f (void ) -{ -return 0 ; -} -int print_cpuinfo (void ) {printf ("Xen virtual CPU\n" );
include/configs/xenguest_arm64.h +0 -2
@@ -9,8 +9,6 @@#include <linux/types.h> #endif -#define CONFIG_BOARD_EARLY_INIT_F -#define CONFIG_EXTRA_ENV_SETTINGS #undef CONFIG_NR_DRAM_BANKS
Signature · 1 line
2.17.1
PATCH v2 1/5 board: xen: Remove unnecessary CONFIG_BOARD_EARLY_INIT_F define and board_early_init_f function
Quoted 4 lines · Anastasiia Lukianenko
From: Anastasiia Lukianenko <[email protected]>
Signed-off-by Anastasiia Lukianenko <[email protected]>Reviewed-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200825/076cc400/attachment.sig>
PATCH v2 2/5 MAINTAINERS: Add maintainers to XEN section
In reply to Anastasiia LukianenkoFrom: Anastasiia Lukianenko <[email protected]>
---
Changes since v1:
- removed duplicates from MAINTAINERS file, which mentioned in board/xen/xenguest_arm64/MAINTAINERS
- change maintainers in XEN GUEST FOR ARM64 section
MAINTAINERS | 16 ++++++++++++++++ board/xen/xenguest_arm64/MAINTAINERS | 3 ++- 2 files changed, 18 insertions(+), 1 deletion(-)
MAINTAINERS +16 -0
@@ -1097,6 +1097,22 @@ T: git https://gitlab.denx.de/u-boot/custodians/u-boot-x86.git F: arch/x86/ F: cmd/x86/ +XEN +M: Anastasiia Lukianenko <[email protected]> +M: Oleksandr Andrushchenko <[email protected]> +S: Maintained +F: arch/arm/cpu/armv8/xen/ +F: arch/arm/include/asm/xen.h +F: arch/arm/include/asm/xen/ +F: cmd/pvblock.c +F: drivers/serial/serial_xen.c +F: drivers/xen/ +F: include/pvblock.h +F: include/xen/ +F: include/xen.h +F: lib/sscanf.c +F: test/lib/sscanf.c + XTENSA M: Max Filippov <[email protected]> S: Maintained
board/xen/xenguest_arm64/MAINTAINERS +2 -1
@@ -1,5 +1,6 @@ XEN GUEST FOR ARM64 -M: Andrii Anisov <[email protected]> +M: Anastasiia Lukianenko <[email protected]> +M: Oleksandr Andrushchenko <[email protected]> S: Maintained F: board/xen/xenguest_arm64/ F: doc/board/xen/
Signature · 1 line
2.17.1
PATCH v2 2/5 MAINTAINERS: Add maintainers to XEN section
Quoted 6 lines · Anastasiia Lukianenko
From: Anastasiia Lukianenko <[email protected]>
Signed-off-by Anastasiia Lukianenko <[email protected]>---
Quoted 9 lines
Changes since v1:
- removed duplicates fromMAINTAINERSfile, which mentioned in board/xen/xenguest_arm64/MAINTAINERS
- change maintainers in XEN GUEST FOR ARM64 sectionMAINTAINERS | 16 ++++++++++++++++ board/xen/xenguest_arm64/MAINTAINERS | 3 ++- 2 files changed, 18 insertions(+), 1 deletion(-)
PATCH v2 2/5 MAINTAINERS: Add maintainers to XEN section
In reply to Anastasiia LukianenkoQuoted 4 lines · Anastasiia Lukianenko
From: Anastasiia Lukianenko <[email protected]>
Signed-off-by Anastasiia Lukianenko <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200825/f26e5336/attachment.sig>
PATCH v2 3/5 board: xen: Remove CONFIG_CMD_RUN define and clean xenguest_arm64_defconfig
In reply to Anastasiia LukianenkoFrom: Anastasiia Lukianenko <[email protected]>
CONFIG_CMD_RUN is set on by default in Kconfig.
Create xenguest_arm64_defconfig by using savedefconfig to avoid unnecessary options.
---
Changes since v1:
- removed wrong config options
- added commit message
configs/xenguest_arm64_defconfig | 75 ++++++++++++-------------------- include/configs/xenguest_arm64.h | 2 - 2 files changed, 27 insertions(+), 50 deletions(-)
configs/xenguest_arm64_defconfig +27 -48
@@ -1,60 +1,39 @@ CONFIG_ARM=y CONFIG_POSITION_INDEPENDENT=y +CONFIG_TARGET_XENGUEST_ARM64=y CONFIG_SYS_TEXT_BASE=0x40080000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_IDENT_STRING=" xenguest" -CONFIG_TARGET_XENGUEST_ARM64=y CONFIG_BOOTDELAY=10 - CONFIG_SYS_PROMPT="xenguest# " - -CONFIG_CMD_NET=n -CONFIG_CMD_BDI=n -CONFIG_CMD_BOOTD=n -CONFIG_CMD_BOOTEFI=n -CONFIG_CMD_BOOTEFI_HELLO_COMPILE=n -CONFIG_CMD_ELF=n +# CONFIG_CMD_BDI is not set +# CONFIG_CMD_BOOTD is not set +# CONFIG_CMD_ELF is not set +# CONFIG_CMD_GO is not set +# CONFIG_CMD_IMI is not set +# CONFIG_CMD_XIMG is not set +# CONFIG_CMD_EXPORTENV is not set +# CONFIG_CMD_IMPORTENV is not set +# CONFIG_CMD_EDITENV is not set +# CONFIG_CMD_SAVEENV is not set +# CONFIG_CMD_ENV_EXISTS is not set +# CONFIG_CMD_CRC32 is not set +# CONFIG_CMD_LZMADEC is not set +# CONFIG_CMD_UNZIP is not set +# CONFIG_CMD_LOADB is not set +# CONFIG_CMD_LOADS is not set +CONFIG_CMD_PVBLOCK=y +# CONFIG_CMD_ECHO is not set +# CONFIG_CMD_ITEST is not set +# CONFIG_CMD_SOURCE is not set +# CONFIG_CMD_SETEXPR is not set +# CONFIG_CMD_NET is not set +# CONFIG_CMD_MISC is not set CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y -CONFIG_CMD_GO=n -CONFIG_CMD_RUN=n -CONFIG_CMD_IMI=n -CONFIG_CMD_IMLS=n -CONFIG_CMD_XIMG=n -CONFIG_CMD_EXPORTENV=n -CONFIG_CMD_IMPORTENV=n -CONFIG_CMD_EDITENV=n -CONFIG_CMD_ENV_EXISTS=n -CONFIG_CMD_MEMORY=y -CONFIG_CMD_CRC32=n -CONFIG_CMD_DM=n -CONFIG_CMD_LOADB=n -CONFIG_CMD_LOADS=n -CONFIG_CMD_FLASH=n -CONFIG_CMD_GPT=n -CONFIG_CMD_FPGA=n -CONFIG_CMD_ECHO=n -CONFIG_CMD_ITEST=n -CONFIG_CMD_SOURCE=n -CONFIG_CMD_SETEXPR=n -CONFIG_CMD_MISC=n -CONFIG_CMD_UNZIP=n -CONFIG_CMD_LZMADEC=n -CONFIG_CMD_SAVEENV=n -CONFIG_CMD_UMS=n - -CONFIG_CMD_PVBLOCK=y - -#CONFIG_USB=n -# CONFIG_ISO_PARTITION is not set - -#CONFIG_EFI_PARTITION=y -# CONFIG_EFI_LOADER is not set - +CONFIG_OF_BOARD=y CONFIG_DM=y # CONFIG_MMC is not set -CONFIG_DM_SERIAL=y # CONFIG_REQUIRE_SERIAL_CONSOLE is not set - -CONFIG_OF_BOARD=y -CONFIG_OF_LIBFDT=y +CONFIG_DM_SERIAL=y +# CONFIG_EFI_LOADER is not set
include/configs/xenguest_arm64.h +0 -2
@@ -39,8 +39,6 @@#define CONFIG_CMDLINE_TAG 1#define CONFIG_INITRD_TAG 1 -#define CONFIG_CMD_RUN -#undef CONFIG_EXTRA_ENV_SETTINGS#define CONFIG_EXTRA_ENV_SETTINGS \ "loadimage=ext4load pvblock 0 0x90000000 /boot/Image;\0" \
Signature · 1 line
2.17.1
PATCH v2 3/5 board: xen: Remove CONFIG_CMD_RUN define and clean xenguest_arm64_defconfig
Quoted 10 lines · Anastasiia Lukianenko
From: Anastasiia Lukianenko <[email protected]>
CONFIG_CMD_RUNis set on by default inKconfig.
Createxenguest_arm64_defconfigby using savedefconfig to avoid unnecessary options.Signed-off-by Anastasiia Lukianenko <[email protected]>---
Quoted 7 lines
Changes since v1:
- removed wrong config options
- added commit messageconfigs/xenguest_arm64_defconfig | 75 ++++++++++++-------------------- include/configs/xenguest_arm64.h | 2 - 2 files changed, 27 insertions(+), 50 deletions(-)
PATCH v2 3/5 board: xen: Remove CONFIG_CMD_RUN define and clean xenguest_arm64_defconfig
In reply to Anastasiia LukianenkoQuoted 8 lines · Anastasiia Lukianenko
From: Anastasiia Lukianenko <[email protected]>
CONFIG_CMD_RUNis set on by default inKconfig.
Createxenguest_arm64_defconfigby using savedefconfig to avoid unnecessary options.Signed-off-by Anastasiia Lukianenko <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200825/d407bb34/attachment.sig>
PATCH v2 4/5 board: xen: Remove unnecessary CONFIG_INITRD_TAG and CONFIG_CMDLINE_TAG
In reply to Anastasiia LukianenkoFrom: Anastasiia Lukianenko <[email protected]>
--- include/configs/xenguest_arm64.h | 3 --- 1 file changed, 3 deletions(-)
include/configs/xenguest_arm64.h +0 -3
@@ -36,9 +36,6 @@#define CONFIG_OF_SYSTEM_SETUP -#define CONFIG_CMDLINE_TAG 1 -#define CONFIG_INITRD_TAG 1 -#undef CONFIG_EXTRA_ENV_SETTINGS#define CONFIG_EXTRA_ENV_SETTINGS \ "loadimage=ext4load pvblock 0 0x90000000 /boot/Image;\0" \
Signature · 1 line
2.17.1
PATCH v2 4/5 board: xen: Remove unnecessary CONFIG_INITRD_TAG and CONFIG_CMDLINE_TAG
Quoted 8 lines · Anastasiia Lukianenko
From: Anastasiia Lukianenko <[email protected]>
Signed-off-by Anastasiia Lukianenko <[email protected]>--- include/configs/xenguest_arm64.h | 3 --- 1 file changed, 3 deletions(-)
PATCH v2 4/5 board: xen: Remove unnecessary CONFIG_INITRD_TAG and CONFIG_CMDLINE_TAG
In reply to Anastasiia LukianenkoQuoted 4 lines · Anastasiia Lukianenko
From: Anastasiia Lukianenko <[email protected]>
Signed-off-by Anastasiia Lukianenko <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200825/e4b1b081/attachment.sig>
PATCH v2 5/5 xen: Code style conformity
In reply to Anastasiia LukianenkoFrom: Anastasiia Lukianenko <[email protected]>
Cleaning up the following:
ERROR: do not use assignment in if condition
#281: FILE: drivers/xen/pvblock.c:260:
+ if ((err = xenbus_switch_state(XBT_NIL, nodename,
CHECK:COMPARISON_TO_NULL: Comparison to NULL could be written "err" #52: FILE: drivers/xen/pvblock.c:298:
+ if (err != NULL) {
ERROR: do not use assignment in if condition
#176: FILE: drivers/xen/gnttab.c:103:
+ if ((flags = nflags) & (GTF_reading | GTF_writing)) {
WARNING: Missing or malformed SPDX-License-Identifier tag in line 1 #329: FILE: include/xen/gnttab.h:1:
+/*
WARNING: Misplaced SPDX-License-Identifier tag - use line 1 instead #330: FILE: include/xen/gnttab.h:2:
+ * SPDX-License-Identifier: GPL-2.0
ERROR: do not use assignment in if condition
#630: FILE: lib/sscanf.c:558:
+ if ((n = inr) < width) {
---
Changes since v1:
- cleaned errors like in drivers/xen/pvblock.c:
CHECK:COMPARISON_TO_NULL: Comparison to NULL could be written "err"
- added commit message
drivers/xen/gnttab.c | 3 ++- drivers/xen/pvblock.c | 12 ++++++------ include/xen/gnttab.h | 3 +-- lib/sscanf.c | 3 ++- 4 files changed, 11 insertions(+), 10 deletions(-)
drivers/xen/gnttab.c +2 -1
@@ -100,7 +100,8 @@ int gnttab_end_access(grant_ref_t ref) nflags = gnttab_table[ref].flags; do { - if ((flags = nflags) & (GTF_reading | GTF_writing)) { + flags = nflags; + if ((flags) & (GTF_reading | GTF_writing)) { printf("WARNING: g.e. still in use! (%x)\n", flags); return 0; }
drivers/xen/pvblock.c +6 -6
@@ -294,8 +294,8 @@ static void shutdown_blkfront(struct blkfront_dev *dev)snprintf (path,sizeof (path),"%s/state" , dev->backend);snprintf (nodename,sizeof (nodename),"%s/state" , dev->nodename); -if ((err =xenbus_switch_state (XBT_NIL , nodename, - XenbusStateClosing)) !=NULL ) { + err =xenbus_switch_state (XBT_NIL , nodename, XenbusStateClosing); +if (err) {printf ("%s: error changing state to %d: %s\n" , __func__, XenbusStateClosing, err); goto close;
@@ -306,8 +306,8 @@ static void shutdown_blkfront(struct blkfront_dev *dev) err =xenbus_wait_for_state_change (path, &state);free (err); -if ((err =xenbus_switch_state (XBT_NIL , nodename, - XenbusStateClosed)) !=NULL ) { + err =xenbus_switch_state (XBT_NIL , nodename, XenbusStateClosed); +if (err) {printf ("%s: error changing state to %d: %s\n" , __func__, XenbusStateClosed, err); goto close;
@@ -319,8 +319,8 @@ static void shutdown_blkfront(struct blkfront_dev *dev)free (err); } -if ((err =xenbus_switch_state (XBT_NIL , nodename, - XenbusStateInitialising)) !=NULL ) { + err =xenbus_switch_state (XBT_NIL , nodename, XenbusStateInitialising); +if (err) {printf ("%s: error changing state to %d: %s\n" , __func__, XenbusStateInitialising, err); goto close;
include/xen/gnttab.h +1 -2
@@ -1,5 +1,4 @@ -/* -* SPDX-License-Identifier: GPL-2.0 +/* SPDX-License-Identifier: GPL-2.0 * * (C) 2006, Steven Smith <[email protected]> * (C) 2006, Grzegorz Milos <[email protected]>
lib/sscanf.c +2 -1
@@ -555,7 +555,8 @@ literal:if (flags &SUPPRESS ) {size_t sum =0 ; -if ((n = inr) < width) { + n = inr; +if (n < width) { sum += n; width -= n; inp += n;
Signature · 1 line
2.17.1
PATCH v2 5/5 xen: Code style conformity
Quoted 32 lines · Anastasiia Lukianenko
From: Anastasiia Lukianenko <[email protected]>
Cleaning up the following:
ERROR: do not use assignment in if condition
#281: FILE:drivers/xen/pvblock.c:260:
+ if ((err = xenbus_switch_state(XBT_NIL, nodename,
CHECK:COMPARISON_TO_NULL: Comparison to NULL could be written "err" #52: FILE:drivers/xen/pvblock.c:298:
+ if (err != NULL) {
ERROR: do not use assignment in if condition
#176: FILE:drivers/xen/gnttab.c:103:
+ if ((flags = nflags) & (GTF_reading|GTF_writing)) {
WARNING: Missing or malformed SPDX-License-Identifier tag in line 1 #329: FILE:include/xen/gnttab.h:1:
+/*
WARNING: Misplaced SPDX-License-Identifier tag - use line 1 instead #330: FILE:include/xen/gnttab.h:2:
+ * SPDX-License-Identifier: GPL-2.0
ERROR: do not use assignment in if condition
#630: FILE:lib/sscanf.c:558:
+ if ((n = inr) < width) {Signed-off-by Anastasiia Lukianenko <[email protected]>---
Changes since v1:
- cleaned errors like indrivers/xen/pvblock.c:
CHECK:COMPARISON_TO_NULL: Comparison to NULL could be written "err"
- added commit message
Quoted 5 lines
drivers/xen/gnttab.c | 3 ++- drivers/xen/pvblock.c | 12 ++++++------ include/xen/gnttab.h | 3 +-- lib/sscanf.c | 3 ++- 4 files changed, 11 insertions(+), 10 deletions(-)
PATCH v2 5/5 xen: Code style conformity
In reply to Anastasiia LukianenkoQuoted 23 lines · Anastasiia Lukianenko
From: Anastasiia Lukianenko <[email protected]>
Cleaning up the following:
ERROR: do not use assignment in if condition
#281: FILE:drivers/xen/pvblock.c:260:
+ if ((err = xenbus_switch_state(XBT_NIL, nodename,
CHECK:COMPARISON_TO_NULL: Comparison to NULL could be written "err" #52: FILE:drivers/xen/pvblock.c:298:
+ if (err != NULL) {
ERROR: do not use assignment in if condition
#176: FILE:drivers/xen/gnttab.c:103:
+ if ((flags = nflags) & (GTF_reading|GTF_writing)) {
WARNING: Missing or malformed SPDX-License-Identifier tag in line 1 #329: FILE:include/xen/gnttab.h:1:
+/*
WARNING: Misplaced SPDX-License-Identifier tag - use line 1 instead #330: FILE:include/xen/gnttab.h:2:
+ * SPDX-License-Identifier: GPL-2.0
ERROR: do not use assignment in if condition
#630: FILE:lib/sscanf.c:558:
+ if ((n = inr) < width) {
Quoted 2 lines
Signed-off-by Anastasiia Lukianenko <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200825/7d21a1f3/attachment.sig>