From patchwork Tue Jun 5 23:53:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 163203 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 D4049B6F86 for ; Wed, 6 Jun 2012 09:58:37 +1000 (EST) Received: from localhost ([::1]:47666 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sc3dz-0005Gn-MI for incoming@patchwork.ozlabs.org; Tue, 05 Jun 2012 19:58:35 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44380) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sc3aF-0007xH-FQ for qemu-devel@nongnu.org; Tue, 05 Jun 2012 19:58:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sc3ZB-0002U5-1P for qemu-devel@nongnu.org; Tue, 05 Jun 2012 19:54:43 -0400 Received: from cantor2.suse.de ([195.135.220.15]:36459 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sc3ZA-0002TX-NC; Tue, 05 Jun 2012 19:53:36 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id 3F061A2BD7; Wed, 6 Jun 2012 01:53:35 +0200 (CEST) From: Alexander Graf To: "qemu-devel@nongnu.org Developers" Date: Wed, 6 Jun 2012 01:53:22 +0200 Message-Id: <1338940402-28502-32-git-send-email-agraf@suse.de> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1338940402-28502-1-git-send-email-agraf@suse.de> References: <1338940402-28502-1-git-send-email-agraf@suse.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 195.135.220.15 Cc: qemu-ppc Mailing List Subject: [Qemu-devel] [PATCH 31/31] PPC: e500: Refactor serial dt generation 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 When generating serial port device tree nodes, we duplicate quite a bit of code, because there are 2 of them in the mpc8544ds board we emulate. Shove the generating code into a function, so we duplicate less code. Signed-off-by: Alexander Graf --- hw/ppce500_mpc8544ds.c | 54 +++++++++++++++++++++++------------------------ 1 files changed, 26 insertions(+), 28 deletions(-) diff --git a/hw/ppce500_mpc8544ds.c b/hw/ppce500_mpc8544ds.c index 6c01093..3c5a483 100644 --- a/hw/ppce500_mpc8544ds.c +++ b/hw/ppce500_mpc8544ds.c @@ -82,6 +82,28 @@ static void pci_map_create(void *fdt, uint32_t *pci_map, uint32_t mpic) } } +static void dt_serial_create(void *fdt, unsigned long long offset, + const char *soc, const char *mpic, + const char *alias, int idx, bool defcon) +{ + char ser[128]; + + sprintf(ser, "%s/serial@%llx", soc, offset); + qemu_devtree_add_subnode(fdt, ser); + qemu_devtree_setprop_string(fdt, ser, "device_type", "serial"); + qemu_devtree_setprop_string(fdt, ser, "compatible", "ns16550"); + qemu_devtree_setprop_cell2(fdt, ser, "reg", offset, 0x100); + qemu_devtree_setprop_cell(fdt, ser, "cell-index", idx); + qemu_devtree_setprop_cell(fdt, ser, "clock-frequency", 0); + qemu_devtree_setprop_cell4(fdt, ser, "interrupts", 42, 2, 0, 0); + qemu_devtree_setprop_phandle(fdt, ser, "interrupt-parent", mpic); + qemu_devtree_setprop_string(fdt, "/aliases", alias, ser); + + if (defcon) { + qemu_devtree_setprop_string(fdt, "/chosen", "linux,stdout-path", ser); + } +} + static int mpc8544_load_device_tree(CPUPPCState *env, target_phys_addr_t addr, target_phys_addr_t ramsize, @@ -101,8 +123,6 @@ static int mpc8544_load_device_tree(CPUPPCState *env, char compatible_sb[] = "fsl,mpc8544-immr\0simple-bus"; char model[] = "MPC8544DS"; char soc[128]; - char ser0[128]; - char ser1[128]; char mpic[128]; uint32_t mpic_ph; char gutil[128]; @@ -274,32 +294,10 @@ static int mpc8544_load_device_tree(CPUPPCState *env, * device it finds in the dt as serial output device. And we generate * devices in reverse order to the dt. */ - sprintf(ser1, "%s/serial@%llx", soc, - MPC8544_SERIAL1_REGS_BASE - MPC8544_CCSRBAR_BASE); - qemu_devtree_add_subnode(fdt, ser1); - qemu_devtree_setprop_string(fdt, ser1, "device_type", "serial"); - qemu_devtree_setprop_string(fdt, ser1, "compatible", "ns16550"); - qemu_devtree_setprop_cell2(fdt, ser1, "reg", MPC8544_SERIAL1_REGS_BASE - - MPC8544_CCSRBAR_BASE, 0x100); - qemu_devtree_setprop_cell(fdt, ser1, "cell-index", 1); - qemu_devtree_setprop_cell(fdt, ser1, "clock-frequency", 0); - qemu_devtree_setprop_cell4(fdt, ser1, "interrupts", 42, 2, 0, 0); - qemu_devtree_setprop_phandle(fdt, ser1, "interrupt-parent", mpic); - qemu_devtree_setprop_string(fdt, "/aliases", "serial1", ser1); - - sprintf(ser0, "%s/serial@%llx", soc, - MPC8544_SERIAL0_REGS_BASE - MPC8544_CCSRBAR_BASE); - qemu_devtree_add_subnode(fdt, ser0); - qemu_devtree_setprop_string(fdt, ser0, "device_type", "serial"); - qemu_devtree_setprop_string(fdt, ser0, "compatible", "ns16550"); - qemu_devtree_setprop_cell2(fdt, ser0, "reg", MPC8544_SERIAL0_REGS_BASE - - MPC8544_CCSRBAR_BASE, 0x100); - qemu_devtree_setprop_cell(fdt, ser0, "cell-index", 0); - qemu_devtree_setprop_cell(fdt, ser0, "clock-frequency", 0); - qemu_devtree_setprop_cell4(fdt, ser0, "interrupts", 42, 2, 0, 0); - qemu_devtree_setprop_phandle(fdt, ser0, "interrupt-parent", mpic); - qemu_devtree_setprop_string(fdt, "/aliases", "serial0", ser0); - qemu_devtree_setprop_string(fdt, "/chosen", "linux,stdout-path", ser0); + dt_serial_create(fdt, MPC8544_SERIAL1_REGS_BASE - MPC8544_CCSRBAR_BASE, + soc, mpic, "serial1", 1, false); + dt_serial_create(fdt, MPC8544_SERIAL0_REGS_BASE - MPC8544_CCSRBAR_BASE, + soc, mpic, "serial0", 0, true); sprintf(gutil, "%s/global-utilities@%llx", soc, MPC8544_UTIL_BASE - MPC8544_CCSRBAR_BASE);