From nobody Wed Nov 5 12:19:25 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=wdc.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1534437800091237.22634130704284; Thu, 16 Aug 2018 09:43:20 -0700 (PDT) Received: from localhost ([::1]:56939 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fqLMk-00049J-Pm for importer@patchew.org; Thu, 16 Aug 2018 12:43:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51800) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fqKt1-0000iT-H5 for qemu-devel@nongnu.org; Thu, 16 Aug 2018 12:12:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fqKsy-0000oH-DT for qemu-devel@nongnu.org; Thu, 16 Aug 2018 12:12:35 -0400 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:53390) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fqKsv-0000mK-Er for qemu-devel@nongnu.org; Thu, 16 Aug 2018 12:12:30 -0400 Received: from mail-sn1nam02lp0017.outbound.protection.outlook.com (HELO NAM02-SN1-obe.outbound.protection.outlook.com) ([216.32.180.17]) by ob1.hgst.iphmx.com with ESMTP; 17 Aug 2018 00:12:27 +0800 Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by CY4PR04MB0392.namprd04.prod.outlook.com (2603:10b6:903:b1::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1059.19; Thu, 16 Aug 2018 16:12:25 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1534435949; x=1565971949; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=uotw06D02O5TpO8kxF2++uOoZ7lSnOcWy6LfkCJHnEI=; b=I2OUSzYaab4fhYvogkgICvTTozvMR2sB8fpvfib3WsmOI8e9DKvh8nug /2KAPIemwb17N5QwKNBb1ZrC9MNXsEW9tN1Yz1sxmHIYT0OILGPkt2JpE OjTpTb4OrkHqQq5ox/IHl+JAmiAuf5lVkxegich1kLBGTxAFutYIX3+H4 mUqLYU27aOsibw6+fNntWBgn82BtRk9hJjUdSK0gywaMbfKCuZuLnjpkV K/TiycZEKkhLCCGDEpuJ0ywZ5KDwbQJNCafNTRKnrTeNqSsjRfWwHVTU1 f7vUVVmL1m0aiJRB0UzLP1L+0cfwochaWFbVEbmYZkhI8nQwlnGDb+qNQ w==; X-IronPort-AV: E=Sophos;i="5.53,247,1531756800"; d="scan'208";a="191720766" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector1-wdc-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=VBEQ8/iUIcck+37h8K0tbRD10lAIVsuH5MxbskUvRtA=; b=Vyq2esHDNSx5PqD4ysmCF21eVXhvKKNSEcu0BDC2lHEqF80OxfPJRZ0DVOfPucH9czj1HaKlk+T1YYIYRf0oh4GiLl6bUJiDwCeIkaikc85IZT90XOD4VIb/JVao1MsgfRn/0LqEz0fLLfWTzF67r9BQ6+/NOW1Lee8KCs3n5ME= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; From: Alistair Francis To: qemu-devel@nongnu.org, mjc@sifive.com Date: Thu, 16 Aug 2018 09:12:17 -0700 Message-Id: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [199.255.44.171] X-ClientProxiedBy: BYAPR07CA0022.namprd07.prod.outlook.com (2603:10b6:a02:bc::35) To CY4PR04MB0392.namprd04.prod.outlook.com (2603:10b6:903:b1::17) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 872edeb9-22f1-4a0d-9654-08d603930e7c X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:CY4PR04MB0392; X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0392; 3:/usT1n4+RYukNAoMZLCaWRJimBv20F57St4oF9I8Rpu/pLOPxtcuSdyy9LZkmk2/GU+bGZ73TTHsIbE2jUzOHa4o7yVAPkzcFtF3udl8aB9W6agNnKEnY55TIFs7dxKVFPMFyZQyOpzUREnDUw5ckbzGKRpD/1W7MPaIRcLHT7rEB+I5YuOXsKbvTkwG0KJMNVjwvHLaLc75CGhmtTDoC+G6oHX3/TCr+P3wz7hhXJ0ysHv2ztbn2F0PUpxJELqX; 25:fE1j2Vfh4c9dJLSaNPs5MLeuaOQvbjEKs7tol5+0OQstoY6xNwTuKFl+ToSseIcp+6+QMPx69+pnjk/YY2BzGUuVKP4nUC26cOUeaQcehz9wEXDS85P0OjoIWg/du+mlCJxhZrf5VyaeP7QUlqzXUXHyLSoyIiBNaE4U/Ozy9tTa8yTAJk48gXitii10iZ3tuo6H7nFmXesQiO7x5PdjXuCq2TIoZN5+valT27LBA/pZTVRliwqUP67n9uOpGKKKvGKxc2XPTSf+DmoZLgLi7H7ReMwTz+s6DarUJCyJWyuH/VK0ASTqDmS/QR/Th0c2GeQRdoayccvrdb/FqIndpQ==; 31:Mx8NJRsK6fqcB36tFKeynpvdZ0D1Xw+k7CJcN7znQvSohG2g7nRCEGHZEwTLxahE52oQz/S5qg5onSwXlUisjWWnytrAYxJH3bci3RCK/n6zAG49Qw0Uw+IExQYL19ZGlLz4nLKuHG55a24zRuwSaMQp9yjoFfL/rYp6yDGpjDpsn8UvmIdqnDjRSZlmkbgvH9Xz2sPN6erJNVMvLP0JllUSY3/1A143PMcUbCPToWA= X-MS-TrafficTypeDiagnostic: CY4PR04MB0392: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0392; 20:XTf62HsNY+mnmUdiSG4WLWGbLG8khfwnD6KFdSUjpJdkd/r7Zk3SUmNswEClAMMLsBYhy8lqIgQGnjDlMoIQw23VbTTZdnRvg1XGeAAEFEW1PngkaIiqesl4+3/lN9j+AKhDRsdIFrxAK5qhCsay0r2MQL5qsvlhvXCkb+8DB2K+IDKGLSLzWCAJge1HOQ8HSKPFU/UEt6SGb989OkQoOAplrWhhSvzWi6pmHZNJ1WZ/vyVhNvw3I9sw7xxYWd8THYj+EQBHn8hz6y3rbEUYY0lRWURuYSumtf7B3BlOUkZTbIp3QQpp5/1IvaMB7U0THBc3VtwtHYKZBWVwQovFWh3OLbQHNYDT6xeOXhVQL7oJmR3jYPAEds+zlBwzrNpX7KgTNfDfw1jPXiS1kDV9SPjkROfdLJrnDpxEsv3hMUS1+upCyPAJtKHWcHMm4dWGXt57f2wi/mKXqcMoMRpPo7OzQfYOesvCh72jIwx+JrDB0xRYLWmWT0z7Ur7pb66G; 4:UgkAk2TvNRUEMJXdXd8TbhlbepE6vGed+KDcyX1B0iQ27hsMz4yXkuhfLh1BdJycXSoORuEWGQhSd3PJodRt5Ns7QQj/mrHGxQMyNgdOWmrw+RH7eh+waGfj8HP09rjZGwOz6wVMy59lByW0dKNTUGE6ae2q2UQ0XAEy8XcfToKHKh89Lty1KIb2L/o6/Jzpzpgx6grWtcUbYNvCICgyjYlARE+FLfxzleulW8QOEDemwaDwi1kNvbsfm7kFpXrAaMVDaQT4xOCAhXT0DfwCmFUkf2MZpkJNiVyHOC6RJBoiMuhTIFHT4ll9DTtDfcww X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(21532816269658); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231311)(944501410)(52105095)(93006095)(93001095)(10201501046)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(201708071742011)(7699016); SRVR:CY4PR04MB0392; BCL:0; PCL:0; RULEID:; SRVR:CY4PR04MB0392; X-Forefront-PRVS: 07665BE9D1 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39860400002)(376002)(136003)(346002)(366004)(396003)(199004)(189003)(6512007)(476003)(25786009)(106356001)(4326008)(105586002)(86362001)(36756003)(76176011)(52116002)(11346002)(51416003)(6116002)(53936002)(16586007)(50466002)(6486002)(3846002)(2616005)(48376002)(956004)(486006)(8936002)(16526019)(386003)(316002)(26005)(186003)(81166006)(305945005)(8676002)(2906002)(81156014)(7736002)(39060400002)(68736007)(118296001)(446003)(14444005)(50226002)(5660300001)(6506007)(72206003)(97736004)(47776003)(478600001)(66066001)(44832011)(6666003); DIR:OUT; SFP:1102; SCL:1; SRVR:CY4PR04MB0392; H:risc6-mainframe.int.fusionio.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR04MB0392; 23:u0k8rVj0o2qw6afFoKUWma9OBfWPjg1KjMAs3KT9v?= =?us-ascii?Q?IYxizobfvHkkzyMHUNwodlWe/vUP3419x/z10i6tPL7DygmbMBlvf6PyMfxr?= =?us-ascii?Q?f3HLFXpIsVutqnASEBEeNMVlwef0q8L81mnfd1RtoQVp556Oxl1yGPMJCho5?= =?us-ascii?Q?Ai8n4maP4I8IqqmhGakXoZpga82H9SVfIuXQhVxH2M1+8KO/xwYTF2Tn7M27?= =?us-ascii?Q?PEUtvwQSL7dqAUzrn4WbvT8fYH8TSw1Jy7nrZobEZ5DO+njMv79+U+0zI86I?= =?us-ascii?Q?cFRINMYnwBXFGYE2UFJIHYVJA1vpdOysqO14L6RVVGhOAEe/yDP/+qVGTXBc?= =?us-ascii?Q?xMmtMKWz7CBDDe7bK5pPGAsOGeXMeYPGUfHWBYjbfxsCAvcMhwPYEqpwk8aP?= =?us-ascii?Q?/EoAcla6IkdHbip0yjkE5cm9+iA3B2lFPgQ7lDQzfwgUE0e/lEz3+qvHcRJt?= =?us-ascii?Q?SISG1MUPbrCrCX9eRuSlhdRXPHXzXi9FDSPQYC7y2WgNBWrRirHFBPUZ/4bu?= =?us-ascii?Q?C7UvBbJxI+wtf8dO9kBsLZ5Eqt4mPFp3XsG0L8oEjRtah8G4mGc9/QqR37w2?= =?us-ascii?Q?fSgiD+GsL0AqmKTmCg2N+PdV5KPUinCTImPsylegy0uy2tK6lDTasLzQiJkh?= =?us-ascii?Q?KXlVEttkaq7RXMew30DBy+PClr2RiS7pvezx+/MPLE/oJ0yQ3e+wQwFX1/5e?= =?us-ascii?Q?e2VZ+6tcbcLO1YH4LAn5iiPiKkjBwWszpYoeeDTzFZTHvNUWTo9JMpboZJmN?= =?us-ascii?Q?uswBlJ482gP5D4wSSlnFtPihQCVh1vlAHZDUZ8YOAFkMQjqtSKMU/LEKV9FU?= =?us-ascii?Q?Er6CwcevO1SHWBRlIQw9i92uF/+MXzAX/ETvpDACB6MGEY1qykbX1EMrkg1b?= =?us-ascii?Q?maKhRBEV5RW3OS7WV7coLdktqjyAH2J+OvqThcukuwjEE1BZCdeWgxzJrY5a?= =?us-ascii?Q?9z1obe4o//DyrmHKT5PGNIzX3lLmjdzlGppJf8Hm+jYy8qKu2WxEnHf1Jw03?= =?us-ascii?Q?E4COFVZPt3FQlMSesyB27jvrpodcLm5qK+1iv50FQolh44w+lWcjkJ90IM/h?= =?us-ascii?Q?n0+0mSobqUN7jlNpFgL6eZWr+Y66T93+dQHCL73miQCcw7PkzexKNBnQxNSI?= =?us-ascii?Q?1dPfSg3YE51zsBCnwO1VdiO4afJhH+ia4+ct9tBGJHkQqimFmW/XH3HYJNMD?= =?us-ascii?Q?Y5popm+hLwdps1Zuc1rdDsg+BEe2ZnxhVqXfmqz7pk+xgYh8e3ay1FZJFBgi?= =?us-ascii?Q?OX77YbGENul9ZaNatA=3D?= X-Microsoft-Antispam-Message-Info: jYqCqMGCNwmB8iPd3G4I8LGoqCRi/lMtiHLfBFdFLrX/2EyXPAk5iysLQ1zupBOVnxnqScg8VPDphD724KU7R7oKn2lGtyv2wMBFYW1eyKTb+xmUfae0L9UYnjpzKnjQlWbVhaev/WBqyUz2qCUFRyZ0vq5pbUY5quuhk91pHXPdZbDeKlDHl36HCPPHH+lATfUynTRe/qDmVTaU93K3geJ0rLCGngMXTMFzFdqot3Q6//ZIie+BKDE05/lxXygK2rK4GLQLJfFl8uyAcLp4HrwDeEbjtmyynenhkp2bhMb1MiQdklBbDxNYl/LBWBmlTjiyUNwCZVapolWnhKzQaTAoUch6+nRPFu1YBiGeMUc= X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0392; 6:QGkR+hsXSVgOg8tO18v3lYUFSGCJi6aQ3yR2mLE0qKLsLgsPV9YcMaYpOFLP1NCoMPd02UWTCn2gs8tYra6LYeq3AD+uaIXpqQsaqaQhnZhotsgJchXCZwpt7ZYVP7rFxLqi9PiPQVCdz8lN3cyL/UId2enevXDeHuzyq9QjaN/Lu4fOdoSskMGrx+Dpv1ZxzGWxoxG/S3wPGe0iuZHxG1/6qP95Pj8fkXnf7f1VtfmwEnirVx3rbrTy3NLpgqLq6nWBrxvsn/Rjjodhglb0tuIlAXfdWpdfJf/dqE/N2vdqqp6A6QJqV820Bq3rQOdKM1GY/PFL5OiymTsQrGZYrtUebtV7Mh5Boz+mHCnY3OUvQVNucG+6qxYum84Ey4UaFPPIQd23NiSfSiwVz0Ln9OsKzhTzTXzL28xgXPvXXMry7WmECohi/8A9k4x77SAgcKBtPc/HpRFNTxkkNyUQ3g==; 5:hyxaEKYd9bfqYs3s7QpfrB3fkJGOY0cwO1doGGoUKDGQ+x59/z5Ak70ei626D0bygdpHm9WMq91RpQc9DAGwpUGY3rhNDMh/9B7hQPuTSqwzRqaqKXQQJvLaE7qw8LCvOWEKBR1AnW7QUqDAMtjRrPT34LeMP1HKtt0waC++jew=; 7:CfHqT8jOZjbCLUzV8TxdCFb7diXS26Af8tO/KB5I57jaFIzM27lFns0tZQYfhZEqbEhEADjyxlJRi2oFQWyVJTxOxhWqH1ZoOIiMVnhVTvM6V/9do8kaYZECGgaKJc8eGmDxEd83Abex5O70QiR/gU4dw+Z6ZJhZxsIxSr0X0wfNSFoOrGFmThKaksM5PO70q3Evv13vG8gP++i+w3B9YvQkmjiMfC4+46vyDxu3gczpbLS3cVQ8vQN4mtqZ9oEB SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Aug 2018 16:12:25.5634 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 872edeb9-22f1-4a0d-9654-08d603930e7c X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR04MB0392 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 68.232.141.245 Subject: [Qemu-devel] [PATCH v3 4/6] hw/riscv/virt: Connect a VGA PCIe device 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: alistair23@gmail.com, alistair.francis@wdc.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (found 2 invalid signatures) X-ZohoMail: RDMRC_1 RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Signed-off-by: Alistair Francis --- default-configs/riscv32-softmmu.mak | 3 +++ default-configs/riscv64-softmmu.mak | 3 +++ hw/riscv/virt.c | 7 ++++++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-= softmmu.mak index 2c943e2669..fcefa68f1e 100644 --- a/default-configs/riscv32-softmmu.mak +++ b/default-configs/riscv32-softmmu.mak @@ -8,3 +8,6 @@ CONFIG_CADENCE=3Dy =20 CONFIG_PCI=3Dy CONFIG_PCI_GENERIC=3Dy + +CONFIG_VGA=3Dy +CONFIG_VGA_PCI=3Dy diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/riscv64-= softmmu.mak index 2c943e2669..fcefa68f1e 100644 --- a/default-configs/riscv64-softmmu.mak +++ b/default-configs/riscv64-softmmu.mak @@ -8,3 +8,6 @@ CONFIG_CADENCE=3Dy =20 CONFIG_PCI=3Dy CONFIG_PCI_GENERIC=3Dy + +CONFIG_VGA=3Dy +CONFIG_VGA_PCI=3Dy diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 9bdeea38f2..02652e44ee 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -322,6 +322,8 @@ static void riscv_virt_board_init(MachineState *machine) MemoryRegion *system_memory =3D get_system_memory(); MemoryRegion *main_mem =3D g_new(MemoryRegion, 1); MemoryRegion *mask_rom =3D g_new(MemoryRegion, 1); + PCIBus *pci_bus; + DeviceState *dev; char *plic_hart_config; size_t plic_hart_config_len; int i; @@ -436,9 +438,12 @@ static void riscv_virt_board_init(MachineState *machin= e) qdev_get_gpio_in(DEVICE(s->plic), VIRTIO_IRQ + i)); } =20 - gpex_pcie_init(system_memory, 0, memmap[VIRT_PCIE].base, + dev =3D gpex_pcie_init(system_memory, 0, memmap[VIRT_PCIE].base, memmap[VIRT_PCIE].size, 0x40000000, 0x20000000, qdev_get_gpio_in(DEVICE(s->plic), PCIE_IRQ), tr= ue); + pci_bus =3D PCI_HOST_BRIDGE(dev)->bus; + + pci_vga_init(pci_bus); =20 serial_mm_init(system_memory, memmap[VIRT_UART0].base, 0, qdev_get_gpio_in(DEVICE(s->plic), UART0_IRQ), 399193, --=20 2.17.1