From nobody Wed Feb 11 00:59:16 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) client-ip=209.85.128.51; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f51.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1634511185; cv=none; d=zohomail.com; s=zohoarc; b=Q1YXQM8Na69zCmiqIRVNrsmo8RhziLqaPI7iEZrKMBu3ErwFIpRSKceA7z+im3Q3Lc3JK9GtvhUQmXyA5Ar+IGJoawbbuis86phQgRUW/kpH0mZTtsHBhU9b+YOs2qyS50ktcdw8sKD/DfTkrfCmq1wYnDvjIyLu8igaFkPQpE4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1634511185; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=R1/oedjGS4mKEBWW5SpNNRDaCNET4hY7MjnW9POQmQ4=; b=U/QAdLLLlW1AAd06bkkczvjYyGC85qvj/mjX03SPAP760NGcPeHrL8RArjntaVnHzBh6pm5apjtXCUQ5z17P4eVADhNRg587js3kRWHw7rmCKvHbYNReFIoDa9FfLd3xk1H5NB0inxlob1Wn2OU8Y1avQefJ4Qj2e5L08toZwAg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mx.zohomail.com with SMTPS id 1634511185122807.0120233793655; Sun, 17 Oct 2021 15:53:05 -0700 (PDT) Received: by mail-wm1-f51.google.com with SMTP id n40-20020a05600c3ba800b0030da2439b21so8617767wms.0 for ; Sun, 17 Oct 2021 15:53:04 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (213.red-81-36-146.dynamicip.rima-tde.net. [81.36.146.213]) by smtp.gmail.com with ESMTPSA id c7sm13529363wmq.13.2021.10.17.15.53.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Oct 2021 15:53:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=R1/oedjGS4mKEBWW5SpNNRDaCNET4hY7MjnW9POQmQ4=; b=etqbIeE7D0XYwDVkM/4oy9M26KSiRdgJi0AjXJZuzKbYF2FBxw4faUujTSTgofRgL3 0En9IGhcCev0SwlCAM+nk03cR0bg+MYAh3aEGEEHtJCq9xUsG0m+Xtg2rbqHToimqvhg 7PYmWQdab/EMGVgF2nfw/eGLHGhj/ZWhyktHopLEslpN3P28NkJQ1Xyyh0v2YmOywG3/ pSEVHRhJ0yDZzHhsPabNDZybJmmIOt+U90sL0mDb92R8/UCgKvMDm7+ZnMzGneRyLHp6 NgChiDjGi28DuMk0Cw93Pkq0IHp53o9xo9h3L2pm4O+bqiAtJgqBU12oVUfXvKzhdx+P Wwfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=R1/oedjGS4mKEBWW5SpNNRDaCNET4hY7MjnW9POQmQ4=; b=D6R2zOAVeJWuHuWvTbeSBmyaLNXFjICBK+hLt32BsPkPtQqfEJ8onzbwMdFPrEIv8U 9hBRuIhOwh5Zxm2vBLrkZ0hqZMoB1SG5N+FwSd+TL4R4+L+3vIx9yyhjvbZseQw6wlMh HlZNeUoWN26xAvuMg6Ko8N5wy77vZwXfJ+aZj32qPZVpeUKUB7zok6rZ+mQpzDuRjVUo PcsqiotPVe7hydxfQVHcuaLvjyczz8iGfhm76Do0+4eiW50Ef/bsjI27Ndi8/0KUk1QW iPGSw74oU5lNqJqnHdCLDsxVn+LTXPDqXjWAlZDXh7IakZDdyb3XO3/317JZMXGQoOqJ 9nHw== X-Gm-Message-State: AOAM532khYb703mIxuK2yJRi9oM2DNTm3GrrkN9JvK/i8wza0ZAbOtJt 0CCuK/dClA9lCzX0EbaalIA= X-Google-Smtp-Source: ABdhPJzWWl4GubzGSU6ev2KhMMUMy6EBOdXfHTnv7hNw+M5Y+RFXcvDwiNiKY5QC2UxFoXTwaDEQKA== X-Received: by 2002:a1c:7d56:: with SMTP id y83mr40798704wmc.86.1634511183363; Sun, 17 Oct 2021 15:53:03 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paul Burton , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang Subject: [PULL 03/17] hw/mips/boston: Allow loading elf kernel and dtb Date: Mon, 18 Oct 2021 00:52:31 +0200 Message-Id: <20211017225245.2618892-4-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211017225245.2618892-1-f4bug@amsat.org> References: <20211017225245.2618892-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1634511186531100001 From: Jiaxun Yang ELF kernel allows us debugging much easier with DWARF symbols. Signed-off-by: Jiaxun Yang Reviewed-by: Philippe Mathieu-Daud=C3=A9 [PMD: Fix coding style] Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20211002184539.169-3-jiaxun.yang@flygoat.com> --- hw/mips/boston.c | 36 ++++++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/hw/mips/boston.c b/hw/mips/boston.c index 37b8278623e..7374bb5da4d 100644 --- a/hw/mips/boston.c +++ b/hw/mips/boston.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" =20 +#include "elf.h" #include "hw/boards.h" #include "hw/char/serial.h" #include "hw/ide/pci.h" @@ -551,10 +552,37 @@ static void boston_mach_init(MachineState *machine) exit(1); } } else if (machine->kernel_filename) { - fit_err =3D load_fit(&boston_fit_loader, machine->kernel_filename,= s); - if (fit_err) { - error_report("unable to load FIT image"); - exit(1); + uint64_t kernel_entry, kernel_high, kernel_size; + + kernel_size =3D load_elf(machine->kernel_filename, NULL, + cpu_mips_kseg0_to_phys, NULL, + &kernel_entry, NULL, &kernel_high, + NULL, 0, EM_MIPS, 1, 0); + + if (kernel_size) { + hwaddr dtb_paddr =3D QEMU_ALIGN_UP(kernel_high, 64 * KiB); + hwaddr dtb_vaddr =3D cpu_mips_phys_to_kseg0(NULL, dtb_paddr); + + s->kernel_entry =3D kernel_entry; + if (machine->dtb) { + int dt_size; + g_autofree const void *dtb_file_data, *dtb_load_data; + + dtb_file_data =3D load_device_tree(machine->dtb, &dt_size); + dtb_load_data =3D boston_fdt_filter(s, dtb_file_data, + NULL, &dtb_vaddr); + + /* Calculate real fdt size after filter */ + dt_size =3D fdt_totalsize(dtb_load_data); + rom_add_blob_fixed("dtb", dtb_load_data, dt_size, dtb_padd= r); + } + } else { + /* Try to load file as FIT */ + fit_err =3D load_fit(&boston_fit_loader, machine->kernel_filen= ame, s); + if (fit_err) { + error_report("unable to load kernel image"); + exit(1); + } } =20 gen_firmware(memory_region_get_ram_ptr(flash) + 0x7c00000, --=20 2.31.1