[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 16/20] acpi: fix piix4 smbus mapping
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 16/20] acpi: fix piix4 smbus mapping |
Date: |
Fri, 23 Nov 2012 16:48:27 +0100 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
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
- [Qemu-devel] [PATCH 00/20] acpi: switch to memory api, Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 02/20] apci: switch ich9 to memory api, Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 05/20] apci: switch timer to memory api [ich9], Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 03/20] apci: switch vt82c686 to memory api, Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 17/20] apci: switch piix4 gpe to memory api, Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 07/20] apci: switch cnt to memory api [ich9], Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 12/20] apci: switch ich9 gpe to memory api, Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 08/20] apci: switch evt to memory api, Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 01/20] apci: switch piix4 to memory api, Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 16/20] acpi: fix piix4 smbus mapping,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 06/20] apci: switch cnt to memory api, Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 18/20] acpi: remove acpi_gpe_blk, Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 20/20] q35: update lpc pci config space according to configured devices, Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 11/20] acpi: cleanup vt82c686 memory region, Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 09/20] apci: switch evt to memory api [ich9], Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 14/20] acpi: cleanup ich9 memory region, Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 10/20] acpi: cleanup piix4 memory region, Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 04/20] apci: switch timer to memory api, Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 15/20] acpi: switch smbus to memory api, Gerd Hoffmann, 2012/11/23