From mboxrd@z Thu Jan 1 00:00:00 1970 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 From: Scott Wood Date: Mon, 2 Jul 2012 18:03:21 -0500 Message-ID: <1341270201-7456-5-git-send-email-scottwood@freescale.com> 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 Content-Type: text/plain Subject: [Qemu-devel] [RESEND PATCH v2 4/4] PPC: e500: add generic e500 platform List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alex Graf Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= 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); -- 1.7.5.4