diff options
| author | Gabriel L. Somlo <somlo@cmu.edu> | 2016-02-19 13:20:25 -0500 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2016-03-08 10:46:30 +0100 |
| commit | ce9a2aa372f567d1a19417ab02789706d132daf7 (patch) | |
| tree | b447b7e8da4524f816af2ca23d91c6b4466a36d1 /hw/nvram/fw_cfg.c | |
| parent | 97556fe80e4f7252300b3498b3477fb4295153a3 (diff) | |
| download | focaccia-qemu-ce9a2aa372f567d1a19417ab02789706d132daf7.tar.gz focaccia-qemu-ce9a2aa372f567d1a19417ab02789706d132daf7.zip | |
fw_cfg: expose control register size in fw_cfg.h
Expose the size of the control register (FW_CFG_CTL_SIZE) in fw_cfg.h. Add comment to fw_cfg_io_realize() pointing out that since the 8-bit data register is always subsumed by the 16-bit control register in the port I/O case, we use the control register width as the *total* width of the (classic, non-DMA) port I/O region reserved for the device. Cc: Marc Marí <markmb@redhat.com> Signed-off-by: Gabriel Somlo <somlo@cmu.edu> Reviewed-by: Laszlo Ersek <lersek@redhat.com> Reviewed-by: Marc Marí <markmb@redhat.com> Message-id: 1455906029-25565-2-git-send-email-somlo@cmu.edu Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw/nvram/fw_cfg.c')
| -rw-r--r-- | hw/nvram/fw_cfg.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index f3acb47bd4..7866248b93 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -32,7 +32,6 @@ #include "qemu/error-report.h" #include "qemu/config-file.h" -#define FW_CFG_CTL_SIZE 2 #define FW_CFG_NAME "fw_cfg" #define FW_CFG_PATH "/machine/" FW_CFG_NAME @@ -886,6 +885,9 @@ static void fw_cfg_io_realize(DeviceState *dev, Error **errp) FWCfgIoState *s = FW_CFG_IO(dev); SysBusDevice *sbd = SYS_BUS_DEVICE(dev); + /* when using port i/o, the 8-bit data register ALWAYS overlaps + * with half of the 16-bit control register. Hence, the total size + * of the i/o region used is FW_CFG_CTL_SIZE */ memory_region_init_io(&s->comb_iomem, OBJECT(s), &fw_cfg_comb_mem_ops, FW_CFG(s), "fwcfg", FW_CFG_CTL_SIZE); sysbus_add_io(sbd, s->iobase, &s->comb_iomem); |