[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 13/18] acpi: fix piix4 smbus mapping
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH v2 13/18] acpi: fix piix4 smbus mapping |
Date: |
Tue, 27 Nov 2012 09:59:23 +0100 |
Make write to the smbus base register and enable bit actually work.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/acpi_piix4.c | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c
index 9e6c97e..b1d5bf3 100644
--- a/hw/acpi_piix4.c
+++ b/hw/acpi_piix4.c
@@ -142,12 +142,29 @@ static void pm_io_space_update(PIIX4PMState *s)
memory_region_transaction_commit();
}
+static void smbus_io_space_update(PIIX4PMState *s)
+{
+ s->smb_io_base = le32_to_cpu(*(uint32_t *)(s->dev.config + 0x90));
+ s->smb_io_base &= 0xffc0;
+
+ memory_region_transaction_begin();
+ memory_region_set_enabled(&s->smb.io, s->dev.config[0xd2] & 1);
+ memory_region_set_address(&s->smb.io, s->smb_io_base);
+ memory_region_transaction_commit();
+}
+
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)
@@ -392,6 +409,7 @@ static int piix4_pm_initfn(PCIDevice *dev)
pci_conf[0x91] = s->smb_io_base >> 8;
pci_conf[0xd2] = 0x09;
pm_smbus_init(&s->dev.qdev, &s->smb);
+ memory_region_set_enabled(&s->smb.io, pci_conf[0xd2] & 1);
memory_region_add_subregion(get_system_io(), s->smb_io_base, &s->smb.io);
memory_region_init(&s->io, "piix4-pm", 64);
--
1.7.1
- [Qemu-devel] [PATCH v2 15/18] acpi: remove acpi_gpe_blk, (continued)
- [Qemu-devel] [PATCH v2 15/18] acpi: remove acpi_gpe_blk, Gerd Hoffmann, 2012/11/27
- [Qemu-devel] [PATCH v2 14/18] apci: switch piix4 gpe to memory api, Gerd Hoffmann, 2012/11/27
- [Qemu-devel] [PATCH v2 01/18] apci: switch piix4 to memory api, Gerd Hoffmann, 2012/11/27
- [Qemu-devel] [PATCH v2 12/18] acpi: switch smbus to memory api, Gerd Hoffmann, 2012/11/27
- [Qemu-devel] [PATCH v2 10/18] apci: switch ich9 smi to memory api, Gerd Hoffmann, 2012/11/27
- [Qemu-devel] [PATCH v2 06/18] apci: switch evt to memory api, Gerd Hoffmann, 2012/11/27
- [Qemu-devel] [PATCH v2 04/18] apci: switch timer to memory api, Gerd Hoffmann, 2012/11/27
- [Qemu-devel] [PATCH v2 11/18] acpi: cleanup ich9 memory region, Gerd Hoffmann, 2012/11/27
- [Qemu-devel] [PATCH v2 05/18] apci: switch cnt to memory api, Gerd Hoffmann, 2012/11/27
- [Qemu-devel] [PATCH v2 17/18] q35: update lpc pci config space according to configured devices, Gerd Hoffmann, 2012/11/27
- [Qemu-devel] [PATCH v2 13/18] acpi: fix piix4 smbus mapping,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH v2 09/18] apci: switch ich9 gpe to memory api, Gerd Hoffmann, 2012/11/27