From patchwork Mon Jul 2 23:03:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Wood X-Patchwork-Id: 168657 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 7802A2C009F for ; Tue, 3 Jul 2012 09:07:20 +1000 (EST) Received: from localhost ([::1]:35641 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SlpfH-0004xv-5D for incoming@patchwork.ozlabs.org; Mon, 02 Jul 2012 19:04:19 -0400 Received: from eggs.gnu.org ([208.118.235.92]:38981) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SlpeW-00030s-Fd for qemu-devel@nongnu.org; Mon, 02 Jul 2012 19:03:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SlpeU-0007H6-A8 for qemu-devel@nongnu.org; Mon, 02 Jul 2012 19:03:32 -0400 Received: from ch1ehsobe001.messaging.microsoft.com ([216.32.181.181]:18816 helo=ch1outboundpool.messaging.microsoft.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SlpeU-0007GJ-6o; Mon, 02 Jul 2012 19:03:30 -0400 Received: from mail158-ch1-R.bigfish.com (10.43.68.226) by CH1EHSOBE004.bigfish.com (10.43.70.54) with Microsoft SMTP Server id 14.1.225.23; Mon, 2 Jul 2012 23:01:31 +0000 Received: from mail158-ch1 (localhost [127.0.0.1]) by mail158-ch1-R.bigfish.com (Postfix) with ESMTP id 47309401E7; Mon, 2 Jul 2012 23:01:31 +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: 10 X-BigFish: VS10(z1039ozc8kzz1202hzz8275bhz2dh2a8h668h839hd24he5bhf0ah) Received: from mail158-ch1 (localhost.localdomain [127.0.0.1]) by mail158-ch1 (MessageSwitch) id 1341270090344868_25709; Mon, 2 Jul 2012 23:01:30 +0000 (UTC) Received: from CH1EHSMHS028.bigfish.com (snatpool1.int.messaging.microsoft.com [10.43.68.247]) by mail158-ch1.bigfish.com (Postfix) with ESMTP id 47FA82A004F; Mon, 2 Jul 2012 23:01:30 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CH1EHSMHS028.bigfish.com (10.43.70.28) with Microsoft SMTP Server (TLS) id 14.1.225.23; Mon, 2 Jul 2012 23:01:29 +0000 Received: from tx30smr01.am.freescale.net (10.81.153.31) by 039-SN1MMR1-002.039d.mgd.msft.net (10.84.1.15) with Microsoft SMTP Server (TLS) id 14.2.298.5; Mon, 2 Jul 2012 18:03:26 -0500 Received: from tyr.buserror.net ([10.214.84.6]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id q62N3MV8008552; Mon, 2 Jul 2012 16:03:25 -0700 From: Scott Wood To: Alex Graf Date: Mon, 2 Jul 2012 18:03:21 -0500 Message-ID: <1341270201-7456-5-git-send-email-scottwood@freescale.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1341270201-7456-1-git-send-email-scottwood@freescale.com> References: <20120627234639.GA8974@tyr.buserror.net> <1341270201-7456-1-git-send-email-scottwood@freescale.com> MIME-Version: 1.0 X-OriginatorOrg: freescale.com X-detected-operating-system: by eggs.gnu.org: Windows XP/2000 (RFC1323+, w+, tstamp-) X-Received-From: 216.32.181.181 Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [RESEND PATCH v2 4/4] PPC: e500: add generic e500 platform 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 This gives the kernel a paravirtualized machine to target, without requiring both sides to pretend to be targeting a specific board that likely has little to do with the host in KVM scenarios. This avoids the need to add new boards to QEMU, just to be able to run KVM on new CPUs. Signed-off-by: Scott Wood --- v2: - Use the right part of the makefile for hw/ppc files - Update platform name to ppce500 - Provide a proper platform description hw/ppc/Makefile.objs | 3 +- hw/ppc/e500plat.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 hw/ppc/e500plat.c diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs index 14debbc..81bcc72 100644 --- a/hw/ppc/Makefile.objs +++ b/hw/ppc/Makefile.objs @@ -27,5 +27,4 @@ obj-y += xilinx_ethlite.o obj-y := $(addprefix ../,$(obj-y)) -obj-y += e500.o mpc8544ds.o - +obj-y += e500.o mpc8544ds.o e500plat.o diff --git a/hw/ppc/e500plat.c b/hw/ppc/e500plat.c new file mode 100644 index 0000000..60a5cb3 --- /dev/null +++ b/hw/ppc/e500plat.c @@ -0,0 +1,60 @@ +/* + * Generic device-tree-driven paravirt PPC e500 platform + * + * Copyright 2012 Freescale Semiconductor, Inc. + * + * This is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + */ + +#include "config.h" +#include "qemu-common.h" +#include "e500.h" +#include "../boards.h" +#include "device_tree.h" + +static void e500plat_fixup_devtree(PPCE500Params *params, void *fdt) +{ + const char model[] = "QEMU ppce500"; + const char compatible[] = "fsl,qemu-e500"; + + qemu_devtree_setprop(fdt, "/", "model", model, sizeof(model)); + qemu_devtree_setprop(fdt, "/", "compatible", compatible, + sizeof(compatible)); +} + +static void e500plat_init(ram_addr_t ram_size, + const char *boot_device, + const char *kernel_filename, + const char *kernel_cmdline, + const char *initrd_filename, + const char *cpu_model) +{ + PPCE500Params params = { + .ram_size = ram_size, + .boot_device = boot_device, + .kernel_filename = kernel_filename, + .kernel_cmdline = kernel_cmdline, + .initrd_filename = initrd_filename, + .cpu_model = cpu_model, + .fixup_devtree = e500plat_fixup_devtree, + }; + + ppce500_init(¶ms); +} + +static QEMUMachine e500plat_machine = { + .name = "ppce500", + .desc = "generic paravirt e500 platform", + .init = e500plat_init, + .max_cpus = 15, +}; + +static void e500plat_machine_init(void) +{ + qemu_register_machine(&e500plat_machine); +} + +machine_init(e500plat_machine_init);