From patchwork Wed Jun 27 23:50:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Wood X-Patchwork-Id: 167760 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 E37E6100AF5 for ; Thu, 28 Jun 2012 09:51:28 +1000 (EST) Received: from localhost ([::1]:50700 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sk218-0001VZ-QW for incoming@patchwork.ozlabs.org; Wed, 27 Jun 2012 19:51:26 -0400 Received: from eggs.gnu.org ([208.118.235.92]:50785) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sk20u-0001TD-Sf for qemu-devel@nongnu.org; Wed, 27 Jun 2012 19:51:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sk20t-0007yu-2p for qemu-devel@nongnu.org; Wed, 27 Jun 2012 19:51:12 -0400 Received: from db3ehsobe002.messaging.microsoft.com ([213.199.154.140]:29298 helo=db3outboundpool.messaging.microsoft.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sk20p-0007vR-I7; Wed, 27 Jun 2012 19:51:07 -0400 Received: from mail64-db3-R.bigfish.com (10.3.81.249) by DB3EHSOBE006.bigfish.com (10.3.84.26) with Microsoft SMTP Server id 14.1.225.23; Wed, 27 Jun 2012 23:49:20 +0000 Received: from mail64-db3 (localhost [127.0.0.1]) by mail64-db3-R.bigfish.com (Postfix) with ESMTP id AC7BDA0362; Wed, 27 Jun 2012 23:49:19 +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: 0 X-BigFish: VS0(zzzz1202hzz8275bhz2dh2a8h668h839h944hd25hf0ah) Received: from mail64-db3 (localhost.localdomain [127.0.0.1]) by mail64-db3 (MessageSwitch) id 134084095871066_21367; Wed, 27 Jun 2012 23:49:18 +0000 (UTC) Received: from DB3EHSMHS009.bigfish.com (unknown [10.3.81.227]) by mail64-db3.bigfish.com (Postfix) with ESMTP id 0D0DCE00C4; Wed, 27 Jun 2012 23:49:18 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by DB3EHSMHS009.bigfish.com (10.3.87.109) with Microsoft SMTP Server (TLS) id 14.1.225.23; Wed, 27 Jun 2012 23:49:18 +0000 Received: from tx30smr01.am.freescale.net (10.81.153.31) by 039-SN1MMR1-001.039d.mgd.msft.net (10.84.1.13) with Microsoft SMTP Server (TLS) id 14.2.298.5; Wed, 27 Jun 2012 18:51:00 -0500 Received: from tyr.buserror.net ([10.214.80.172]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id q5RNoxMO022531; Wed, 27 Jun 2012 16:51:00 -0700 Date: Wed, 27 Jun 2012 18:50:59 -0500 From: Scott Wood To: Message-ID: <20120627235059.GB9149@tyr.buserror.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20120627234639.GA8974@tyr.buserror.net> User-Agent: Mutt/1.5.21 (2010-09-15) X-OriginatorOrg: freescale.com X-detected-operating-system: by eggs.gnu.org: Windows XP/2000 (RFC1323+, w+, tstamp-) X-Received-From: 213.199.154.140 Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 2/4] PPC: e500: change internal references away from mpc8544ds 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 No functional changes -- machine is still outwardly mpc8544ds. The references that are not changed contain mpc8544 hardware details that need to be parameterized if/when a different e500 platform wants to change them. Signed-off-by: Scott Wood --- hw/ppc/e500.c | 27 ++++++++++++++------------- 1 files changed, 14 insertions(+), 13 deletions(-) diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index 0b383e6..db5ca6e 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -1,5 +1,5 @@ /* - * QEMU PowerPC MPC8544DS board emulation + * QEMU PowerPC e500-based platforms * * Copyright (C) 2009 Freescale Semiconductor, Inc. All rights reserved. * @@ -42,6 +42,7 @@ #define RAM_SIZES_ALIGN (64UL << 20) +/* TODO: parameterize */ #define MPC8544_CCSRBAR_BASE 0xE0000000ULL #define MPC8544_CCSRBAR_SIZE 0x00100000ULL #define MPC8544_MPIC_REGS_BASE (MPC8544_CCSRBAR_BASE + 0x40000ULL) @@ -104,7 +105,7 @@ static void dt_serial_create(void *fdt, unsigned long long offset, } } -static int mpc8544_load_device_tree(CPUPPCState *env, +static int ppce500_load_device_tree(CPUPPCState *env, target_phys_addr_t addr, target_phys_addr_t ramsize, target_phys_addr_t initrd_base, @@ -388,7 +389,7 @@ static void mmubooke_create_initial_mapping(CPUPPCState *env) env->tlb_dirty = true; } -static void mpc8544ds_cpu_reset_sec(void *opaque) +static void ppce500_cpu_reset_sec(void *opaque) { PowerPCCPU *cpu = opaque; CPUPPCState *env = &cpu->env; @@ -401,7 +402,7 @@ static void mpc8544ds_cpu_reset_sec(void *opaque) env->exception_index = EXCP_HLT; } -static void mpc8544ds_cpu_reset(void *opaque) +static void ppce500_cpu_reset(void *opaque) { PowerPCCPU *cpu = opaque; CPUPPCState *env = &cpu->env; @@ -417,7 +418,7 @@ static void mpc8544ds_cpu_reset(void *opaque) mmubooke_create_initial_mapping(env); } -static void mpc8544ds_init(ram_addr_t ram_size, +static void ppce500_init(ram_addr_t ram_size, const char *boot_device, const char *kernel_filename, const char *kernel_cmdline, @@ -478,11 +479,11 @@ static void mpc8544ds_init(ram_addr_t ram_size, /* Primary CPU */ struct boot_info *boot_info; boot_info = g_malloc0(sizeof(struct boot_info)); - qemu_register_reset(mpc8544ds_cpu_reset, cpu); + qemu_register_reset(ppce500_cpu_reset, cpu); env->load_info = boot_info; } else { /* Secondary CPUs */ - qemu_register_reset(mpc8544ds_cpu_reset_sec, cpu); + qemu_register_reset(ppce500_cpu_reset_sec, cpu); } } @@ -577,7 +578,7 @@ static void mpc8544ds_init(ram_addr_t ram_size, int dt_size; dt_base = (loadaddr + kernel_size + DTC_LOAD_PAD) & ~DTC_PAD_MASK; - dt_size = mpc8544_load_device_tree(env, dt_base, ram_size, initrd_base, + dt_size = ppce500_load_device_tree(env, dt_base, ram_size, initrd_base, initrd_size, kernel_cmdline); if (dt_size < 0) { fprintf(stderr, "couldn't load device tree\n"); @@ -595,16 +596,16 @@ static void mpc8544ds_init(ram_addr_t ram_size, } } -static QEMUMachine mpc8544ds_machine = { +static QEMUMachine ppce500_machine = { .name = "mpc8544ds", .desc = "mpc8544ds", - .init = mpc8544ds_init, + .init = ppce500_init, .max_cpus = 15, }; -static void mpc8544ds_machine_init(void) +static void ppce500_machine_init(void) { - qemu_register_machine(&mpc8544ds_machine); + qemu_register_machine(&ppce500_machine); } -machine_init(mpc8544ds_machine_init); +machine_init(ppce500_machine_init);