acpi: split out apm register emulation from acpi.c (04762841) · Commits · SUMMER2020 / students / proj-2021291

Makefile.target

+2 −2

Original line number	Diff line number	Diff line
		@@ -195,7 +195,7 @@ obj-i386-y += cirrus_vga.o apic.o ioapic.o piix_pci.o
		obj-i386-y += vmmouse.o vmport.o hpet.o
		obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o wdt_ib700.o
		obj-i386-y += debugcon.o multiboot.o
		obj-i386-y += pm_smbus.o
		obj-i386-y += pm_smbus.o apm.o

		# shared objects
		obj-ppc-y = ppc.o
		@@ -221,7 +221,7 @@ obj-mips-y += dma.o vga.o i8259.o
		obj-mips-y += g364fb.o jazz_led.o
		obj-mips-y += gt64xxx.o pckbd.o mc146818rtc.o
		obj-mips-y += piix4.o cirrus_vga.o
		obj-mips-y += pm_smbus.o
		obj-mips-y += pm_smbus.o apm.o

		obj-microblaze-y = petalogix_s3adsp1800_mmu.o

hw/acpi.c

+18 −43

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		*/
		#include "hw.h"
		#include "pc.h"
		#include "apm.h"
		#include "pm_smbus.h"
		#include "pci.h"
		#include "qemu-timer.h"
		@@ -36,8 +37,9 @@ typedef struct PIIX4PMState {
		uint16_t pmsts;
		uint16_t pmen;
		uint16_t pmcntrl;
		uint8_t apmc;
		uint8_t apms;

		APMState apm;

		QEMUTimer *tmr_timer;
		int64_t tmr_overflow_time;

		@@ -218,15 +220,9 @@ static uint32_t pm_ioport_readl(void *opaque, uint32_t addr)
		return val;
		}

		static void pm_smi_writeb(void *opaque, uint32_t addr, uint32_t val)
		static void apm_ctrl_changed(uint32_t val, void *arg)
		{
		PIIX4PMState *s = opaque;
		addr &= 1;
		#ifdef DEBUG
		printf("pm_smi_writeb addr=0x%x val=0x%02x\n", addr, val);
		#endif
		if (addr == 0) {
		s->apmc = val;
		PIIX4PMState *s = arg;

		/* ACPI specs 3.0, 4.7.2.5 */
		if (val == ACPI_ENABLE) {
		@@ -240,26 +236,6 @@ static void pm_smi_writeb(void *opaque, uint32_t addr, uint32_t val)
		qemu_irq_raise(s->smi_irq);
		}
		}
		} else {
		s->apms = val;
		}
		}

		static uint32_t pm_smi_readb(void *opaque, uint32_t addr)
		{
		PIIX4PMState *s = opaque;
		uint32_t val;

		addr &= 1;
		if (addr == 0) {
		val = s->apmc;
		} else {
		val = s->apms;
		}
		#ifdef DEBUG
		printf("pm_smi_readb addr=0x%x val=0x%02x\n", addr, val);
		#endif
		return val;
		}

		static void acpi_dbg_writel(void *opaque, uint32_t addr, uint32_t val)
		@@ -315,8 +291,7 @@ static const VMStateDescription vmstate_acpi = {
		VMSTATE_UINT16(pmsts, PIIX4PMState),
		VMSTATE_UINT16(pmen, PIIX4PMState),
		VMSTATE_UINT16(pmcntrl, PIIX4PMState),
		VMSTATE_UINT8(apmc, PIIX4PMState),
		VMSTATE_UINT8(apms, PIIX4PMState),
		VMSTATE_STRUCT(apm, PIIX4PMState, 0, vmstate_apm, APMState),
		VMSTATE_TIMER(tmr_timer, PIIX4PMState),
		VMSTATE_INT64(tmr_overflow_time, PIIX4PMState),
		VMSTATE_END_OF_LIST()
		@@ -375,8 +350,8 @@ i2c_bus piix4_pm_init(PCIBus bus, int devfn, uint32_t smb_io_base,

		pci_conf[0x40] = 0x01; /* PM io base read only bit */

		register_ioport_write(0xb2, 2, 1, pm_smi_writeb, s);
		register_ioport_read(0xb2, 2, 1, pm_smi_readb, s);
		/* APM */
		apm_init(&s->apm, apm_ctrl_changed, s);

		register_ioport_write(ACPI_DBG_IO_ADDR, 4, 4, acpi_dbg_writel, s);

hw/apm.c

0 → 100644

+85 −0

Original line number	Diff line number	Diff line
		/*
		* QEMU PC APM controller Emulation
		* This is split out from acpi.c
		*
		* Copyright (c) 2006 Fabrice Bellard
		*
		* This library is free software; you can redistribute it and/or
		* modify it under the terms of the GNU Lesser General Public
		* License version 2 as published by the Free Software Foundation.
		*
		* This library is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
		* Lesser General Public License for more details.
		*
		* You should have received a copy of the GNU Lesser General Public
		* License along with this library; if not, see <http://www.gnu.org/licenses/>
		*/

		#include "apm.h"
		#include "hw.h"
		#include "isa.h"

		//#define DEBUG

		/* fixed I/O location */
		#define APM_CNT_IOPORT 0xb2
		#define APM_STS_IOPORT 0xb3

		static void apm_ioport_writeb(void *opaque, uint32_t addr, uint32_t val)
		{
		APMState *apm = opaque;
		addr &= 1;
		#ifdef DEBUG
		printf("apm_ioport_writeb addr=0x%x val=0x%02x\n", addr, val);
		#endif
		if (addr == 0) {
		apm->apmc = val;

		if (apm->callback) {
		(apm->callback)(val, apm->arg);
		}
		} else {
		apm->apms = val;
		}
		}

		static uint32_t apm_ioport_readb(void *opaque, uint32_t addr)
		{
		APMState *apm = opaque;
		uint32_t val;

		addr &= 1;
		if (addr == 0) {
		val = apm->apmc;
		} else {
		val = apm->apms;
		}
		#ifdef DEBUG
		printf("apm_ioport_readb addr=0x%x val=0x%02x\n", addr, val);
		#endif
		return val;
		}

		const VMStateDescription vmstate_apm = {
		.name = "APM State",
		.version_id = 1,
		.minimum_version_id = 1,
		.minimum_version_id_old = 1,
		.fields = (VMStateField[]) {
		VMSTATE_UINT8(apmc, APMState),
		VMSTATE_UINT8(apms, APMState),
		VMSTATE_END_OF_LIST()
		}
		};

		void apm_init(APMState apm, apm_ctrl_changed_t callback, void arg)
		{
		apm->callback = callback;
		apm->arg = arg;

		/* ioport 0xb2, 0xb3 */
		register_ioport_write(APM_CNT_IOPORT, 2, 1, apm_ioport_writeb, apm);
		register_ioport_read(APM_CNT_IOPORT, 2, 1, apm_ioport_readb, apm);
		}

hw/apm.h

0 → 100644

+22 −0

Original line number	Diff line number	Diff line
		#ifndef APM_H
		#define APM_H

		#include <stdint.h>
		#include "qemu-common.h"
		#include "hw.h"

		typedef void (apm_ctrl_changed_t)(uint32_t val, void arg);

		typedef struct APMState {
		uint8_t apmc;
		uint8_t apms;

		apm_ctrl_changed_t callback;
		void *arg;
		} APMState;

		void apm_init(APMState s, apm_ctrl_changed_t callback, void arg);

		extern const VMStateDescription vmstate_apm;

		#endif /* APM_H */