From nobody Mon Sep 16 19:36:54 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1707654730; cv=none; d=zohomail.com; s=zohoarc; b=TqH+RDtY7hDHUNx1EY49Mq8XnMdkNtCSDnyXjrxGHL8waUC7+xg28zeOgbQaqRdjnhC9bo4whbo1UcphydCdcRIo+aI2dvkTOtmEzs6pr18DHx2hMCouOlea5toziNLIZ7AtYpzs2GICRXgN5ciWJMck1KcvDMe7+x8M1e5SANo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1707654730; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Sfd9GwCAzZoy+bknu4dpBqvRX+VTGxD9LpxkdChJiPU=; b=PUgLJ9QZ9R7te8dRNuw0QtBh9lXJBbZsFNgZqKSFNtlV1ZPmOqrADr5RMM25BthFexCw2cr3IomEMVTzGaOqhX72mjpYIOp9qxAW6gMxNw5fm/aGAyB68T7x/EyGpEAgd/CJv/BL6N/M1lg8whGtkPvq5RsflNeA1s9m4f5MLP0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1707654730600889.8181825242863; Sun, 11 Feb 2024 04:32:10 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZ8xo-0006Bt-46; Sun, 11 Feb 2024 07:29:40 -0500 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 1rZ8xn-0006Bk-6A for qemu-devel@nongnu.org; Sun, 11 Feb 2024 07:29:39 -0500 Received: from sin.source.kernel.org ([2604:1380:40e1:4800::1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rZ8xl-0006Gy-Gl for qemu-devel@nongnu.org; Sun, 11 Feb 2024 07:29:38 -0500 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 65B33CE0D8B; Sun, 11 Feb 2024 12:29:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 54177C433C7; Sun, 11 Feb 2024 12:29:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1707654575; bh=dmm23UrfgEksNR5qCPqYN6vj7hcWMO7WB2mC/roSAbI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gva582P1Z2niQIGtWUDuWy8Glk8SC/7S7LKTIZJ5LF+EieyXx7GhQEokxBQu+eoaU +Ld2WbntdDaKxsFt103mSIAZg+dyR6OnOTHY8q/OJdWcEZ4XP5ZtYNb7d3CuFBakw+ Z6mPVYXuRbmdKKyVsDxgmGz3fkAmAsp5lsv8OVLx/i7ABPJNF3yhheida5gzUo5wTI ENEagBK7gjH1l9gvxYIP6gGEEr6Y+ZSF6mAL/ueACLPoscQdaBqiUe2FBitfdtzC9e INREGjXEQiTY/c3nGu8wj3H6ljRrkVJ4hV72BFQuk0HeiFMRSV/tZXlj3gYkVyo3I1 CuKa21lUvTw2g== From: deller@kernel.org To: qemu-devel@nongnu.org Cc: Richard Henderson , Sven Schnelle , Jason Wang , Helge Deller Subject: [PULL 12/12] hw/hppa/machine: Load 64-bit firmware on 64-bit machines Date: Sun, 11 Feb 2024 13:29:09 +0100 Message-ID: <20240211122909.5807-13-deller@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240211122909.5807-1-deller@kernel.org> References: <20240211122909.5807-1-deller@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2604:1380:40e1:4800::1; envelope-from=deller@kernel.org; helo=sin.source.kernel.org X-Spam_score_int: -50 X-Spam_score: -5.1 X-Spam_bar: ----- X-Spam_report: (-5.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.677, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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-ZohoMail-DKIM: pass (identity @kernel.org) X-ZM-MESSAGEID: 1707654732371100003 Content-Type: text/plain; charset="utf-8" From: Helge Deller Load the 64-bit SeaBIOS-hppa firmware by default when running on a 64-bit machine. This will enable us to later support more than 4GB of RAM and is required that the OS (or PALO bootloader) will start or install a 64-bit ke= rnel instead of a 32-bit kernel. Note that SeaBIOS-hppa v16 provides the "-fw_cfg opt/OS64,string=3D3" optio= n with which the user can control what the firmware shall report back to the OS: Support of 32-bit OS, support of a 64-bit OS, or support for both (default). Signed-off-by: Helge Deller Acked-by: Richard Henderson --- hw/hppa/machine.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index eb78c46ff1..a47baa572d 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -333,6 +333,7 @@ static void machine_HP_common_init_tail(MachineState *m= achine, PCIBus *pci_bus, const char *kernel_filename =3D machine->kernel_filename; const char *kernel_cmdline =3D machine->kernel_cmdline; const char *initrd_filename =3D machine->initrd_filename; + const char *firmware =3D machine->firmware; MachineClass *mc =3D MACHINE_GET_CLASS(machine); DeviceState *dev; PCIDevice *pci_dev; @@ -408,9 +409,13 @@ static void machine_HP_common_init_tail(MachineState *= machine, PCIBus *pci_bus, =20 /* Load firmware. Given that this is not "real" firmware, but one explicitly written for the emulation, we might as - well load it directly from an ELF image. */ - firmware_filename =3D qemu_find_file(QEMU_FILE_TYPE_BIOS, - machine->firmware ?: "hppa-firmware= .img"); + well load it directly from an ELF image. Load the 64-bit + firmware on 64-bit machines by default if not specified + on command line. */ + if (!firmware) { + firmware =3D lasi_dev ? "hppa-firmware.img" : "hppa-firmware64.img= "; + } + firmware_filename =3D qemu_find_file(QEMU_FILE_TYPE_BIOS, firmware); if (firmware_filename =3D=3D NULL) { error_report("no firmware provided"); exit(1); --=20 2.43.0