From nobody Sat May 4 02:21:43 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=none dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1593537019; cv=none; d=zohomail.com; s=zohoarc; b=bjiNLdhalAEyju6Xaed3i7kUwI4v0wXy2A9Qeveq42Y5pFF0bHOwQJJUqaJfUO/X5vh/OkQV7Grm9vWkdQImigzCLrw5mmTaiTPsjYwh4xIh2RVh4lgzbX9azk4FKAYKtRJQ1F7Mhz64XhTkRaZLaFpEhUQj2VTn23ZB+ZNtwC4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593537019; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=o4P3NUTO3tk9yv7RmY3Ms2VcnPFY4e38GXvHZYk22LU=; b=GCOMg7kSfL492ZDZvIJRSiZgdCLYu7VctjV7usFaWTbz6owaeTb6j6pLXPiPEv58dtUiF+CtRNWlZ+VdETwG/hwZBImSivR6bgw6Cm7nAvGZOxnKZBUWaCFr8+qKDxJzLY6QIm2jUsYQEXT3SirlwpdNx2B3myuGhsry6gA2xQU= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1593537019167102.60142223983735; Tue, 30 Jun 2020 10:10:19 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jqJlR-00071F-ST; Tue, 30 Jun 2020 17:09:45 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jqJlQ-000718-9N for xen-devel@lists.xenproject.org; Tue, 30 Jun 2020 17:09:44 +0000 Received: from esa2.hc3370-68.iphmx.com (unknown [216.71.145.153]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 7d1c26d6-baf4-11ea-bb8b-bc764e2007e4; Tue, 30 Jun 2020 17:09:42 +0000 (UTC) X-Inumbo-ID: 7d1c26d6-baf4-11ea-bb8b-bc764e2007e4 Authentication-Results: esa2.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: uVxal5l+6qY90nygpfB30oTzqbO5tiCQpFNAcwlNWp/lC1QdaD/x4TOO5b12IEipt9G9ObkKuh 6O0lHAK3GNf4PdcQQTqP+MO7a+z4W3rjv0ApHbppJwntDKo4EGx/Rtns3wpC9WyJFHompHytjM qfi2ZxOIqBhyqUqTqmvSpYfgjbYckqdDPiGJ3+DvbbwUgMHXv2puRS1q/78UAKshPBbi/IceH6 sNNm02BAsrAKU9LEx6ZwQRl3Z2NacZjfpx6r9fp591da3wPqSsCX2AdVgSstTlG7sWXYE/7P8P IUI= X-SBRS: 2.7 X-MesageID: 21309442 X-Ironport-Server: esa2.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.75,298,1589256000"; d="scan'208";a="21309442" From: Anthony PERARD To: Subject: [XEN PATCH] hvmloader: Fix reading ACPI PM1 CNT value Date: Tue, 30 Jun 2020 18:09:13 +0100 Message-ID: <20200630170913.123646-1-anthony.perard@citrix.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Wei Liu , Andrew Cooper , Ian Jackson , Jan Beulich , Anthony PERARD , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Content-Type: text/plain; charset="utf-8" In order to get the CNT value from QEMU, we were supposed to read a word, according to the implementation in QEMU. But it has been lax and allowed to read a single byte. This has changed with commit 5d971f9e6725 ("memory: Revert "memory: accept mismatching sizes in memory_region_access_valid"") and result in hvmloader crashing on the BUG_ON. Signed-off-by: Anthony PERARD --- I'll try to have the QEMU implementation changes to allow reading a byte, but it would probably by nice to not have to change qemu. --- tools/firmware/hvmloader/hvmloader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/firmware/hvmloader/hvmloader.c b/tools/firmware/hvmloade= r/hvmloader.c index 598a22627872..bdcbe4a26664 100644 --- a/tools/firmware/hvmloader/hvmloader.c +++ b/tools/firmware/hvmloader/hvmloader.c @@ -256,7 +256,7 @@ static const struct bios_config *detect_bios(void) =20 static void acpi_enable_sci(void) { - uint8_t pm1a_cnt_val; + uint16_t pm1a_cnt_val; =20 #define PIIX4_SMI_CMD_IOPORT 0xb2 #define PIIX4_ACPI_ENABLE 0xf1 @@ -265,11 +265,11 @@ static void acpi_enable_sci(void) * PIIX4 emulation in QEMU has SCI_EN=3D0 by default. We have no legacy * SMM implementation, so give ACPI control to the OSPM immediately. */ - pm1a_cnt_val =3D inb(ACPI_PM1A_CNT_BLK_ADDRESS_V1); + pm1a_cnt_val =3D inw(ACPI_PM1A_CNT_BLK_ADDRESS_V1); if ( !(pm1a_cnt_val & ACPI_PM1C_SCI_EN) ) outb(PIIX4_SMI_CMD_IOPORT, PIIX4_ACPI_ENABLE); =20 - pm1a_cnt_val =3D inb(ACPI_PM1A_CNT_BLK_ADDRESS_V1); + pm1a_cnt_val =3D inw(ACPI_PM1A_CNT_BLK_ADDRESS_V1); BUG_ON(!(pm1a_cnt_val & ACPI_PM1C_SCI_EN)); } =20 --=20 Anthony PERARD