From nobody Tue Feb 10 23:13:32 2026 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1529696275696959.1554354905267; Fri, 22 Jun 2018 12:37:55 -0700 (PDT) Received: from localhost ([::1]:35834 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fWRsU-0005Jy-CU for importer@patchew.org; Fri, 22 Jun 2018 15:37:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44565) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fWRmM-0001eB-1e for qemu-devel@nongnu.org; Fri, 22 Jun 2018 15:31:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fWRmI-0005UL-S5 for qemu-devel@nongnu.org; Fri, 22 Jun 2018 15:31:30 -0400 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:30203) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1fWRmI-0005SZ-HW for qemu-devel@nongnu.org; Fri, 22 Jun 2018 15:31:26 -0400 Received: from mail-dm3nam05lp0118.outbound.protection.outlook.com (HELO NAM05-DM3-obe.outbound.protection.outlook.com) ([216.32.181.118]) by ob1.hgst.iphmx.com with ESMTP; 23 Jun 2018 03:31:25 +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.884.19; Fri, 22 Jun 2018 19:31:22 +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=1529695887; x=1561231887; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=fzbeNTxbBN05Ukcg/TPq/PvjzSYKd6pyzITR1l+8OL4=; b=adE7bmaUnt3MW5ze61v/U35ON88peYHWK+WSi7CReiBcuHOuFvTqdVlR XzERb3ceDpuqn9zAWHANt0dEmzm2ycLczJH4xt6cyh+H5NlbNd7cbvoXt j7a29/4sRQI7tVxq9VfSewQZM4pXKIcxQhu5h5BkPnkeXDW74PQEXrgqb tu4LvmFipBr29vOusFdVLIyJcYg+aRg3IZ1YXLeHYq3czQk2qA+f+ZZ4g mFqU7JMQ/j5r2ZlTKYgiue16kk+TJr+VKbACcD0abs+mZr3poKDq0932+ jJC0BFRki+W4whFIMsMzD+vx2YCZqnlc1xJl8BU4WaXSAgTQjiBkRloEb Q==; X-IronPort-AV: E=Sophos;i="5.51,258,1526313600"; d="scan'208";a="82510515" 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=t12K31LP1fh1ScuR5J3BZlojJy80v5J6rHAJ52Stuok=; b=BywjMkMaMOFHZ1JwXMwIDURtqHqpHs2mtzC9HJ5x/u9swatpzpZwr2WOpFut19sKz17//tA5/giWCoPqGE2S5jLK7AXwwSkF27ItZmnKw6HHQ+TDYO0dBb8uz33GvFfKyK0XjEx1YEzDDi9Qbz3YQ4cv/AO85wmjwW7M4trKSyY= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; From: Alistair Francis To: qemu-devel@nongnu.org Date: Fri, 22 Jun 2018 12:30:19 -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: CO1PR15CA0107.namprd15.prod.outlook.com (2603:10b6:101:21::27) To CY4PR04MB0392.namprd04.prod.outlook.com (2603:10b6:903:b1::17) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6012679b-8404-4ed3-f389-08d5d876bcdf X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(8989117)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600026)(711020)(48565401081)(2017052603328)(7153060)(7193020); SRVR:CY4PR04MB0392; X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0392; 3:OsxRY4iThavGn7kJPP8wxKrsSn8fF45C4AOkiqYxLvixZAnWVKrcxfz+xlUpITugFttKMfPaBQ0QedmLsBCJIE7b+Ic6GnjgNP0EgRdSeeV/mtdiRPcjDhT/R+leEwpRpvlXCqI7fHJ+DnL+K8bpJ5Is7emvNbyUENOBwPXDeEc8b3L6qieooRb78exqmvSIBorgiA9eSXN/V1oaqgFeqxVFVvdRgf6sN9+sSrto6ctfdTCT8JAfMxqfsc57vB3v; 25:w7l7Uu4oOg4xZTTo+Qyjk17qI8DfVBJHWJlK3MHT1q/5DZFKw7EQEAJe37weKsYuGineFY/K6hHhfbNlUeC2ctEYwqQw3xeXmgSyhwQT0hXgnOjSXBZ0u54wZrxtf+2GBXLlcZpF7ta7zK9P3tqhp094z7+lpM+PhcSbDMnnUYliiH4F3JqBJur+XwPvcN0g57T0/RXiDlZz6HO/9kMPcxWUdk9Zf40FJtIIJ/fwijSyCNIsOZAXrJH+NM6IFBjk62kHqkvN46GUZTSinZ8+/KGDWSPs3CgBVFIfBerdf8YxUOQELnaZPpNAcd0AUuvv9GFu+l5UaWPimBOMOgZxIQ==; 31:gO00wAPUOre2Q77BGhMYjm4/CQ+ULvv6Y9+6BvbrITNLbG1KK+bBpkyAYjM6xwx7wu2NlJD/kuzlN9DXqaXR9jPFuCAI7SfLB+/+aCx/IXlFJe7rXPEyTfBt44nAnHSo1ILEKhkTm/4GkluL1JvCcP3db4dmkmacrDoKVdey6u4xJF9h/Mj99IcWA5Tc9pH53TSjqLZlTjDxipEOLndOk/hebS1+wcfrfEu6PM18K4o= X-MS-TrafficTypeDiagnostic: CY4PR04MB0392: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0392; 20:yxAxA2AIm8LUI7nwTvv2WEe3T5R3P5Lb3buMRuqnzQ48tFPAGkvaySxsDinQ8bFmojKzCIXpRx6J86CYpxqNQLXQtXZ6CXrPBqDZ/kjJ2tIN5UXAiUhntUxsjf+D/l8m+8OdVL8eW8lyAp+CMqnkeQCYaSZsnnsj3VC/zL3WhIm4d1nZ+Q9cSn3JEA+NWV5mq3VDX/txeUWMKqKs3+tHGMgzfGBg7p2NZBaBiuJlT07hc6Vcgye5iZW/OWUO4oAmEv+LgZda1RAD42wuETAt004vfKXR4pdKcjRiV31q/RAWvITO0TfqsalOFJlGrhjebJFUunBsaxGBgmqV3YduNh4WyOgq+HFPaadqfcTMtJaWoq/OyIkqTxB1zjaD7xvmzDlk4faHatvpLtFphR920qzbhujowT0iYpAZlw5q1f09nF9LJukHUJaZ+xfcc2z3XN+PS1Vn7y1GRZtXFb6dEkc/qDtuVHuveeU8dVOsTcx7gIsAakeamp32mmB+oqFf; 4:emo3lH9JPBDOEUOYo3zr8mSxA2CRW9Hasxjnn8osDnLpsK+lpgLwkq6vr92PPVeji9CsbFlaRNa9CyyaJ7aHpuH+lQBzaow6pMkQCZRng8XoTV7weLVAtKROLnPxyBEgGSMBfIywEYznz/zGMm2hXscCdYmxQKYMT+5xK1HoEsmJqtlUYNTzv3DcxeYW5xSXdWX/IZ7GYuH6d3MawR5Yd/4l0VuRmBblSYtjngDt624o0g0SJ02PdXVtEkF3MDKNFPcbMD8i16wwIeR8NEPqoEZIgEx5Ef1+dFsgTyyTx1VhRrgABr2y2z1gy8e7GYyj 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:(6040522)(2401047)(8121501046)(5005006)(10201501046)(3002001)(93006095)(93001095)(3231254)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123564045)(20161123558120)(6072148)(201708071742011)(7699016); SRVR:CY4PR04MB0392; BCL:0; PCL:0; RULEID:; SRVR:CY4PR04MB0392; X-Forefront-PRVS: 071156160B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39380400002)(366004)(39850400004)(376002)(346002)(396003)(199004)(189003)(8936002)(476003)(6486002)(446003)(51416003)(486006)(6916009)(39060400002)(2351001)(25786009)(11346002)(3846002)(26005)(44832011)(76176011)(16526019)(186003)(5660300001)(52116002)(106356001)(8676002)(105586002)(81166006)(956004)(6116002)(59450400001)(2616005)(6506007)(81156014)(6666003)(53936002)(6512007)(4326008)(386003)(2906002)(72206003)(478600001)(7736002)(118296001)(305945005)(50226002)(48376002)(97736004)(2361001)(50466002)(36756003)(16586007)(68736007)(86362001)(316002)(66066001)(47776003); 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:fnd0S3QCHNc9exaxhBTJVzNIkgFiIIoRJcjpBSIQQ?= =?us-ascii?Q?WktJ1KXyZ7dZx7wZT5vr+pUcPVKNs/EA5v+rM0OglpjAjI7Z22o+pZ7kZe2f?= =?us-ascii?Q?0XoFPPghTWOO5MnDbJKJW4Pck5zGowCAAaMFlsS8YW2fud/OiU4pcF+IkE/E?= =?us-ascii?Q?EyulM8TgyvO7iqnNQnYRwjRDdVxSBWAtxnEGzzjaECMPoygJsC08DKAjnvVR?= =?us-ascii?Q?1kdDeB7AOvclFVHi92Vj2HbMA6lIR65AZgAzHDhEi2+Ja/CqgcRzUAejJkto?= =?us-ascii?Q?kvbnaVjiQzqXfFc72uz6tmxzbfMnX/2nLunv2EDIzScfVT34eInoKuHUBinU?= =?us-ascii?Q?NO9/2RajvNPF+pXvI19OMB2/D+lifKjxkILkzuHo/aW1P5Dn9wlOH6J9dVgb?= =?us-ascii?Q?TRGoYgpS5+yd0EQj/LAZ1zV0wo7WZt/Rlpse4E67EuEAcrF4eNH1QOrvTetf?= =?us-ascii?Q?92fc5VtVHHyb0GAow7Z1yTEurFyCB6vUMHCDNysUcwhgqbHwxM1IfxUFEx9g?= =?us-ascii?Q?7LTC+8QozWwEQp2cqBfhNCd58ykFEeqBlfZ9SP8SjiQXDFeDaMp6mgsqJMqj?= =?us-ascii?Q?QJKDY9Mt1fqbSwnqGLfdJMYGjeYaNy/6x9JAQXT9jp34LQRaKpxrJQsdo7O1?= =?us-ascii?Q?4aIpNc+bLRHiFSSPYxHt0fjXd2I+d1vBTuUGWY8wYYDsY0TacOr4vnfm9SI0?= =?us-ascii?Q?mXAbek8XZIvmu24GUICiGvyHo/c3UB6Sp1b4TCLOgo36Dv7fAcE4Y1sZJWo8?= =?us-ascii?Q?xeoBDZ4fmKscZ1Grhd29ruKTxNse+oUu2l/+IkVGfzmOGj9A7iArd062L28p?= =?us-ascii?Q?4V2lo8TAwL6QqF2Z+t3fH24i6VMswmJ5R0dRSvMyBjdwDgvGIS165bkxntTp?= =?us-ascii?Q?IIFsFWMMdlooITUtVm0fsPxTKQcUP/pCmvj087FZEwYeG3+UEr6KDuqekt38?= =?us-ascii?Q?mHjU1tgMf8pvH/9VpCOl/FPAkgiBfGp44mX/2GvNB/2pLF244kzV8muVWZGA?= =?us-ascii?Q?cR4Fo+8tnjNnZCB/BeMefGz03c9nscfGx9H2ZH0kddASrB1+jyIWxfChJiEn?= =?us-ascii?Q?m7DF7dvBS0YREJEYy40vV5QDwc4u8D9xifcY2LER77StywbMdmlbmS9cqOqL?= =?us-ascii?Q?7ks7m9MKE5lnHMqlcc61BWquxHPjGuhFfnmbZ4z7WEQP3mOz55OXJaeHilN7?= =?us-ascii?Q?BWi1ANjjvpX62Dpu7l0INIU5U2VWEEzyZ5XupcVvoLqRpbT+BdqVJr1phasA?= =?us-ascii?Q?WjjidWupXi314ykiR1oMPx7or39PGK/2fdxHKk4C4aqodyauWYwtSreiU5sh?= =?us-ascii?Q?Su2b411HmUtg+5rwGz/wR4SbVb/+24KVXX1NJmY4xtE?= X-Microsoft-Antispam-Message-Info: NqVDmiLZyklq/13hOnzGi08MDeYyDWe5UD1SULLhj9/qKvD6h/6h4bxdDMbX8MUO7siS97zT9/54qkAoQn0ZCfw3Fqb6Kq2A1BfyXGwWoSzOG9IWrzJfGWdHAtgPuDG+i/J7ErTs06BY3UVxEebTQy1tVwAw901wmm1P0YTx4gITP5PpT4NYj9Thp4MFU5jGOkydZI6a7N4FmDj7LOVZbgh9rS2/d0mqawCfJV0mSpBmkQTOcTaVyY2yljw93Ei7ns9p9ma7OgstSo6BHgR0PL/JXCZuGEXMLldjFLYHeopyy0DDC3UGp8VHWqFWpkYeTs27dKj4nPSrQkDKx19OtA== X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0392; 6:a/rwiq5yJWQB2/kUSs4OX+zPZSU/DC+5iD6WuxSRmzBL9sQFBuPXjQQVvDL8zsF/4kFW44UIkKgJFPFxCElXjZkjk9e8jJiIKnfg8BI6ExYRVZG/NvRy/tbdMywll9/8Fml5kXWFcCCsbI6KDGaZKOR0QIaFsV52Gmr3jFrtzVJZLDzDG1GpdyC0LtVbEl9ZLY6kIjBRuRy4cSzgiX71GBcbkZt+byy9j9TbEgge2QNqM1VEF4G2JoPK6l6kQu583QxLGesZ8hz0TDAcC1eDpgp0cbECQuhyDGOOY2I1dafSNL/sHhYjO2hGOx7NnuPuk/o7w8SIB5bWpoAdxSzST0JNyl6Z+wGH0BTl+BFfzFEkqhBhmSE8+Vei+T125zYHuEMuD1ergJJG6EZ7l5IE3QSegWiza5dZm63BeZVoBtEDwY0SQ5zJvM/jkK173k6RdRtq2W/p1Eci1xElRDHo8g==; 5:u46OAWXIeReeMpJOeP312/2fuauNrbQTCjCaubGD2UWkROsMDorxGuihhfYAisBd7BCSR5LpWcQlwIGcq4AIhWW94km3uxTGaromAmXIKeOFmcWUX1wy8AajeIFhJ/nKCklZw3+kDDYzawVwd6HQrQQYG0PRo4bOSUW6ExE2f5c=; 24:9KayDVTkRgkYSK6KYck3JDUSjS4fDWaZBLsuOHD8qpVRTCUz+SXdIH6z/9zCBlCddrTNsqbPXr7oL8yHZkq+OK/PVMqqFXe67spqXJKuww8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0392; 7:Wjq6BglymTn4QrZDthcHisGFGB3a3BnhsRqJyZ78mK+VPTDYf/vhQOJSaG1P23n/WaWn2iNUPhVseW5EHBMwTdxohVGrjtABGCr525jSXYkQBHuwRKmItQh4ZSBn3a3FePj6AKmiUKL92BhQmkmuehGVYe/LBwDOa/oNcDhWCfClxi+FNcN+Am4YmT+yrMl1PUuWQSlWf2DsWnwnQ3YJYVVZweo2zKmBEed4SgBYWaqqJ4hm5dbpUbp2gVdpJtZP; 20:EcRejfi/hM4Ojr6J2FDUWicIJ8rqvKZSivW3IqoV/vBXc3nTLF/+ykeo3+PJZuQckj0wqnwwzML7ZcARC9KIkHkPXGBbFjY3WXlST1WJ8yKgH8NmTaolHftZZhsW6SM0zkSSzJEoMG0+nZVzGraE/ntqg+rfZ9BTsW85GM3j5ig= X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jun 2018 19:31:22.5577 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6012679b-8404-4ed3-f389-08d5d876bcdf 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: 216.71.154.45 Subject: [Qemu-devel] [PATCH v1 4/5] 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, mjc@sifive.com, palmer@sifive.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: 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 | 12 +++++++++--- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-= softmmu.mak index b8cac7a49f..73a421d3de 100644 --- a/default-configs/riscv32-softmmu.mak +++ b/default-configs/riscv32-softmmu.mak @@ -7,3 +7,6 @@ CONFIG_CADENCE=3Dy =20 CONFIG_PCI=3Dy CONFIG_PCI_XILINX=3Dy + +CONFIG_VGA=3Dy +CONFIG_VGA_PCI=3Dy diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/riscv64-= softmmu.mak index b8cac7a49f..73a421d3de 100644 --- a/default-configs/riscv64-softmmu.mak +++ b/default-configs/riscv64-softmmu.mak @@ -7,3 +7,6 @@ CONFIG_CADENCE=3Dy =20 CONFIG_PCI=3Dy CONFIG_PCI_XILINX=3Dy + +CONFIG_VGA=3Dy +CONFIG_VGA_PCI=3Dy diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 7c1ed3aee5..11f6f96a47 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -328,6 +328,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; @@ -443,9 +445,12 @@ static void riscv_virt_board_init(MachineState *machin= e) qdev_get_gpio_in(DEVICE(s->plic), VIRTIO_IRQ + i)); } =20 - xilinx_pcie_init(system_memory, 0, memmap[VIRT_PCIE].base, - memmap[VIRT_PCIE].size, 0x40000000, 0x20000000, - qdev_get_gpio_in(DEVICE(s->plic), PCIE_IRQ), true); + dev =3D xilinx_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_BRIDGE(&XILINX_PCIE_HOST(dev)->root)->sec_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, @@ -457,6 +462,7 @@ static void riscv_virt_board_machine_init(MachineClass = *mc) mc->desc =3D "RISC-V VirtIO Board (Privileged ISA v1.10)"; mc->init =3D riscv_virt_board_init; mc->max_cpus =3D 8; /* hardcoded limit in BBL */ + mc->default_display =3D "std"; } =20 DEFINE_MACHINE("virt", riscv_virt_board_machine_init) --=20 2.17.1