From da1b291d643009a92a866d5ffb05a536c54435d9 Mon Sep 17 00:00:00 2001 From: Penny Zheng Date: Mon, 23 Sep 2019 11:09:37 +0800 Subject: [PATCH 1/2] config: update kernel config on aarch64 Since kernel version updated to v4.19.73, kernel config file should also been updated accorindly. Fixes: #736 Signed-off-by: Penny Zheng Signed-off-by: Haibo Xu --- kernel/configs/arm64_kata_kvm_4.19.x | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/kernel/configs/arm64_kata_kvm_4.19.x b/kernel/configs/arm64_kata_kvm_4.19.x index 1b477ba3b2..7e5ba6765c 100644 --- a/kernel/configs/arm64_kata_kvm_4.19.x +++ b/kernel/configs/arm64_kata_kvm_4.19.x @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.19.52 Kernel Configuration +# Linux/arm64 4.19.73 Kernel Configuration # # @@ -463,6 +463,7 @@ CONFIG_CPU_IDLE_GOV_MENU=y CONFIG_ARM_PSCI_FW=y # CONFIG_ARM_PSCI_CHECKER is not set # CONFIG_ARM_SDE_INTERFACE is not set +# CONFIG_ISCSI_IBFT is not set # CONFIG_FW_CFG_SYSFS is not set CONFIG_HAVE_ARM_SMCCC=y # CONFIG_GOOGLE_FIRMWARE is not set @@ -2054,8 +2055,11 @@ CONFIG_CRYPTO=y # CONFIG_CRYPTO_ALGAPI=y CONFIG_CRYPTO_ALGAPI2=y +CONFIG_CRYPTO_BLKCIPHER=y +CONFIG_CRYPTO_BLKCIPHER2=y CONFIG_CRYPTO_HASH=y CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_RNG2=y # CONFIG_CRYPTO_RSA is not set # CONFIG_CRYPTO_DH is not set # CONFIG_CRYPTO_ECDH is not set @@ -2064,6 +2068,7 @@ CONFIG_CRYPTO_HASH2=y # CONFIG_CRYPTO_GF128MUL is not set # CONFIG_CRYPTO_NULL is not set # CONFIG_CRYPTO_PCRYPT is not set +CONFIG_CRYPTO_WORKQUEUE=y # CONFIG_CRYPTO_CRYPTD is not set # CONFIG_CRYPTO_MCRYPTD is not set # CONFIG_CRYPTO_AUTHENC is not set From d74a600083f6242a65b5a4829ab25080db042769 Mon Sep 17 00:00:00 2001 From: Penny Zheng Date: Mon, 23 Sep 2019 10:01:25 +0800 Subject: [PATCH 2/2] FC: Support serial device on aarch64 Serial device was finally fully supported with firecracker on aarch64, see details here(https://github.com/firecracker-microvm/firecracker/pull/1233). A set of kernel configs related with 8250 compatible serial ports should be turn on. Fixes: #736 Signed-off-by: Penny Zheng Signed-off-by: Haibo Xu --- kernel/configs/arm64_kata_kvm_4.19.x | 17 ++++++++++++++++- kernel/kata_config_version | 2 +- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/kernel/configs/arm64_kata_kvm_4.19.x b/kernel/configs/arm64_kata_kvm_4.19.x index 7e5ba6765c..e8d23cc932 100644 --- a/kernel/configs/arm64_kata_kvm_4.19.x +++ b/kernel/configs/arm64_kata_kvm_4.19.x @@ -1510,7 +1510,22 @@ CONFIG_DEVMEM=y # Serial drivers # CONFIG_SERIAL_EARLYCON=y -# CONFIG_SERIAL_8250 is not set +CONFIG_SERIAL_8250=y +# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set +CONFIG_SERIAL_8250_PNP=y +# CONFIG_SERIAL_8250_FINTEK is not set +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_PCI=y +# CONFIG_SERIAL_8250_EXAR is not set +CONFIG_SERIAL_8250_NR_UARTS=4 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +# CONFIG_SERIAL_8250_EXTENDED is not set +# CONFIG_SERIAL_8250_ASPEED_VUART is not set +CONFIG_SERIAL_8250_FSL=y +# CONFIG_SERIAL_8250_DW is not set +# CONFIG_SERIAL_8250_RT288X is not set +# CONFIG_SERIAL_8250_MOXA is not set +CONFIG_SERIAL_OF_PLATFORM=y # # Non-8250 serial port support diff --git a/kernel/kata_config_version b/kernel/kata_config_version index 0691f67b20..59343b09ec 100644 --- a/kernel/kata_config_version +++ b/kernel/kata_config_version @@ -1 +1 @@ -52 +53