From patchwork Thu May 8 13:35:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 888594 Delivered-To: patch@linaro.org Received: by 2002:adf:b60d:0:b0:3a1:f579:ae88 with SMTP id f13csp8051wre; Thu, 8 May 2025 06:40:50 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU2BQZmXMpdexCDSXFwz7QlQiaL4xL/XbDBfMw8DFv/+dH9aQ/411H2IYAVClyznpp5kw4kyQ==@linaro.org X-Google-Smtp-Source: AGHT+IFa53EezjcQKeogAVwuwZ4zowy4AdHmebn50eWTMdnL1XzlM7diM0/nkH2OeYvUu2+rY0E6 X-Received: by 2002:a05:620a:4104:b0:7c9:2537:be48 with SMTP id af79cd13be357-7ccf9e06856mr488941185a.24.1746711650455; Thu, 08 May 2025 06:40:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746711650; cv=none; d=google.com; s=arc-20240605; b=U1SHsIUqKffh0goRUYGXMk/Wfvx7gJywjZJpYEt744uykR71ULtj7lN72grkxLhz+O CYSsQKNrSQkz3TJ1sDSNY27ihfwocg8YKRXgPFUNWGj6fyNUGV/d54/MPzy81E71HBbc eq3tQdAzquw5SBNvqYqWNq/cq5bn1zm0Dc1p4U/TZDtTkz2krQ1E6rK20C6H53X/nMck /jzlbyDoAn3LTq5vO8NH/tgULE53S72hHp9GG2yQWFl6/brroF6/hEwu/c+DIVHVlVdO 5eDd/jUPqoU0nG3k27oDt82aEdMenudXxVl6hVO0RsvRQeaoxG9lkJIhlv+gtPX+UyED qfxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=LkeIBMUss+wtjS4ebn41wnF/9BG8kxWBr1hV0emyy84=; fh=xyeXvpamOH1eRGtBV+YDaJ5x5nGSJHDSUFJV25PfZrc=; b=JnCwZzSqR7mFXMPJUV6UlecxJjDy0d+Yxd7lME+7rgXtpy3YFSxw6D+YVCCm/NodZZ Euj91e0sHhNE/kedmECmRSvYA6SMQkVWmJpUxYMjp7Ha9/tP+f+1wJDMl0jorj190n1H W3gFCAc/WhBxJJlNZ0KO2L7eFdJ+/cm4E3W/KfIqeozUfck+QPwjNHTb5jyrVd/GikpB kL1pWoBE2eQ+Zzie1LSGp4mSiDwvHLKLznncbEmhNCL2hawmILqAGsQ1XGsxSYI2i1NG yNKxqvLF2Oo5XojohWMdZgIwQAp6TwY6P/0n4G0L0OhleDt7cyuZ4lqO3Pd2qOdlDrz8 Xn3A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=e+FyG83a; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7caf751e759si424985385a.16.2025.05.08.06.40.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 May 2025 06:40:50 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=e+FyG83a; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uD1UH-0005nS-LF; Thu, 08 May 2025 09:40:33 -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 1uD1Td-0004oG-0R for qemu-devel@nongnu.org; Thu, 08 May 2025 09:39:53 -0400 Received: from mail-pg1-x531.google.com ([2607:f8b0:4864:20::531]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uD1TZ-00048Y-7v for qemu-devel@nongnu.org; Thu, 08 May 2025 09:39:52 -0400 Received: by mail-pg1-x531.google.com with SMTP id 41be03b00d2f7-af579e46b5dso578814a12.3 for ; Thu, 08 May 2025 06:39:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746711587; x=1747316387; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LkeIBMUss+wtjS4ebn41wnF/9BG8kxWBr1hV0emyy84=; b=e+FyG83aASK38W0I6CSA7bE9Z92uGQYCgsjhayAqtQFlw4JPT4toGZ50V8Ao9jZlJF 47scVdKKg0upu89pj2NL2hoN8CCQHI/1fPC1B5b4pzZGQvyXuKAVqP545IPxPx9vVDxo 4RO1dOLRBdc8qrUd7KeSkE9Lh2hsCxApuMuG9upfXwAkDckDU/GQJx+sLt99Q4Lv8XyM it+G1OiaJ5Xj6M1n89dubp6Tm6iQnRmxi2sTtkuAftNETGmTAx01BkIJ+P10hXVEMbc8 DQTwjl6E4FDUcIgQsTyNYc22UBG+KfQ4vT2jeHgv8/72w/w8y2hPIE5SxQY3ZOnyJiAY c2vA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746711587; x=1747316387; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LkeIBMUss+wtjS4ebn41wnF/9BG8kxWBr1hV0emyy84=; b=o+HeaUKlO2BiSmFDDqBLD4dXdRcLt146+hmZyl3VvE3CW1MnXf2BObYI18lSnqkFy6 VWgDujQhCT6KMjt0axzh0DwLb698bhB5k8mztYBENkRmuMu5C6cJAkUr5EfaGWx96nNF SkVmK23vp0huIUzHiEGcCtA/Vd0mFKGuwoT9Whi/ejqZpWoAXKTnx+Qr0zAtbyIPx9o2 UKvIl3n4AW5ZSbSb3Z1TdDj7VPSDQ2WtrIOD8u3qHEj09PW3Rdl9tA3YK3Voz4LzHvHM wbzxKEUUm1jGNMrHN8v90JGeq62OdMUlDFdHGFXQo7/de3PHwC5WekitDE3C9oeioHGQ Ec+w== X-Gm-Message-State: AOJu0Yz3/98AkCh+Va18whb8kzlgbnZ0l5Ydat1H83t4uIb7ov9qRyWP vHgiJYLozNgLt0kxfW9xUbGXfX+ANxLYMDhSa8cxhouGHcneJafsuUiw4E6KBTrt1KgC6YE+HvA 3OQvxuQ== X-Gm-Gg: ASbGncscijHRswDIS+eU46YpIpli9K9OVhy42SjccTkQSuh1DnAcr94omCALkYxTWhi tdW8bqEpFQCIduWvIVnaW4D+bs4qSXLWknUHQffANaRK9mDL70GQzGriiFY2Y9s6oRBrDLOdOc1 nZCkYi6Znoy48f2k9IxmUgZBmiQaMK4d4QenKfW3C/FcB8SJOwUwwRzTp8vBrXWaA1JM//LCm8R JBwUmtMlmXblLsVr7xjANROQkjfoIjVzxeLvn3irG+df5A9NLhvhaPoVPDKcmVkX7x9tmYH2NLh fIf3Iv4osnHfZofRp8n++vJSWYluZ8az9Hxjt8qcA9HXEvPGL0m6Dc6Ep6cc4/uAGczaQpnsASx kLqx9+KvSsM4rz6s= X-Received: by 2002:a17:90b:3803:b0:2fe:9783:afd3 with SMTP id 98e67ed59e1d1-30b28cec4d7mr5237370a91.2.1746711586707; Thu, 08 May 2025 06:39:46 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-30ad4d5341dsm2150592a91.21.2025.05.08.06.39.33 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 08 May 2025 06:39:46 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , kvm@vger.kernel.org, Sergio Lopez , Gerd Hoffmann , Peter Maydell , Laurent Vivier , Jiaxun Yang , Yi Liu , "Michael S. Tsirkin" , Eduardo Habkost , Marcel Apfelbaum , Alistair Francis , Daniel Henrique Barboza , Marcelo Tosatti , qemu-riscv@nongnu.org, Weiwei Li , Amit Shah , Zhao Liu , Yanan Wang , Helge Deller , Palmer Dabbelt , Ani Sinha , Igor Mammedov , Fabiano Rosas , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Liu Zhiwei , =?utf-8?q?Cl=C3=A9ment_Mathieu--?= =?utf-8?q?Drif?= , qemu-arm@nongnu.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Huacai Chen , Jason Wang , Thomas Huth Subject: [PATCH v4 10/27] hw/i386/pc: Remove linuxboot.bin Date: Thu, 8 May 2025 15:35:33 +0200 Message-ID: <20250508133550.81391-11-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250508133550.81391-1-philmd@linaro.org> References: <20250508133550.81391-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::531; envelope-from=philmd@linaro.org; helo=mail-pg1-x531.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, LOTS_OF_MONEY=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org All PC machines now use the linuxboot_dma.bin binary, we can remove the non-DMA version (linuxboot.bin). Suggested-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daudé --- hw/i386/pc.c | 3 +- pc-bios/meson.build | 1 - pc-bios/optionrom/Makefile | 2 +- pc-bios/optionrom/linuxboot.S | 195 ---------------------------------- 4 files changed, 2 insertions(+), 199 deletions(-) delete mode 100644 pc-bios/optionrom/linuxboot.S diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 524d2fd98e8..4e6fe68e2e0 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -654,8 +654,7 @@ void xen_load_linux(PCMachineState *pcms) x86_load_linux(x86ms, fw_cfg, PC_FW_DATA, pcmc->pvh_enabled); for (i = 0; i < nb_option_roms; i++) { - assert(!strcmp(option_rom[i].name, "linuxboot.bin") || - !strcmp(option_rom[i].name, "linuxboot_dma.bin") || + assert(!strcmp(option_rom[i].name, "linuxboot_dma.bin") || !strcmp(option_rom[i].name, "pvh.bin") || !strcmp(option_rom[i].name, "multiboot_dma.bin")); rom_add_option(option_rom[i].name, option_rom[i].bootindex); diff --git a/pc-bios/meson.build b/pc-bios/meson.build index f2d4dc416a4..39a7fea332e 100644 --- a/pc-bios/meson.build +++ b/pc-bios/meson.build @@ -63,7 +63,6 @@ blobs = [ 'efi-vmxnet3.rom', 'qemu-nsis.bmp', 'multiboot_dma.bin', - 'linuxboot.bin', 'linuxboot_dma.bin', 'kvmvapic.bin', 'pvh.bin', diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile index 1183ef88922..e694c7aac00 100644 --- a/pc-bios/optionrom/Makefile +++ b/pc-bios/optionrom/Makefile @@ -2,7 +2,7 @@ include config.mak SRC_DIR := $(TOPSRC_DIR)/pc-bios/optionrom VPATH = $(SRC_DIR) -all: multiboot_dma.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin pvh.bin +all: multiboot_dma.bin linuxboot_dma.bin kvmvapic.bin pvh.bin # Dummy command so that make thinks it has done something @true diff --git a/pc-bios/optionrom/linuxboot.S b/pc-bios/optionrom/linuxboot.S deleted file mode 100644 index ba821ab922d..00000000000 --- a/pc-bios/optionrom/linuxboot.S +++ /dev/null @@ -1,195 +0,0 @@ -/* - * Linux Boot Option ROM - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see . - * - * Copyright Novell Inc, 2009 - * Authors: Alexander Graf - * - * Based on code in hw/pc.c. - */ - -#include "optionrom.h" - -#define BOOT_ROM_PRODUCT "Linux loader" - -BOOT_ROM_START - -run_linuxboot: - - cli - cld - - jmp copy_kernel -boot_kernel: - - read_fw FW_CFG_SETUP_ADDR - - mov %eax, %ebx - shr $4, %ebx - - /* All segments contain real_addr */ - mov %bx, %ds - mov %bx, %es - mov %bx, %fs - mov %bx, %gs - mov %bx, %ss - - /* CX = CS we want to jump to */ - add $0x20, %bx - mov %bx, %cx - - /* SP = cmdline_addr-real_addr-16 */ - read_fw FW_CFG_CMDLINE_ADDR - mov %eax, %ebx - read_fw FW_CFG_SETUP_ADDR - sub %eax, %ebx - sub $16, %ebx - mov %ebx, %esp - - /* Build indirect lret descriptor */ - pushw %cx /* CS */ - xor %ax, %ax - pushw %ax /* IP = 0 */ - - /* Clear registers */ - xor %eax, %eax - xor %ebx, %ebx - xor %ecx, %ecx - xor %edx, %edx - xor %edi, %edi - xor %ebp, %ebp - - /* Jump to Linux */ - lret - - -copy_kernel: - /* Read info block in low memory (0x10000 or 0x90000) */ - read_fw FW_CFG_SETUP_ADDR - shr $4, %eax - mov %eax, %es - xor %edi, %edi - read_fw_blob_addr32_edi(FW_CFG_SETUP) - - cmpw $0x203, %es:0x206 // if protocol >= 0x203 - jae 1f // have initrd_max - movl $0x37ffffff, %es:0x22c // else assume 0x37ffffff -1: - - /* Check if using kernel-specified initrd address */ - read_fw FW_CFG_INITRD_ADDR - mov %eax, %edi // (load_kernel wants it in %edi) - read_fw FW_CFG_INITRD_SIZE // find end of initrd - add %edi, %eax - xor %es:0x22c, %eax // if it matches es:0x22c - and $-4096, %eax // (apart from padding for page) - jz load_kernel // then initrd is not at top - // of memory - - /* pc.c placed the initrd at end of memory. Compute a better - * initrd address based on e801 data. - */ - mov $0xe801, %ax - xor %cx, %cx - xor %dx, %dx - int $0x15 - - /* Output could be in AX/BX or CX/DX */ - or %cx, %cx - jnz 1f - or %dx, %dx - jnz 1f - mov %ax, %cx - mov %bx, %dx -1: - - or %dx, %dx - jnz 2f - addw $1024, %cx /* add 1 MB */ - movzwl %cx, %edi - shll $10, %edi /* convert to bytes */ - jmp 3f - -2: - addw $16777216 >> 16, %dx /* add 16 MB */ - movzwl %dx, %edi - shll $16, %edi /* convert to bytes */ - -3: - read_fw FW_CFG_INITRD_SIZE - subl %eax, %edi - andl $-4096, %edi /* EDI = start of initrd */ - movl %edi, %es:0x218 /* put it in the header */ - -load_kernel: - /* We need to load the kernel into memory we can't access in 16 bit - mode, so let's get into 32 bit mode, write the kernel and jump - back again. */ - - /* Reserve space on the stack for our GDT descriptor. */ - mov %esp, %ebp - sub $16, %esp - - /* Now create the GDT descriptor */ - movw $((3 * 8) - 1), -16(%bp) - mov %cs, %eax - movzwl %ax, %eax - shl $4, %eax - addl $gdt, %eax - movl %eax, -14(%bp) - - /* And load the GDT */ - data32 lgdt -16(%bp) - mov %ebp, %esp - - /* Get us to protected mode now */ - mov $1, %eax - mov %eax, %cr0 - - /* So we can set ES to a 32-bit segment */ - mov $0x10, %eax - mov %eax, %es - - /* We're now running in 16-bit CS, but 32-bit ES! */ - - /* Load kernel and initrd */ - read_fw_blob_addr32_edi(FW_CFG_INITRD) - read_fw_blob_addr32(FW_CFG_KERNEL) - read_fw_blob_addr32(FW_CFG_CMDLINE) - - /* And now jump into Linux! */ - mov $0, %eax - mov %eax, %cr0 - - /* ES = CS */ - mov %cs, %ax - mov %ax, %es - - jmp boot_kernel - -/* Variables */ - -.align 4, 0 -gdt: - /* 0x00 */ -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - - /* 0x08: code segment (base=0, limit=0xfffff, type=32bit code exec/read, DPL=0, 4k) */ -.byte 0xff, 0xff, 0x00, 0x00, 0x00, 0x9a, 0xcf, 0x00 - - /* 0x10: data segment (base=0, limit=0xfffff, type=32bit data read/write, DPL=0, 4k) */ -.byte 0xff, 0xff, 0x00, 0x00, 0x00, 0x92, 0xcf, 0x00 - -BOOT_ROM_END