From: "Gabriel L. Somlo" <somlo@cmu.edu>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, drjones@redhat.com,
matt.fleming@intel.com, ehabkost@redhat.com, mst@redhat.com,
zhaoshenglong@huawei.com, leif.lindholm@linaro.org,
ard.biesheuvel@linaro.org, kevin@koconnor.net, kraxel@redhat.com,
pbonzini@redhat.com, imammedo@redhat.com, markmb@redhat.com,
lersek@redhat.com, rth@twiddle.net
Subject: [Qemu-devel] [PATCH v4 1/5] fw_cfg: expose control register size in fw_cfg.h
Date: Sun, 27 Sep 2015 17:28:58 -0400 [thread overview]
Message-ID: <1443389342-2186-2-git-send-email-somlo@cmu.edu> (raw)
In-Reply-To: <1443389342-2186-1-git-send-email-somlo@cmu.edu>
Expose the size of the control register (FW_CFG_SIZE, renamed to
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 port I/O region reserved for the device.
Suggested-by: Marc Marí <markmb@redhat.com>
Signed-off-by: Gabriel Somlo <somlo@cmu.edu>
---
hw/nvram/fw_cfg.c | 8 +++++---
include/hw/nvram/fw_cfg.h | 3 +++
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
index 658f8c4..9dd95c7 100644
--- a/hw/nvram/fw_cfg.c
+++ b/hw/nvram/fw_cfg.c
@@ -30,7 +30,6 @@
#include "qemu/error-report.h"
#include "qemu/config-file.h"
-#define FW_CFG_SIZE 2
#define FW_CFG_NAME "fw_cfg"
#define FW_CFG_PATH "/machine/" FW_CFG_NAME
@@ -672,8 +671,11 @@ 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_SIZE);
+ FW_CFG(s), "fwcfg", FW_CFG_CTL_SIZE);
sysbus_add_io(sbd, s->iobase, &s->comb_iomem);
}
@@ -705,7 +707,7 @@ static void fw_cfg_mem_realize(DeviceState *dev, Error **errp)
const MemoryRegionOps *data_ops = &fw_cfg_data_mem_ops;
memory_region_init_io(&s->ctl_iomem, OBJECT(s), &fw_cfg_ctl_mem_ops,
- FW_CFG(s), "fwcfg.ctl", FW_CFG_SIZE);
+ FW_CFG(s), "fwcfg.ctl", FW_CFG_CTL_SIZE);
sysbus_init_mmio(sbd, &s->ctl_iomem);
if (s->data_width > data_ops->valid.max_access_size) {
diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h
index e60d3ca..5008270 100644
--- a/include/hw/nvram/fw_cfg.h
+++ b/include/hw/nvram/fw_cfg.h
@@ -46,6 +46,9 @@
#define FW_CFG_INVALID 0xffff
+/* width in bytes of fw_cfg control port */
+#define FW_CFG_CTL_SIZE 0x02
+
#define FW_CFG_MAX_FILE_PATH 56
#ifndef NO_QEMU_PROTOS
--
2.4.3
next prev parent reply other threads:[~2015-09-27 21:29 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-27 21:28 [Qemu-devel] [PATCH v4 0/5] add ACPI node for fw_cfg on pc and arm Gabriel L. Somlo
2015-09-27 21:28 ` Gabriel L. Somlo [this message]
2015-09-29 10:10 ` [Qemu-devel] [PATCH v4 1/5] fw_cfg: expose control register size in fw_cfg.h Laszlo Ersek
2015-09-27 21:28 ` [Qemu-devel] [PATCH v4 2/5] pc: fw_cfg: move ioport base constant to pc.h Gabriel L. Somlo
2015-09-29 10:20 ` Laszlo Ersek
2015-09-27 21:29 ` [Qemu-devel] [PATCH v4 3/5] acpi: pc: add fw_cfg device node to ssdt Gabriel L. Somlo
2015-09-29 10:33 ` Laszlo Ersek
2015-09-29 16:46 ` Gabriel L. Somlo
2015-09-29 16:55 ` Laszlo Ersek
2015-09-29 17:19 ` Gabriel L. Somlo
2015-09-29 17:28 ` Laszlo Ersek
2015-09-30 0:18 ` Gabriel L. Somlo
2015-09-30 13:01 ` Paolo Bonzini
2015-09-30 14:16 ` Gabriel L. Somlo
2015-09-30 14:27 ` Paolo Bonzini
2015-10-01 7:02 ` Igor Mammedov
2015-10-01 8:27 ` Laszlo Ersek
2015-10-01 11:33 ` Igor Mammedov
2015-10-01 11:52 ` Laszlo Ersek
2015-10-01 13:00 ` Gabriel L. Somlo
2015-10-01 15:59 ` Eric Blake
2015-10-10 4:00 ` Gabriel L. Somlo
2015-10-13 19:10 ` Eduardo Habkost
2015-10-13 21:18 ` Michael S. Tsirkin
2015-10-13 22:43 ` Eduardo Habkost
2015-10-14 5:06 ` Michael S. Tsirkin
2015-10-14 16:32 ` Eduardo Habkost
2015-10-14 8:45 ` Igor Mammedov
2015-10-14 16:47 ` Eduardo Habkost
2015-10-15 13:44 ` Igor Mammedov
2015-09-27 21:29 ` [Qemu-devel] [PATCH v4 4/5] acpi: arm: add fw_cfg device node to dsdt Gabriel L. Somlo
2015-09-29 10:40 ` Laszlo Ersek
2015-09-29 18:26 ` Gabriel L. Somlo
2015-09-29 18:54 ` Laszlo Ersek
2015-09-30 9:59 ` Ard Biesheuvel
2015-09-30 10:21 ` Laszlo Ersek
2015-09-30 11:13 ` Peter Maydell
2015-09-30 12:22 ` Laszlo Ersek
2015-09-30 15:16 ` Gerd Hoffmann
2015-09-30 15:19 ` Peter Maydell
2015-09-30 19:07 ` Gabriel L. Somlo
2015-10-01 12:22 ` Gabriel L. Somlo
2015-10-01 12:25 ` Ard Biesheuvel
2015-10-01 12:35 ` Laszlo Ersek
2015-10-01 12:39 ` Peter Maydell
2015-10-01 12:50 ` Laszlo Ersek
2015-09-30 10:28 ` Laszlo Ersek
2015-09-27 21:29 ` [Qemu-devel] [PATCH v4 5/5] fw_cfg: document ACPI device node information Gabriel L. Somlo
2015-09-29 10:43 ` Laszlo Ersek
2015-09-29 10:27 ` [Qemu-devel] [PATCH v4 0/5] add ACPI node for fw_cfg on pc and arm Michael S. Tsirkin
2015-09-29 10:45 ` Laszlo Ersek
2015-09-29 13:59 ` Laszlo Ersek
2015-09-29 14:15 ` Michael S. Tsirkin
2015-09-29 19:04 ` Gabriel L. Somlo
2015-09-29 19:21 ` Laszlo Ersek
2015-09-29 18:40 ` Gabriel L. Somlo
2015-09-29 17:30 ` Gabriel L. Somlo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1443389342-2186-2-git-send-email-somlo@cmu.edu \
--to=somlo@cmu.edu \
--cc=ard.biesheuvel@linaro.org \
--cc=drjones@redhat.com \
--cc=ehabkost@redhat.com \
--cc=imammedo@redhat.com \
--cc=kevin@koconnor.net \
--cc=kraxel@redhat.com \
--cc=leif.lindholm@linaro.org \
--cc=lersek@redhat.com \
--cc=markmb@redhat.com \
--cc=matt.fleming@intel.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
--cc=zhaoshenglong@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.