From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37044) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Urq9D-0004E4-T2 for qemu-devel@nongnu.org; Wed, 26 Jun 2013 09:52:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Urq98-0007FS-MJ for qemu-devel@nongnu.org; Wed, 26 Jun 2013 09:52:35 -0400 Received: from oxygen.pond.sub.org ([2a01:4f8:121:10e4::3]:35364) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Urq98-0007Ew-FR for qemu-devel@nongnu.org; Wed, 26 Jun 2013 09:52:30 -0400 From: Markus Armbruster Date: Wed, 26 Jun 2013 15:52:15 +0200 Message-Id: <1372254743-15808-5-git-send-email-armbru@redhat.com> In-Reply-To: <1372254743-15808-1-git-send-email-armbru@redhat.com> References: <1372254743-15808-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v4 04/12] libqos: Add support for memory-mapped fw_cfg List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, jan.kiszka@siemens.com, mjt@tls.msk.ru, alex.williamson@redhat.com, aviksil@linux.vnet.ibm.com, afaerber@suse.de Signed-off-by: Markus Armbruster --- tests/libqos/fw_cfg.c | 29 +++++++++++++++++++++++++++++ tests/libqos/fw_cfg.h | 3 +++ 2 files changed, 32 insertions(+) diff --git a/tests/libqos/fw_cfg.c b/tests/libqos/fw_cfg.c index e386ff7..49d1683 100644 --- a/tests/libqos/fw_cfg.c +++ b/tests/libqos/fw_cfg.c @@ -2,15 +2,19 @@ * libqos fw_cfg support * * Copyright IBM, Corp. 2012-2013 + * Copyright (C) 2013 Red Hat Inc. * * Authors: * Anthony Liguori + * Markus Armbruster * * 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 #include "libqos/fw_cfg.h" +#include "libqtest.h" #include "qemu/bswap.h" void qfw_cfg_select(QFWCFG *fw_cfg, uint16_t key) @@ -50,3 +54,28 @@ uint64_t qfw_cfg_get_u64(QFWCFG *fw_cfg, uint16_t key) return le64_to_cpu(value); } +static void mm_fw_cfg_select(QFWCFG *fw_cfg, uint16_t key) +{ + writew(fw_cfg->base, key); +} + +static void mm_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] = readb(fw_cfg->base + 2); + } +} + +QFWCFG *mm_fw_cfg_init(uint64_t base) +{ + QFWCFG *fw_cfg = g_malloc0(sizeof(*fw_cfg)); + + fw_cfg->base = base; + fw_cfg->select = mm_fw_cfg_select; + fw_cfg->read = mm_fw_cfg_read; + + return fw_cfg; +} diff --git a/tests/libqos/fw_cfg.h b/tests/libqos/fw_cfg.h index 44fc42b..19bb053 100644 --- a/tests/libqos/fw_cfg.h +++ b/tests/libqos/fw_cfg.h @@ -20,6 +20,7 @@ typedef struct QFWCFG QFWCFG; struct QFWCFG { + uint64_t base; void (*select)(QFWCFG *fw_cfg, uint16_t key); void (*read)(QFWCFG *fw_cfg, void *data, size_t len); }; @@ -31,4 +32,6 @@ 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); +QFWCFG *mm_fw_cfg_init(uint64_t base); + #endif -- 1.7.11.7