From patchwork Fri Sep 13 04:33:03 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antony Pavlov X-Patchwork-Id: 274655 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6EA5D2C016F for ; Fri, 13 Sep 2013 14:37:18 +1000 (EST) Received: from localhost ([::1]:44741 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VKL88-0005ze-J8 for incoming@patchwork.ozlabs.org; Fri, 13 Sep 2013 00:37:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59978) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VKL6z-0004T1-Bn for qemu-devel@nongnu.org; Fri, 13 Sep 2013 00:36:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VKL6i-0005jD-Fz for qemu-devel@nongnu.org; Fri, 13 Sep 2013 00:36:05 -0400 Received: from mail-lb0-x22a.google.com ([2a00:1450:4010:c04::22a]:37393) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VKL6i-0005iW-7x for qemu-devel@nongnu.org; Fri, 13 Sep 2013 00:35:48 -0400 Received: by mail-lb0-f170.google.com with SMTP id w7so1655252lbi.15 for ; Thu, 12 Sep 2013 21:35:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=4WuqAgiLBHUjwbLyFnGXgj/dwDAo3LxUQ9iypNInCuw=; b=ps4RiQqzbRPvB6Fgos/p8v5vSduOeLjMeu++QcHlmW6arPOCtuQK5nNODbaxz2wqw3 C/1fGCuOhfpV1K8AjHmFbhLCq1bywiys0TR4TlsVepolZprD39H9xNM8r5qFdMlZ0oM/ 9Lpiz/rubAuu90cf8bwrYop8bC8ZJI2PbpAa6y9M4MtgJKBBFSsbUPXGt8J0gJDXmPGB haqsxh0fpVroJKfeJLut5gcOSgIJOXeQ76L9OqN4pmyo+64F5smncif6GC7Dy3fdy0cv P8LikkqemuNHDbaVDxkxzIIqqbUAyfX3qU4p6mrNMzxWk0awTWvuFQTUwFn3nivAX0Jd M2Qg== X-Received: by 10.152.120.73 with SMTP id la9mr9127777lab.3.1379046947180; Thu, 12 Sep 2013 21:35:47 -0700 (PDT) Received: from localhost.localdomain (ppp37-190-57-26.pppoe.spdop.ru. [37.190.57.26]) by mx.google.com with ESMTPSA id m13sm5248702lbo.11.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 12 Sep 2013 21:35:46 -0700 (PDT) From: Antony Pavlov To: qemu-devel@nongnu.org Date: Fri, 13 Sep 2013 08:33:03 +0400 Message-Id: <1379046783-19382-3-git-send-email-antonynpavlov@gmail.com> X-Mailer: git-send-email 1.8.4.rc3 In-Reply-To: <1379046783-19382-1-git-send-email-antonynpavlov@gmail.com> References: <1379046783-19382-1-git-send-email-antonynpavlov@gmail.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c04::22a Cc: Paolo Bonzini , Richard Henderson , Antony Pavlov , Aurelien Jarno , Stefan Weil Subject: [Qemu-devel] [RFC v2 2/2] hw/mips: use sizes.h macros 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: Antony Pavlov Reviewed-by: Aurelien Jarno --- hw/mips/mips_malta.c | 25 +++++++++++++------------ include/hw/mips/bios.h | 3 ++- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 05c8771..604832f 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -51,6 +51,7 @@ #include "sysemu/qtest.h" #include "qemu/error-report.h" #include "hw/empty_slot.h" +#include "qemu/sizes.h" //#define DEBUG_BOARD_INIT @@ -63,7 +64,7 @@ #define FPGA_ADDRESS 0x1f000000ULL #define RESET_ADDRESS 0x1fc00000ULL -#define FLASH_SIZE 0x400000 +#define FLASH_SIZE SZ_4M #define MAX_IDE_BUS 2 @@ -827,8 +828,8 @@ static int64_t load_kernel (void) } prom_set(prom_buf, prom_index++, "memsize"); - prom_set(prom_buf, prom_index++, "%i", - MIN(loaderparams.ram_size, 256 << 20)); + prom_set(prom_buf, prom_index++, "%li", + MIN(loaderparams.ram_size, SZ_256M)); prom_set(prom_buf, prom_index++, "modetty0"); prom_set(prom_buf, prom_index++, "38400n8r"); prom_set(prom_buf, prom_index++, NULL); @@ -954,10 +955,10 @@ void mips_malta_init(QEMUMachineInitArgs *args) env = &cpu->env; /* allocate RAM */ - if (ram_size > (2048u << 20)) { + if (ram_size > SZ_2G) { fprintf(stderr, - "qemu: Too much memory for this machine: %d MB, maximum 2048 MB\n", - ((unsigned int)ram_size / (1 << 20))); + "qemu: Too much memory for this machine: %ld MB, maximum 2048 MB\n", + ((unsigned long)ram_size / SZ_1M)); exit(1); } @@ -968,17 +969,17 @@ void mips_malta_init(QEMUMachineInitArgs *args) /* alias for pre IO hole access */ memory_region_init_alias(ram_low_preio, NULL, "mips_malta_low_preio.ram", - ram_high, 0, MIN(ram_size, (256 << 20))); + ram_high, 0, MIN(ram_size, SZ_256M)); memory_region_add_subregion(system_memory, 0, ram_low_preio); /* alias for post IO hole access, if there is enough RAM */ - if (ram_size > (512 << 20)) { + if (ram_size > SZ_512M) { ram_low_postio = g_new(MemoryRegion, 1); memory_region_init_alias(ram_low_postio, NULL, "mips_malta_low_postio.ram", - ram_high, 512 << 20, - ram_size - (512 << 20)); - memory_region_add_subregion(system_memory, 512 << 20, ram_low_postio); + ram_high, SZ_512M, + ram_size - SZ_512M); + memory_region_add_subregion(system_memory, SZ_512M, ram_low_postio); } /* generate SPD EEPROM data */ @@ -1012,7 +1013,7 @@ void mips_malta_init(QEMUMachineInitArgs *args) fl_idx++; if (kernel_filename) { /* Write a small bootloader to the flash location. */ - loaderparams.ram_size = MIN(ram_size, 256 << 20); + loaderparams.ram_size = MIN(ram_size, SZ_256M); loaderparams.kernel_filename = kernel_filename; loaderparams.kernel_cmdline = kernel_cmdline; loaderparams.initrd_filename = initrd_filename; diff --git a/include/hw/mips/bios.h b/include/hw/mips/bios.h index b4b88ac..3d7da4b 100644 --- a/include/hw/mips/bios.h +++ b/include/hw/mips/bios.h @@ -1,6 +1,7 @@ #include "cpu.h" +#include "qemu/sizes.h" -#define BIOS_SIZE (4 * 1024 * 1024) +#define BIOS_SIZE SZ_4M #ifdef TARGET_WORDS_BIGENDIAN #define BIOS_FILENAME "mips_bios.bin" #else