[PATCH v12 13/24] virt: geniezone: Add dtb config support

[Liju-clr Chen]

From: Jerry Wang <ze-yu.w...@mediatek.com>

Hypervisor might need to know the accurate address and size of dtb
passed from userspace. And then hypervisor would parse the dtb and get
vm information.

Signed-off-by: Jerry Wang <ze-yu.w...@mediatek.com>
Signed-off-by: Yi-De Wu <yi-de...@mediatek.com>
Signed-off-by: Liju Chen <liju-clr.c...@mediatek.com>
---
 arch/arm64/geniezone/gzvm_arch_common.h |  2 ++
 arch/arm64/geniezone/vm.c               |  9 +++++++++
 drivers/virt/geniezone/gzvm_vm.c        | 10 ++++++++++
 include/linux/soc/mediatek/gzvm_drv.h   |  1 +
 include/uapi/linux/gzvm.h               | 14 ++++++++++++++
 5 files changed, 36 insertions(+)

diff --git a/arch/arm64/geniezone/gzvm_arch_common.h 
b/arch/arm64/geniezone/gzvm_arch_common.h
index dabd11438e94..4366618cdc0a 100644
--- a/arch/arm64/geniezone/gzvm_arch_common.h
+++ b/arch/arm64/geniezone/gzvm_arch_common.h
@@ -23,6 +23,7 @@ enum {
        GZVM_FUNC_ENABLE_CAP = 13,
        GZVM_FUNC_INFORM_EXIT = 14,
        GZVM_FUNC_MEMREGION_PURPOSE = 15,
+       GZVM_FUNC_SET_DTB_CONFIG = 16,
        NR_GZVM_FUNC,
 };
 
@@ -46,6 +47,7 @@ enum {
 #define MT_HVC_GZVM_ENABLE_CAP         GZVM_HCALL_ID(GZVM_FUNC_ENABLE_CAP)
 #define MT_HVC_GZVM_INFORM_EXIT                
GZVM_HCALL_ID(GZVM_FUNC_INFORM_EXIT)
 #define MT_HVC_GZVM_MEMREGION_PURPOSE  
GZVM_HCALL_ID(GZVM_FUNC_MEMREGION_PURPOSE)
+#define MT_HVC_GZVM_SET_DTB_CONFIG     GZVM_HCALL_ID(GZVM_FUNC_SET_DTB_CONFIG)
 
 #define GIC_V3_NR_LRS                  16
 
diff --git a/arch/arm64/geniezone/vm.c b/arch/arm64/geniezone/vm.c
index c20a2ded2a4f..00c74a4bcfd7 100644
--- a/arch/arm64/geniezone/vm.c
+++ b/arch/arm64/geniezone/vm.c
@@ -154,6 +154,15 @@ int gzvm_arch_memregion_purpose(struct gzvm *gzvm,
                                    mem->flags, 0, 0, 0, &res);
 }
 
+int gzvm_arch_set_dtb_config(struct gzvm *gzvm, struct gzvm_dtb_config *cfg)
+{
+       struct arm_smccc_res res;
+
+       return gzvm_hypcall_wrapper(MT_HVC_GZVM_SET_DTB_CONFIG, gzvm->vm_id,
+                                   cfg->dtb_addr, cfg->dtb_size, 0, 0, 0, 0,
+                                   &res);
+}
+
 static int gzvm_vm_arch_enable_cap(struct gzvm *gzvm,
                                   struct gzvm_enable_cap *cap,
                                   struct arm_smccc_res *res)
diff --git a/drivers/virt/geniezone/gzvm_vm.c b/drivers/virt/geniezone/gzvm_vm.c
index dd2de6e3bcde..5ae5abff2955 100644
--- a/drivers/virt/geniezone/gzvm_vm.c
+++ b/drivers/virt/geniezone/gzvm_vm.c
@@ -281,6 +281,16 @@ static long gzvm_vm_ioctl(struct file *filp, unsigned int 
ioctl,
                ret = gzvm_vm_ioctl_enable_cap(gzvm, &cap, argp);
                break;
        }
+       case GZVM_SET_DTB_CONFIG: {
+               struct gzvm_dtb_config cfg;
+
+               if (copy_from_user(&cfg, argp, sizeof(cfg))) {
+                       ret = -EFAULT;
+                       goto out;
+               }
+               ret = gzvm_arch_set_dtb_config(gzvm, &cfg);
+               break;
+       }
        default:
                ret = -ENOTTY;
        }
diff --git a/include/linux/soc/mediatek/gzvm_drv.h 
b/include/linux/soc/mediatek/gzvm_drv.h
index 3c2b5d9071c6..982463eea4f6 100644
--- a/include/linux/soc/mediatek/gzvm_drv.h
+++ b/include/linux/soc/mediatek/gzvm_drv.h
@@ -181,6 +181,7 @@ void gzvm_vm_irqfd_release(struct gzvm *gzvm);
 
 int gzvm_arch_memregion_purpose(struct gzvm *gzvm,
                                struct gzvm_userspace_memory_region *mem);
+int gzvm_arch_set_dtb_config(struct gzvm *gzvm, struct gzvm_dtb_config *args);
 
 int gzvm_init_ioeventfd(struct gzvm *gzvm);
 int gzvm_ioeventfd(struct gzvm *gzvm, struct gzvm_ioeventfd *args);
diff --git a/include/uapi/linux/gzvm.h b/include/uapi/linux/gzvm.h
index 6e102cbfec98..7aec4adf2206 100644
--- a/include/uapi/linux/gzvm.h
+++ b/include/uapi/linux/gzvm.h
@@ -364,4 +364,18 @@ struct gzvm_ioeventfd {
 
 #define GZVM_IOEVENTFD _IOW(GZVM_IOC_MAGIC, 0x79, struct gzvm_ioeventfd)
 
+/**
+ * struct gzvm_dtb_config: store address and size of dtb passed from userspace
+ *
+ * @dtb_addr: dtb address set by VMM (guset memory)
+ * @dtb_size: dtb size
+ */
+struct gzvm_dtb_config {
+       __u64 dtb_addr;
+       __u64 dtb_size;
+};
+
+#define GZVM_SET_DTB_CONFIG       _IOW(GZVM_IOC_MAGIC, 0xff, \
+                                      struct gzvm_dtb_config)
+
 #endif /* __GZVM_H__ */
-- 
2.18.0