From patchwork Wed Apr 5 12:41:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?C=C3=A9dric_Le_Goater?= X-Patchwork-Id: 747282 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 3vymDS55PCz9s89 for ; Wed, 5 Apr 2017 23:00:56 +1000 (AEST) Received: from localhost ([::1]:40436 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cvkYQ-0005zN-9C for incoming@patchwork.ozlabs.org; Wed, 05 Apr 2017 09:00:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42509) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cvkII-0001Hv-9U for qemu-devel@nongnu.org; Wed, 05 Apr 2017 08:44:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cvkIE-0001hx-Co for qemu-devel@nongnu.org; Wed, 05 Apr 2017 08:44:14 -0400 Received: from 9.mo177.mail-out.ovh.net ([46.105.72.238]:52592) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cvkIE-0001hg-3h for qemu-devel@nongnu.org; Wed, 05 Apr 2017 08:44:10 -0400 Received: from player688.ha.ovh.net (b6.ovh.net [213.186.33.56]) by mo177.mail-out.ovh.net (Postfix) with ESMTP id 0F9C949B6D for ; Wed, 5 Apr 2017 14:44:09 +0200 (CEST) Received: from zorba.kaod.org.com (LFbn-1-10647-27.w90-89.abo.wanadoo.fr [90.89.233.27]) (Authenticated sender: clg@kaod.org) by player688.ha.ovh.net (Postfix) with ESMTPSA id D6FF520080; Wed, 5 Apr 2017 14:44:01 +0200 (CEST) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: David Gibson Date: Wed, 5 Apr 2017 14:41:46 +0200 Message-Id: <1491396106-26376-22-git-send-email-clg@kaod.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1491396106-26376-1-git-send-email-clg@kaod.org> References: <1491396106-26376-1-git-send-email-clg@kaod.org> MIME-Version: 1.0 X-Ovh-Tracer-Id: 16616312300410932198 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeeliedrtddvgdehhecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 46.105.72.238 Subject: [Qemu-devel] [PATCH 21/21] ppc/pnv: Create a default PCI layout X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Michael S. Tsirkin" , qemu-devel@nongnu.org, qemu-ppc@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Marcel Apfelbaum Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Benjamin Herrenschmidt This creates a legacy PCIe->PCI bridge under the PHB by default to which a bunch of standard devices are attached. Currently: - VGA (as specified by -vga) - USB (with keyboard and mouse if graphcis is enabled) - AHCI - e1000 This gives us something close to a standard OpenPower platform. Signed-off-by: Benjamin Herrenschmidt [clg: updated for qemu-2.9 reworked pnv_create_pci_legacy_bridge() ] Signed-off-by: Cédric Le Goater Reviewed-by: David Gibson --- hw/ppc/pnv.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 111 insertions(+) diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index db6e078edcea..766e6cf4bc12 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -48,6 +48,10 @@ #include "hw/pci/pci_bridge.h" #include "hw/pci/msi.h" #include "hw/pci-host/pnv_phb3.h" +#include "hw/usb.h" +#include "hw/ide/pci.h" +#include "hw/ide/ahci.h" +#include "net/net.h" #include @@ -573,6 +577,87 @@ static ISABus *pnv_isa_create(PnvChip *chip) return isa_bus; } + +/* Returns whether we want to use VGA or not */ +static int pnv_vga_init(PCIBus *pci_bus) +{ + switch (vga_interface_type) { + case VGA_NONE: + return false; + case VGA_DEVICE: + return true; + case VGA_STD: + case VGA_VIRTIO: + return pci_vga_init(pci_bus) != NULL; + default: + fprintf(stderr, "This vga model is not supported," + "currently it only supports -vga std\n"); + exit(0); + } +} + +static void pnv_nic_init(PCIBus *pci_bus) +{ + int i; + + for (i = 0; i < nb_nics; i++) { + NICInfo *nd = &nd_table[i]; + DeviceState *dev; + PCIDevice *pdev; + Error *err = NULL; + + pdev = pci_create(pci_bus, -1, "e1000"); + dev = &pdev->qdev; + qdev_set_nic_properties(dev, nd); + object_property_set_bool(OBJECT(dev), true, "realized", &err); + if (err) { + error_report_err(err); + object_unparent(OBJECT(dev)); + exit(1); + } + } +} + +#define MAX_SATA_PORTS 6 + +static void pnv_storage_init(PCIBus *pci_bus) +{ + DriveInfo *hd[MAX_SATA_PORTS]; + PCIDevice *ahci; + + /* Add an AHCI device. We use an ICH9 since that's all we have + * at hand for PCI AHCI but it shouldn't really matter + */ + ahci = pci_create_simple(pci_bus, -1, "ich9-ahci"); + g_assert(MAX_SATA_PORTS == ICH_AHCI(ahci)->ahci.ports); + ide_drive_get(hd, ICH_AHCI(ahci)->ahci.ports); + ahci_ide_create_devs(ahci, hd); +} + +static PCIBus *pnv_create_pci_legacy_bridge(PnvPhb3State *phb, + uint8_t chassis_nr) +{ + PCIDevice *dev; + PCIHostState *pcih = PCI_HOST_BRIDGE(phb); + PCIDevice *pdev; + PCIBus *parent; + + /* Add root complex */ + pdev = pci_create_multifunction(pcih->bus, 0, false, TYPE_PNV_PHB3_RC); + qdev_prop_set_uint8(&pdev->qdev, "chassis", phb->chip_id * 4 + phb->phb_id); + qdev_prop_set_uint16(&pdev->qdev, "slot", 1); + qdev_init_nofail(&pdev->qdev); + + /* Setup bus for that chip */ + parent = pci_bridge_get_sec_bus(PCI_BRIDGE(pdev)); + + dev = pci_create_multifunction(parent, 0, false, "pci-bridge"); + qdev_prop_set_uint8(&dev->qdev, "chassis_nr", chassis_nr); + dev->qdev.id = "pci"; + qdev_init_nofail(&dev->qdev); + return pci_bridge_get_sec_bus(PCI_BRIDGE(dev)); +} + static void ppc_powernv_init(MachineState *machine) { PnvMachineState *pnv = POWERNV_MACHINE(machine); @@ -581,6 +666,8 @@ static void ppc_powernv_init(MachineState *machine) long fw_size; int i; char *chip_typename; + PCIBus *pbus; + bool has_gfx = false; /* allocate RAM */ if (machine->ram_size < (1 * G_BYTE)) { @@ -682,6 +769,30 @@ static void ppc_powernv_init(MachineState *machine) * host to powerdown */ pnv->powerdown_notifier.notify = pnv_powerdown_notify; qemu_register_powerdown_notifier(&pnv->powerdown_notifier); + + /* Add a PCI switch */ + pbus = pnv_create_pci_legacy_bridge(pnv->chips[0]->phbs[0], 128); + + /* Graphics & USB */ + if (pnv_vga_init(pbus)) { + has_gfx = true; + machine->usb |= defaults_enabled() && !machine->usb_disabled; + } + if (machine->usb) { + pci_create_simple(pbus, -1, "nec-usb-xhci"); + if (has_gfx) { + USBBus *usb_bus = usb_bus_find(-1); + + usb_create_simple(usb_bus, "usb-kbd"); + usb_create_simple(usb_bus, "usb-mouse"); + } + } + + /* Add NIC */ + pnv_nic_init(pbus); + + /* Add storage */ + pnv_storage_init(pbus); } /*