diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2013-04-16 09:45:17 -0500 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-04-17 10:26:05 -0500 |
commit | 234c69c5f92f18d7692e859d2784edb17a88873f (patch) | |
tree | 3e2bb985360aeabec7893d3e0e32a976f3f2880c /tests/libqos | |
parent | c4efe1cada311b9dc0df5beb71c4227ff3414aa1 (diff) | |
download | qemu-234c69c5f92f18d7692e859d2784edb17a88873f.tar.gz qemu-234c69c5f92f18d7692e859d2784edb17a88873f.tar.bz2 qemu-234c69c5f92f18d7692e859d2784edb17a88873f.zip |
libqos: add fw_cfg support
fw_cfg is needed to get the top of memory which is necessary for
doing PCI allocation and allocating RAM for DMA.
Add a PC version of fw_cfg and enough abstraction to support other
platforms.
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-id: 1366123521-4330-4-git-send-email-aliguori@us.ibm.com
Diffstat (limited to 'tests/libqos')
-rw-r--r-- | tests/libqos/fw_cfg-pc.c | 40 | ||||
-rw-r--r-- | tests/libqos/fw_cfg-pc.h | 20 | ||||
-rw-r--r-- | tests/libqos/fw_cfg.c | 51 | ||||
-rw-r--r-- | tests/libqos/fw_cfg.h | 34 |
4 files changed, 145 insertions, 0 deletions
diff --git a/tests/libqos/fw_cfg-pc.c b/tests/libqos/fw_cfg-pc.c new file mode 100644 index 0000000000..613604db77 --- /dev/null +++ b/tests/libqos/fw_cfg-pc.c @@ -0,0 +1,40 @@ +/* + * libqos fw_cfg support for PC + * + * Copyright IBM, Corp. 2012-2013 + * + * Authors: + * Anthony Liguori <aliguori@us.ibm.com> + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ + +#include "libqos/fw_cfg-pc.h" +#include "libqtest.h" +#include <glib.h> + +static void pc_fw_cfg_select(QFWCFG *fw_cfg, uint16_t key) +{ + outw(0x510, key); +} + +static void pc_fw_cfg_read(QFWCFG *fw_cfg, void *data, size_t len) +{ + uint8_t *ptr = data; + int i; + + for (i = 0; i < len; i++) { + ptr[i] = inb(0x511); + } +} + +QFWCFG *pc_fw_cfg_init(void) +{ + QFWCFG *fw_cfg = g_malloc0(sizeof(*fw_cfg)); + + fw_cfg->select = pc_fw_cfg_select; + fw_cfg->read = pc_fw_cfg_read; + + return fw_cfg; +} diff --git a/tests/libqos/fw_cfg-pc.h b/tests/libqos/fw_cfg-pc.h new file mode 100644 index 0000000000..444bd7975a --- /dev/null +++ b/tests/libqos/fw_cfg-pc.h @@ -0,0 +1,20 @@ +/* + * libqos fw_cfg support for PC + * + * Copyright IBM, Corp. 2012-2013 + * + * Authors: + * Anthony Liguori <aliguori@us.ibm.com> + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ + +#ifndef LIBQOS_FW_CFG_PC_H +#define LIBQOS_FW_CFG_PC_H + +#include "libqos/fw_cfg.h" + +QFWCFG *pc_fw_cfg_init(void); + +#endif diff --git a/tests/libqos/fw_cfg.c b/tests/libqos/fw_cfg.c new file mode 100644 index 0000000000..799139edee --- /dev/null +++ b/tests/libqos/fw_cfg.c @@ -0,0 +1,51 @@ +/* + * libqos fw_cfg support + * + * Copyright IBM, Corp. 2012-2013 + * + * Authors: + * Anthony Liguori <aliguori@us.ibm.com> + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ + +#include "libqos/fw_cfg.h" + +void qfw_cfg_select(QFWCFG *fw_cfg, uint16_t key) +{ + fw_cfg->select(fw_cfg, key); +} + +void qfw_cfg_read_data(QFWCFG *fw_cfg, void *data, size_t len) +{ + fw_cfg->read(fw_cfg, data, len); +} + +void qfw_cfg_get(QFWCFG *fw_cfg, uint16_t key, void *data, size_t len) +{ + qfw_cfg_select(fw_cfg, key); + qfw_cfg_read_data(fw_cfg, data, len); +} + +uint16_t qfw_cfg_get_u16(QFWCFG *fw_cfg, uint16_t key) +{ + uint16_t value; + qfw_cfg_get(fw_cfg, key, &value, sizeof(value)); + return value; +} + +uint32_t qfw_cfg_get_u32(QFWCFG *fw_cfg, uint16_t key) +{ + uint32_t value; + qfw_cfg_get(fw_cfg, key, &value, sizeof(value)); + return value; +} + +uint64_t qfw_cfg_get_u64(QFWCFG *fw_cfg, uint16_t key) +{ + uint64_t value; + qfw_cfg_get(fw_cfg, key, &value, sizeof(value)); + return value; +} + diff --git a/tests/libqos/fw_cfg.h b/tests/libqos/fw_cfg.h new file mode 100644 index 0000000000..44fc42ba11 --- /dev/null +++ b/tests/libqos/fw_cfg.h @@ -0,0 +1,34 @@ +/* + * libqos fw_cfg support + * + * Copyright IBM, Corp. 2012-2013 + * + * Authors: + * Anthony Liguori <aliguori@us.ibm.com> + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ + +#ifndef LIBQOS_FW_CFG_H +#define LIBQOS_FW_CFG_H + +#include <stdint.h> +#include <sys/types.h> + +typedef struct QFWCFG QFWCFG; + +struct QFWCFG +{ + void (*select)(QFWCFG *fw_cfg, uint16_t key); + void (*read)(QFWCFG *fw_cfg, void *data, size_t len); +}; + +void qfw_cfg_select(QFWCFG *fw_cfg, uint16_t key); +void qfw_cfg_read_data(QFWCFG *fw_cfg, void *data, size_t len); +void qfw_cfg_get(QFWCFG *fw_cfg, uint16_t key, void *data, size_t len); +uint16_t qfw_cfg_get_u16(QFWCFG *fw_cfg, uint16_t key); +uint32_t qfw_cfg_get_u32(QFWCFG *fw_cfg, uint16_t key); +uint64_t qfw_cfg_get_u64(QFWCFG *fw_cfg, uint16_t key); + +#endif |