From nobody Fri May 3 09:47:29 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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=temperror (zoho.com: Error in retrieving data from DNS) 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 1544567944682119.92151256516422; Tue, 11 Dec 2018 14:39:04 -0800 (PST) Received: from localhost ([::1]:41671 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWqgA-0006jL-8z for importer@patchew.org; Tue, 11 Dec 2018 17:39:02 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35683) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWqec-0005lH-19 for qemu-devel@nongnu.org; Tue, 11 Dec 2018 17:37:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gWqeY-0006FS-TJ for qemu-devel@nongnu.org; Tue, 11 Dec 2018 17:37:26 -0500 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:2084) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gWqeW-00066r-VK; Tue, 11 Dec 2018 17:37:22 -0500 Received: from mail-dm3nam03lp2052.outbound.protection.outlook.com (HELO NAM03-DM3-obe.outbound.protection.outlook.com) ([104.47.41.52]) by ob1.hgst.iphmx.com with ESMTP; 12 Dec 2018 06:37:19 +0800 Received: from MWHPR04MB0401.namprd04.prod.outlook.com (10.173.48.18) by MWHPR04MB1168.namprd04.prod.outlook.com (10.173.53.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1425.18; Tue, 11 Dec 2018 22:37:17 +0000 Received: from MWHPR04MB0401.namprd04.prod.outlook.com ([fe80::9067:fb44:66b2:7604]) by MWHPR04MB0401.namprd04.prod.outlook.com ([fe80::9067:fb44:66b2:7604%3]) with mapi id 15.20.1425.016; Tue, 11 Dec 2018 22:37:17 +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=1544567842; x=1576103842; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=6FWvdovG/DHyaWBdkK2BoC0/ankaXJpJMmYD9cTlpJA=; b=H9Ig7VDgm+p15z3Ol8ryoOVZ4apAOZlDTXxZM4jbMS3lJBzQFlN5iJ9E D4iy/XhsAvXVexw6ctfROD8OoF3MGq8H1FI05CRp2eDzefsSOJKtyxk3s muJMV3ufIAKzgr+BYbnMgXKmimVW1J5CeExuqowdwZjDnKskxUsBvmicv 8zhOgH1NDxkFjvS5xc5yxzWnzXHCmJDe3CvXETLvfhIBLzA9m0063C8nY MZz5Esc7JFadYraHJlDHq4wdQPEkyodXP4a7KcFnYPKLTZX1mAEOxsRrQ D2fQzW9GXZHo4K3mhIZxIAdXrRVkmpsAi25Jpc6S694tVChFW3B5Ju8Co A==; X-IronPort-AV: E=Sophos;i="5.56,343,1539619200"; d="scan'208";a="98113638" 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=9Ro3eIxnNK+lykHoPxhn/p/WWWfxmJe4W7tdVet+9Wo=; b=UhTOO+AXumQuNtsdKYr9gOmvxrj2GrnOHlWGEyFyoMhIaEddvSZ2AEfeDC7ORH23+H5NuPtliS7uwvrkKkpTqPCM4YZdDyVcK3KmD+qdXeo4XWg/hke1B6iAiKBG7s8jusPfcZ1EwVbtGLq6Z+8/Fixnf6T4rgIZZFDWIWqrqYM= From: Alistair Francis To: "qemu-devel@nongnu.org" , "qemu-riscv@nongnu.org" Thread-Topic: [PATCH v8 1/4] hw/riscv/virt: Increase the number of interrupts Thread-Index: AQHUkaISXTBDO6cd40aYJ/iLiG/Qtw== Date: Tue, 11 Dec 2018 22:37:17 +0000 Message-ID: <3e20c204cce495e5cbbfb560f92d35c86840b8fd.1544567709.git.alistair.francis@wdc.com> References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.19.1 x-clientproxiedby: BYAPR03CA0029.namprd03.prod.outlook.com (2603:10b6:a02:a8::42) To MWHPR04MB0401.namprd04.prod.outlook.com (2603:10b6:300:70::18) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [199.255.44.171] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; MWHPR04MB1168; 6:mVYXkQibd1qwrbCTtlgo+aoq9jL829+WKrSmhgeqn5nBs6cLEjFqG/6QTDGQv+Y/Xfk21/QVXIa1r+nAs/H2jIB9Vu/hwAa+st/nyFYqfV2HvKXOLvaCPYehOCNh72pD8h+zl5P5aUHSqGuVlDOU2Z9AQzI7eI7dZgpzNotmX9buGYEb1CJrw8gP65WQIE2D+5Dg6xmQBoQYqGjSZfXmgWgx0KNpViqGnddJoJjswZtZuGO3Qkf7E+76J5hBIbUe6RaCETpAanz//SXh02R9oc3+CcJsF92yG3QQer1aUsIamuXBN0ZtD7jIVOxkoNOVnOnbAou4naeYMQ+az4L44KmuesEleDPvk4gOT3Tv5RR97+q+bk/6bD0B4fLUBqkCQwGqgEGXnJc8DvjgSzrt73qjogtJ4NnCnjrZC3dqwH+xL7DvpITO9ZSI6M0unyRLkSXirGXWm5k+R8m8fUjOFQ==; 5:BVnEnQ93yNzVbHveHNawPhp6gbjp3M2wYGfK+quF3bucicCihXl+P35zqm8Et1K2MuAmSbGe4Pv19EHuhelEyQLZYE3uPNGBBXg/YlHZiqvjUO5CLoYHfsnHKcYwLz/ca4LBoe9w+yC8kPATxyDPLxGFYJvuQieHzDHunAEgT6M=; 7:bDqCWPhwkkVjU7iDcgmjNUWjovyC75qDLk3XarriFRwlpPf5hIourhnF/oJTn2YPcl3nAJ4KcsViflhIVU7AMOsxyP53jyCxRbJreenuqrWU9Tq6gnC5RvpYgMcy25CecMu1h/pRTFnw8RzW4vz5Og== x-ms-office365-filtering-correlation-id: 523e4523-79f3-4623-4cef-08d65fb93465 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:MWHPR04MB1168; x-ms-traffictypediagnostic: MWHPR04MB1168: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(10201501046)(3231455)(999002)(944501520)(52105112)(93006095)(93001095)(3002001)(6055026)(148016)(149066)(150057)(6041310)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123558120)(201708071742011)(7699051)(76991095); SRVR:MWHPR04MB1168; BCL:0; PCL:0; RULEID:; SRVR:MWHPR04MB1168; x-forefront-prvs: 08831F51DC x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(136003)(346002)(39860400002)(376002)(396003)(366004)(189003)(199004)(76176011)(66066001)(71190400001)(2501003)(71200400001)(305945005)(14444005)(6506007)(256004)(386003)(44832011)(105586002)(7736002)(25786009)(6512007)(486006)(68736007)(8936002)(102836004)(476003)(81156014)(106356001)(53936002)(478600001)(8676002)(72206003)(446003)(14454004)(26005)(86362001)(52116002)(50226002)(11346002)(81166006)(2616005)(6116002)(36756003)(5660300001)(2906002)(110136005)(97736004)(6486002)(6436002)(3846002)(4326008)(99286004)(39060400002)(186003)(54906003)(118296001)(316002); DIR:OUT; SFP:1102; SCL:1; SRVR:MWHPR04MB1168; H:MWHPR04MB0401.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; x-microsoft-antispam-message-info: dpIyfvoDZjgvIbIk7TswCQ6CIhh2EkOOBcFVOzj3OxjhSxT+v0kysI0efNkXiqm6NKobANPAWiPXxkjlK507gb28/97kQ8yzQ/PrYsr6zu/7cAA8lMaOE1fP7TJFahL6i/hAHw77vRhcD20qInoE3yzswEU9G04HWbOosPVUwXmE0w5fBXUwdF4FpFzbnlABPPTHme/OCgbEhoIuYBmh8wixB1xEnSYBunTOD33X1nZmGynyvJYKW6eeLBCggs2zuDpivx9Y7VaoxqvtX82WaLuFKetGzVuBipocEsltMQB/RHu1MIJSSUKms2s8EkMn spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 523e4523-79f3-4623-4cef-08d65fb93465 X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Dec 2018 22:37:17.4646 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR04MB1168 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 v8 1/4] hw/riscv/virt: Increase the number of interrupts 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" , "palmer@sifive.com" , Alistair Francis , "stephen@eideticom.com" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (found 2 invalid signatures) Content-Type: text/plain; charset="utf-8" Increase the number of interrupts to match the HiFive Unleashed board. Signed-off-by: Alistair Francis Tested-by: Guenter Roeck Tested-by: Andrea Bolognani --- include/hw/riscv/virt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/hw/riscv/virt.h b/include/hw/riscv/virt.h index 91163d6cbf..2b2e6dd4ea 100644 --- a/include/hw/riscv/virt.h +++ b/include/hw/riscv/virt.h @@ -45,7 +45,7 @@ enum { UART0_IRQ =3D 10, VIRTIO_IRQ =3D 1, /* 1 to 8 */ VIRTIO_COUNT =3D 8, - VIRTIO_NDEV =3D 10 + VIRTIO_NDEV =3D 0x35 /* Arbitrary maximum number of interrupts */ }; =20 enum { --=20 2.19.1 From nobody Fri May 3 09:47:29 2024 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 1544568088652675.8237866757016; Tue, 11 Dec 2018 14:41:28 -0800 (PST) Received: from localhost ([::1]:41685 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWqiR-0008Fr-JY for importer@patchew.org; Tue, 11 Dec 2018 17:41:23 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35717) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWqek-0005pG-St for qemu-devel@nongnu.org; Tue, 11 Dec 2018 17:37:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gWqeg-0006Nq-TS for qemu-devel@nongnu.org; Tue, 11 Dec 2018 17:37:34 -0500 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:2109) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gWqeg-0006KJ-Kk; Tue, 11 Dec 2018 17:37:30 -0500 Received: from mail-dm3nam03lp2055.outbound.protection.outlook.com (HELO NAM03-DM3-obe.outbound.protection.outlook.com) ([104.47.41.55]) by ob1.hgst.iphmx.com with ESMTP; 12 Dec 2018 06:37:28 +0800 Received: from MWHPR04MB0401.namprd04.prod.outlook.com (10.173.48.18) by MWHPR04MB1168.namprd04.prod.outlook.com (10.173.53.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1425.18; Tue, 11 Dec 2018 22:37:26 +0000 Received: from MWHPR04MB0401.namprd04.prod.outlook.com ([fe80::9067:fb44:66b2:7604]) by MWHPR04MB0401.namprd04.prod.outlook.com ([fe80::9067:fb44:66b2:7604%3]) with mapi id 15.20.1425.016; Tue, 11 Dec 2018 22:37:26 +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=1544567851; x=1576103851; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=Lr7s+LbBpa5okVowj9CvhSx1TXBHaqkbiUiLl7k0zLM=; b=AQZv2vdjg9BlRS2iVNqCkwS8gTyyGCAIgOx1VuebYYDzbgpmIUGX8c7r 3fHdsOv2JNAdye2k5Se7d0tt95LNcWdSfUzf9pZtZV/I3lAiAeyCohdQ9 Ugxe+V9TIs/AMWV0TD9UrpxMNm2wcA7xjEK4f9kcMvkCMvKqxzEpg3mVr qsBRrbeReGN7gBBINjjpn8xzy6V5KgmiGXBmZbgUo11LrmmNhu4CN9QGw SrE/ycHFKgQTFRrYkvXq6yBBt1pgAZ6YAx4whEXOfr5xpbayNJXQO3aSP zVOO7TbaI2/Fy9GSoBkipRuNjyCLzYjgrCHNDssX/2AsjmqWkMqnw8Glz A==; X-IronPort-AV: E=Sophos;i="5.56,343,1539619200"; d="scan'208";a="98113645" 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=CorkShMWeT62xCZ6mv2aCYFdia3InyQGwssGnCgLD4c=; b=lLkepPpE3ZaqsW0sple1rI2f1pKeRIvVjtRilK2mr9LC7fqMYqyPPUuNS4z2VWV1M+PyjoHZ9C7dplsSluU1Z9Y5PBX4E5xP4oX13/IGmmDLJ10+fUUNMPy2jLqtxjqffdXsMgOsWbP4zyvQMJ13n42lrDs7eJfyli7NL9+zO3I= From: Alistair Francis To: "qemu-devel@nongnu.org" , "qemu-riscv@nongnu.org" Thread-Topic: [PATCH v8 2/4] hw/riscv/virt: Adjust memory layout spacing Thread-Index: AQHUkaIXxjvXoG3Vo0S4p/AZwsI7sQ== Date: Tue, 11 Dec 2018 22:37:26 +0000 Message-ID: <8064f094368f233fe0fbdda772a33b7c07114613.1544567709.git.alistair.francis@wdc.com> References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.19.1 x-clientproxiedby: BYAPR03CA0029.namprd03.prod.outlook.com (2603:10b6:a02:a8::42) To MWHPR04MB0401.namprd04.prod.outlook.com (2603:10b6:300:70::18) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [199.255.44.171] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; MWHPR04MB1168; 6:KUQRHiTSSW+mqZewEYhyg/7fGktt151d42dFIdY8oDkQ7B4ImiHOCyORvTDmCphviMTrLMz/O7dxhO9qfn5ZZ3gySEF421RDxuBHN8X3ksb41WI9vzTm2bzbsnSPUnSGQXCNcd7QJeG4j+3tfzYvZWQr1Y+6GhUQTYuPjUMwtrskz9pjSDHftfG7LcgndouW4WwkYAkMdy7F8aO9H6X4KveI1iMrb0xtNUahqkdbACLi74FwIN54fYHOJN0FLI5ad7tY/RU6VP5IECg2XsSlyQaEvGo+gDd4v3pkDBc0hSWvLprdi6XrHyAN6FTuGQh9etmLtDVfHrNN+R4s2MuH+zhojGX+4PfYd/eCsnaSzR+xDa7ER0gbghakNi/SagS7UUcqF8b8jM7vi7FzPOQW5y9jDVpjQ0DfUuXZ/dQqaspPkNHIk/pJDGhzil7bqKzWoyluj2zCTUTNsYlFuI8ayA==; 5:7B5i8uOmifqUlIS5YvPmJfmrH3MI4GvhCPA/csY67HS4jwVR2vMD+JuHN2noUXncpENFoNN1D5hGhCD6vtk9kvmcUkGTKaZybsirEItGDqwU4jsgcinOJZ1DEF97lHVfgn37lqs3t636QCVolkdRvH9UZmq1KEZkzy8PuSwStao=; 7:MQ7aUG+XnhkP57zb4MnxxbXyAu9xQ0iuFlbDqD3qtrRiGs7xpeXJTqBP8xzGXzw0P9oRErW9kLLn3cafNBg1VZQnwhM0BXXJjCnMtTy6HZGAFgJgEJtnSsDsj0vdMUoh8WZWp2LzHgfQiucadW/mlQ== x-ms-office365-filtering-correlation-id: 8e154b07-0cf6-4849-8a0a-08d65fb939ce x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:MWHPR04MB1168; x-ms-traffictypediagnostic: MWHPR04MB1168: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(10201501046)(3231455)(999002)(944501520)(52105112)(93006095)(93001095)(3002001)(6055026)(148016)(149066)(150057)(6041310)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123558120)(201708071742011)(7699051)(76991095); SRVR:MWHPR04MB1168; BCL:0; PCL:0; RULEID:; SRVR:MWHPR04MB1168; x-forefront-prvs: 08831F51DC x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(136003)(346002)(39860400002)(376002)(396003)(366004)(189003)(199004)(76176011)(66066001)(71190400001)(2501003)(71200400001)(305945005)(6506007)(256004)(386003)(44832011)(105586002)(7736002)(25786009)(6512007)(486006)(68736007)(8936002)(102836004)(476003)(81156014)(106356001)(53936002)(478600001)(8676002)(72206003)(446003)(14454004)(26005)(86362001)(52116002)(50226002)(11346002)(81166006)(2616005)(6116002)(36756003)(5660300001)(2906002)(110136005)(97736004)(6486002)(6436002)(3846002)(4326008)(99286004)(39060400002)(186003)(54906003)(118296001)(316002); DIR:OUT; SFP:1102; SCL:1; SRVR:MWHPR04MB1168; H:MWHPR04MB0401.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; x-microsoft-antispam-message-info: MEhux2//pGb91oUNt5VSFgJLs6wkArEUvH6IiSvrLw0IH8BTYeGQH8FJ/XkW0dKNL8ADx/93Z1dS/98iaIU2ASyAi4/wTHNT3Ljq/Yive1VdHyP/lPXufqX9ICEXwhVwBe0eqrXezRQw1bDcN9tuuTM+b5/d/1jRzEhDnO01de4XQhAEVR0chPGfgueKyd/oX/En4XOWZPlGBA5DEkH1eDdLbgM87klTZlPFP2k7mZixzpLRCUM3AbJbixpTuSby2bQsjGwPfJpF61pRZC8KZhwO6N1mx6+1wCDYkG3VEpFZ0eAdgPVDAEeJh7SUfphK spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8e154b07-0cf6-4849-8a0a-08d65fb939ce X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Dec 2018 22:37:26.5116 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR04MB1168 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 v8 2/4] hw/riscv/virt: Adjust memory layout spacing 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" , "palmer@sifive.com" , Alistair Francis , "stephen@eideticom.com" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (found 2 invalid signatures) Content-Type: text/plain; charset="utf-8" Signed-off-by: Alistair Francis Reviewed-by: Logan Gunthorpe Tested-by: Guenter Roeck Tested-by: Andrea Bolognani --- hw/riscv/virt.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 2b38f89070..6b6fa39aaa 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -47,14 +47,14 @@ static const struct MemmapEntry { hwaddr base; hwaddr size; } virt_memmap[] =3D { - [VIRT_DEBUG] =3D { 0x0, 0x100 }, - [VIRT_MROM] =3D { 0x1000, 0x11000 }, - [VIRT_TEST] =3D { 0x100000, 0x1000 }, - [VIRT_CLINT] =3D { 0x2000000, 0x10000 }, - [VIRT_PLIC] =3D { 0xc000000, 0x4000000 }, - [VIRT_UART0] =3D { 0x10000000, 0x100 }, - [VIRT_VIRTIO] =3D { 0x10001000, 0x1000 }, - [VIRT_DRAM] =3D { 0x80000000, 0x0 }, + [VIRT_DEBUG] =3D { 0x0, 0x100 }, + [VIRT_MROM] =3D { 0x1000, 0x11000 }, + [VIRT_TEST] =3D { 0x100000, 0x1000 }, + [VIRT_CLINT] =3D { 0x2000000, 0x10000 }, + [VIRT_PLIC] =3D { 0xc000000, 0x4000000 }, + [VIRT_UART0] =3D { 0x10000000, 0x100 }, + [VIRT_VIRTIO] =3D { 0x10001000, 0x1000 }, + [VIRT_DRAM] =3D { 0x80000000, 0x0 }, }; =20 static uint64_t load_kernel(const char *kernel_filename) --=20 2.19.1 From nobody Fri May 3 09:47:29 2024 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 1544568452110580.5501891620125; Tue, 11 Dec 2018 14:47:32 -0800 (PST) Received: from localhost ([::1]:41723 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWqoI-0004ru-Lr for importer@patchew.org; Tue, 11 Dec 2018 17:47:26 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35774) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWqf3-0006CC-9J for qemu-devel@nongnu.org; Tue, 11 Dec 2018 17:37:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gWqez-0006ap-L6 for qemu-devel@nongnu.org; Tue, 11 Dec 2018 17:37:53 -0500 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:41303) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gWqev-0006Tv-Fu; Tue, 11 Dec 2018 17:37:46 -0500 Received: from mail-by2nam03lp2053.outbound.protection.outlook.com (HELO NAM03-BY2-obe.outbound.protection.outlook.com) ([104.47.42.53]) by ob1.hgst.iphmx.com with ESMTP; 12 Dec 2018 06:37:38 +0800 Received: from MWHPR04MB0401.namprd04.prod.outlook.com (10.173.48.18) by MWHPR04MB0608.namprd04.prod.outlook.com (10.173.49.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1404.22; Tue, 11 Dec 2018 22:37:36 +0000 Received: from MWHPR04MB0401.namprd04.prod.outlook.com ([fe80::9067:fb44:66b2:7604]) by MWHPR04MB0401.namprd04.prod.outlook.com ([fe80::9067:fb44:66b2:7604%3]) with mapi id 15.20.1425.016; Tue, 11 Dec 2018 22:37:36 +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=1544567865; x=1576103865; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=sfadnx/auh4oqZkES4o9nQDgSF7tvihPnOS1PDdv6II=; b=EUikkv7hhUdyvem9linxHc9TbAyjXxZey17G3NWOMBAIBcPHAxuBHZ9u cikNUuTic/G/mtJ55vDj347z0mwg524CU0w5B0FdHrowVziX0Zwf0k/zi Euy+crjLItpH8cGSrLP606+U2Vhu94u8c66r8lz+jp38JVl1SjcCZjR7a QuehyqxYxiu7i5IBd3hbpLjVjwxI1zFU8MHt2rdUwYnS+cWB1HMcgw5Ih PVzsQRp/nYKj2nAPBnKba12cpm7u5ifpoWMf8VK1iccu7OSD5a5q0hv+A etSVF7n4A3MG8YWlCvUcJ3J2f84eVvHiEUp93y4kEMfspX2QRigk+yM4e Q==; X-IronPort-AV: E=Sophos;i="5.56,343,1539619200"; d="scan'208";a="201014433" 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=NexpM7NVXrxPEGKwo1hroPLHDjH6o6z5yCYCwGAW+HE=; b=J0KQxOEn1frOpNGCUN+zDXoLLBXC2DRDzdOPwJAKhuTW8/XzHHx1k5VLMbHJ+psgl4eKIgTcasGQU/LCAkTGsiKlQCF1+uX3j2JAHptj9C3uhrFyXusnTeeMuDlqTGAG39gqFiw3O6XU0NYViTLQbOz/RIl1kxwxse5j8zvEYGM= From: Alistair Francis To: "qemu-devel@nongnu.org" , "qemu-riscv@nongnu.org" Thread-Topic: [PATCH v8 3/4] hw/riscv/virt: Connect the gpex PCIe Thread-Index: AQHUkaIdqu7dJIsIJUa1RUUELnP7GQ== Date: Tue, 11 Dec 2018 22:37:36 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.19.1 x-clientproxiedby: BYAPR03CA0020.namprd03.prod.outlook.com (2603:10b6:a02:a8::33) To MWHPR04MB0401.namprd04.prod.outlook.com (2603:10b6:300:70::18) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [199.255.44.171] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; MWHPR04MB0608; 6:W6A21Dl2qCHGPkYncmgELvegoVNXpBfZIuijpavwPIPG+Oxs9HKB59Sdm457mAaUDWRZE81Eha9vVr5cNn/DkTeJEPMu2HMH2FSpA/4XiJnuktZ/nOc/luxYAWhMwK2x4rB4VP1j4fHZHk2PoZ5r6oIdZ4vx7ss69roZHpAcpUVhDtjHdA6T+V7cQvfSQG7hkwCUV2eNkWo0oRP4aHMDudu8vye1cycbrv+B8Aemon6amd2xmREOVtzB8zUraDSFwSQhxGuCiJJYi/RysYcD/sYWjMarT2Tv42PTb1AZ/U4xdcJLemKxMzo7OJowWUGMQrfGEpJt7Kw+0nubTbIJlMipuPASCx6D/mSn4qnuT8nyko9gzl3zw/AuY838RJ+PVh3OzLlaYkSULTkTs/UrNDgtEer7hWUKRih+dUrB5ENmI8cTXDGT8Z6dovnE6762FYnFppD9rCi1Y0kFBLly0Q==; 5:j82EuxkOzT/U6zhEkDTTQJhI83zHgKVwQ0OUOIFIl3FYcjOF9fj1xSThySGVc5+oKNH7WMa70Bzwt3IJCY37REq3pCqV6m0eprvFX/qTbN5uoRhCbYNBz/P+G8p93DAaRoOeJswL8A4qEQ7aRQzotICGw0c9O9hv6x6WTgpsTs8=; 7:6oWJfqy4VjqrZURroBvwyLR7xrVrrNEYXJ7idO8lliJT2t/3JuHPat7YpH2QHaSn0neQshUJRJARlUwnzPHDfPHKi4mldb7xGq6sFqkFoZ3BtjS0T7QzGZnWeyIaKy8WbdLkhOhvShAaIFXmK7eNJQ== x-ms-office365-filtering-correlation-id: 230e1d17-c1a9-4d12-fe8a-08d65fb93f8f x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:MWHPR04MB0608; x-ms-traffictypediagnostic: MWHPR04MB0608: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(3230017)(999002)(6040522)(2401047)(8121501046)(5005006)(10201501046)(93006095)(93001095)(3002001)(3231472)(944501520)(52105112)(6055026)(148016)(149066)(150057)(6041310)(20161123560045)(20161123558120)(20161123562045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699051)(76991095); SRVR:MWHPR04MB0608; BCL:0; PCL:0; RULEID:; SRVR:MWHPR04MB0608; x-forefront-prvs: 08831F51DC x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(376002)(346002)(366004)(136003)(396003)(39860400002)(199004)(189003)(446003)(11346002)(7736002)(54906003)(486006)(86362001)(81166006)(8936002)(81156014)(36756003)(118296001)(476003)(478600001)(8676002)(76176011)(52116002)(2906002)(44832011)(14454004)(25786009)(4326008)(2616005)(99286004)(3846002)(66066001)(6116002)(2501003)(50226002)(110136005)(102836004)(305945005)(186003)(6436002)(26005)(6506007)(72206003)(106356001)(256004)(68736007)(6486002)(5660300001)(53936002)(71200400001)(97736004)(71190400001)(105586002)(6512007)(386003)(39060400002)(316002); DIR:OUT; SFP:1102; SCL:1; SRVR:MWHPR04MB0608; H:MWHPR04MB0401.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; x-microsoft-antispam-message-info: qqiEkDEKu1UA8ymLTjo0RNmTzX9YwOKhbnkhylaUbFpV4VlXw5Toi8ue+zZKETFqA9XzdS9ER/0CZwr899nw88Sl3XovV/tqgb89El4qdTxLoBs0TcMtfYrYYLBzZawjPJQoE51XwzXH0MNRnBe9gKJ74gNqdjjQNug3I0lw69ppiJWgd+4hLD7J6boyTAnG9R4n1w5SUDFNaK90AO0Dtnaqp5NAk8nvW1TWKPhSXA8xtIU6FChzP/2U9jCT86BwWtxzAsnv836ys/JqjfzDKBf2SYqpG5gs9DFcBGFpg3mtTtzRxNcGacJayd346947 spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 230e1d17-c1a9-4d12-fe8a-08d65fb93f8f X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Dec 2018 22:37:36.1837 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR04MB0608 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 v8 3/4] hw/riscv/virt: Connect the gpex PCIe 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" , "palmer@sifive.com" , Alistair Francis , "stephen@eideticom.com" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (found 2 invalid signatures) Content-Type: text/plain; charset="utf-8" Connect the gpex PCIe device based on the device tree included in the HiFive Unleashed ROM. Signed-off-by: Alistair Francis Signed-off-by: Logan Gunthorpe Reviewed-by: Logan Gunthorpe Tested-by: Guenter Roeck Tested-by: Andrea Bolognani --- default-configs/riscv32-softmmu.mak | 5 +- default-configs/riscv64-softmmu.mak | 5 +- hw/riscv/virt.c | 131 +++++++++++++++++++++++++++- include/hw/riscv/virt.h | 13 ++- 4 files changed, 150 insertions(+), 4 deletions(-) diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-= softmmu.mak index 7937c69e22..c5ea36cba5 100644 --- a/default-configs/riscv32-softmmu.mak +++ b/default-configs/riscv32-softmmu.mak @@ -1,7 +1,10 @@ # Default configuration for riscv-softmmu =20 +include pci.mak + CONFIG_SERIAL=3Dy CONFIG_VIRTIO_MMIO=3Dy -include virtio.mak =20 CONFIG_CADENCE=3Dy + +CONFIG_PCI_GENERIC=3Dy diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/riscv64-= softmmu.mak index 7937c69e22..c5ea36cba5 100644 --- a/default-configs/riscv64-softmmu.mak +++ b/default-configs/riscv64-softmmu.mak @@ -1,7 +1,10 @@ # Default configuration for riscv-softmmu =20 +include pci.mak + CONFIG_SERIAL=3Dy CONFIG_VIRTIO_MMIO=3Dy -include virtio.mak =20 CONFIG_CADENCE=3Dy + +CONFIG_PCI_GENERIC=3Dy diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 6b6fa39aaa..e7f0716fb6 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -39,6 +39,8 @@ #include "sysemu/arch_init.h" #include "sysemu/device_tree.h" #include "exec/address-spaces.h" +#include "hw/pci/pci.h" +#include "hw/pci-host/gpex.h" #include "elf.h" =20 #include @@ -55,6 +57,9 @@ static const struct MemmapEntry { [VIRT_UART0] =3D { 0x10000000, 0x100 }, [VIRT_VIRTIO] =3D { 0x10001000, 0x1000 }, [VIRT_DRAM] =3D { 0x80000000, 0x0 }, + [VIRT_PCIE_MMIO] =3D { 0x40000000, 0x40000000 }, + [VIRT_PCIE_PIO] =3D { 0x03000000, 0x00010000 }, + [VIRT_PCIE_ECAM] =3D { 0x30000000, 0x10000000 }, }; =20 static uint64_t load_kernel(const char *kernel_filename) @@ -98,6 +103,51 @@ static hwaddr load_initrd(const char *filename, uint64_= t mem_size, return *start + size; } =20 +static void create_pcie_irq_map(void *fdt, char *nodename, + uint32_t plic_phandle) +{ + int pin, dev; + uint32_t + full_irq_map[GPEX_NUM_IRQS * GPEX_NUM_IRQS * FDT_INT_MAP_WIDTH] = =3D {}; + uint32_t *irq_map =3D full_irq_map; + + /* This code creates a standard swizzle of interrupts such that + * each device's first interrupt is based on it's PCI_SLOT number. + * (See pci_swizzle_map_irq_fn()) + * + * We only need one entry per interrupt in the table (not one per + * possible slot) seeing the interrupt-map-mask will allow the table + * to wrap to any number of devices. + */ + for (dev =3D 0; dev < GPEX_NUM_IRQS; dev++) { + int devfn =3D dev * 0x8; + + for (pin =3D 0; pin < GPEX_NUM_IRQS; pin++) { + int irq_nr =3D PCIE_IRQ + ((pin + PCI_SLOT(devfn)) % GPEX_NUM_= IRQS); + int i =3D 0; + + irq_map[i] =3D cpu_to_be32(devfn << 8); + + i +=3D FDT_PCI_ADDR_CELLS; + irq_map[i] =3D cpu_to_be32(pin + 1); + + i +=3D FDT_PCI_INT_CELLS; + irq_map[i++] =3D cpu_to_be32(plic_phandle); + + i +=3D FDT_PLIC_ADDR_CELLS; + irq_map[i] =3D cpu_to_be32(irq_nr); + + irq_map +=3D FDT_INT_MAP_WIDTH; + } + } + + qemu_fdt_setprop(fdt, nodename, "interrupt-map", + full_irq_map, sizeof(full_irq_map)); + + qemu_fdt_setprop_cells(fdt, nodename, "interrupt-map-mask", + 0x1800, 0, 0, 0x7); +} + static void *create_fdt(RISCVVirtState *s, const struct MemmapEntry *memma= p, uint64_t mem_size, const char *cmdline) { @@ -203,7 +253,10 @@ static void *create_fdt(RISCVVirtState *s, const struc= t MemmapEntry *memmap, nodename =3D g_strdup_printf("/soc/interrupt-controller@%lx", (long)memmap[VIRT_PLIC].base); qemu_fdt_add_subnode(fdt, nodename); - qemu_fdt_setprop_cell(fdt, nodename, "#interrupt-cells", 1); + qemu_fdt_setprop_cells(fdt, nodename, "#address-cells", + FDT_PLIC_ADDR_CELLS); + qemu_fdt_setprop_cell(fdt, nodename, "#interrupt-cells", + FDT_PLIC_INT_CELLS); qemu_fdt_setprop_string(fdt, nodename, "compatible", "riscv,plic0"); qemu_fdt_setprop(fdt, nodename, "interrupt-controller", NULL, 0); qemu_fdt_setprop(fdt, nodename, "interrupts-extended", @@ -233,6 +286,33 @@ static void *create_fdt(RISCVVirtState *s, const struc= t MemmapEntry *memmap, g_free(nodename); } =20 + nodename =3D g_strdup_printf("/soc/pci@%lx", + (long) memmap[VIRT_PCIE_ECAM].base); + qemu_fdt_add_subnode(fdt, nodename); + qemu_fdt_setprop_cells(fdt, nodename, "#address-cells", + FDT_PCI_ADDR_CELLS); + qemu_fdt_setprop_cells(fdt, nodename, "#interrupt-cells", + FDT_PCI_INT_CELLS); + qemu_fdt_setprop_cells(fdt, nodename, "#size-cells", 0x2); + qemu_fdt_setprop_string(fdt, nodename, "compatible", + "pci-host-ecam-generic"); + qemu_fdt_setprop_string(fdt, nodename, "device_type", "pci"); + qemu_fdt_setprop_cell(fdt, nodename, "linux,pci-domain", 0); + qemu_fdt_setprop_cells(fdt, nodename, "bus-range", 0, + memmap[VIRT_PCIE_ECAM].base / + PCIE_MMCFG_SIZE_MIN - 1); + qemu_fdt_setprop(fdt, nodename, "dma-coherent", NULL, 0); + qemu_fdt_setprop_cells(fdt, nodename, "reg", 0, memmap[VIRT_PCIE_ECAM]= .base, + 0, memmap[VIRT_PCIE_ECAM].size); + qemu_fdt_setprop_sized_cells(fdt, nodename, "ranges", + 1, FDT_PCI_RANGE_IOPORT, 2, 0, + 2, memmap[VIRT_PCIE_PIO].base, 2, memmap[VIRT_PCIE_PIO].size, + 1, FDT_PCI_RANGE_MMIO, + 2, memmap[VIRT_PCIE_MMIO].base, + 2, memmap[VIRT_PCIE_MMIO].base, 2, memmap[VIRT_PCIE_MMIO].size); + create_pcie_irq_map(fdt, nodename, plic_phandle); + g_free(nodename); + nodename =3D g_strdup_printf("/test@%lx", (long)memmap[VIRT_TEST].base); qemu_fdt_add_subnode(fdt, nodename); @@ -263,6 +343,47 @@ static void *create_fdt(RISCVVirtState *s, const struc= t MemmapEntry *memmap, return fdt; } =20 + +static inline DeviceState *gpex_pcie_init(MemoryRegion *sys_mem, + hwaddr ecam_base, hwaddr ecam_si= ze, + hwaddr mmio_base, hwaddr mmio_si= ze, + hwaddr pio_base, + DeviceState *plic, bool link_up) +{ + DeviceState *dev; + MemoryRegion *ecam_alias, *ecam_reg; + MemoryRegion *mmio_alias, *mmio_reg; + qemu_irq irq; + int i; + + dev =3D qdev_create(NULL, TYPE_GPEX_HOST); + + qdev_init_nofail(dev); + + ecam_alias =3D g_new0(MemoryRegion, 1); + ecam_reg =3D sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 0); + memory_region_init_alias(ecam_alias, OBJECT(dev), "pcie-ecam", + ecam_reg, 0, ecam_size); + memory_region_add_subregion(get_system_memory(), ecam_base, ecam_alias= ); + + mmio_alias =3D g_new0(MemoryRegion, 1); + mmio_reg =3D sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 1); + memory_region_init_alias(mmio_alias, OBJECT(dev), "pcie-mmio", + mmio_reg, mmio_base, mmio_size); + memory_region_add_subregion(get_system_memory(), mmio_base, mmio_alias= ); + + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 2, pio_base); + + for (i =3D 0; i < GPEX_NUM_IRQS; i++) { + irq =3D qdev_get_gpio_in(plic, PCIE_IRQ + i); + + sysbus_connect_irq(SYS_BUS_DEVICE(dev), i, irq); + gpex_set_irq_num(GPEX_HOST(dev), i, PCIE_IRQ + i); + } + + return dev; +} + static void riscv_virt_board_init(MachineState *machine) { const struct MemmapEntry *memmap =3D virt_memmap; @@ -385,6 +506,14 @@ 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, + memmap[VIRT_PCIE_ECAM].base, + memmap[VIRT_PCIE_ECAM].size, + memmap[VIRT_PCIE_MMIO].base, + memmap[VIRT_PCIE_MMIO].size, + memmap[VIRT_PCIE_PIO].base, + DEVICE(s->plic), true); + serial_mm_init(system_memory, memmap[VIRT_UART0].base, 0, qdev_get_gpio_in(DEVICE(s->plic), UART0_IRQ), 399193, serial_hd(0), DEVICE_LITTLE_ENDIAN); diff --git a/include/hw/riscv/virt.h b/include/hw/riscv/virt.h index 2b2e6dd4ea..f12deaebd6 100644 --- a/include/hw/riscv/virt.h +++ b/include/hw/riscv/virt.h @@ -38,13 +38,17 @@ enum { VIRT_PLIC, VIRT_UART0, VIRT_VIRTIO, - VIRT_DRAM + VIRT_DRAM, + VIRT_PCIE_MMIO, + VIRT_PCIE_PIO, + VIRT_PCIE_ECAM }; =20 enum { UART0_IRQ =3D 10, VIRTIO_IRQ =3D 1, /* 1 to 8 */ VIRTIO_COUNT =3D 8, + PCIE_IRQ =3D 0x20, /* 32 to 35 */ VIRTIO_NDEV =3D 0x35 /* Arbitrary maximum number of interrupts */ }; =20 @@ -62,6 +66,13 @@ enum { #define VIRT_PLIC_CONTEXT_BASE 0x200000 #define VIRT_PLIC_CONTEXT_STRIDE 0x1000 =20 +#define FDT_PCI_ADDR_CELLS 3 +#define FDT_PCI_INT_CELLS 1 +#define FDT_PLIC_ADDR_CELLS 0 +#define FDT_PLIC_INT_CELLS 1 +#define FDT_INT_MAP_WIDTH (FDT_PCI_ADDR_CELLS + FDT_PCI_INT_CELLS + 1 = + \ + FDT_PLIC_ADDR_CELLS + FDT_PLIC_INT_CELLS) + #if defined(TARGET_RISCV32) #define VIRT_CPU TYPE_RISCV_CPU_RV32GCSU_V1_10_0 #elif defined(TARGET_RISCV64) --=20 2.19.1 From nobody Fri May 3 09:47:29 2024 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 1544568261874219.33245647522722; Tue, 11 Dec 2018 14:44:21 -0800 (PST) Received: from localhost ([::1]:41704 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWqlI-0002Sz-En for importer@patchew.org; Tue, 11 Dec 2018 17:44:20 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35790) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWqf4-0006Hn-M6 for qemu-devel@nongnu.org; Tue, 11 Dec 2018 17:37:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gWqf1-0006cS-Dc for qemu-devel@nongnu.org; Tue, 11 Dec 2018 17:37:54 -0500 Received: from esa4.hgst.iphmx.com ([216.71.154.42]:29404) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gWqf0-0006Zk-JY; Tue, 11 Dec 2018 17:37:51 -0500 Received: from mail-dm3nam03lp2054.outbound.protection.outlook.com (HELO NAM03-DM3-obe.outbound.protection.outlook.com) ([104.47.41.54]) by ob1.hgst.iphmx.com with ESMTP; 12 Dec 2018 06:37:47 +0800 Received: from MWHPR04MB0401.namprd04.prod.outlook.com (10.173.48.18) by MWHPR04MB0608.namprd04.prod.outlook.com (10.173.49.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1404.22; Tue, 11 Dec 2018 22:37:46 +0000 Received: from MWHPR04MB0401.namprd04.prod.outlook.com ([fe80::9067:fb44:66b2:7604]) by MWHPR04MB0401.namprd04.prod.outlook.com ([fe80::9067:fb44:66b2:7604%3]) with mapi id 15.20.1425.016; Tue, 11 Dec 2018 22:37:46 +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=1544567871; x=1576103871; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=NWU584To5ANJKVal7RSzaotgKjo8EEfCqELWBY2aIy8=; b=HCMA0TqWcJ7DRDELftXGvwHJmDNfNe2tSOYUWT7L1GPTrrYyVdHc/SKr P04Ys2Nm+RfwcA/Bhe6/9Fq8zL/jqGUxUgyHvmyyv7IIYYac4jF39IBev l/tRne4P4q8ANLl8jbGgCPsAuVZK89SAVU2nBoUn2NwIkW7SOcB5sw0qc KACtyOoo/SJXVFiIrNvb+6QWB9qf9ISb9jdxzDwCTqIWqcXZehtKoPC8J kQBCNyecRkcA220mhRB9D58IgdHjnzYINGk9tYGMvg0wKlBVNxJDxOnLd 2eSAIDdcTJVR4wUDUSXRgaGeimv35sIkw6liqvgLXkfG83BJHEASRnyOa A==; X-IronPort-AV: E=Sophos;i="5.56,343,1539619200"; d="scan'208";a="96357267" 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=NWU584To5ANJKVal7RSzaotgKjo8EEfCqELWBY2aIy8=; b=aRKKVXS4izRlyaVkwRRkr/Wi4LVs6JKgtvgdGoMVQEWy9cyo4ssC9RsH3BRBEPthXn7zbgecV0+jzWfn6reAzrPR0TwezVEMFNAHrocdXycH05YOFoispwfrZyF+P98E4Jhj5DBVFdIZj85rdwUs9BezwTEr3YSR/tDMouFG5V4= From: Alistair Francis To: "qemu-devel@nongnu.org" , "qemu-riscv@nongnu.org" Thread-Topic: [PATCH v8 4/4] riscv: Enable VGA and PCIE_VGA Thread-Index: AQHUkaIjHFlr/U6MGUiDwS9OQG5OFg== Date: Tue, 11 Dec 2018 22:37:46 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.19.1 x-clientproxiedby: BYAPR03CA0015.namprd03.prod.outlook.com (2603:10b6:a02:a8::28) To MWHPR04MB0401.namprd04.prod.outlook.com (2603:10b6:300:70::18) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [199.255.44.171] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; MWHPR04MB0608; 6:wENYpgVZi7tgEffGfkyhU3mVU9MHlIMv3P+kErviiv+xr0e4nf5PlQUu+wlKvU4B1Gn7J53g6cC+heYaH2rzr4u6QtI5PKIcglyK37iXZ2LxvkrkyJJh6L5FWCxC3sHUx4GAaS66lsf7SwutJ6ka6bu1+c4aQKN67cA6gMAYyCY9+QQ5W1V8UiUFIoN9M3iqZhg35bv3ng3FpTogqLY1t6MT1DhMAJBJ0BOdRM9ID/VMTScrGJdHSUdKKZw6AUncDx8921ujGAuWmupEi6g+jTUkXh153EP/vpduCOAsu3+zPSG5PgLT2ClDvujQN7Z/HPGTuPPgeSmzwQBL0LCfdACexBbu3x/NZ8jsk6r7lu7sDsW3hLxtvvMSiLMeLwKErItx08Kbirb6olW1UtFL020rT9D8nCQbie4DPKcYyVTu8gx1dTQJjqO3BpiHL8RVIKVr7KUK4ioePU6R2EoJwA==; 5:jid/8BVPVlm4kDTv0yhna2jUDDNnpp8vL3GhqlPdPLBsnurV4+B4fCvZZ6YIAz5lx0N44dEMzbqZGTP58XMXTuJQeg7UoJcTm0MZQGJ8r3OtK6dLz5lMDqexTigYcnsse6iCv0xRS2E2e9k68mhkwBM9jNMQ2gyGBgJLL8WSSBw=; 7:rKjmIQ6cMju0PQ+aL8uOQwqt3IJUBE88xY0vWHHadDJZJkw6z642gmfsPn4+Y+2KKplE1Bogc+LGbZw5dB1Zv7reh148ftZturpR2RdGTL5A9XQyGEk0pG8xV03F/GpLDLQfuZGD89fUWJvqewCMgQ== x-ms-office365-filtering-correlation-id: e7b7a532-ae34-4b30-707c-08d65fb9458f x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:MWHPR04MB0608; x-ms-traffictypediagnostic: MWHPR04MB0608: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(3230017)(999002)(6040522)(2401047)(8121501046)(5005006)(10201501046)(93006095)(93001095)(3002001)(3231472)(944501520)(52105112)(6055026)(148016)(149066)(150057)(6041310)(20161123560045)(20161123558120)(20161123562045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699051)(76991095); SRVR:MWHPR04MB0608; BCL:0; PCL:0; RULEID:; SRVR:MWHPR04MB0608; x-forefront-prvs: 08831F51DC x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(376002)(346002)(366004)(136003)(396003)(39860400002)(199004)(189003)(446003)(11346002)(7736002)(54906003)(486006)(86362001)(81166006)(8936002)(81156014)(36756003)(118296001)(476003)(478600001)(8676002)(76176011)(52116002)(2906002)(44832011)(14454004)(25786009)(4326008)(2616005)(99286004)(3846002)(66066001)(6116002)(2501003)(50226002)(110136005)(102836004)(305945005)(186003)(6436002)(26005)(6506007)(72206003)(106356001)(256004)(68736007)(6486002)(5660300001)(53936002)(71200400001)(97736004)(71190400001)(105586002)(6512007)(386003)(39060400002)(316002); DIR:OUT; SFP:1102; SCL:1; SRVR:MWHPR04MB0608; H:MWHPR04MB0401.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; x-microsoft-antispam-message-info: ccMduK0QvyffGcnddLOG49GYlpSMF7XEVUWGhaUt7owIrG3ip3Ioqq94IO5QyCMzZqkbQNHhn+9o0eoH8Nbi35uw9VWiSMXzMVygT/i9bs7BCgCi/u0ozUj1jcPKm+Un7WmehjzXFcgfOd2+xyLUFzdfOEMgGX9hU7uDQtoOIxVYa+exvaueTwd8yWcSYt/ofc3WIKhBGJQMuSlAmMEwHyQttMSz0jowwKDmorFZdVMaMRs1CDx5M0eAF8om86a997HtcEttUsrXeAi0fwKhBHOwevnWTSD7su8F+vkxpDtCQUm9ZUtOD4ksl4VuRyOX spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: e7b7a532-ae34-4b30-707c-08d65fb9458f X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Dec 2018 22:37:46.2777 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR04MB0608 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 216.71.154.42 Subject: [Qemu-devel] [PATCH v8 4/4] riscv: Enable VGA and PCIE_VGA 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" , "palmer@sifive.com" , Alistair Francis , "stephen@eideticom.com" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (found 2 invalid signatures) Content-Type: text/plain; charset="utf-8" Enable compile support for VGA devices. This allows the user to conenct a display by adding '-device bochs-display -display sdl' to their command line argument. Signed-off-by: Alistair Francis Reviewed-by: Logan Gunthorpe Tested-by: Andrea Bolognani --- default-configs/riscv32-softmmu.mak | 3 +++ default-configs/riscv64-softmmu.mak | 3 +++ 2 files changed, 6 insertions(+) diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-= softmmu.mak index c5ea36cba5..dbc9398284 100644 --- a/default-configs/riscv32-softmmu.mak +++ b/default-configs/riscv32-softmmu.mak @@ -8,3 +8,6 @@ CONFIG_VIRTIO_MMIO=3Dy CONFIG_CADENCE=3Dy =20 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 c5ea36cba5..dbc9398284 100644 --- a/default-configs/riscv64-softmmu.mak +++ b/default-configs/riscv64-softmmu.mak @@ -8,3 +8,6 @@ CONFIG_VIRTIO_MMIO=3Dy CONFIG_CADENCE=3Dy =20 CONFIG_PCI_GENERIC=3Dy + +CONFIG_VGA=3Dy +CONFIG_VGA_PCI=3Dy --=20 2.19.1