From patchwork Thu Sep 12 10:17:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 20001 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f200.google.com (mail-ve0-f200.google.com [209.85.128.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 80A0225B63 for ; Thu, 12 Sep 2013 10:18:02 +0000 (UTC) Received: by mail-ve0-f200.google.com with SMTP id oy12sf10884059veb.11 for ; Thu, 12 Sep 2013 03:18:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=LpNq2d3BSRD408upKsWAzl/tc7rmSAlsNOA64p9VXXg=; b=I/lDvbFyQ/MZstofGbbbQfu6TAdmFigdGTEtldAiqVAXJN2kiC8ZVOPGLw0KwVjG7Y pwo8/LmOZ1KpyPQgBulzt8PFvoXS8PB6i+JK5jPsL63IOpxE7ifhNnDR177pRAB1ziur aIf1u47SW5G1n7l/1XbmctDiAviUf/nTk2PXWJ3oIVjD49SpVTh7EJl55VOy4nbz5pzf CxTPKf4ufa4PgdzTixY0wUR+qUzVs/+uRTwkZMJOk2bRY1XuUjUPWLQAlkuvw16bpO5R 5kwgwQecYLQbpt5vB5ExWwBBl4RK3QgKXi950LIJZJPvCEBgNXH5gY5L1DBWwDHEEu1C aIPQ== X-Gm-Message-State: ALoCoQkvbmRWvIYIsDauw+bV659Q1w4oLE8ms9KBR333BFgg5hAO+Z3P9bvejbbQzosGrof760YW X-Received: by 10.236.93.45 with SMTP id k33mr2618878yhf.19.1378981082213; Thu, 12 Sep 2013 03:18:02 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.70.161 with SMTP id n1ls672542qeu.27.gmail; Thu, 12 Sep 2013 03:18:02 -0700 (PDT) X-Received: by 10.59.8.232 with SMTP id dn8mr5923672ved.8.1378981081987; Thu, 12 Sep 2013 03:18:01 -0700 (PDT) Received: from mail-vb0-f42.google.com (mail-vb0-f42.google.com [209.85.212.42]) by mx.google.com with ESMTPS id t10si953379vcr.110.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 12 Sep 2013 03:18:01 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.42 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.42; Received: by mail-vb0-f42.google.com with SMTP id e12so7347171vbg.1 for ; Thu, 12 Sep 2013 03:18:01 -0700 (PDT) X-Received: by 10.52.24.4 with SMTP id q4mr240094vdf.34.1378981081876; Thu, 12 Sep 2013 03:18:01 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp11662vcz; Thu, 12 Sep 2013 03:18:01 -0700 (PDT) X-Received: by 10.68.253.161 with SMTP id ab1mr6771738pbd.76.1378981079972; Thu, 12 Sep 2013 03:17:59 -0700 (PDT) Received: from mnementh.archaic.org.uk (1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id jx3si2363427pbc.294.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 12 Sep 2013 03:17:59 -0700 (PDT) Received-SPF: neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) client-ip=2001:8b0:1d0::1; Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1VK3yD-0002ba-U6; Thu, 12 Sep 2013 11:17:53 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: kvmarm@lists.cs.columbia.edu, patches@linaro.org, Alexander Graf , "Mian M. Hamayun" Subject: [PATCH v7 0/3] hw/arm: Add 'virt' platform Date: Thu, 12 Sep 2013 11:17:50 +0100 Message-Id: <1378981073-9989-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.42 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This patch series adds a 'virt' platform which uses the kernel's mach-virt (fully device-tree driven) support to create a simple minimalist platform intended for use for KVM VM guests. The major change here is that I've added a PL011 UART. Sample command line: qemu-system-arm -machine type=virt -display none \ -kernel zImage \ -append 'root=/dev/vda rw console=ttyAMA0 rootwait' -cpu cortex-a15 \ -device virtio-blk-device,drive=foo \ -drive if=none,file=arm-wheezy.img,id=foo \ -m 2048 -serial stdio Note that there is no earlyprintk via the PL011 because there's no defined device tree binding for "hey, here is your earlyprintk UART". *** NOTE *** to get the PL011 to work you'll need to tweak the kernel a bit: Otherwise the kernel doesn't ever add the clock to its list, and then it refuses to probe for the PL011. (I'm told this isn't really the right fix, though, and ideally the call should be done in some generic location rather than in every machine's init function.) The alternative would be for the kernel to be fixed to follow its own device tree binding documentation and not require clocks/clock-names properties on the pl011 node. Changes from John Rigby's v3->my v4: * renamed user-facing machine to just "virt" * removed the A9 support (it can't work since the A9 has no generic timers) * added virtio-mmio transports instead of random set of 'soc' devices * instead of updating io_base as we step through adding devices, define a memory map with an array (similar to vexpress) * folded in some minor fixes from John's aarch64-support patch * rather than explicitly doing endian-swapping on FDT cells, use fdt APIs that let us just pass in host-endian values and let the fdt layer take care of the swapping * miscellaneous minor code cleanups and style fixes Changes v4->v5: * removed outdated TODO remarks from commit messages Changes v5->v6: * adjusted the memory map as per Anup's review comments (actually made the changes this time!) Changes v6->v7: * added a PL011 UART, at Alex's suggestion (and the accompanying fake clock dtb node that this requires) * added an irqmap[] in parallel with the memmap[] so that our assignment of devices to irq lines is neatly in one place * the removal of arm_pic allows us to get rid of an irritating array sized to the number of CPUs * included the "terminate dtb reservemap" patch since it's a dependency to get the kernel to boot John Rigby (1): hw/arm/boot: Allow boards to provide an fdt blob Peter Maydell (2): device_tree.c: Terminate the empty reservemap in create_device_tree() hw/arm: Add 'virt' platform device_tree.c | 4 + hw/arm/Makefile.objs | 2 +- hw/arm/boot.c | 32 ++-- hw/arm/virt.c | 419 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/hw/arm/arm.h | 7 + 5 files changed, 451 insertions(+), 13 deletions(-) create mode 100644 hw/arm/virt.c Reviewed-by: Chritoffer Dall diff --git a/arch/arm/mach-virt/virt.c b/arch/arm/mach-virt/virt.c index b184e57..2b6aceb 100644 --- a/arch/arm/mach-virt/virt.c +++ b/arch/arm/mach-virt/virt.c @@ -21,11 +21,13 @@ #include #include #include +#include #include static void __init virt_init(void) { + of_clk_init(NULL); of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); }