From patchwork Mon Jun 16 12:55:40 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 360128 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id B5D171400D3 for ; Mon, 16 Jun 2014 22:56:50 +1000 (EST) Received: from localhost ([::1]:43740 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwWSu-0004AS-Oi for incoming@patchwork.ozlabs.org; Mon, 16 Jun 2014 08:56:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47268) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwWSS-0003dD-MN for qemu-devel@nongnu.org; Mon, 16 Jun 2014 08:56:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WwWSN-0002IZ-3a for qemu-devel@nongnu.org; Mon, 16 Jun 2014 08:56:20 -0400 Received: from mail-oa0-x231.google.com ([2607:f8b0:4003:c02::231]:63205) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwWSM-0002IM-TV for qemu-devel@nongnu.org; Mon, 16 Jun 2014 08:56:15 -0400 Received: by mail-oa0-f49.google.com with SMTP id i7so5679301oag.36 for ; Mon, 16 Jun 2014 05:56:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=JSqXGF7sQ5bwKwpx4gLyAadsnUa+uhYI1nWxDwWLuBM=; b=DDf+kEvKi4bkE1+RvZ0NrzHmqlDpL/Cyn1crPoqMCEprioDHSuAmZD9vgwqEcDmfA9 XQTLt+IQ/bDEL/m34SaDYkTgSUXeo6LfN4501OOn0ZX1ZKrBOTVkRVkg0o6W9gaM3orl hL4XpJ3eKK06KrFoysb1KXI+DICVhZ5G6yvKZDhGfMtJeEeql2MRb/n7BNGL+ZTZ1Tif xa4O7ywJWZy73gjGDA4Yf4dASXbd3VrrwF0W4SwmXw0eWglWmRmgTPZZqE/ZxyDG7s5r LfS/qk82ePhD+LlIPOAppX0Fdfz51ALmvvHVNzNPBV/M8JUtLn6ArZOyRirXdC58r+8w NMMg== X-Received: by 10.60.55.169 with SMTP id t9mr1872150oep.84.1402923374245; Mon, 16 Jun 2014 05:56:14 -0700 (PDT) Received: from localhost.localdomain (66-90-144-10.dyn.grandenetworks.net. [66.90.144.10]) by mx.google.com with ESMTPSA id ub1sm50381478oeb.9.2014.06.16.05.56.13 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 16 Jun 2014 05:56:13 -0700 (PDT) From: Rob Herring To: Claudio Fontana , Peter Maydell Date: Mon, 16 Jun 2014 07:55:40 -0500 Message-Id: <1402923340-4950-2-git-send-email-robherring2@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1402923340-4950-1-git-send-email-robherring2@gmail.com> References: <1402923340-4950-1-git-send-email-robherring2@gmail.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:4003:c02::231 Cc: Rob Herring , qemu-devel@nongnu.org Subject: [Qemu-devel] [RFC PATCH 2/2] hw/arm/virt: Add generic PCI host device 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 From: Rob Herring Enable the generic PCI host on ARM virt platform. TODO: The memory regions aliases are hard coded in the host ATM. These probably need to become QOM properties. Signed-off-by: Rob Herring --- hw/arm/virt.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index ea4f02d..951f012 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -37,6 +37,7 @@ #include "sysemu/sysemu.h" #include "sysemu/kvm.h" #include "hw/boards.h" +#include "hw/pci/pci.h" #include "exec/address-spaces.h" #include "qemu/bitops.h" #include "qemu/error-report.h" @@ -65,6 +66,7 @@ enum { VIRT_GIC_CPU, VIRT_UART, VIRT_MMIO, + VIRT_PCI_CFG, }; typedef struct MemMapEntry { @@ -104,6 +106,7 @@ static const MemMapEntry a15memmap[] = { [VIRT_MMIO] = { 0xa000000, 0x200 }, /* ...repeating for a total of NUM_VIRTIO_TRANSPORTS, each of that size */ /* 0x10000000 .. 0x40000000 reserved for PCI */ + [VIRT_PCI_CFG] = { 0x10000000, 0x01000000 }, [VIRT_MEM] = { 0x40000000, 30ULL * 1024 * 1024 * 1024 }, }; @@ -340,6 +343,58 @@ static void create_uart(const VirtBoardInfo *vbi, qemu_irq *pic) g_free(nodename); } +static void create_pci_host(const VirtBoardInfo *vbi, qemu_irq *pic) +{ + PCIBus *pci_bus; + DeviceState *dev; + SysBusDevice *busdev; + uint32_t gic_phandle; + char *nodename; + hwaddr base = vbi->memmap[VIRT_PCI_CFG].base; + hwaddr size = vbi->memmap[VIRT_PCI_CFG].size; + + nodename = g_strdup_printf("/pci@%" PRIx64, base); + qemu_fdt_add_subnode(vbi->fdt, nodename); + qemu_fdt_setprop_string(vbi->fdt, nodename, "compatible", + "pci-host-cam-generic"); + qemu_fdt_setprop_string(vbi->fdt, nodename, "device_type", "pci"); + qemu_fdt_setprop_cell(vbi->fdt, nodename, "#address-cells", 0x3); + qemu_fdt_setprop_cell(vbi->fdt, nodename, "#size-cells", 0x2); + qemu_fdt_setprop_cell(vbi->fdt, nodename, "#interrupt-cells", 0x1); + + qemu_fdt_setprop_sized_cells(vbi->fdt, nodename, "reg", 2, base, 2, size); + + qemu_fdt_setprop_sized_cells(vbi->fdt, nodename, "ranges", + 1, 0x01000000, 2, 0x00000000, 2, 0x11000000, 2, 0x00010000, + 1, 0x02000000, 2, 0x12000000, 2, 0x12000000, 2, 0x2e000000); + + gic_phandle = qemu_fdt_get_phandle(vbi->fdt, "/intc"); + qemu_fdt_setprop_sized_cells(vbi->fdt, nodename, "interrupt-map-mask", + 1, 0xf800, 1, 0x0, 1, 0x0, 1, 0x7); + qemu_fdt_setprop_sized_cells(vbi->fdt, nodename, "interrupt-map", + 1, 0x0000, 2, 0x00000000, 1, 0x1, 1, gic_phandle, 1, 0, 1, 0x4, 1, 0x1, + 1, 0x0800, 2, 0x00000000, 1, 0x1, 1, gic_phandle, 1, 0, 1, 0x5, 1, 0x1, + 1, 0x1000, 2, 0x00000000, 1, 0x1, 1, gic_phandle, 1, 0, 1, 0x6, 1, 0x1, + 1, 0x1800, 2, 0x00000000, 1, 0x1, 1, gic_phandle, 1, 0, 1, 0x7, 1, 0x1); + + dev = qdev_create(NULL, "generic_pci"); + busdev = SYS_BUS_DEVICE(dev); + qdev_init_nofail(dev); + sysbus_mmio_map(busdev, 0, base); /* PCI config */ + sysbus_mmio_map(busdev, 1, 0x11000000); /* PCI I/O */ + sysbus_mmio_map(busdev, 2, 0x12000000); /* PCI memory window */ + sysbus_connect_irq(busdev, 0, pic[4]); + sysbus_connect_irq(busdev, 1, pic[5]); + sysbus_connect_irq(busdev, 2, pic[6]); + sysbus_connect_irq(busdev, 3, pic[7]); + + pci_bus = (PCIBus *)qdev_get_child_bus(dev, "pci"); + pci_create_simple(pci_bus, -1, "pci-ohci"); + pci_create_simple(pci_bus, -1, "lsi53c895a"); + + g_free(nodename); +} + static void create_virtio_devices(const VirtBoardInfo *vbi, qemu_irq *pic) { int i; @@ -455,6 +510,8 @@ static void machvirt_init(QEMUMachineInitArgs *args) create_uart(vbi, pic); + create_pci_host(vbi, pic); + /* Create mmio transports, so the user can create virtio backends * (which will be automatically plugged in to the transports). If * no backend is created the transport will just sit harmlessly idle.