diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-03-09 00:44:43 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-03-09 00:44:43 +0000 |
| commit | 3293680dc79c9a4fbbc2bbdd9395a886825a87a2 (patch) | |
| tree | 6ccc40e86ba1cb6d6a0362212c3ecf400708de5c /include | |
| parent | 5763795f935ec8e8b68a7ed82067c3a4729136dd (diff) | |
| parent | a60c7856088b75b402671de74bf9c5cfce87dfbb (diff) | |
| download | qemu-3293680dc79c9a4fbbc2bbdd9395a886825a87a2.zip qemu-3293680dc79c9a4fbbc2bbdd9395a886825a87a2.tar.gz qemu-3293680dc79c9a4fbbc2bbdd9395a886825a87a2.tar.bz2 | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-fw-cfg-20160308-1' into staging
acpi: add fw_cfg device node to dsdt
# gpg: Signature made Tue 08 Mar 2016 11:15:42 GMT using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
* remotes/kraxel/tags/pull-fw-cfg-20160308-1:
tests: update acpi test data
fw_cfg: document ACPI device node information
acpi: arm: add fw_cfg device node to dsdt
acpi: pc: add fw_cfg device node to dsdt
pc: fw_cfg: move ioport base constant to pc.h
fw_cfg: expose control register size in fw_cfg.h
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/i386/pc.h | 2 | ||||
| -rw-r--r-- | include/hw/nvram/fw_cfg.h | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 8b3546e..79ffe5b 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -266,6 +266,8 @@ void ioapic_init_gsi(GSIState *gsi_state, const char *parent_name); ISADevice *pc_find_fdc0(void); +#define FW_CFG_IO_BASE 0x510 + /* acpi_piix.c */ I2CBus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h index 5d19975..4315f4e 100644 --- a/include/hw/nvram/fw_cfg.h +++ b/include/hw/nvram/fw_cfg.h @@ -44,6 +44,9 @@ #define FW_CFG_INVALID 0xffff +/* width in bytes of fw_cfg control register */ +#define FW_CFG_CTL_SIZE 0x02 + #define FW_CFG_MAX_FILE_PATH 56 #ifndef NO_QEMU_PROTOS |