From: Bibo Mao <maobibo@loongson.cn>
To: Song Gao <gaosong@loongson.cn>, Thomas Huth <thuth@redhat.com>,
Laurent Vivier <lvivier@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>, qemu-devel@nongnu.org
Subject: [PATCH v2 4/6] hw/loongarch: Refine system dram memory region
Date: Tue, 7 May 2024 11:49:02 +0800 [thread overview]
Message-ID: <20240507034904.2391129-5-maobibo@loongson.cn> (raw)
In-Reply-To: <20240507034904.2391129-1-maobibo@loongson.cn>
For system dram memory region, it is not necessary to use numa node
information. There is only low memory region and high memory region.
Remove numa node information for ddr memory region here, it can reduce
memory region number about LoongArch virt machine.
Signed-off-by: Bibo Mao <maobibo@loongson.cn>
---
hw/loongarch/virt.c | 55 ++++++++++++++-------------------------------
1 file changed, 17 insertions(+), 38 deletions(-)
diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
index aca8290795..5abfe0a9d7 100644
--- a/hw/loongarch/virt.c
+++ b/hw/loongarch/virt.c
@@ -974,18 +974,13 @@ static void loongarch_init(MachineState *machine)
{
LoongArchCPU *lacpu;
const char *cpu_model = machine->cpu_type;
- ram_addr_t offset = 0;
- ram_addr_t ram_size = machine->ram_size;
- uint64_t highram_size = 0, phyAddr = 0;
MemoryRegion *address_space_mem = get_system_memory();
LoongArchMachineState *lams = LOONGARCH_MACHINE(machine);
- int nb_numa_nodes = machine->numa_state->num_nodes;
- NodeInfo *numa_info = machine->numa_state->nodes;
int i;
+ hwaddr base, size, ram_size = machine->ram_size;
const CPUArchIdList *possible_cpus;
MachineClass *mc = MACHINE_GET_CLASS(machine);
CPUState *cpu;
- char *ramName = NULL;
if (!cpu_model) {
cpu_model = LOONGARCH_CPU_TYPE_NAME("la464");
@@ -1020,41 +1015,27 @@ static void loongarch_init(MachineState *machine)
fdt_add_memory_nodes(machine);
fw_cfg_add_memory(machine);
- /* Node0 memory */
- memory_region_init_alias(&lams->lowmem, NULL, "loongarch.node0.lowram",
- machine->ram, offset, VIRT_LOWMEM_SIZE);
- memory_region_add_subregion(address_space_mem, phyAddr, &lams->lowmem);
-
- offset += VIRT_LOWMEM_SIZE;
- if (nb_numa_nodes > 0) {
- assert(numa_info[0].node_mem > VIRT_LOWMEM_SIZE);
- highram_size = numa_info[0].node_mem - VIRT_LOWMEM_SIZE;
- } else {
- highram_size = ram_size - VIRT_LOWMEM_SIZE;
+ size = ram_size;
+ base = VIRT_LOWMEM_BASE;
+ if (size > VIRT_LOWMEM_SIZE) {
+ size = VIRT_LOWMEM_SIZE;
}
- phyAddr = VIRT_HIGHMEM_BASE;
- memory_region_init_alias(&lams->highmem, NULL, "loongarch.node0.highram",
- machine->ram, offset, highram_size);
- memory_region_add_subregion(address_space_mem, phyAddr, &lams->highmem);
-
- /* Node1 - Nodemax memory */
- offset += highram_size;
- phyAddr += highram_size;
-
- for (i = 1; i < nb_numa_nodes; i++) {
- MemoryRegion *nodemem = g_new(MemoryRegion, 1);
- ramName = g_strdup_printf("loongarch.node%d.ram", i);
- memory_region_init_alias(nodemem, NULL, ramName, machine->ram,
- offset, numa_info[i].node_mem);
- memory_region_add_subregion(address_space_mem, phyAddr, nodemem);
- offset += numa_info[i].node_mem;
- phyAddr += numa_info[i].node_mem;
+
+ memory_region_init_alias(&lams->lowmem, NULL, "loongarch.lowram",
+ machine->ram, base, size);
+ memory_region_add_subregion(address_space_mem, base, &lams->lowmem);
+ base += size;
+ if (ram_size - size) {
+ base = VIRT_HIGHMEM_BASE;
+ memory_region_init_alias(&lams->highmem, NULL, "loongarch.highram",
+ machine->ram, VIRT_LOWMEM_BASE + size, ram_size - size);
+ memory_region_add_subregion(address_space_mem, base, &lams->highmem);
+ base += ram_size - size;
}
/* initialize device memory address space */
if (machine->ram_size < machine->maxram_size) {
ram_addr_t device_mem_size = machine->maxram_size - machine->ram_size;
- hwaddr device_mem_base;
if (machine->ram_slots > ACPI_MAX_RAM_SLOTS) {
error_report("unsupported amount of memory slots: %"PRIu64,
@@ -1068,9 +1049,7 @@ static void loongarch_init(MachineState *machine)
"%d bytes", TARGET_PAGE_SIZE);
exit(EXIT_FAILURE);
}
- /* device memory base is the top of high memory address. */
- device_mem_base = ROUND_UP(VIRT_HIGHMEM_BASE + highram_size, 1 * GiB);
- machine_memory_devices_init(machine, device_mem_base, device_mem_size);
+ machine_memory_devices_init(machine, base, device_mem_size);
}
/* load the BIOS image. */
--
2.39.3
next prev parent reply other threads:[~2024-05-07 3:50 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-07 3:48 [PATCH v2 0/6] hw/loongarch: Refine numa memory map Bibo Mao
2024-05-07 3:48 ` [PATCH v2 1/6] hw/loongarch: Refine acpi srat table for numa memory Bibo Mao
2024-05-07 3:49 ` [PATCH v2 2/6] hw/loongarch: Refine fadt memory " Bibo Mao
2024-05-07 3:49 ` [PATCH v2 3/6] hw/loongarch: Refine fwcfg memory map Bibo Mao
2024-05-07 3:49 ` Bibo Mao [this message]
2024-05-07 3:49 ` [PATCH v2 5/6] hw/loongarch: Remove minimum and default memory size Bibo Mao
2024-05-07 3:49 ` [PATCH v2 6/6] tests/qtest: Add numa test for loongarch system Bibo Mao
2024-05-15 8:27 ` [PATCH v2 0/6] hw/loongarch: Refine numa memory map gaosong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240507034904.2391129-5-maobibo@loongson.cn \
--to=maobibo@loongson.cn \
--cc=gaosong@loongson.cn \
--cc=lvivier@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).