From patchwork Tue Nov 27 07:07:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olivia Yin X-Patchwork-Id: 202108 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5FA0E2C008F for ; Tue, 27 Nov 2012 18:56:17 +1100 (EST) Received: from localhost ([::1]:54112 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TdG1f-00057U-HC for incoming@patchwork.ozlabs.org; Tue, 27 Nov 2012 02:56:15 -0500 Received: from eggs.gnu.org ([208.118.235.92]:56187) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TdG1H-0004jB-JW for qemu-devel@nongnu.org; Tue, 27 Nov 2012 02:55:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TdG1B-00049k-HS for qemu-devel@nongnu.org; Tue, 27 Nov 2012 02:55:51 -0500 Received: from co9ehsobe003.messaging.microsoft.com ([207.46.163.26]:56285 helo=co9outboundpool.messaging.microsoft.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TdG14-00047C-UY; Tue, 27 Nov 2012 02:55:39 -0500 Received: from mail52-co9-R.bigfish.com (10.236.132.225) by CO9EHSOBE020.bigfish.com (10.236.130.83) with Microsoft SMTP Server id 14.1.225.23; Tue, 27 Nov 2012 07:55:37 +0000 Received: from mail52-co9 (localhost [127.0.0.1]) by mail52-co9-R.bigfish.com (Postfix) with ESMTP id 25DC7940148; Tue, 27 Nov 2012 07:55:37 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 1 X-BigFish: VS1(z551bizzz1de0h1202h1d1ah1d2ahzz8275bhz2dh2a8h668h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h1354h137ah139eh13b6h1441h1504h1537h162dh1631h1155h) Received: from mail52-co9 (localhost.localdomain [127.0.0.1]) by mail52-co9 (MessageSwitch) id 1354002935415988_26883; Tue, 27 Nov 2012 07:55:35 +0000 (UTC) Received: from CO9EHSMHS022.bigfish.com (unknown [10.236.132.248]) by mail52-co9.bigfish.com (Postfix) with ESMTP id 62DE02E004C; Tue, 27 Nov 2012 07:55:35 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CO9EHSMHS022.bigfish.com (10.236.130.32) with Microsoft SMTP Server (TLS) id 14.1.225.23; Tue, 27 Nov 2012 07:55:35 +0000 Received: from tx30smr01.am.freescale.net (10.81.153.31) by 039-SN1MMR1-004.039d.mgd.msft.net (10.84.1.14) with Microsoft SMTP Server (TLS) id 14.2.318.3; Tue, 27 Nov 2012 07:55:34 +0000 Received: from localhost.localdomain (rock.ap.freescale.net [10.193.20.106]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id qAR7tJav009818; Tue, 27 Nov 2012 00:55:32 -0700 From: Olivia Yin To: , Date: Tue, 27 Nov 2012 15:07:37 +0800 Message-ID: <1354000059-805-3-git-send-email-hong-hua.yin@freescale.com> X-Mailer: git-send-email 1.6.4 In-Reply-To: <1354000059-805-2-git-send-email-hong-hua.yin@freescale.com> References: <1354000059-805-1-git-send-email-hong-hua.yin@freescale.com> <1354000059-805-2-git-send-email-hong-hua.yin@freescale.com> MIME-Version: 1.0 X-OriginatorOrg: freescale.com X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 X-Received-From: 207.46.163.26 Cc: Olivia Yin Subject: [Qemu-devel] [RFC PATCH v6 2/4] use uimage_reset to reload uimage X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Olivia Yin --- hw/loader.c | 57 +++++++++++++++++++++++++++++++++++++++++++++------------ hw/loader.h | 6 ++++++ 2 files changed, 51 insertions(+), 12 deletions(-) diff --git a/hw/loader.c b/hw/loader.c index e45f56a..0d93c3b 100644 --- a/hw/loader.c +++ b/hw/loader.c @@ -472,15 +472,15 @@ static ssize_t gunzip(void *dst, size_t dstlen, uint8_t *src, return dstbytes; } -/* Load a U-Boot image. */ -int load_uimage(const char *filename, hwaddr *ep, - hwaddr *loadaddr, int *is_linux) +/* write uimage into memory */ +static int uimage_physical_loader(const char *filename, hwaddr *ep, + uint8_t **data, hwaddr *loadaddr, + int *is_linux, int reset) { int fd; int size; uboot_image_header_t h; uboot_image_header_t *hdr = &h; - uint8_t *data = NULL; int ret = -1; fd = open(filename, O_RDONLY | O_BINARY); @@ -522,9 +522,9 @@ int load_uimage(const char *filename, hwaddr *ep, } *ep = hdr->ih_ep; - data = g_malloc(hdr->ih_size); + *data = g_malloc(hdr->ih_size); - if (read(fd, data, hdr->ih_size) != hdr->ih_size) { + if (read(fd, *data, hdr->ih_size) != hdr->ih_size) { fprintf(stderr, "Error reading file\n"); goto out; } @@ -534,11 +534,11 @@ int load_uimage(const char *filename, hwaddr *ep, size_t max_bytes; ssize_t bytes; - compressed_data = data; + compressed_data = *data; max_bytes = UBOOT_MAX_GUNZIP_BYTES; - data = g_malloc(max_bytes); + *data = g_malloc(max_bytes); - bytes = gunzip(data, max_bytes, compressed_data, hdr->ih_size); + bytes = gunzip(*data, max_bytes, compressed_data, hdr->ih_size); g_free(compressed_data); if (bytes < 0) { fprintf(stderr, "Unable to decompress gzipped image!\n"); @@ -547,7 +547,11 @@ int load_uimage(const char *filename, hwaddr *ep, hdr->ih_size = bytes; } - rom_add_blob_fixed(filename, data, hdr->ih_size, hdr->ih_load); + if (!reset) { + rom_add_blob_fixed(filename, *data, hdr->ih_size, hdr->ih_load); + } else { + cpu_physical_memory_write(hdr->ih_load, *data, hdr->ih_size); + } if (loadaddr) *loadaddr = hdr->ih_load; @@ -555,12 +559,41 @@ int load_uimage(const char *filename, hwaddr *ep, ret = hdr->ih_size; out: - if (data) - g_free(data); close(fd); return ret; } +static void uimage_reset(void *opaque) +{ + ImageFile *image = opaque; + uint8_t *data = NULL; + + uimage_physical_loader(image->name, image->ep, &data, &image->addr, + image->is_linux, 1); + g_free(data); +} + +/* Load a U-Boot image. */ +int load_uimage(const char *filename, hwaddr *ep, + hwaddr *loadaddr, int *is_linux) +{ + int size; + ImageFile *image; + uint8_t *data = NULL; + + size = uimage_physical_loader(filename, ep, &data, loadaddr, is_linux, 0); + if (size > 0) { + g_free(data); + image = g_malloc0(sizeof(*image)); + image->name = g_strdup(filename); + image->addr = *loadaddr; + image->ep = ep; + image->is_linux = is_linux; + qemu_register_reset(uimage_reset, image); + } + return size; +} + /* * Functions for reboot-persistent memory regions. * - used for vga bios and option roms. diff --git a/hw/loader.h b/hw/loader.h index 9e76ebd..17654fa 100644 --- a/hw/loader.h +++ b/hw/loader.h @@ -5,6 +5,12 @@ typedef struct ImageFile ImageFile; struct ImageFile { char *name; hwaddr addr; + int reset; + /* rom file */ + char *dir; + /* uimage */ + hwaddr *ep; + int *is_linux; }; /* loader.c */