From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:35022) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TbvUi-00067i-3o for qemu-devel@nongnu.org; Fri, 23 Nov 2012 10:48:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TbvUb-0006k4-0T for qemu-devel@nongnu.org; Fri, 23 Nov 2012 10:48:44 -0500 Received: from mx1.redhat.com ([209.132.183.28]:6776) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TbvUa-0006jf-O9 for qemu-devel@nongnu.org; Fri, 23 Nov 2012 10:48:36 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qANFmaqs005142 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 23 Nov 2012 10:48:36 -0500 From: Gerd Hoffmann Date: Fri, 23 Nov 2012 16:48:27 +0100 Message-Id: <1353685711-24573-17-git-send-email-kraxel@redhat.com> In-Reply-To: <1353685711-24573-1-git-send-email-kraxel@redhat.com> References: <1353685711-24573-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 16/20] acpi: fix piix4 smbus mapping List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Signed-off-by: Gerd Hoffmann --- hw/acpi_piix4.c | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 deletions(-) diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c index cd876c8..a85c2d4 100644 --- a/hw/acpi_piix4.c +++ b/hw/acpi_piix4.c @@ -146,12 +146,33 @@ static void pm_io_space_update(PIIX4PMState *s) } } +static void smbus_io_space_update(PIIX4PMState *s) +{ + if (s->smb.io.parent) { + memory_region_del_subregion(get_system_io(), &s->smb.io); + } + if (s->dev.config[0xd2] & 1) { + s->smb_io_base = le32_to_cpu(*(uint32_t *)(s->dev.config + 0x90)); + + /* XXX: need to improve memory and ioport allocation */ + PIIX4_DPRINTF("smbus: mapping to 0x%x\n", s->smb_io_base); + memory_region_add_subregion(get_system_io(), s->smb_io_base, + &s->smb.io); + } +} + static void pm_write_config(PCIDevice *d, uint32_t address, uint32_t val, int len) { pci_default_write_config(d, address, val, len); - if (range_covers_byte(address, len, 0x80)) + if (range_covers_byte(address, len, 0x80) || + ranges_overlap(address, len, 0x40, 4)) { pm_io_space_update((PIIX4PMState *)d); + } + if (range_covers_byte(address, len, 0xd2) || + ranges_overlap(address, len, 0x90, 4)) { + smbus_io_space_update((PIIX4PMState *)d); + } } static void vmstate_pci_status_pre_save(void *opaque) -- 1.7.1