Merge "haven: hh_ctrl: pass right function number for enabling hyp uart"

arch/arm64/configs/generic_vm_defconfig

@@ -47,7 +47,6 @@ CONFIG_PROFILING=y
 CONFIG_ARCH_QCOM=y
 CONFIG_SCHED_MC=y
 CONFIG_NR_CPUS=32
-CONFIG_SECCOMP=y
 CONFIG_PARAVIRT=y
 CONFIG_ARM64_SW_TTBR0_PAN=y
 CONFIG_COMPAT=y
@@ -95,6 +94,8 @@ CONFIG_INET=y
 CONFIG_NETWORK_SECMARK=y
 # CONFIG_WIRELESS is not set
 # CONFIG_ETHTOOL_NETLINK is not set
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
 # CONFIG_FW_CACHE is not set
@@ -104,6 +105,7 @@ CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_LOOP_MIN_COUNT=16
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=8192
+CONFIG_VIRTIO_BLK=y
 CONFIG_SCSI=y
 # CONFIG_SCSI_PROC_FS is not set
 CONFIG_BLK_DEV_SD=y
@@ -215,4 +217,5 @@ CONFIG_SOFTLOCKUP_DETECTOR=y
 CONFIG_SCHEDSTATS=y
 # CONFIG_DEBUG_PREEMPT is not set
 CONFIG_BUG_ON_DATA_CORRUPTION=y
+CONFIG_BLK_DEV_IO_TRACE=y
 # CONFIG_RUNTIME_TESTING_MENU is not set

arch/arm64/configs/vendor/waipio_tuivm.config

@@ -8,7 +8,7 @@ CONFIG_HH_MEM_NOTIFIER=y
 CONFIG_HH_MSGQ=y
 CONFIG_HH_RM_DRV=y
 # CONFIG_HH_VIRTIO_BACKEND is not set
-CONFIG_HH_VIRT_WATCHDOG=y
+# CONFIG_HH_VIRT_WATCHDOG is not set
 CONFIG_HVC_HAVEN=y
 CONFIG_HVC_HAVEN_CONSOLE=y
 CONFIG_ION=y

drivers/virt/haven/hh_ctrl.c

@@ -101,7 +101,7 @@ static void __exit hh_sysfs_unregister(void)
 			   ARM_SMCCC_OWNER_VENDOR_HYP, 0x0)
 #define QC_HYP_SMCCC_UART_ENABLE                                              \
 	ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL, ARM_SMCCC_SMC_32,              \
-			   ARM_SMCCC_OWNER_VENDOR_HYP, 0x1)
+			   ARM_SMCCC_OWNER_VENDOR_HYP, 0xc)
 #define ENABLE 1
 #define DISABLE 0