From c71cf753eb44052ac321340e26300d02324a1e96 Mon Sep 17 00:00:00 2001
From: Zhao Yakui <yakui.zhao@intel.com>
Date: Tue, 4 Jun 2019 09:29:39 +0800
Subject: [PATCH] ACRN/HV: Add one new board configuration for ACRN-hypervisor

The memory size and IOMMU number are refined to meet with ICL board requirement.
Otherwise the ACRN hypervisor can't be booted on the new ICL board.
ICL(the abbreviation of Ice Lake) is the next generation platform based on 10nm.
CPU is based on Sunny Cove microarchitecture and GPU is based on gen11.
The new board is named as icl-rvp.

Tracked-On: #3216
Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
Reviewed-by: Binbin Wu <binbin.wu@intel.com>
---
 hypervisor/arch/x86/configs/icl-rvp.config  |  6 ++++++
 hypervisor/arch/x86/configs/icl-rvp/board.c | 10 ++++++++++
 hypervisor/arch/x86/configs/icl-rvp/ve820.c | 16 ++++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 100644 hypervisor/arch/x86/configs/icl-rvp.config
 create mode 100644 hypervisor/arch/x86/configs/icl-rvp/board.c
 create mode 100644 hypervisor/arch/x86/configs/icl-rvp/ve820.c

diff --git a/hypervisor/arch/x86/configs/icl-rvp.config b/hypervisor/arch/x86/configs/icl-rvp.config
new file mode 100644
index 000000000..f281b849b
--- /dev/null
+++ b/hypervisor/arch/x86/configs/icl-rvp.config
@@ -0,0 +1,6 @@
+# Generated by Kconfiglib (https://github.com/ulfalizer/Kconfiglib)
+CONFIG_BOARD="icl-rvp"
+CONFIG_SERIAL_LEGACY=y
+CONFIG_SOS_RAM_SIZE=0x600000000
+CONFIG_UOS_RAM_SIZE=0x600000000
+CONFIG_MAX_IOMMU_NUM=3
diff --git a/hypervisor/arch/x86/configs/icl-rvp/board.c b/hypervisor/arch/x86/configs/icl-rvp/board.c
new file mode 100644
index 000000000..830a75dcc
--- /dev/null
+++ b/hypervisor/arch/x86/configs/icl-rvp/board.c
@@ -0,0 +1,10 @@
+/*
+ * Copyright (C) 2019 Intel Corporation. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include <board.h>
+
+struct platform_clos_info platform_clos_array[0];
+uint16_t platform_clos_num = 0;
diff --git a/hypervisor/arch/x86/configs/icl-rvp/ve820.c b/hypervisor/arch/x86/configs/icl-rvp/ve820.c
new file mode 100644
index 000000000..c1e5bedd3
--- /dev/null
+++ b/hypervisor/arch/x86/configs/icl-rvp/ve820.c
@@ -0,0 +1,16 @@
+/*
+ * Copyright (C) 2019 Intel Corporation. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include <vm.h>
+
+/**
+ * @pre vm != NULL
+ */
+void create_prelaunched_vm_e820(struct acrn_vm *vm)
+{
+	vm->e820_entry_num = 0U;
+	vm->e820_entries = NULL;
+}