ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

apci: switch ich9 smi to memory api 

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2012-11-22 13:51:35 +01:00
parent 76a7daf974
commit 10cc69b0de
2 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
hw/acpi_ich9.c
View File

@ -119,12 +119,7 @@ static uint32_t pm_ioport_readw(void *opaque, uint32_t addr)
static void pm_ioport_writel(void *opaque, uint32_t addr, uint32_t val) static void pm_ioport_writel(void *opaque, uint32_t addr, uint32_t val)
{ {
ICH9LPCPMRegs *pm = opaque;
switch (addr & ICH9_PMIO_MASK) { switch (addr & ICH9_PMIO_MASK) {
case ICH9_PMIO_SMI_EN:
pm->smi_en = val;
break;
default: default:
pm_ioport_write_fallback(opaque, addr, 4, val); pm_ioport_write_fallback(opaque, addr, 4, val);
break; break;
@ -134,14 +129,9 @@ static void pm_ioport_writel(void *opaque, uint32_t addr, uint32_t val)
static uint32_t pm_ioport_readl(void *opaque, uint32_t addr) static uint32_t pm_ioport_readl(void *opaque, uint32_t addr)
{ {
ICH9LPCPMRegs *pm = opaque;
uint32_t val; uint32_t val;
switch (addr & ICH9_PMIO_MASK) { switch (addr & ICH9_PMIO_MASK) {
case ICH9_PMIO_SMI_EN:
val = pm->smi_en;
break;
default: default:
val = pm_ioport_read_fallback(opaque, addr, 4); val = pm_ioport_read_fallback(opaque, addr, 4);
break; break;
@ -223,6 +213,38 @@ static const MemoryRegionOps ich9_gpe_ops = {
.endianness = DEVICE_LITTLE_ENDIAN, .endianness = DEVICE_LITTLE_ENDIAN,
}; };
static uint64_t ich9_smi_readl(void *opaque, hwaddr addr, unsigned width)
{
ICH9LPCPMRegs *pm = opaque;
switch (addr) {
case 0:
return pm->smi_en;
case 4:
return pm->smi_sts;
default:
return 0;
}
}
static void ich9_smi_writel(void *opaque, hwaddr addr, uint64_t val,
unsigned width)
{
ICH9LPCPMRegs *pm = opaque;
switch (addr) {
case 0:
pm->smi_en = val;
break;
}
}
static const MemoryRegionOps ich9_smi_ops = {
.read = ich9_smi_readl,
.write = ich9_smi_writel,
.valid.min_access_size = 4,
.valid.max_access_size = 4,
.endianness = DEVICE_LITTLE_ENDIAN,
};
void ich9_pm_iospace_update(ICH9LPCPMRegs *pm, uint32_t pm_io_base) void ich9_pm_iospace_update(ICH9LPCPMRegs *pm, uint32_t pm_io_base)
{ {
ICH9_DEBUG("to 0x%x\n", pm_io_base); ICH9_DEBUG("to 0x%x\n", pm_io_base);
@ -318,6 +340,10 @@ void ich9_pm_init(ICH9LPCPMRegs *pm, qemu_irq sci_irq, qemu_irq cmos_s3)
ICH9_PMIO_GPE0_LEN); ICH9_PMIO_GPE0_LEN);
memory_region_add_subregion(&pm->io, ICH9_PMIO_GPE0_STS, &pm->io_gpe); memory_region_add_subregion(&pm->io, ICH9_PMIO_GPE0_STS, &pm->io_gpe);
memory_region_init_io(&pm->io_smi, &ich9_smi_ops, pm, "apci-smi",
8);
memory_region_add_subregion(&pm->io, ICH9_PMIO_SMI_EN, &pm->io_smi);
pm->irq = sci_irq; pm->irq = sci_irq;
qemu_register_reset(pm_reset, pm); qemu_register_reset(pm_reset, pm);
pm->powerdown_notifier.notify = pm_powerdown_req; pm->powerdown_notifier.notify = pm_powerdown_req;

1
hw/acpi_ich9.h
View File

@ -32,6 +32,7 @@ typedef struct ICH9LPCPMRegs {
ACPIREGS acpi_regs; ACPIREGS acpi_regs;
MemoryRegion io; MemoryRegion io;
MemoryRegion io_gpe; MemoryRegion io_gpe;
MemoryRegion io_smi;
uint32_t smi_en; uint32_t smi_en;
uint32_t smi_sts; uint32_t smi_sts;