Commit dba04c34 authored by Michael Tokarev's avatar Michael Tokarev Committed by Michael S. Tsirkin
Browse files

acpi: accept byte and word access to core ACPI registers 

All ISA registers should be accessible as bytes, words or dwords
(if wide enough).  Fix the access constraints for acpi-pm-evt,
acpi-pm-tmr & acpi-cnt registers.

Fixes: 5d971f9e (memory: Revert "memory: accept mismatching sizes in memory_region_access_valid")
Fixes: afafe4bb (apci: switch cnt to memory api)
Fixes: 77d58b1e (apci: switch timer to memory api)
Fixes: b5a7c024 (apci: switch evt to memory api)
Buglink: https://lore.kernel.org/xen-devel/20200630170913.123646-1-anthony.perard@citrix.com/T/
Buglink: https://bugs.debian.org/964793
BugLink: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=964247
BugLink: https://bugs.launchpad.net/bugs/1886318


Reported-By: default avatarSimon John <git@the-jedi.co.uk>
Signed-off-by: default avatarMichael Tokarev <mjt@tls.msk.ru>
Message-Id: <20200720160627.15491-1-mjt@msgid.tls.msk.ru>
Cc: qemu-stable@nongnu.org
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent c8004fe6

hw/acpi/core.c

+6 −3
Original line number Diff line number Diff line
@@ -458,7 +458,8 @@ static void acpi_pm_evt_write(void *opaque, hwaddr addr, uint64_t val, 
static const MemoryRegionOps acpi_pm_evt_ops = {

    .read = acpi_pm_evt_read,

    .write = acpi_pm_evt_write,

    .valid.min_access_size = 2,

    .impl.min_access_size = 2,

    .valid.min_access_size = 1,

    .valid.max_access_size = 2,

    .endianness = DEVICE_LITTLE_ENDIAN,

};
@@ -527,7 +528,8 @@ static void acpi_pm_tmr_write(void *opaque, hwaddr addr, uint64_t val, 
static const MemoryRegionOps acpi_pm_tmr_ops = {

    .read = acpi_pm_tmr_read,

    .write = acpi_pm_tmr_write,

    .valid.min_access_size = 4,

    .impl.min_access_size = 4,

    .valid.min_access_size = 1,

    .valid.max_access_size = 4,

    .endianness = DEVICE_LITTLE_ENDIAN,

};
@@ -599,7 +601,8 @@ static void acpi_pm_cnt_write(void *opaque, hwaddr addr, uint64_t val, 
static const MemoryRegionOps acpi_pm_cnt_ops = {

    .read = acpi_pm_cnt_read,

    .write = acpi_pm_cnt_write,

    .valid.min_access_size = 2,

    .impl.min_access_size = 2,

    .valid.min_access_size = 1,

    .valid.max_access_size = 2,

    .endianness = DEVICE_LITTLE_ENDIAN,

};