From 8afcd608d8062b38042b98a5b45a1cff5e8eb827 Mon Sep 17 00:00:00 2001 From: Li Fei1 Date: Mon, 8 Feb 2021 14:26:02 +0800 Subject: [PATCH] kv: kconfig: remove some unused ram size kconfig MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit SOS_RAM_SIZE/UOS_RAM_SIZE Kconfig are only used to calculate how many pages we should reserve for the VM EPT mapping. Now we reserve pages for each VM EPT pagetable mapping by the PLATFORM_RAM_SIZE not the VM RAM SIZE. This could simplify the reserve logic for us: not need to take care variable corner cases. We could make assume we reserve enough pages base on the VM could not use the resources beyond the platform hardware resources. So remove these two unused VM ram size kconfig. Signed-off-by: Li Fei1 Tracked-On: #5788 --- doc/faq.rst | 3 --- doc/tutorials/acrn-config-details.txt | 6 ------ hypervisor/arch/x86/Kconfig | 20 ++------------------ 3 files changed, 2 insertions(+), 27 deletions(-) diff --git a/doc/faq.rst b/doc/faq.rst index 9de119edc..2c0bb21e7 100644 --- a/doc/faq.rst +++ b/doc/faq.rst @@ -27,8 +27,6 @@ on your platform. Check the documentation for these option settings for details: * :option:`CONFIG_PLATFORM_RAM_SIZE` -* :option:`CONFIG_SOS_RAM_SIZE` -* :option:`CONFIG_UOS_RAM_SIZE` * :option:`CONFIG_HV_RAM_SIZE` For example, if the Intel NUC's physical memory size is 32G, you may follow these steps @@ -44,7 +42,6 @@ the ACRN Service VM with the 32G memory size. (0x0f000000) Size of the RAM region used by the hypervisor (0x800000000) Size of the physical platform RAM - (0x800000000) Size of the Service OS (SOS) RAM #. Press :kbd:`S` and then :kbd:`Enter` to save the ``.config`` to the default directory: ``acrn-hypervisor/hypervisor/build/.config`` diff --git a/doc/tutorials/acrn-config-details.txt b/doc/tutorials/acrn-config-details.txt index 6eb5b94e1..4674bb57c 100644 --- a/doc/tutorials/acrn-config-details.txt +++ b/doc/tutorials/acrn-config-details.txt @@ -95,12 +95,6 @@ ``LOW_RAM_SIZE`` (a child node of ``MEMORY``): Specify the size of the RAM region below address 0x10000, starting from address 0x0. -``SOS_RAM_SIZE`` (a child node of ``MEMORY``): - Specify the size of the Service OS VM RAM region. - -``UOS_RAM_SIZE`` (a child node of ``MEMORY``): - Specify the size of the User OS VM RAM region. - ``PLATFORM_RAM_SIZE`` (a child node of ``MEMORY``): Specify the size of the physical platform RAM region. diff --git a/hypervisor/arch/x86/Kconfig b/hypervisor/arch/x86/Kconfig index 82cc748d0..0893098dc 100644 --- a/hypervisor/arch/x86/Kconfig +++ b/hypervisor/arch/x86/Kconfig @@ -212,8 +212,8 @@ config HV_RAM_START config HV_RAM_SIZE hex "Size of the RAM region used by the hypervisor" - range 0x1000000 0x20000000 - default 0x14000000 + range 0x800000 0x4000000 + default 0x800000 help A 64-bit integer indicating the size of RAM used by the hypervisor. It is ensured at link time that the footprint of the hypervisor @@ -227,22 +227,6 @@ config PLATFORM_RAM_SIZE A 64-bit integer indicating the size of the physical platform RAM (MMIO not included). -config SOS_RAM_SIZE - hex "Size of the Service OS (SOS) RAM" - range 0x100000000 0x4000000000 - default 0x400000000 - help - A 64-bit integer indicating the size of the Service OS RAM (MMIO not - included). - - config UOS_RAM_SIZE - hex "Size of the User OS (UOS) RAM" - range 0 0x2000000000 - default 0x200000000 - help - A 64-bit integer indicating the size of the User OS RAM (MMIO not - included). Now we assume each UOS uses same amount of RAM size. - config ACPI_PARSE_ENABLED bool "Enable ACPI runtime parsing" default y