From patchwork Fri Dec 18 11:01:10 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 41384 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 08C42B6F07 for ; Fri, 18 Dec 2009 22:12:40 +1100 (EST) Received: from localhost ([127.0.0.1]:51682 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NLal9-0002kn-UJ for incoming@patchwork.ozlabs.org; Fri, 18 Dec 2009 06:12:36 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NLaaP-00069S-Fa for qemu-devel@nongnu.org; Fri, 18 Dec 2009 06:01:29 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NLaaJ-000670-Go for qemu-devel@nongnu.org; Fri, 18 Dec 2009 06:01:27 -0500 Received: from [199.232.76.173] (port=33825 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NLaaI-00066o-TX for qemu-devel@nongnu.org; Fri, 18 Dec 2009 06:01:22 -0500 Received: from mx1.redhat.com ([209.132.183.28]:22288) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NLaaG-0004D9-6N for qemu-devel@nongnu.org; Fri, 18 Dec 2009 06:01:20 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nBIB1Jqd017698 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 18 Dec 2009 06:01:19 -0500 Received: from zweiblum.home.kraxel.org (vpn1-6-184.ams2.redhat.com [10.36.6.184]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nBIB1FbC031106; Fri, 18 Dec 2009 06:01:15 -0500 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id DACB970FCE; Fri, 18 Dec 2009 12:01:14 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org, seabios@seabios.org Date: Fri, 18 Dec 2009 12:01:10 +0100 Message-Id: <1261134074-11795-5-git-send-email-kraxel@redhat.com> In-Reply-To: <1261134074-11795-1-git-send-email-kraxel@redhat.com> References: <1261134074-11795-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 4/8] fw_cfg: add API for file transfer. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This patch adds a file transfer interface to fw_cfg. Intended to be used for passing non-pci option roms and vgabios to seabios. Namespace is modeled after the existing cbfs filesystem support in seabios. Reading the new FW_CFG_FILE_DIR entry returns a file list. Fields there are in network byte order (aka bigendian). Signed-off-by: Gerd Hoffmann --- hw/fw_cfg.c | 43 +++++++++++++++++++++++++++++++++++++++++++ hw/fw_cfg.h | 21 +++++++++++++++++++-- 2 files changed, 62 insertions(+), 2 deletions(-) diff --git a/hw/fw_cfg.c b/hw/fw_cfg.c index 2e3662d..0492f5f 100644 --- a/hw/fw_cfg.c +++ b/hw/fw_cfg.c @@ -47,6 +47,7 @@ typedef struct _FWCfgEntry { struct _FWCfgState { FWCfgEntry entries[2][FW_CFG_MAX_ENTRY]; + FWCfgFiles *files; uint16_t cur_entry; uint32_t cur_offset; }; @@ -273,6 +274,48 @@ int fw_cfg_add_callback(FWCfgState *s, uint16_t key, FWCfgCallback callback, return 1; } +int fw_cfg_add_file(FWCfgState *s, const char *dir, const char *filename, + uint8_t *data, uint32_t len) +{ + const char *basename; + int index; + + if (!s->files) { + int dsize = sizeof(uint32_t) + sizeof(FWCfgFile) * FW_CFG_FILE_SLOTS; + s->files = qemu_mallocz(dsize); + fw_cfg_add_bytes(s, FW_CFG_FILE_DIR, (uint8_t*)s->files, dsize); + } + + index = be32_to_cpu(s->files->count); + if (index == FW_CFG_FILE_SLOTS) { + fprintf(stderr, "fw_cfg: out of file slots\n"); + return 0; + } + + fw_cfg_add_bytes(s, FW_CFG_FILE_FIRST + index, data, len); + + basename = strrchr(filename, '/'); + if (basename) { + basename++; + } else { + basename = filename; + } + if (dir) { + snprintf(s->files->f[index].name, sizeof(s->files->f[index].name), + "%s/%s", dir, basename); + } else { + snprintf(s->files->f[index].name, sizeof(s->files->f[index].name), + "%s", basename); + } + s->files->f[index].size = cpu_to_be32(len); + s->files->f[index].select = cpu_to_be16(FW_CFG_FILE_FIRST + index); + fprintf(stderr, "%s: #%d: %s (%d bytes)\n", __FUNCTION__, + index, s->files->f[index].name, len); + + s->files->count = cpu_to_be32(index+1); + return 1; +} + FWCfgState *fw_cfg_init(uint32_t ctl_port, uint32_t data_port, target_phys_addr_t ctl_addr, target_phys_addr_t data_addr) { diff --git a/hw/fw_cfg.h b/hw/fw_cfg.h index b06665e..a63f54f 100644 --- a/hw/fw_cfg.h +++ b/hw/fw_cfg.h @@ -26,7 +26,11 @@ #define FW_CFG_SETUP_ADDR 0x16 #define FW_CFG_SETUP_SIZE 0x17 #define FW_CFG_SETUP_DATA 0x18 -#define FW_CFG_MAX_ENTRY 0x19 +#define FW_CFG_FILE_DIR 0x19 + +#define FW_CFG_FILE_FIRST 0x20 +#define FW_CFG_FILE_SLOTS 0x10 +#define FW_CFG_MAX_ENTRY (FW_CFG_FILE_FIRST+FW_CFG_FILE_SLOTS) #define FW_CFG_WRITE_CHANNEL 0x4000 #define FW_CFG_ARCH_LOCAL 0x8000 @@ -34,6 +38,18 @@ #define FW_CFG_INVALID 0xffff +typedef struct FWCfgFile { + uint32_t size; /* file size */ + uint16_t select; /* write this to 0x510 to read it */ + uint16_t reserved; + char name[56]; +} FWCfgFile; + +typedef struct FWCfgFiles { + uint32_t count; + FWCfgFile f[]; +} FWCfgFiles; + #ifndef NO_QEMU_PROTOS typedef void (*FWCfgCallback)(void *opaque, uint8_t *data); @@ -44,7 +60,8 @@ int fw_cfg_add_i32(FWCfgState *s, uint16_t key, uint32_t value); int fw_cfg_add_i64(FWCfgState *s, uint16_t key, uint64_t value); int fw_cfg_add_callback(FWCfgState *s, uint16_t key, FWCfgCallback callback, void *callback_opaque, uint8_t *data, size_t len); -int fw_cfg_add_file(FWCfgState *s, uint8_t type, uint8_t *data, uint32_t len); +int fw_cfg_add_file(FWCfgState *s, const char *dir, const char *filename, + uint8_t *data, uint32_t len); FWCfgState *fw_cfg_init(uint32_t ctl_port, uint32_t data_port, target_phys_addr_t crl_addr, target_phys_addr_t data_addr);