[Xen-changelog] [qemu-xen-4.1-testing] hw/piix4acpi: Make writes to ACPI_DBG_IO_ADDR actually work.

[patchbot@xxxxxxx]

commit 2d4fa397ba0fbae0c62282de619e1f088a320b33
Author:     Konrad Rzeszutek Wilk <konrad@xxxxxxxxxx>
AuthorDate: Mon Nov 11 13:42:56 2013 -0500
Commit:     Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
CommitDate: Mon Nov 25 13:53:49 2013 +0000

    hw/piix4acpi: Make writes to ACPI_DBG_IO_ADDR actually work.
    
    The ACPI AML code has little snippets where it uses two
    memory locations to stash debug information when doing PCI
    hotplug, such as:
    
    Device (S20)
    {
        Name (_ADR, 0x00040000)
        Name (_SUN, 0x04)
        Method (_EJ0, 1, NotSerialized)
        {
        Store (0x20, \_GPE.DPT1)
        Store (0x88, \_GPE.DPT2)
        Store (One, \_GPE.PH20)
        }
    
        Method (_STA, 0, NotSerialized)
        {
        Store (0x20, \_GPE.DPT1)
        Store (0x89, \_GPE.DPT2)
        }
    }
    
    and DPT1 (and DPT2) is defined as:
    
    OperationRegion ( DG1, SystemIO, 0xb044, 0x04 )
    Field ( DG1, ByteAcc, NoLock, Preserve ) {
        DPT1, 8, DPT2, 8
    }
    
    But unfortunately when we do the writes they are done
    as byte writes, not as 4-byte writes (long). Hence
    any debug values are never show in QEMU.
    
    This fixes it so that we can see them in the log file.
    
    Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
    Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
    (cherry picked from commit 832f9bde25542961ea4f768be6e00e4801484e3a)
    (cherry picked from commit 147f83f9b7d87a698c200c4f3eb2d36a0e4fe54b)
    (cherry picked from commit 7c51fb2971cd455eb728e716f16a488c01f8e759)
---
 hw/piix4acpi.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/piix4acpi.c b/hw/piix4acpi.c
index bf916d9..ddbe8e0 100644
--- a/hw/piix4acpi.c
+++ b/hw/piix4acpi.c
@@ -284,7 +284,7 @@ static inline void clear_bit(uint8_t *map, int bit)
     map[bit / 8] &= ~(1 << (bit % 8));
 }
 
-static void acpi_dbg_writel(void *opaque, uint32_t addr, uint32_t val)
+static void acpi_dbg_writeb(void *opaque, uint32_t addr, uint32_t val)
 {
     PIIX4ACPI_LOG(PIIX4ACPI_LOG_DEBUG, "ACPI: DBG: 0x%08x\n", val);
     PIIX4ACPI_LOG(PIIX4ACPI_LOG_INFO, "ACPI:debug: write addr=0x%x, 
val=0x%x.\n", addr, val);
@@ -776,7 +776,7 @@ i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t 
smb_io_base,
 #ifdef CONFIG_PASSTHROUGH
     php_devfn_init();
 #endif
-    register_ioport_write(ACPI_DBG_IO_ADDR, 4, 4, acpi_dbg_writel, d);
+    register_ioport_write(ACPI_DBG_IO_ADDR, 4, 1, acpi_dbg_writeb, d);
 
     register_savevm("piix4acpi", 0, 2, piix4acpi_save, piix4acpi_load, d);
 
--
generated by git-patchbot for /home/xen/git/qemu-xen-4.1-testing.git

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog