From nobody Mon Feb 9 02:27:46 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1491612088758696.9314098799939; Fri, 7 Apr 2017 17:41:28 -0700 (PDT) Received: from localhost ([::1]:53091 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cweRS-0003mE-3q for importer@patchew.org; Fri, 07 Apr 2017 20:41:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35459) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cwePp-0002YQ-K1 for qemu-devel@nongnu.org; Fri, 07 Apr 2017 20:39:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cwePo-0007xZ-6D for qemu-devel@nongnu.org; Fri, 07 Apr 2017 20:39:45 -0400 Received: from mga14.intel.com ([192.55.52.115]:37867) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cwePn-0007wz-Sf for qemu-devel@nongnu.org; Fri, 07 Apr 2017 20:39:44 -0400 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Apr 2017 17:39:38 -0700 Received: from anthony.sc.intel.com ([10.3.52.155]) by orsmga001.jf.intel.com with ESMTP; 07 Apr 2017 17:39:38 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=intel; t=1491611983; x=1523147983; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=+DSA+selbkYPW32pZTyt2AXEgOsUKzwdLEeOakoaLuE=; b=NnP7KSL4gd0vkAT8RGFRgRuO5LIYjdChAAnRxmO7PAaIM9vBTRVBNrqj ULcIL0+wbCktytR+isEy0hr0wmrmUQ==; X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,168,1488873600"; d="scan'208";a="1117127729" From: Anthony Xu To: qemu-devel@nongnu.org Date: Fri, 7 Apr 2017 17:45:36 -0700 Message-Id: <1491612336-31066-5-git-send-email-anthony.xu@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1491612336-31066-1-git-send-email-anthony.xu@intel.com> References: <1491612336-31066-1-git-send-email-anthony.xu@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.115 Subject: [Qemu-devel] [PATCH 4/4] pam: setup pc.bios X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, Anthony Xu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" when pam is disabled, set pc.bios and isa.bios region as writeable, and add isa.bios to system memory region. Signed-off-by: Anthony Xu --- hw/i386/pc.c | 2 +- hw/i386/pc_sysfw.c | 30 +++++++++++++++++++++--------- include/hw/i386/pc.h | 4 +++- 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 455f7fe..3e23f58 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1443,7 +1443,7 @@ void pc_memory_init(PCMachineState *pcms, } =20 /* Initialize PC system firmware */ - pc_system_firmware_init(rom_memory, !pcmc->pci_enabled); + pc_system_firmware_init(system_memory, rom_memory, !pcmc->pci_enabled); =20 if (pcms->pam) { MemoryRegion *option_rom_mr =3D g_malloc(sizeof(*option_rom_mr)); diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c index f915ad0..e5ac615 100644 --- a/hw/i386/pc_sysfw.c +++ b/hw/i386/pc_sysfw.c @@ -173,7 +173,8 @@ static void pc_system_flash_init(MemoryRegion *rom_memo= ry) } } =20 -static void old_pc_system_rom_init(MemoryRegion *rom_memory, bool isapc_ra= m_fw) +static void old_pc_system_rom_init(MemoryRegion *system_memory, + MemoryRegion *rom_memory, bool isapc_ra= m_fw) { char *filename; MemoryRegion *bios, *isa_bios; @@ -197,8 +198,11 @@ static void old_pc_system_rom_init(MemoryRegion *rom_m= emory, bool isapc_ram_fw) bios =3D g_malloc(sizeof(*bios)); memory_region_init_ram(bios, NULL, "pc.bios", bios_size, &error_fatal); vmstate_register_ram_global(bios); - if (!isapc_ram_fw) { - memory_region_set_readonly(bios, true); + if (PC_MACHINE(current_machine)->pam) { + /* if PAM is disabled, set it as readwrite */ + if (!isapc_ram_fw) { + memory_region_set_readonly(bios, true); + } } ret =3D rom_add_file_fixed(bios_name, (uint32_t)(-bios_size), -1); if (ret !=3D 0) { @@ -216,21 +220,29 @@ static void old_pc_system_rom_init(MemoryRegion *rom_= memory, bool isapc_ram_fw) isa_bios =3D g_malloc(sizeof(*isa_bios)); memory_region_init_alias(isa_bios, NULL, "isa-bios", bios, bios_size - isa_bios_size, isa_bios_size); - memory_region_add_subregion_overlap(rom_memory, + if (PC_MACHINE(current_machine)->pam) { + memory_region_add_subregion_overlap(rom_memory, + 0x100000 - isa_bios_size, + isa_bios, + 1); + if (!isapc_ram_fw) { + memory_region_set_readonly(isa_bios, true); + } + } else { + /* if PAM is disabed, add isa-bios to system memory region */ + memory_region_add_subregion_overlap(system_memory, 0x100000 - isa_bios_size, isa_bios, 1); - if (!isapc_ram_fw) { - memory_region_set_readonly(isa_bios, true); } - /* map all the bios at the top of memory */ memory_region_add_subregion(rom_memory, (uint32_t)(-bios_size), bios); } =20 -void pc_system_firmware_init(MemoryRegion *rom_memory, bool isapc_ram_fw) +void pc_system_firmware_init(MemoryRegion *system_memory, + MemoryRegion *rom_memory, bool isapc_ram_fw) { DriveInfo *pflash_drv; =20 @@ -238,7 +250,7 @@ void pc_system_firmware_init(MemoryRegion *rom_memory, = bool isapc_ram_fw) =20 if (isapc_ram_fw || pflash_drv =3D=3D NULL) { /* When a pflash drive is not found, use rom-mode */ - old_pc_system_rom_init(rom_memory, isapc_ram_fw); + old_pc_system_rom_init(system_memory, rom_memory, isapc_ram_fw); return; } =20 diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 05f4df5..eb5b853 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -354,7 +354,9 @@ static inline bool isa_ne2000_init(ISABus *bus, int bas= e, int irq, NICInfo *nd) } =20 /* pc_sysfw.c */ -void pc_system_firmware_init(MemoryRegion *rom_memory, + +void pc_system_firmware_init(MemoryRegion *system_memory, + MemoryRegion *rom_memory, bool isapc_ram_fw); =20 /* pvpanic.c */ --=20 1.8.3.1