From nobody Sat Nov 15 22:23:02 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1746006514830100.40991904438147; Wed, 30 Apr 2025 02:48:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uA42z-0001cR-2R; Wed, 30 Apr 2025 05:48:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uA42h-0001ak-8S for qemu-devel@nongnu.org; Wed, 30 Apr 2025 05:47:51 -0400 Received: from mail.loongson.cn ([114.242.206.163]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uA42e-00055e-8D for qemu-devel@nongnu.org; Wed, 30 Apr 2025 05:47:50 -0400 Received: from loongson.cn (unknown [10.2.5.213]) by gateway (Coremail) with SMTP id _____8AxmnG+8RFoMQjLAA--.8213S3; Wed, 30 Apr 2025 17:47:42 +0800 (CST) Received: from localhost.localdomain (unknown [10.2.5.213]) by front1 (Coremail) with SMTP id qMiowMCx7xu68RFoIBegAA--.7587S3; Wed, 30 Apr 2025 17:47:41 +0800 (CST) From: Bibo Mao To: Song Gao Cc: Jiaxun Yang , qemu-devel@nongnu.org Subject: [PATCH 1/2] hw/loongarch/virt: Remove global variables about initrd Date: Wed, 30 Apr 2025 17:47:37 +0800 Message-Id: <20250430094738.1556670-2-maobibo@loongson.cn> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20250430094738.1556670-1-maobibo@loongson.cn> References: <20250430094738.1556670-1-maobibo@loongson.cn> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: qMiowMCx7xu68RFoIBegAA--.7587S3 X-CM-SenderInfo: xpdruxter6z05rqj20fqof0/ X-Coremail-Antispam: 1Uk129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7KY7 ZEXasCq-sGcSsGvfJ3UbIjqfuFe4nvWSU5nxnvy29KBjDU0xBIdaVrnUUvcSsGvfC2Kfnx nUUI43ZEXa7xR_UUUUUUUUU== Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=114.242.206.163; envelope-from=maobibo@loongson.cn; helo=mail.loongson.cn X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1746006516652019000 Content-Type: text/plain; charset="utf-8" Global variables initrd_offset and initrd_size records loading information about initrd, it can be moved to structure loongarch_boot_info. Signed-off-by: Bibo Mao Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/loongarch/boot.c | 21 ++++++++++----------- include/hw/loongarch/boot.h | 2 ++ 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c index 354cf458c8..44d537d987 100644 --- a/hw/loongarch/boot.c +++ b/hw/loongarch/boot.c @@ -38,9 +38,6 @@ struct loongarch_linux_hdr { struct memmap_entry *memmap_table; unsigned memmap_entries; =20 -ram_addr_t initrd_offset; -uint64_t initrd_size; - static const unsigned int slave_boot_code[] =3D { /* Configure reset ebase. */ 0x0400302c, /* csrwr $t0, LOONGARCH_CSR_EENTRY */ @@ -121,7 +118,8 @@ static void init_efi_boot_memmap(struct efi_system_tabl= e *systab, } } =20 -static void init_efi_initrd_table(struct efi_system_table *systab, +static void init_efi_initrd_table(struct loongarch_boot_info *info, + struct efi_system_table *systab, void *p, void *start) { efi_guid_t tbl_guid =3D LINUX_EFI_INITRD_MEDIA_GUID; @@ -132,8 +130,8 @@ static void init_efi_initrd_table(struct efi_system_tab= le *systab, systab->tables[1].table =3D (struct efi_configuration_table *)(p - sta= rt); systab->nr_tables =3D 2; =20 - initrd_table->base =3D initrd_offset; - initrd_table->size =3D initrd_size; + initrd_table->base =3D info->initrd_addr; + initrd_table->size =3D info->initrd_size; } =20 static void init_efi_fdt_table(struct efi_system_table *systab) @@ -169,7 +167,7 @@ static void init_systab(struct loongarch_boot_info *inf= o, void *p, void *start) init_efi_boot_memmap(systab, p, start); p +=3D ROUND_UP(sizeof(struct efi_boot_memmap) + sizeof(efi_memory_desc_t) * memmap_entries, 64 * KiB); - init_efi_initrd_table(systab, p, start); + init_efi_initrd_table(info, systab, p, start); p +=3D ROUND_UP(sizeof(struct efi_initrd), 64 * KiB); init_efi_fdt_table(systab); =20 @@ -237,8 +235,8 @@ static int64_t load_loongarch_linux_image(const char *f= ilename, =20 static int64_t load_kernel_info(struct loongarch_boot_info *info) { - uint64_t kernel_entry, kernel_low, kernel_high; - ssize_t kernel_size; + uint64_t kernel_entry, kernel_low, kernel_high, initrd_offset =3D 0; + ssize_t kernel_size, initrd_size; =20 kernel_size =3D load_elf(info->kernel_filename, NULL, cpu_loongarch_virt_to_phys, NULL, @@ -278,8 +276,9 @@ static int64_t load_kernel_info(struct loongarch_boot_i= nfo *info) info->initrd_filename); exit(1); } - } else { - initrd_size =3D 0; + + info->initrd_addr =3D initrd_offset; + info->initrd_size =3D initrd_size; } =20 return kernel_entry; diff --git a/include/hw/loongarch/boot.h b/include/hw/loongarch/boot.h index b3b870df1f..27399de99c 100644 --- a/include/hw/loongarch/boot.h +++ b/include/hw/loongarch/boot.h @@ -102,6 +102,8 @@ struct loongarch_boot_info { const char *kernel_cmdline; const char *initrd_filename; uint64_t a0, a1, a2; + uint64_t initrd_addr; + uint64_t initrd_size; }; =20 extern struct memmap_entry *memmap_table; --=20 2.39.3 From nobody Sat Nov 15 22:23:02 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1746006542883532.1374546188944; Wed, 30 Apr 2025 02:49:02 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uA43B-0001h7-GT; Wed, 30 Apr 2025 05:48:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uA42i-0001au-OX for qemu-devel@nongnu.org; Wed, 30 Apr 2025 05:47:54 -0400 Received: from mail.loongson.cn ([114.242.206.163]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uA42e-000562-Am for qemu-devel@nongnu.org; Wed, 30 Apr 2025 05:47:52 -0400 Received: from loongson.cn (unknown [10.2.5.213]) by gateway (Coremail) with SMTP id _____8BxlmnA8RFoNAjLAA--.8207S3; Wed, 30 Apr 2025 17:47:44 +0800 (CST) Received: from localhost.localdomain (unknown [10.2.5.213]) by front1 (Coremail) with SMTP id qMiowMCx7xu68RFoIBegAA--.7587S4; Wed, 30 Apr 2025 17:47:43 +0800 (CST) From: Bibo Mao To: Song Gao Cc: Jiaxun Yang , qemu-devel@nongnu.org Subject: [PATCH 2/2] hw/loongarch/virt: Remove global variables about memmap tables Date: Wed, 30 Apr 2025 17:47:38 +0800 Message-Id: <20250430094738.1556670-3-maobibo@loongson.cn> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20250430094738.1556670-1-maobibo@loongson.cn> References: <20250430094738.1556670-1-maobibo@loongson.cn> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: qMiowMCx7xu68RFoIBegAA--.7587S4 X-CM-SenderInfo: xpdruxter6z05rqj20fqof0/ X-Coremail-Antispam: 1Uk129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7KY7 ZEXasCq-sGcSsGvfJ3UbIjqfuFe4nvWSU5nxnvy29KBjDU0xBIdaVrnUUvcSsGvfC2Kfnx nUUI43ZEXa7xR_UUUUUUUUU== Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=114.242.206.163; envelope-from=maobibo@loongson.cn; helo=mail.loongson.cn X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1746006545660019100 Content-Type: text/plain; charset="utf-8" Global variables memmap_table and memmap_entries stores UEFI memory map table informations. It can be moved into structure LoongArchVirtMachineState. Signed-off-by: Bibo Mao Reviewed-by: Song Gao --- hw/loongarch/boot.c | 31 +++++++++++++++++++------------ hw/loongarch/virt.c | 23 ++++++++++++++++------- include/hw/loongarch/boot.h | 3 --- include/hw/loongarch/virt.h | 2 ++ 4 files changed, 37 insertions(+), 22 deletions(-) diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c index 44d537d987..86435caa5e 100644 --- a/hw/loongarch/boot.c +++ b/hw/loongarch/boot.c @@ -35,9 +35,6 @@ struct loongarch_linux_hdr { uint32_t pe_header_offset; } QEMU_PACKED; =20 -struct memmap_entry *memmap_table; -unsigned memmap_entries; - static const unsigned int slave_boot_code[] =3D { /* Configure reset ebase. */ 0x0400302c, /* csrwr $t0, LOONGARCH_CSR_EENTRY */ @@ -91,12 +88,16 @@ static inline void *guidcpy(void *dst, const void *src) return memcpy(dst, src, sizeof(efi_guid_t)); } =20 -static void init_efi_boot_memmap(struct efi_system_table *systab, +static void init_efi_boot_memmap(MachineState *ms, + struct efi_system_table *systab, void *p, void *start) { unsigned i; struct efi_boot_memmap *boot_memmap =3D p; efi_guid_t tbl_guid =3D LINUX_EFI_BOOT_MEMMAP_GUID; + LoongArchVirtMachineState *lvms =3D LOONGARCH_VIRT_MACHINE(ms); + struct memmap_entry *memmap_table; + unsigned int memmap_entries; =20 /* efi_configuration_table 1 */ guidcpy(&systab->tables[0].guid, &tbl_guid); @@ -108,6 +109,8 @@ static void init_efi_boot_memmap(struct efi_system_tabl= e *systab, boot_memmap->map_size =3D 0; =20 efi_memory_desc_t *map =3D p + sizeof(struct efi_boot_memmap); + memmap_table =3D lvms->memmap_table; + memmap_entries =3D lvms->memmap_entries; for (i =3D 0; i < memmap_entries; i++) { map =3D (void *)boot_memmap + sizeof(*map); map[i].type =3D memmap_table[i].type; @@ -144,10 +147,12 @@ static void init_efi_fdt_table(struct efi_system_tabl= e *systab) systab->nr_tables =3D 3; } =20 -static void init_systab(struct loongarch_boot_info *info, void *p, void *s= tart) +static void init_systab(MachineState *ms, + struct loongarch_boot_info *info, void *p, void *s= tart) { void *bp_tables_start; struct efi_system_table *systab =3D p; + LoongArchVirtMachineState *lvms =3D LOONGARCH_VIRT_MACHINE(ms); =20 info->a2 =3D p - start; =20 @@ -164,9 +169,9 @@ static void init_systab(struct loongarch_boot_info *inf= o, void *p, void *start) systab->tables =3D p; bp_tables_start =3D p; =20 - init_efi_boot_memmap(systab, p, start); + init_efi_boot_memmap(ms, systab, p, start); p +=3D ROUND_UP(sizeof(struct efi_boot_memmap) + - sizeof(efi_memory_desc_t) * memmap_entries, 64 * KiB); + sizeof(efi_memory_desc_t) * lvms->memmap_entries, 64 * K= iB); init_efi_initrd_table(info, systab, p, start); p +=3D ROUND_UP(sizeof(struct efi_initrd), 64 * KiB); init_efi_fdt_table(systab); @@ -333,17 +338,19 @@ static void loongarch_firmware_boot(LoongArchVirtMach= ineState *lvms, fw_cfg_add_kernel_info(info, lvms->fw_cfg); } =20 -static void init_boot_rom(struct loongarch_boot_info *info, void *p) +static void init_boot_rom(MachineState *ms, + struct loongarch_boot_info *info, void *p) { void *start =3D p; =20 init_cmdline(info, p, start); p +=3D COMMAND_LINE_SIZE; =20 - init_systab(info, p, start); + init_systab(ms, info, p, start); } =20 -static void loongarch_direct_kernel_boot(struct loongarch_boot_info *info) +static void loongarch_direct_kernel_boot(MachineState *ms, + struct loongarch_boot_info *info) { void *p, *bp; int64_t kernel_addr =3D VIRT_FLASH0_BASE; @@ -361,7 +368,7 @@ static void loongarch_direct_kernel_boot(struct loongar= ch_boot_info *info) /* Load cmdline and system tables at [0 - 1 MiB] */ p =3D g_malloc0(1 * MiB); bp =3D p; - init_boot_rom(info, p); + init_boot_rom(ms, info, p); rom_add_blob_fixed_as("boot_info", bp, 1 * MiB, 0, &address_space_memo= ry); =20 /* Load slave boot code at pflash0 . */ @@ -401,6 +408,6 @@ void loongarch_load_kernel(MachineState *ms, struct loo= ngarch_boot_info *info) if (lvms->bios_loaded) { loongarch_firmware_boot(lvms, info); } else { - loongarch_direct_kernel_boot(info); + loongarch_direct_kernel_boot(ms, info); } } diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c index 779544fada..601e7c6bd3 100644 --- a/hw/loongarch/virt.c +++ b/hw/loongarch/virt.c @@ -168,8 +168,15 @@ static void virt_powerdown_req(Notifier *notifier, voi= d *opaque) acpi_send_event(s->acpi_ged, ACPI_POWER_DOWN_STATUS); } =20 -static void memmap_add_entry(uint64_t address, uint64_t length, uint32_t t= ype) +static void memmap_add_entry(MachineState *ms, uint64_t address, + uint64_t length, uint32_t type) { + LoongArchVirtMachineState *lvms =3D LOONGARCH_VIRT_MACHINE(ms); + struct memmap_entry *memmap_table; + unsigned int memmap_entries; + + memmap_table =3D lvms->memmap_table; + memmap_entries =3D lvms->memmap_entries; /* Ensure there are no duplicate entries. */ for (unsigned i =3D 0; i < memmap_entries; i++) { assert(memmap_table[i].address !=3D address); @@ -182,6 +189,8 @@ static void memmap_add_entry(uint64_t address, uint64_t= length, uint32_t type) memmap_table[memmap_entries].type =3D cpu_to_le32(type); memmap_table[memmap_entries].reserved =3D 0; memmap_entries++; + lvms->memmap_table =3D memmap_table; + lvms->memmap_entries =3D memmap_entries; } =20 static DeviceState *create_acpi_ged(DeviceState *pch_pic, @@ -625,13 +634,13 @@ static void fw_cfg_add_memory(MachineState *ms) } =20 if (size >=3D gap) { - memmap_add_entry(base, gap, 1); + memmap_add_entry(ms, base, gap, 1); size -=3D gap; base =3D VIRT_HIGHMEM_BASE; } =20 if (size) { - memmap_add_entry(base, size, 1); + memmap_add_entry(ms, base, size, 1); base +=3D size; } =20 @@ -646,7 +655,7 @@ static void fw_cfg_add_memory(MachineState *ms) * lowram: [base, +(gap - numa_info[0].node_mem)) * highram: [VIRT_HIGHMEM_BASE, +(ram_size - gap)) */ - memmap_add_entry(base, gap - numa_info[0].node_mem, 1); + memmap_add_entry(ms, base, gap - numa_info[0].node_mem, 1); size =3D ram_size - gap; base =3D VIRT_HIGHMEM_BASE; } else { @@ -654,7 +663,7 @@ static void fw_cfg_add_memory(MachineState *ms) } =20 if (size) { - memmap_add_entry(base, size, 1); + memmap_add_entry(ms, base, size, 1); } } =20 @@ -740,8 +749,8 @@ static void virt_init(MachineState *machine) rom_set_fw(lvms->fw_cfg); if (lvms->fw_cfg !=3D NULL) { fw_cfg_add_file(lvms->fw_cfg, "etc/memmap", - memmap_table, - sizeof(struct memmap_entry) * (memmap_entries)); + lvms->memmap_table, + sizeof(struct memmap_entry) * lvms->memmap_entries= ); } =20 /* Initialize the IO interrupt subsystem */ diff --git a/include/hw/loongarch/boot.h b/include/hw/loongarch/boot.h index 27399de99c..9819f7fbe3 100644 --- a/include/hw/loongarch/boot.h +++ b/include/hw/loongarch/boot.h @@ -106,9 +106,6 @@ struct loongarch_boot_info { uint64_t initrd_size; }; =20 -extern struct memmap_entry *memmap_table; -extern unsigned memmap_entries; - struct memmap_entry { uint64_t address; uint64_t length; diff --git a/include/hw/loongarch/virt.h b/include/hw/loongarch/virt.h index 2b7d19953f..602feab0f0 100644 --- a/include/hw/loongarch/virt.h +++ b/include/hw/loongarch/virt.h @@ -63,6 +63,8 @@ struct LoongArchVirtMachineState { struct loongarch_boot_info bootinfo; DeviceState *ipi; DeviceState *extioi; + struct memmap_entry *memmap_table; + unsigned int memmap_entries; }; =20 #define TYPE_LOONGARCH_VIRT_MACHINE MACHINE_TYPE_NAME("virt") --=20 2.39.3