From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51394) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adFfS-00005g-Gh for qemu-devel@nongnu.org; Tue, 08 Mar 2016 06:19:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1adFfP-0001Ax-B2 for qemu-devel@nongnu.org; Tue, 08 Mar 2016 06:19:10 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60808) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adFfP-0001Am-4d for qemu-devel@nongnu.org; Tue, 08 Mar 2016 06:19:07 -0500 From: Gerd Hoffmann Date: Tue, 8 Mar 2016 12:18:58 +0100 Message-Id: <1457435941-17578-4-git-send-email-kraxel@redhat.com> In-Reply-To: <1457435941-17578-1-git-send-email-kraxel@redhat.com> References: <1457435941-17578-1-git-send-email-kraxel@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 3/6] acpi: pc: add fw_cfg device node to dsdt List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Eduardo Habkost , "Michael S. Tsirkin" , "Gabriel L. Somlo" , Gerd Hoffmann , Paolo Bonzini , Igor Mammedov , Richard Henderson From: "Gabriel L. Somlo" Add a fw_cfg device node to the ACPI DSDT. While the guest-side firmware can't utilize this information (since it has to access the hard-coded fw_cfg device to extract ACPI tables to begin with), having fw_cfg listed in ACPI will help the guest kernel keep a more accurate inventory of in-use IO port regions. Signed-off-by: Gabriel Somlo Reviewed-by: Laszlo Ersek Reviewed-by: Marc Mar=C3=AD Reviewed-by: Michael S. Tsirkin Message-id: 1455906029-25565-4-git-send-email-somlo@cmu.edu Signed-off-by: Gerd Hoffmann --- hw/i386/acpi-build.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 52c9470..b888008 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -2190,6 +2190,35 @@ build_dsdt(GArray *table_data, GArray *linker, aml_append(scope, aml_name_decl("_S5", pkg)); aml_append(dsdt, scope); =20 + /* create fw_cfg node, unconditionally */ + { + /* when using port i/o, the 8-bit data register *always* overlap= s + * with half of the 16-bit control register. Hence, the total si= ze + * of the i/o region used is FW_CFG_CTL_SIZE; when using DMA, th= e + * DMA control register is located at FW_CFG_DMA_IO_BASE + 4 */ + uint8_t io_size =3D object_property_get_bool(OBJECT(pcms->fw_cfg= ), + "dma_enabled", NULL) = ? + ROUND_UP(FW_CFG_CTL_SIZE, 4) + sizeof(dma_addr= _t) : + FW_CFG_CTL_SIZE; + + scope =3D aml_scope("\\_SB.PCI0"); + dev =3D aml_device("FWCF"); + + aml_append(dev, aml_name_decl("_HID", aml_string("QEMU0002"))); + + /* device present, functioning, decoding, not shown in UI */ + aml_append(dev, aml_name_decl("_STA", aml_int(0xB))); + + crs =3D aml_resource_template(); + aml_append(crs, + aml_io(AML_DECODE16, FW_CFG_IO_BASE, FW_CFG_IO_BASE, 0x01, i= o_size) + ); + aml_append(dev, aml_name_decl("_CRS", crs)); + + aml_append(scope, dev); + aml_append(dsdt, scope); + } + if (misc->applesmc_io_base) { scope =3D aml_scope("\\_SB.PCI0.ISA"); dev =3D aml_device("SMC"); --=20 1.8.3.1