From nobody Thu Mar 28 23:55:28 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1531182598037293.68738469056507; Mon, 9 Jul 2018 17:29:58 -0700 (PDT) Received: from localhost ([::1]:45086 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fcgXN-0005KC-6r for importer@patchew.org; Mon, 09 Jul 2018 20:29:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41452) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fcgVt-0004Wh-9M for qemu-devel@nongnu.org; Mon, 09 Jul 2018 20:28:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fcgVq-0008Fe-5t for qemu-devel@nongnu.org; Mon, 09 Jul 2018 20:28:17 -0400 Received: from esa4.hgst.iphmx.com ([216.71.154.42]:48835) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1fcgVp-0008Es-Ol for qemu-devel@nongnu.org; Mon, 09 Jul 2018 20:28:14 -0400 Received: from mail-sn1nam02lp0022.outbound.protection.outlook.com (HELO NAM02-SN1-obe.outbound.protection.outlook.com) ([216.32.180.22]) by ob1.hgst.iphmx.com with ESMTP; 10 Jul 2018 08:28:12 +0800 Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by DM5PR04MB0394.namprd04.prod.outlook.com (2603:10b6:3:9d::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.930.21; Tue, 10 Jul 2018 00:28:09 +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=1531182494; x=1562718494; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=ieuDDImRehqsEVldr2o9MUKBWwf11xSBxHDSjxMl97s=; b=MHEucX/MneQ5L1Y+v/QiArE5Ywp9D1IL1MEsI+seKSAjuDTzIsJm+J9P dAI35hoRyH/sdVg+7MTlcZx0DsF03dFz/bN+Xai8Yi7APpw56WDy/HpVo D5Ixq0dG6jWHz1MlpL86J4Wps1eeysh73eAMIYAYakAFtljB0McXdIIix D0JMP9EYBEnKTF/588aIibnsp25biADCO30Yguzner8osYs7eleos5Cq3 H5zwuMlTMXvDngZHmOVbbhPkPYpuLAV/CgDjuhC9WMa1l6FoWyHl/WMuG n94bOPIFMrl/GK54OiIVio3lts+EDANQRPJHLitCPGIhzz5DpEZltmcGj Q==; X-IronPort-AV: E=Sophos;i="5.51,332,1526313600"; d="scan'208";a="83570417" 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=5JJUUVwB++05s1ZsQAUFrFcDrgGvh3vEewnGEK0Qpv8=; b=Xcie1Ym7IVr9Fy8AzM8t+Q5evcZbqB+nQeoNAS8KIZsK26TiTJxMIsImY5q8tbVDXs2n7pMVr4kScRJj0aWXFiUd32ksvlBPtWKW5C70R4KYsaQjVEsMUoWX0w+APqpxFi/3v/wtK9BBm7BXYnmGJB8Yx4z84siMT5a9a2oDBeQ= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; From: Alistair Francis To: qemu-devel@nongnu.org Date: Mon, 9 Jul 2018 17:27:59 -0700 Message-Id: <2ab3ad45e569dfb484c125e5dc46613081c71389.1531182400.git.alistair.francis@wdc.com> 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: CO1PR15CA0056.namprd15.prod.outlook.com (2603:10b6:101:1f::24) To DM5PR04MB0394.namprd04.prod.outlook.com (2603:10b6:3:9d::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3b2e2c4f-5d5c-402a-2181-08d5e5fc0395 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(48565401081)(2017052603328)(7153060)(7193020); SRVR:DM5PR04MB0394; X-Microsoft-Exchange-Diagnostics: 1; DM5PR04MB0394; 3:dhJvOx6oZeeIdiEFrlp76kddeq7lr3rsMZvYyPoQv4g6QhUIMPzpcaT1/qI9UEFNCOk1lTPTiVSrxucFJUBzCzWVfNDuLsKxVucsMZj6a/JasXO81S4sHY+i2Ql1awJkz3AqcJsSlaa8lXHEHHZ0znZkYo6Hcq0ZGzGXwMPYAgRyvrHY/Rpwawv9XYNeht47uJb76lElLW6OBAP7Kk+QQNeWmXBsrQsLUQ/AB8ALuZqyEUuBWa+cStC17rEEG9VB; 25:qC5hpIBRoFkhKiOJC8BoSmn2csTrYOQwbLJDJPotpPhELWA5Kq+bz6hvEv1NGFrkWPtHVoFCIA7VYtkWwuQNMAGXVZ+z4IrIRvulgbI3IpeoNIs53gRdGkS1PwUdB6R/zJUipMcxoX9kawn1iSbii6NVA8PF5vZpn7WOcodUavaMuzgyJ45FaHTEpffknYx7hCYqy66gJKkjPIWd/Dm8gNKgs+8y2g8nL/Ulbu3SdORL1IPGpVv+7sIe5Ala3/OLNIZ9XjbKCiDBAcE6a7TU3C89G42eEoBKZqESdWybywpZCq7fxWbvd4kGSe9IfwpmozqJlut8UJyzxqgoHEoGQg==; 31:9+k8qgDpuRycPrLbYqRNKwakeQFIkZ/tG2/iTFrdcZnAlgtP3CFWhjzFg8umqwSE5/EA0KmAl7JydRvktr0IDHrVeZCGS3HrmksBrnH8Fi+ACPRJ99DFvGiACq3nIwz27wG7uvzEgUEPBjYfkYkfBwsC+pb6WkEbTUq7bXAYIBDvNoPJ7Yt76AUN5BNohMO69XBhF8FckN087IKUJ7zSzkaVwb3uM0UeaZqf0yzmmy8= X-MS-TrafficTypeDiagnostic: DM5PR04MB0394: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; DM5PR04MB0394; 20:4WZAk3aEfzfIs95y1S6Rdej0AImKJgfxcBXsRsS3/NYT0FOcy7pgvy5kg5sdgpFWqb0/7jlrGq89K+UqRqVGnpo5HH4LefPaGFpqzbUrjpnaWh90X4v1Fd6iX2EmiyGov2WC60bzDLUHwqQKywD8t+s6WB4yuVytjQXY1tZL5GeQ/NMM/3v6LAoJ/wkzlnHLAHDr+gAC+igvGq6A7s5a6ioDw1xvohhtnd6E2JcNMF1yEWDCEI1KhruuFLedl6uoO2IgyXUnIAfnE/J0upck9UAr1BmwloRtPY7qDXNbB8BJzh1nJkRCJGfkMJ7YQxNd7xdHdd8OpUhLA2z4e43vwAiFMImynhO0Dco9Ts5Z7PdOL3PLtXa3SfP1b37pxCN8iySfZnZ02JG629o3jnRxvfHznBG43V6QOIqurEaeWbjxUkLVEOVcXGELyQl1dy9BlapUKn+i65nClmkwV3Kg+WT3pUDaZ7Ez5lVEbMpdie6Kd1azxrCdaIa45ouFOaCi; 4:I4naaOYU0/UA3A/HNO3jeLbco016qSUCaOc/jWSEVMNkU9ZosI6qtHzqY+YWBJq42UBaHWThknjC0Q00nMlZXBlVJ5BZ4H9GnJRrwMtS7dWXYbcQ/Bfor5zWr0r6JHr9h8odLe1v8ysvjthxApFSnYcaAG/X5S14YqLRzaX/KfDv//qqEr0nnPlboy2X3MTbshH5lgknbFsCWM6OXuiLOcaAormxUb811UcBDjFKTQXRhIQGUReZf3NLFxZ30Ij/inkc9oR8qTSPm7JwCtHCKg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(8121501046)(5005006)(3231311)(944501410)(52105095)(93006095)(93001095)(10201501046)(3002001)(6055026)(149027)(150027)(6041310)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:DM5PR04MB0394; BCL:0; PCL:0; RULEID:; SRVR:DM5PR04MB0394; X-Forefront-PRVS: 0729050452 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39860400002)(376002)(136003)(346002)(396003)(366004)(189003)(199004)(7736002)(6916009)(6666003)(305945005)(76176011)(66066001)(47776003)(2906002)(8936002)(478600001)(81166006)(8676002)(81156014)(68736007)(72206003)(50466002)(52116002)(51416003)(48376002)(50226002)(36756003)(2351001)(2361001)(6512007)(106356001)(105586002)(6486002)(118296001)(476003)(316002)(5660300001)(53936002)(4326008)(16586007)(26005)(97736004)(16526019)(25786009)(86362001)(6116002)(11346002)(186003)(3846002)(14444005)(446003)(386003)(486006)(6506007)(39060400002)(44832011)(956004)(2616005); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR04MB0394; H:risc6-mainframe.int.fusionio.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR04MB0394; 23:klXO9pTr68njNOsYCthMm5qBdEyjzR5UD0inlByvP?= =?us-ascii?Q?NzfN30bD2W0KQFmNSf21HA18cs89bFKFABpBRNjJTZjgmsWTfTaGwsVdAynU?= =?us-ascii?Q?4jpwK8q+kLv6MUCiWY6vNaMqEe22NDUozlfhntkM7HGOe3sG3ZGwjbC1yruX?= =?us-ascii?Q?APSzgvZMupAG1J7ITumHT0qz9thhS8t/4NT2Y/CElHrpcjAWr2kfZ7mxbBMS?= =?us-ascii?Q?I+UV23FbVgfrL0BEkoPYXTauMXYh0vW2Cgx1GCnHj9IvpZxjMXVllgg4b9xM?= =?us-ascii?Q?5ho4c7BI92n4PNPPB2f7OzrgnLYBI3SNBfzml2ZMLRluEF/3sHZfAmEGCp6T?= =?us-ascii?Q?gDpwH+SIUh1tneHwQB+S/P0QsWkMkEbph9E/4vh1vbdv2ykls00JWKEzNPOJ?= =?us-ascii?Q?ytxTK66XPSAS2/vJ61e+5+Ka/WSrUHpQ5jVlBq8YwswqGdln3sUHsReayN3k?= =?us-ascii?Q?ASwWGOWqHvMk0dK/TIr2GOS3EyyCa8OL3TNVkyhHGQV59eEs84JMNMFnC2Tg?= =?us-ascii?Q?zVyEj6WPNJ4HRu2R5UlBuNwZFkGFSl3iD9plMjrSOvpOkPdQKrARIQFwyGrH?= =?us-ascii?Q?FQ5BA8Zvin6vT0UJWvfZwh1NN7yqaHGtlzwIfhPdHkYGTFo2/2LFKHvTw1li?= =?us-ascii?Q?ghmLVd9OXOX502iGMjEWk09oUiVlgkIzcpIYL1yMn1IcI9BIcewvMD6E0igM?= =?us-ascii?Q?oO1Br1yjPFQvTsIqgAeamtA+vA689FfunlfWYsBgbro+BZILlFXBm5vjTDs3?= =?us-ascii?Q?iI3Y5pBh1U/5fXMl6GWX1KZbKwqJLOIJPvXI8RK/CtC8FziJZjFIA2QMbPfU?= =?us-ascii?Q?zDFyA9yHklDSL0q5aqQFYqZafnzCn5NfEkwq4Ztha+tGc80KQphcaWB4I1Ps?= =?us-ascii?Q?XDap7K+NSBCgQ0x6g0+JSsoLg7t2eoLX115nAEUuW0FT3RgDCans5t3GpIGc?= =?us-ascii?Q?CTRMrNzqP4N3jzTojTf9SdAxAH74f9Kqp8NzjTrM+V7LAkNFZoUGdy0cYBTd?= =?us-ascii?Q?BZOHAC9jQk+Kghk7zSFU+s4lDO4fD5TQXk2JE7nMWFZTHVRORLQC0AqmhxqY?= =?us-ascii?Q?aKs99HtYdTlNzVMSuI6+SGZ0ua1FzZthvjuAiosBInmsL7fTqIwsOWI6DjSk?= =?us-ascii?Q?uPH3GnHQFpnJZ06+8lcJHC3frXl9EovGRH/WtyQpaKSuCV+HpraASflMtu18?= =?us-ascii?Q?DSSgB0qkNOMozNJIsyRqS0y2vNOT3uRknF26o1/kckM09p8j2OyKdI4R6r8H?= =?us-ascii?Q?xuHpWtmGj00gFbhDBAc+/DEuvqoFrbDZtQScGFYRt+rV8q37sGo+O6vrgemL?= =?us-ascii?Q?GlmdksC/6b/YIhvP6Z4nHY=3D?= X-Microsoft-Antispam-Message-Info: 6FX9Mt4CxXjnD4uh8CZZx3VZXrsMmtDaU918VYTTWDNNYK8aXtrp5D4yl55dgz4GpDPD769JIo2kqmR2P+1XiKPV1rfmLktpgvbSoqi39oyWDsHyqaGPibVtO2Pd02rFspzohlh2184oacUyl1VYOjlOzxYMCJpBTSxeVV8jG+8cAbMdSoWGUbbYOZAHKb+259SbbljlRYmr2fk8JoN0QldlY6vAdunpyhJK4M2l+6vYgUfLJzI3epGlr3ORax8T4jSRc4a0GNFYUgbGRTMWuBHPYYvhYm+2LLciiTbEOu1DWhfDDIUHWevYS8IAf9iLmxiAAHHVzSx9cVUlynTtL8EsPVYOLRdNWy2p4kCo6VM= X-Microsoft-Exchange-Diagnostics: 1; DM5PR04MB0394; 6:TF3stIwcr8mcdljPsfikdJqrO4OWyBLRxwNQvX3El9mW+7K2lm8Xh9ciCyDQUHHJtPj0OGDkbx/XOh6TMZ14Eo/9iph7YN/PlMaq44MW8uv9UOQUFZeIxDEK2EdIyngcEdxtAh6ha7hjYURnHvJIcI/dCsvuQWe+Qu3jkqzPsQASaJwTfbA3AimU9wx8fTJPLRra1j/0A63O4+agkO1RuktWEkgPzCnAU6yWcIx9E0MmDmNDIXtfmrrSX0wDUGIunaNOkGWzYEJfWLdt5ZKS0a/4PE3tTZLjAOnQ2zPSDuSnY9HAguK1MtOyOja19lKC8SeI40N3HxDhuDs+Mz0Bl6qh1w2kNYSJSzKQLU5TxJZf2mSnA9wZxTukY6f60UeS6+uMIDHzoO2F3qYsNbjn7+A+jPbyIFymL+p2qTv919SKYaisfar610rzRvz0qn6LZaSN7z/AfUNjwUFXdF6bcw==; 5:QOP5n3VjyI15WxcfI3G+a4MuN3owmoxdH10tKNqpYMXNxXtKBHLOjoP1hojqWTNwHU+HNDt+/UYN+4MR/vEQxPJ+esqIQv6n9R/xVccNLnREbGTKtuJn4u5/8k5bm4ypYaOz7PRl0HO7jTLO6mYsUZdaYJ1C9B7jf4qyrmj0MfE=; 24:NvYd7LOcMV5V1stYPvKUaUlsLQoLvV69g7AMsk3ImcdbHOW6BUdrb0vQ0/++cPTGvn6oXYBLWif625A0nin5vpuNZV+eQlSmb9rkuwLTj6w= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR04MB0394; 7:nGv67n4AlpZZ3Btc43jAWD9q2aSWhSXHpg4QKMlK5gS8p3GdVS3Qaonv5Y71Vw0OSLn68bx+3y6vk0ZqZxJcnVIIVgSnQgnZEayQD7S/cCgUp/j5vj/9AAY4d98wZbtlVhC1vKH9RSFRRkmqDmVm82kU3GswRYOW07K6Fm0bT4KbDe7AA6P3SaKch6DNlrfmeH/TobGQDYGLBtAqRtob6DQv61LPYFTRH9T7G4tEFX+KyE2RCGtvWFhPZooRvikq; 20:WRcbqppDVxnIWpPG+sUYUBvc64J6w9uYhoUSHY/Am3qyNL3cekKkYLJrPzotXbaHnX6Q75kH12RwGAM28seBBw/akaxR8ahas+oFzuR/3W3e6AuedNEwg/X5+gRa5SKyeyRpJWL+A0nGglL945yxRrZHfAY0hdG1NE7IBOHjnzI= X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jul 2018 00:28:09.3694 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3b2e2c4f-5d5c-402a-2181-08d5e5fc0395 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR04MB0394 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 v2 1/6] hw/riscv/virtio: Set the soc device tree node as a simple-bus 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, 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" To allow Linux to ennumerate devices on the /soc/ node set it as a "simple-bus". Signed-off-by: Alistair Francis --- hw/riscv/virt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index aeada2498d..5336166f6d 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -121,7 +121,7 @@ static void *create_fdt(RISCVVirtState *s, const struct= MemmapEntry *memmap, =20 qemu_fdt_add_subnode(fdt, "/soc"); qemu_fdt_setprop(fdt, "/soc", "ranges", NULL, 0); - qemu_fdt_setprop_string(fdt, "/soc", "compatible", "riscv-virtio-soc"); + qemu_fdt_setprop_string(fdt, "/soc", "compatible", "simple-bus"); qemu_fdt_setprop_cell(fdt, "/soc", "#size-cells", 0x2); qemu_fdt_setprop_cell(fdt, "/soc", "#address-cells", 0x2); =20 --=20 2.17.1 From nobody Thu Mar 28 23:55:28 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1531182606916964.0291101274267; Mon, 9 Jul 2018 17:30:06 -0700 (PDT) Received: from localhost ([::1]:45087 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fcgXd-0005ja-Qk for importer@patchew.org; Mon, 09 Jul 2018 20:30:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41497) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fcgW4-0004eb-Ox for qemu-devel@nongnu.org; Mon, 09 Jul 2018 20:28:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fcgW1-0008J0-K2 for qemu-devel@nongnu.org; Mon, 09 Jul 2018 20:28:28 -0400 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:18954) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1fcgW1-0008Ii-6n for qemu-devel@nongnu.org; Mon, 09 Jul 2018 20:28:25 -0400 Received: from mail-sn1nam02lp0021.outbound.protection.outlook.com (HELO NAM02-SN1-obe.outbound.protection.outlook.com) ([216.32.180.21]) by ob1.hgst.iphmx.com with ESMTP; 10 Jul 2018 08:28:23 +0800 Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by DM5PR04MB0395.namprd04.prod.outlook.com (2603:10b6:3:9d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.930.20; Tue, 10 Jul 2018 00:28:21 +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=1531182505; x=1562718505; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=+/J2hhMfVls7SJP/DEbyHDxBN2Gwa318fTn5co8HZBk=; b=HHPWPa6IpR6x2l6W172EwofITno69kYRak0i2MOFVsfZjR4iPAZ34Rp5 /QxS0XXk5I4S6ugMtFTBT5qdvI7NL9gs09eXh0Z/+qZGI8xdssvrBYfTe S3zxeotXgBSFXX5AsBIclTnNykTuaXqlMmH00ZR1XSqRLSvxnxOsBzAva 82GAFDbcLz7YOPwmwxl2JJaHay3X2rG5kVFsfMRw8UezkZb0NtKJJGZhW GbvasnlivS2XA+5U1073qArT1ZWIBSzIlwe/bztsnpysU0OaI4qKc4XBR WYRuQDvE/4se4wsdKoxbIF1huQxs0+0zPiHfiCkat4YqNXPro4bLSL+dk Q==; X-IronPort-AV: E=Sophos;i="5.51,332,1526313600"; d="scan'208";a="187084044" 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=9l+OjGr9O4EjmBS0MXz8BDvQjz/Alw2Nhq2bE6TgyPQ=; b=bLpeBVIZ0uwObywVZBDf3K8uQmGegxEEKZ4RelEVmN1+JA36cfMEUg8aDmrZo6JlSWvlMI++PLY1FiyKEMbGwNRVSY7NsPN3StEzlS3UJBucH2xRpZdTuMawq5d1kjlZD38eK56BO+6QXIuKA68cqguB9Db219vr/Q1E+10emBI= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; From: Alistair Francis To: qemu-devel@nongnu.org Date: Mon, 9 Jul 2018 17:28:12 -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: CO1PR15CA0052.namprd15.prod.outlook.com (2603:10b6:101:1f::20) To DM5PR04MB0395.namprd04.prod.outlook.com (2603:10b6:3:9d::16) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d6b27d33-ae39-4118-bdee-08d5e5fc0afc X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(48565401081)(2017052603328)(7153060)(7193020); SRVR:DM5PR04MB0395; X-Microsoft-Exchange-Diagnostics: 1; DM5PR04MB0395; 3:fCd23HMeuBzMrOstZ3ZZZBEJCSgAI/0WHXW1mwTcpGhsSSwmeC1IAEOaXD56sjA2KuqC0PdN6cnmpq87gv1D/U8kT5ce4iBIewbgwTIp3SGFlwVwGkS+EH0dJb9/LrO9UMoxu48Xj7VV5tEhAOVBlUEnjAtbanaMxfq9k8D7X8cJMBs79Ar/+N9ce4Caz3ePoCRvdYOx50D26tH8YUWzhcFBsEyt0Sd1v6elQv2lmL68JPY4GxsizSFMrbpsBIf/; 25:mB8YsMnv0oPomzzdjc+V4elxIvJnzuOB2oa9M0hJswwwqF8dbEpFfJ5P42oP9RohDQpCibLGLckHaKvfTOwUmN8barT1MaVQ+DIf9Ft6qXOmkT09r5c+XIiXSTiJZv+hKiNOd4KTMvqmAmXzKjFuRtI3OobUAN90uVOPsqn5lvyBC9oE5ThCYGKukclNDsfvLKG2l7OFlpbfVmntYEIn+OXFmzfybpyuZxoJrW2uUNmwChL8wA5k7dpujjUlOJqVFmpU6fxRMMGtXtOpy/yyaixjIF252dgSOaaJEopjiR0gd6xdTJ4pAr3F+WgdlSQzuj0BDLLXcPiJ/DoLBwkkgw==; 31:NBe0e28gBEUPjncwzlOKlnzm83UmqLrERitqHysF+BjAopCOQ4cU/9Vcme1CbwLRDTGjAR8BuV6NPgzQH4/vfND8X1edfWvUuBaRRq0LJaCctriCncLJgX8Y230M89SjGVXM3QucNPxAovDe1cBdaRivZmUIG0SS1tq3nXFjT7dYqWRHLk0+rKtOodzNzukkSfTA27XCurIvMk+b2CekEtqcNNdMiFahhE1c8lIikJM= X-MS-TrafficTypeDiagnostic: DM5PR04MB0395: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; DM5PR04MB0395; 20:gQKfikRfNtT43+h4rV3EyvCp9eUMjhiQ8yv39ZxZJ7JrRu2AUB7tMH6hUHKyi9z3F+Z+Tg5L+LUt2cKi8p9RlnW62JmZTCXIghlMcRq/8bbMUSByafQWyv5prZNf5md+g2tw5SsCDKqgQskl+7n87xhPXkKkwM6BeljnbO+Q874EgbjzY99cFf4r3iRmK6tjKD6JaJ2DrkhjE0fFJEgDFPHg374O+wIUpejXiW1w3q6YQvfUBvGOEYj7IrXlaapxGW2iPbfb1Et2ATl7QeFDlcx7PiE7iED55W3GFsZ+KN9Xvq90cihlan6zT3Iq6i95tsDbHOIxDxLM6ItXdhC/E7byJhwPYXTRFgMz/AcKAe+BU/5JsbGhgTs+d6bz3GO2QppxkWNRTbPB0M/7CMIcJ+4vpmzWUx7AelgDm1lSPDsKwNh/FCaTdRYzae059KJLgkYUP+YL1RN9KlozL6+Bhequ4Dw5405cUcfh5U/22Nke+TnsJLnfAku+aQ1/qz4V; 4:AaYqsAWw9+nTsbYJbUpXG7hcVXrdhFtipmV+7Ev40tkh7tnASEdJcOVhTgAnovq8ZAeXAb9lYojEtRBzRSAXl0X6EQYqm+E6wYlCYyx9fYdqU2I26EiK/HsWMRfQOYxlxm+zVhqXO8PhDOVBoT2iVSnxC7fu5I8Cs0W1PJrLudyRhwXXEUgBw6BDyRYpkib1/p7Jua0y2BJVGIgLenEDLYAsAiDS4Kzd8no9gWqffd+Thks0O9LubAMx0eWmdg15J32EMev/fi+ffgKxOc6+vQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(3231311)(944501410)(52105095)(10201501046)(3002001)(6055026)(149027)(150027)(6041310)(20161123562045)(20161123564045)(20161123560045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:DM5PR04MB0395; BCL:0; PCL:0; RULEID:; SRVR:DM5PR04MB0395; X-Forefront-PRVS: 0729050452 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39860400002)(366004)(136003)(376002)(346002)(396003)(199004)(189003)(44832011)(16586007)(6916009)(2906002)(316002)(39060400002)(956004)(386003)(118296001)(2616005)(53936002)(6116002)(446003)(486006)(11346002)(3846002)(2351001)(6486002)(6506007)(97736004)(26005)(6666003)(4326008)(16526019)(476003)(8676002)(105586002)(478600001)(68736007)(48376002)(51416003)(47776003)(52116002)(305945005)(50226002)(7736002)(8936002)(72206003)(81166006)(81156014)(5660300001)(2361001)(66066001)(76176011)(50466002)(86362001)(25786009)(14444005)(106356001)(6512007)(36756003)(186003); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR04MB0395; 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; DM5PR04MB0395; 23:2wsh8EWBjOrrA09BG261OQHCOgCTNe2g0aJpGCbEp?= =?us-ascii?Q?Fynr/hIP2/TWa41EqMsH0/35SNGSGnh+mqto0rf7Gvor3vhtTfp57jZ5SlkY?= =?us-ascii?Q?MClJvLnhAVkE4gLOn4cqaFnMNbkx1wI3k7AeHIQnWnPevpwQgrzoOfcBBwc+?= =?us-ascii?Q?qDztzLGyG/xswUgYwhKN5gEwtmZz6KSgPQaxZdbWbk34P50r8yq61zqT7zzy?= =?us-ascii?Q?6IFoC8L0XGyzfMntKKFXpnbPCoPEzMO91u7RmbNONTb5+LyGGCukR0jlVmXu?= =?us-ascii?Q?X1tvu8wradLkXxb2dQWhpqO3l66QxGomIz4unInTaImx66dTNEAFwuGTKJHE?= =?us-ascii?Q?04/YqDz+fLv1Ff/MM5nPDR4XJG52dA8XPgptKFAl01GXP2G4DAN0JYhx7Lsd?= =?us-ascii?Q?gRDWzCL6oL52Mx+TR40ilFa8sqiEkgpfAGbaafjwI7bJ6ioXkNliccxlRkbq?= =?us-ascii?Q?CTXqFnBcJ60zhATka0CTKhNGY4qxf/epMZbYeTYMYbwUBmqjl4grN4YtOsnM?= =?us-ascii?Q?SDFy+4F+oH8tScUMzdh2MJjzLu/sERLjFxEO8c/49ogpOoHzXIxX2ngrdm3E?= =?us-ascii?Q?K5V9S5PNqVhdjpgsgeJ2hTrtv85YfRXAWWtDk/kvyCkdsg/WesScTpQLs9QP?= =?us-ascii?Q?Mi/sKUM6TdLaw9Q28JCrgcYe0iMSYtESLYJMWVFk2B7jEFPoQdSKJ1VMZRuE?= =?us-ascii?Q?cXk0YlpLcUpVH/ErZ6ZjUMrgiLuQ5ugptFbmgAgRAkyt798FsWDqELuuZs5G?= =?us-ascii?Q?igfJkh1c/ykM7TkAd95c0/tu7GvZVla/jWdgayzmrhMsBIruB1ZUiKLjQNsy?= =?us-ascii?Q?n1bsjP642e/6nHG4tymENZtFsZvBTL9cs81TUCmR1txsPB+JYJZiCG6iAhof?= =?us-ascii?Q?h1d5ZWNuu6/87pdnD3vbdKKgBE1RP0Zh7PRehcCfGDiaP/JQOJ0LlbnPjT2J?= =?us-ascii?Q?42YyyiNw2xcdmmkpe/7skOuZGZz/HqXFAQTb1kffvTDhAUTLYrCz4yOxLJ5U?= =?us-ascii?Q?RDh1CHTxinvk7orjuhnNuCS/v2rpc9HrDBji7l7Riha7I7rEWzUtVtWXDrjl?= =?us-ascii?Q?NVK5wxHJKonXouXB1Rm4RoLIwc6dUMB2aBpsVO+owOu6YIRVlKDb0OKYCbYK?= =?us-ascii?Q?nVgEGpTOsqoUVtAuZPR24/IMvo2whg96fAQ9E71M74T0uaHYTzaKSwkwXWMT?= =?us-ascii?Q?U+Og/wiAVtVhfIB7gIiKsswrEAi/rGUxPpyDjLKHnK3O+SAlfmCY9cflK2s0?= =?us-ascii?Q?K52OduwXf2AalmqQGiaDg2B0lj/ZYjsx/USNFGMIP0R5FkHnYPEEHWdos8es?= =?us-ascii?Q?XJu4Huel/ZtLD7VID4NjaY=3D?= X-Microsoft-Antispam-Message-Info: j85gJwNt/9X1iXoUNJNKGem2PVKWER0j0whhi+9YtzqwTadJcmKg7ZR0tA8rgJhoMrkITloB2SiV989X8pK55aAHtDDa+Z6dD5nnRFFluhX5PhXmjTbXiLX/XKK3Qj9HxNE1Ca59uwcpI7jHqykwE9XDkyY+xeykbjRNdKjn1X6LDAXL85xDSsTASIL66cRcXEYNuNsttPmsssxG2MqRIiy1CnKRa+0//VZZf6h/SAAJagdlrTk/L3lo5mLrVgD8sjUjyDCEVsgvhu4DK85W5xlAQIoTNvNUwtlfSH1YrHYkzeXAYClRaMmgSfc9gaAKQTnsRi05a5W5gTvJ5ujiLYSjy16X5rnVGuw7D9KBOAk= X-Microsoft-Exchange-Diagnostics: 1; DM5PR04MB0395; 6:7cZ3PURkSELE1kndY6tB4plr7bIIynSUXTYg+2jQ598bcYebUfUt1GKDwpznCpNSSUYI/MaYslnQF0ftPyyRqF6ZF4YGhqkndaTp8H4SP9+vyuIdhN/cr6gNlaUjEDNAU7thmnyddlsTsDR869ew3sAfLK3rdm9OCmyUBgsnw9LWwBoTlG4txcM+BIzbdtiH7CO6uCVTdJlRKsrpGGmy3cuSZcMtyq/WxIrL9LcxxlykCnWRXnFWoU0WYcwneizQ9cqa5Eocqzf7flWSHC4NHahnfn1BifZKj0LpiiA4PyyjK3c5HZemQpaANy1ZXDqk+TqEXbHhKodTQlJXBFp8vivAum0+vnzrrkKc6//8kHHAb9fZrmQLsjwVMm0ItcUyPTY51AMJJ9Lee3K2GAYHUDM+YFUbR90RBdD0rAyjDwyz8Iabn4dGxVMPuE4mfgrB91d00cLknp/nQQwIQWb79g==; 5:40E0NQU0PSwfGMovxxAmQWfN6bIBU7l9j+Mcdo/xD/VuPH+QFjs1DDKovGwV/JJ3pfkbUCThZU5keIifwG1lH47O8/ucq/mkVfmklYl4L48mIufJ+l4NeMy5iltTaoqGCZJXmK0K6UxvWNGVxQWe/BL5w+JpnMg5MSoOEXFSEWs=; 24:p16BRm9h10YwhfVK+RyN0yr6SblIoSBoJwUUTJQkQZ0nQ24VGpE0mSF9NX21SgPSrpd46VJLrfOJYgRATPckI4QSmCHFnOn0EfRhtxUf4E8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR04MB0395; 7:zycDHucmbCtXtN3ScUgHp0QxjzOsWfqxQ39REf/PwzcxqFhMiu6yiM06Engr8r4s/B30vf4M+IMgj3br+6WZ8fVslPVMbR1zUpbJpsGRpK/TAvLBo5hPRh/wSlmSsX/v36WIe3buByUqrkEXKAiwWHSb7w8af46fjEkWZEYrx0gfTx+jRfdgltQRdHkUZ7AsDciB/CjuEizt7eTa209MKzPIFQbJ2GOkrloY837LojwAtAWsSbG0sI44xft/z3tG; 20:NAcUSGn9TATGbX9t1xqBhKjPkhKfoyCk1aRKHDrUoaoltnboJbC4Jqb6YCoUyIxZlqtqJvcxkWdCthCDnFlekI87VGgaYOern0p/lEdZYYFQ/oFJrzlDchfPKJOv85EAzUIHhu+SAALRgjzqFaI/SeI+fdvL6RfKL7hnGIg866E= X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jul 2018 00:28:21.7995 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d6b27d33-ae39-4118-bdee-08d5e5fc0afc X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR04MB0395 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 v2 2/6] 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, mjc@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" Increase the number of interrupts to match the HiFive Unleashed board. Signed-off-by: Alistair Francis --- 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..7cb2742070 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 }; =20 enum { --=20 2.17.1 From nobody Thu Mar 28 23:55:28 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1531182701802948.7645648698337; Mon, 9 Jul 2018 17:31:41 -0700 (PDT) Received: from localhost ([::1]:45098 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fcgZA-00076F-Pa for importer@patchew.org; Mon, 09 Jul 2018 20:31:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41555) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fcgWG-0004lW-W2 for qemu-devel@nongnu.org; Mon, 09 Jul 2018 20:28:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fcgWD-0008Lq-Pd for qemu-devel@nongnu.org; Mon, 09 Jul 2018 20:28:40 -0400 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:33241) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1fcgWD-0008LZ-C0 for qemu-devel@nongnu.org; Mon, 09 Jul 2018 20:28:37 -0400 Received: from mail-sn1nam04lp0086.outbound.protection.outlook.com (HELO NAM04-SN1-obe.outbound.protection.outlook.com) ([216.32.180.86]) by ob1.hgst.iphmx.com with ESMTP; 10 Jul 2018 08:28:36 +0800 Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by DM5PR04MB0397.namprd04.prod.outlook.com (2603:10b6:3:9d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.930.20; Tue, 10 Jul 2018 00:28:33 +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=1531182518; x=1562718518; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=jnqTPh44HGsdtK3fRol/uDfRZKjssj0DPSOffDzgxjM=; b=KvodxBEm3dm7XjRUZHEOcGPqE3T3EPHBSPq/99E+GWBccsLexOYFNBmE RpDfelvQHEPLo4gTr6mzXXxgcbM78+PHscSfjMaFPqa8e2gzdV02GWXuY J24SedV83vKJGVCP5vZklGC0togRueI2oP6A/s+9cvl2PB21l2wqGpNjJ akQJPxBo0VdAAYx5Ku78j60g3V6vy/3rz9rsm/mqxkZ5RSBJ0mE5rWMi0 ru3cDn9k8VwpQ/5htfBhQC35T83mbjyIsQYNMC2obDbDZ6oFzRfQ62BEi ZRAPQuKHQPA1rb2aZtxoo+zGvuC3suBdFcniQPhKb87fPC9s6F/buAMIo w==; X-IronPort-AV: E=Sophos;i="5.51,332,1526313600"; d="scan'208";a="84859317" 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=kLdoiga1ak+d8uATjHbVsSf132QoQMoKAowzrUYeTXQ=; b=cS0COW3RF09Fsven5sv1MKFgybdPgzx73tWXUrax6p/HfOH9Ly05jLVE3QSNdSoFfsj8J6pSASEg1plcFxN0HtRsTCKXv9JZDWoPkyrXdK+adLgKCsmT6Uq+nWq2Cr2m+7iu9j4fIXAVe64FPtamEr30sMB7eynvWkujfo7QXS4= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; From: Alistair Francis To: qemu-devel@nongnu.org Date: Mon, 9 Jul 2018 17:28:24 -0700 Message-Id: <1183ecd4c583855f33f36cffbc9307a094bac68f.1531182400.git.alistair.francis@wdc.com> 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: CO1PR15CA0052.namprd15.prod.outlook.com (2603:10b6:101:1f::20) To DM5PR04MB0397.namprd04.prod.outlook.com (2603:10b6:3:9d::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 838402d5-7242-49df-e303-08d5e5fc11cb X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(48565401081)(2017052603328)(7153060)(7193020); SRVR:DM5PR04MB0397; X-Microsoft-Exchange-Diagnostics: 1; DM5PR04MB0397; 3:r1xjM1GAEagq+WSQ/PGngvXdrd8oNgXD3263JRjajbychFPqh5se1JeFgG17Cb9S2+ji33umbFXwobigLoeYBuJYwcSdB9VOM4D5Te547bOWvVlAC+LSQrVBJN8Zs/+NDOQwSamZ4R0866jvjlZzsBlzSlrriDxxcZWUIMrr5Iuoy8Pn36tuVIzpD7zPG3OQe020XhsE4KWtzS1wqszHpSTKas5u26v+ZsXfJ+hHsr3faX+IblcpN2Qq/cN+LxEG; 25:W51bA6Qs7pldlyrtFxM3BAJLcgfbLbNaHLnzfOGZSY10tl/5ROV6CUx+alTx66wkTGL89ct42bEnQ5XqXo7zh7Ho1Kl8TKUxPgf5cZaN3JdW05spgyovGfJYuZ32Rz7UD0u+wduldCXhy+Jp1aAkxrkG/hFojW1vilmAG17LKMaGpzs0IArIfzSi1Z8HwwkU7AZq7YJ9TiVNCIVRUIEJnrJibj1tddTH1cdQWdl94fTV9JkG3+K2W3hxmVo15U77u/CdR5orre+YVqrIHA8jR9FJuL1rSP9UCPqXkNuvLD5VcFmJSi/ya5IWgzWNhweZzOkyJnQIQNBKMBjHniJUqQ==; 31:iw86uS8Be82sp6xhTNiIagZgGZfbESIObaEKiOUDiXy62f8cnbnw/l6bq/H5Wa22UkAC3Ce/7/M/RVudT9VnAkXpospZ8oUVN/lFOm6uNwvlhnAl/ZoXb9+vWBRFiJ04s+vWcVMW2n9PWZ382QcGhQPxfb36tuWVgY9mzkE1ifPlrxoKi+6+1qJEJ/8RdnvZTtqpLwc77G8JTpYRpRrL3oDUHRq124+zUD7OmXWiVcI= X-MS-TrafficTypeDiagnostic: DM5PR04MB0397: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; DM5PR04MB0397; 20:28MLC+vOb9yRW94Y1Tior0c8eHzmh+hOmed3OyFLeBSh+7+BjmELEfwyFFMYxaKoODNPE/LFQfqfsFGO4z8WrjFDQO5bq8PbhrzF+KPppy17NFmF+FWy6WwPoJuXAWC8RqjLfHZXUhrxZcoI8Of8xHWswbgfMMELQYplBWA/skvFsWRAVgwfTtaZTlT+TCGNNdAZQWn1UsyC4m6fagnoWrp1aovMG66TgKQG9HnPFe4kZVcYXA3uxEQkh33HzwqCDloJgqVK+jtLP3Wbkt11B469+RaUzlGNhGUwvF9rNz7EOuvwA78RuL8WzQyATWxmN3wyFLoJpsIpZyLpYGWwHoBlNC6WKX0R8kXKuBD+upETx7eZaUGVMuTdxbhqh7M382fQtrOQaFd3cENnrZ4cAfLfWAd1AHGfbyCKXeyJRWQgw3mV98eLyRGBnAjglMrhuXb4ZU9Hf6YdnCIe3JPWXNL4bT8so6ga7zhomyntvVup0ij4dNTU00RsvYmlr6OI; 4:7FCP+5k3oXPOhXnCtiFmPTLZZ5xG04yjdcQSg6XqPZvpn+jHjE50/apS2jTP8uLKlQSv0pQmk0IUqRVbjyy+eVUuituyp17SKsqi+zbHO41zcqexCwJXJl4GuEwqI2iScjo6BA897rm6NENPnrDdJxD2Ow/SSqX3dZ7BCc2hsSP2JlKJkG8OF2uuDSk9Ul/d9W58eoxmV/aJNQPUkg5CC4fZnT7jaMVY3L0LZWIV70SwyPOSAeDSh7Wvysf+j5CashXsKpHouT8dU5p38ymTXPxLvP2718PN6Rre6Mm9k3EOBQ6v5y2mviFWiLMMRsnS 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)(5005006)(8121501046)(93006095)(93001095)(3231311)(944501410)(52105095)(10201501046)(3002001)(6055026)(149027)(150027)(6041310)(20161123558120)(20161123562045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(6072148)(201708071742011)(7699016); SRVR:DM5PR04MB0397; BCL:0; PCL:0; RULEID:; SRVR:DM5PR04MB0397; X-Forefront-PRVS: 0729050452 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39860400002)(376002)(396003)(136003)(366004)(346002)(199004)(189003)(16526019)(186003)(2616005)(6512007)(81156014)(8936002)(86362001)(6666003)(44832011)(105586002)(50226002)(305945005)(14444005)(36756003)(68736007)(26005)(476003)(6486002)(81166006)(2351001)(106356001)(486006)(11346002)(956004)(8676002)(446003)(478600001)(53936002)(316002)(52116002)(47776003)(97736004)(66066001)(39060400002)(16586007)(386003)(6506007)(2906002)(2361001)(72206003)(76176011)(48376002)(50466002)(7736002)(25786009)(3846002)(6916009)(6116002)(5660300001)(4326008)(118296001)(51416003); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR04MB0397; 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; DM5PR04MB0397; 23:hTcgiHpqQPkyUFXlrFkQJOPMrZvV6ANlbrtuma4ty?= =?us-ascii?Q?+M+mQY2dd+PBPOCXIORYK/TVzalu1yoVM096iOovWMxtNYYrPXiFpLJdr/z4?= =?us-ascii?Q?DzrWt4o69nNRfXFi+sC3U2zQYQfyAHOF7Prta1tlDkPZyerumdAFMrYQDaPw?= =?us-ascii?Q?GNc78FF+VSNvPWzR91JorAt0CJ0uUfZ5Ug/J+P8Z/YossoIOOIscuX6sTebS?= =?us-ascii?Q?EAXZg8B2UAPTsmX8NjYoTFfDVhTYCxpI8p/oGHT2l6E0sED8hI0DGgVE4+aO?= =?us-ascii?Q?tSeEJRmlyPcZEWtkhif3/KLwgAsigbYFStOCVDHDGz9CYKl2OhjnKBx0cLw6?= =?us-ascii?Q?R0k6HnSIkDEL9yp/DMnFp343OcQvH7XKR2To83GFK/IZhNsNTZX4o+8cLenx?= =?us-ascii?Q?LK1+RQwZ6l6Nu/XZ2Il/wN/GkSYAHn4W/Xl3NasJpXcv9wE1KMXe08NjGdRN?= =?us-ascii?Q?NyI9CPHdlSHD0HTLZK98+1r58A86U+Uh8HsrQ2R1vVuIa4W0SfPAxl+J/FXC?= =?us-ascii?Q?rqAF42243AgVBxOtjMbFUu7o0hsKxzWIxkr4YbYgbOId7hvd6QnC5fRKjo+M?= =?us-ascii?Q?aSNrZSL3ik1OAU8HJgRVa+sBWmtkgQZxIQsoQADcdxvCUu0F5/E7VJZlTTsV?= =?us-ascii?Q?33jsbqTMYO8KO38ai4Y8YkYH+6OfyXt9SOpl/wlCBKjS1zZf4cDHlA9rg6G/?= =?us-ascii?Q?9aVv2fpuh6TOu8l8ucnX8ufSD/A7cDYnRA4m44+Rfvop1sdpSKpuDJYfD+BP?= =?us-ascii?Q?BzfP1YTMhS2+YjMdm3EEgKiR68xseZnbyn0Hte87ewknyiAT24tb+xT2f5jn?= =?us-ascii?Q?+eiRC08ENTLpuP+HPWgihoE/aXSbLuQGiY2h4+C2EBJjleNy7NkMZVQFdHUD?= =?us-ascii?Q?Ik2tl/IjO/aHOStEJhNjdiYrYgu3CGLTfkVpuWyl8YlZwa9XYe7kjMtWp8JY?= =?us-ascii?Q?0OuMazqsho0uqyIn8Qh7KDy19312RMEB/lY2Zi7emzithL2gf9i2fRbVbCT5?= =?us-ascii?Q?YDY3+L0ck9Y3Hgi4AP1IUk26pO4CsAezw3hSlpRdFD7ugL0kqnJ92Kfah49Y?= =?us-ascii?Q?6UDfGzpKrl/iQsb450XPcAR9xffdV5lrIJD8GsHsW8dduhAAxrSOEG7aD6IJ?= =?us-ascii?Q?uwH+cMJXTgOh+lW+dDhFJuVN099YvWDmTeB8oBQNiL+OR0UosiUaph/zDipI?= =?us-ascii?Q?KFNCTTp2w3ZBIYvAlIfT4J57/rVaVio+xYIRJfWSHqDLVD4KTxQeVJaYIfHi?= =?us-ascii?Q?dzvSW/n5E5gDo5Zcr1fb1DcAjyyQJG5OntS/Ta+40OxK1GUC984lyi742s/F?= =?us-ascii?Q?S5DyDqrXap4325b4UiY9eY=3D?= X-Microsoft-Antispam-Message-Info: RMEpqOt4kISId7BcL9K2fkj4ribusJVv/zCa95jaNY4qtQYqK/DQHf+KDAG29cVGp7W0spQg2a5D/l4yG3nbtrl77xgnj4PiSH8CpoDE9xkfPQIvS964fAotEz788yq9f3QRYALFVuvAiS54OKjst1DF+dyFvuCv3589vmlD1B+ByNe/IhXVj1JXh43fGOR1Eavp8BGMeRBbTHVvqBpZm3j870fDv6ODo74mWthrrEdumhA1nLrKK5dBceT/BeCQhcJrNuehetdaWDc/TTB9uxAV6cNgKRMWJpFGc0N5o9EncPsaC5kjoB1ymXB5n5CDXGW/nALmiG/Y9E7NBfH79M2lpjjqcXO8GJi5uVfHE68= X-Microsoft-Exchange-Diagnostics: 1; DM5PR04MB0397; 6:2COeZyQIHEOwZ/BzRMwmR8C0F/0iMFaRnuiudMofkUhk108pfEq1m2XvMTyEMSPP679rnJfAOsIynYGseFfEnJZ72ZLBGbzCId+QuG7DnxAF2U10C4GneLC48VjII/TcSiC5E07DzCGTrDHO1TRkIz0y2DtmqwHa9IaXhqD/gh56Ayn1rBgAuXeXHBA0IJtQnAQxRF5fXvOg8lkUppRIqtHzwsxYnaMVYXklD1VfpLuBXLkHWJqsoba22QkYrVTpA9CAQ6XEYhWiQZrppWdh6PyvcPfQheitFQs47Rl2Yr+R8Pt0YOnkg/uoOSEboOhl35U7NQrlJeyVwB42pLwy9nUL8BKpAWlccDGyv/ny7U0okK+4J6MbiS4TXXo58ZEB+Co9M2TDiwD9WOkacPDd1Wi+6Z0B3EtQcrWkBrLFsDItdTXrVA5aobunZRkkUXesLYz8Yvj3H9BMdLPYrmGtuA==; 5:tHVmrnbCO8Ail1/tER8oYORe9U19D/7fHMVJFBB6z0fwDG0+WwFf+5BSZrGeaoJqdi+PWjPqLQbPh0yV4IXUL2L3czGt2kU461lnlzdT3+WNmgzkORo4lizB8faSrRXw/voL4vAAVyE0Pf8BVH9ZsqYZGqnJcorarSZbKX4AQeM=; 24:3csYIPcc6b+Ybu2ySCpV9BSBg8E+qP4yDq35Hj5cjiJEOM0zfc+srfpGASW0Zs0506QAqmtH/ZVPC7YSMEO02GyVlSN52wDTgK+H2RYMXLM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR04MB0397; 7:nV9Gp2uZ1zl+Cj8BdTy5xqIAIVPcOEl4BaQPo3zeVRyPJ1C8jzNqbl27sRkj7rjb70pqjvjg4zOG8ciLxBg5VoXKFBFxRg+bmTGIJE/Ec4x87EMrG1wQENLPWlSLQlP/eyn7RdCPv3WHkg5bQ7DlcuJmstplQ2p4feRpSPvJCw1ahnBMacbbpSyyoo6Igg5Dk+/pmlJYviUtpQDAm/X2TTH5psB32jpj2LEeDhlpq7ytmbZSbtePLU/+ozpz/yKq; 20:QgqGmUXULedjjwidgd+RamVEf/al5KQ4QT9/1lLJPP3rg/SnbLeClUyLUmZL+1kc6CLRgs/NS22gXfXdqtiOHqqu9A/7otVCVPEf3Ik6EjqLCDC/s0ndvqxyvfRi5oUKSTBechzQdG0aOCqiDUSGt4IDiMywQJAVuAojYGj4gu8= X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jul 2018 00:28:33.2173 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 838402d5-7242-49df-e303-08d5e5fc11cb X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR04MB0397 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 v2 3/6] 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, mjc@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" Connect the gpex PCIe device based on the device tree included in the HiFive Unleashed ROM. Signed-off-by: Alistair Francis --- default-configs/riscv32-softmmu.mak | 3 ++ default-configs/riscv64-softmmu.mak | 3 ++ hw/riscv/virt.c | 58 +++++++++++++++++++++++++++++ include/hw/riscv/virt.h | 4 +- 4 files changed, 67 insertions(+), 1 deletion(-) diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-= softmmu.mak index 7937c69e22..2c943e2669 100644 --- a/default-configs/riscv32-softmmu.mak +++ b/default-configs/riscv32-softmmu.mak @@ -5,3 +5,6 @@ CONFIG_VIRTIO_MMIO=3Dy include virtio.mak =20 CONFIG_CADENCE=3Dy + +CONFIG_PCI=3Dy +CONFIG_PCI_GENERIC=3Dy diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/riscv64-= softmmu.mak index 7937c69e22..2c943e2669 100644 --- a/default-configs/riscv64-softmmu.mak +++ b/default-configs/riscv64-softmmu.mak @@ -5,3 +5,6 @@ CONFIG_VIRTIO_MMIO=3Dy include virtio.mak =20 CONFIG_CADENCE=3Dy + +CONFIG_PCI=3Dy +CONFIG_PCI_GENERIC=3Dy diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 5336166f6d..0c3800fd64 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,7 @@ static const struct MemmapEntry { [VIRT_UART0] =3D { 0x10000000, 0x100 }, [VIRT_VIRTIO] =3D { 0x10001000, 0x1000 }, [VIRT_DRAM] =3D { 0x80000000, 0x0 }, + [VIRT_PCIE] =3D { 0x2000000000, 0x4000000 }, }; =20 static uint64_t load_kernel(const char *kernel_filename) @@ -233,6 +236,32 @@ static void *create_fdt(RISCVVirtState *s, const struc= t MemmapEntry *memmap, g_free(nodename); } =20 + nodename =3D g_strdup_printf("/pci@%lx", + (long) memmap[VIRT_PCIE].base); + qemu_fdt_add_subnode(fdt, nodename); + qemu_fdt_setprop_cells(fdt, nodename, "#address-cells", 0x3); + qemu_fdt_setprop_cells(fdt, nodename, "#interrupt-cells", 0x1); + 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_cells(fdt, nodename, "reg", 0x20, 0x0, 0x0, + memmap[VIRT_PCIE].size); + qemu_fdt_setprop_string(fdt, nodename, "reg-names", "control"); + qemu_fdt_setprop_cells(fdt, nodename, "ranges", 0x2000000, 0x0, + 0x40000000, 0x0, 0x40000000, 0x0, 0x20000000); + qemu_fdt_setprop_cells(fdt, nodename, "interrupt-parent", plic_phandle= ); + qemu_fdt_setprop_cells(fdt, nodename, "interrupts", PCIE_IRQ); + g_free(nodename); + + nodename =3D g_strdup_printf("/pci@%lx/interrupt-controller", + (long) memmap[VIRT_PCIE].base); + qemu_fdt_add_subnode(fdt, nodename); + qemu_fdt_setprop_cells(fdt, nodename, "#address-cells", 0x00); + qemu_fdt_setprop_cells(fdt, nodename, "#interrupt-cells", 0x1); + qemu_fdt_setprop(fdt, nodename, "interrupt-controller", NULL, 0); + g_free(nodename); + nodename =3D g_strdup_printf("/test@%lx", (long)memmap[VIRT_TEST].base); qemu_fdt_add_subnode(fdt, nodename); @@ -260,6 +289,31 @@ static void *create_fdt(RISCVVirtState *s, const struc= t MemmapEntry *memmap, return fdt; } =20 + +static inline DeviceState * +gpex_pcie_init(MemoryRegion *sys_mem, uint32_t bus_nr, + hwaddr cfg_base, uint64_t cfg_size, + hwaddr mmio_base, uint64_t mmio_size, + qemu_irq irq, bool link_up) +{ + DeviceState *dev; + MemoryRegion *cfg, *mmio; + + dev =3D qdev_create(NULL, TYPE_GPEX_HOST); + + qdev_init_nofail(dev); + + cfg =3D sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 0); + memory_region_add_subregion_overlap(sys_mem, cfg_base, cfg, 0); + + mmio =3D sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 1); + memory_region_add_subregion_overlap(sys_mem, 0, mmio, 0); + + sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, irq); + + return dev; +} + static void riscv_virt_board_init(MachineState *machine) { const struct MemmapEntry *memmap =3D virt_memmap; @@ -383,6 +437,10 @@ 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, + memmap[VIRT_PCIE].size, 0x40000000, 0x20000000, + qdev_get_gpio_in(DEVICE(s->plic), PCIE_IRQ), tr= ue); + 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 7cb2742070..d0129c2ca5 100644 --- a/include/hw/riscv/virt.h +++ b/include/hw/riscv/virt.h @@ -38,13 +38,15 @@ enum { VIRT_PLIC, VIRT_UART0, VIRT_VIRTIO, - VIRT_DRAM + VIRT_DRAM, + VIRT_PCIE }; =20 enum { UART0_IRQ =3D 10, VIRTIO_IRQ =3D 1, /* 1 to 8 */ VIRTIO_COUNT =3D 8, + PCIE_IRQ =3D 0x20, VIRTIO_NDEV =3D 0x35 }; =20 --=20 2.17.1 From nobody Thu Mar 28 23:55:28 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1531182719314698.2671490908407; Mon, 9 Jul 2018 17:31:59 -0700 (PDT) Received: from localhost ([::1]:45099 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fcgZS-0007GP-5C for importer@patchew.org; Mon, 09 Jul 2018 20:31:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41593) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fcgWQ-0004ta-Df for qemu-devel@nongnu.org; Mon, 09 Jul 2018 20:28:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fcgWN-0008Ov-7i for qemu-devel@nongnu.org; Mon, 09 Jul 2018 20:28:50 -0400 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:6522) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1fcgWM-0008Ni-SV for qemu-devel@nongnu.org; Mon, 09 Jul 2018 20:28:47 -0400 Received: from mail-by2nam03lp0055.outbound.protection.outlook.com (HELO NAM03-BY2-obe.outbound.protection.outlook.com) ([216.32.180.55]) by ob1.hgst.iphmx.com with ESMTP; 10 Jul 2018 08:28:45 +0800 Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by CY4PR04MB0393.namprd04.prod.outlook.com (2603:10b6:903:b1::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.930.19; Tue, 10 Jul 2018 00:28:44 +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=1531182526; x=1562718526; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=MdlhwdWrGbZWHXLnb1eBgNgS7Fh1XkdLlHXk79g8wKU=; b=IUUxDNawCQBvT8DQG1CZm5rOl7+4qb/sI82YFNx7nfgE75KRuZMzwxKQ N0foO23J13rUMtn8234KwecVwWHdgP0g5XDwIN3IWrP7+8HJ9H66TtnYM deD9F4zrIKsTvrMbjZ2UxfShvMOobawo4fO/SgLhTC1fOjku5OH1aoWzC xuPM8Os44l4TF7z8Am5b+a/25+fYI5o4DM/3fxYfZALA+wHsY8peLNgWN WHklZ9M2NyB8Q4AAxHJd3S9JzZYB+5nWLGqdKoMnI/KEPTCxDNWeQrCWG O4B0kumxU/UoDI52eCKjE+vcJC3KCys5fJTuWm7vy2YkJXlGKlzN0zVQq A==; X-IronPort-AV: E=Sophos;i="5.51,332,1526313600"; d="scan'208";a="187084052" 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=NV6vAFmOC8Zep+Pp0mfc3B3InxIKIGw0swF8+H+1s9U=; b=BjGSXW5OyhYLU9BpwDCq6n5pYTgXzLXRfjIFfw1r3evkTuCuUs+mO1CF4P971I4CUXYjlN4DxgWlySHWgqJZB+Guw7UUt51qBUzK+mnfO3Tzvv4XearaGCK5jSrKAhESHhDL0wlHRzNP3k3vBCkxH61g+LhTPyb86ZWLUGNLOI8= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; From: Alistair Francis To: qemu-devel@nongnu.org Date: Mon, 9 Jul 2018 17:28:36 -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: BYAPR02CA0032.namprd02.prod.outlook.com (2603:10b6:a02:ee::45) To CY4PR04MB0393.namprd04.prod.outlook.com (2603:10b6:903:b1::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b3f75ea4-0f3a-40c4-0952-08d5e5fc185e X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(48565401081)(2017052603328)(7153060)(7193020); SRVR:CY4PR04MB0393; X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0393; 3:e++XRfrS8f/T8NcjN3auwN1mCmylS7MOB0KNmuQNCkcPQBpV9UtALU5TfqCxW/UdasX+xeuDoE/gS2QXM5KHCnTQWM9sfl+kDnYLaf9t56w4UkD+dN4wiojSEfgl7ICe08SsG6R/l9dTAfZseeJ4lU8W6WyvwLR2AxbkiqR3R/Gz1l9+Hxlw5v4nZoGV53uiFlGSw4/szsvd37j5ouE3/70tTHxENm6AUqeGggu1bMba+irxQShWSfVbihD5kVYL; 25:F6Ejv0zfM5b/1RwSK/6YUZ4Vd4l4KV8oZxFmHeeSMKCbfoA1GRxAGil9fuXxODyDAtdkXcwhNWqQje7mUkKXCGoqmLJgTyDDNYnpUIH0DxOTURaMFLyZmlUiBk21QowXteaFShG1Eunekuw92Pu21925XOmdgYi/s1PbKjlARDYYV9t3ODkpLp/eau1oTNZZtDy/nuTJaraRutplzC/EKR+jrnlyi8Zjg1iaiKzy+aJ/cy83BnKCzhKazfbGsTQ/kp/o9W3YCuFMyL02Avq0Ikv92mFgf1D2Ay/w2U5T7dpuQEzR0cgcTqIudaKfd8Jv3js9FhKPo3abNOf1/UbEzQ==; 31:DHNzWSZcy0yNCZXVMNXRNRBJrNZsMYIi3dyoFCN23VjrfQHSsw4oZKr1qO4yKKKrfOeNBPLL4IQbeYs/p+NB1tjHQuu5ubLDzunjwFHuwkhrEN8IEaK5HnxMA1/D7/7UehAakFouUfYyRGzcwBdi7d9cL1AtdRNe0BAHwXyKslZPn34xDB8Pc4ajCnouPwD/pUmZYnLV74qgfYBv7RoyeAxmen8Jqcx5jPtMDACOY2g= X-MS-TrafficTypeDiagnostic: CY4PR04MB0393: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0393; 20:UnYhZQJZgZ2z+AgEWCnPiME+ds+vkIr1GFLgehOFsBs2fgEIxsnwGR7iJBkkEJx8BlLNk0jnDMZ9G7dA+nCMQ6vlBvULbGa0CcB/1WZ7o20+1r8LKJwaFxzuIQI6pAyjd7IS+b2G4i2uYYRRqxwaIl2Oh2XoTWqAEM5HdcubKyPWGkDrbRqjBNsB8KOA091nwaJaGhvdQgTVP4//RBQccKQNx7yo5/zILKu2MR6hjqh/j7TN7RPE35c3bW2WPC4h84yoK/ox2miurSlh21a9fUYb1Mbq6WJADT7mP1ULBgpXxIAisMUex0XqRaPdhXwZAWK9/Kl+9xyr19mb3Vz3dLLsRDAr38wCqa1aehqe6C3D1OQDd4v9P35ByuNgcoFQj1jxNjLbWvsoj9NI+/DW8LArQht9gvycRyNuPa6vuZRu+nPMStzTBuoKvhVgtIs8TuWjsuZyA5K55NvziQnNprM3XVIUDKTsRR05yPXJ6s9ePKx+1VSRfDMXs230Biez; 4:WgH7rYBAdyTVKyRsH9FXbcpK9BPSvAjG6d9fpZ5Gb/i5bB5VgTkbkACFl2YrxHxotw9Z9hbpkTJ8ltIRebQJK1HG+9wS38g2P2N76G4+3qdpDRieZ89KT+NE18BVMPqcY/E6r73QWZS4eFN0y+loA0xHR28Tpskx+IQGkvl+RRW6G0vw4/zglmQ0DJuJLhsww8Yc7d1wh7zJCFivdxb8GIb5nIyElu1Yf6JTZGWwLnhW5v0md5yecMTXhFn/MpCdXi9Or05rDuAUvo790JM4uDxz0+JJOM62AquJXMWfihsXRojUEsEP8ji/E0MkyOqC 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)(5005006)(8121501046)(93006095)(93001095)(3231311)(944501410)(52105095)(10201501046)(3002001)(6055026)(149027)(150027)(6041310)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(20161123560045)(6072148)(201708071742011)(7699016); SRVR:CY4PR04MB0393; BCL:0; PCL:0; RULEID:; SRVR:CY4PR04MB0393; X-Forefront-PRVS: 0729050452 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(376002)(39860400002)(396003)(346002)(366004)(136003)(189003)(199004)(2361001)(68736007)(25786009)(6116002)(8676002)(8936002)(2906002)(3846002)(81166006)(66066001)(81156014)(50226002)(39060400002)(2351001)(5660300001)(305945005)(86362001)(48376002)(6916009)(50466002)(53936002)(7736002)(47776003)(4326008)(6666003)(106356001)(105586002)(72206003)(478600001)(486006)(186003)(16526019)(14444005)(956004)(26005)(11346002)(446003)(476003)(2616005)(6512007)(44832011)(118296001)(386003)(52116002)(6506007)(51416003)(316002)(76176011)(6486002)(36756003)(16586007)(97736004); DIR:OUT; SFP:1102; SCL:1; SRVR:CY4PR04MB0393; H:risc6-mainframe.int.fusionio.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR04MB0393; 23:WB+P+aZa9vVfqIG0hBcceD07ZGCjIiYnk2kLaVcJB?= =?us-ascii?Q?B9SzkLOnBsQ2m0uv5ZqOWwqG8ya/TrOGgSzZLotLMO5hMXojaFpcGf8rBHtM?= =?us-ascii?Q?INB0e5N9FTrFwordRK989L6b148XTuZkuf+vTrpNOvuIjWVFkHf9THVA2hXT?= =?us-ascii?Q?2grd5N3auVNGu2l6g1MpRQiwm3KTu7uY5xschM7TmPvo2L/y9rAwJGYzvcC+?= =?us-ascii?Q?7skFHOuADJKoOPKsWOJJ+QqI+agX88n/Bpg4HGLpzgtjJhT/1LnTfkzokaQr?= =?us-ascii?Q?wRsyNyRaXHhjEwE7YhWccAV+TrkP3GuoCDOn8aCP3kkvwvRRSX+auZrVpZtj?= =?us-ascii?Q?bGbv2ItEqZFneETHLMEQms43LIWSB03L9MgJiy4KVhxXpBUfbMlgT1wuZgp/?= =?us-ascii?Q?bxh503Frtw2OvmKZOVXLOvPl8ryg5ihlXgivzNnyIfBWyYO3/GMgtXx9lgjx?= =?us-ascii?Q?bd13gPqzMj6daRPGcO5xR5yPF2MQwalY8vkEtzutiEYde0zXClEMfuSycmxm?= =?us-ascii?Q?F1ct1IGtw1sN5erSyUDra3KAsTBmqoPIKz3LEuHrhPoA0842FPwzFp50ua7D?= =?us-ascii?Q?MwybcdZ2hugjtQcPC/8Kf/t8uFVniHmBzOzZyBWpJj2gjN2vLrj2L4t73N2Z?= =?us-ascii?Q?f5VRPcx+V1FLAIXsF3M8jktd5zdLtmx4susoPB23629ytUViq/xy5oSPUv/i?= =?us-ascii?Q?ObyW3VeOlVg9oMeh3fSKZlXaGwp9p3FoA75/nCwNAtEgBlWQAGG53HkpspXQ?= =?us-ascii?Q?+mTB5TLNxVxwOjlSTSWjRAdMGy1s4iRiQ3dumoOl51KL/X2qSffPeFr90gUT?= =?us-ascii?Q?xptzqH+c/sEIPko2hMVGd1Ho9kQfoxhTtz4MOm5IOec33XvyY6dnw0jIkeb2?= =?us-ascii?Q?RGJzDQCqHko4uzhc2XIC5ZkC6VGdWieTVuS3W+Z5QS2ZfeTPVRCaX7rXiqRq?= =?us-ascii?Q?tdgNmWXGs99vWtt+5YHkuqIs+6DRZq8jMYvxJwQTAkXzNBjLddK0iplcqfnJ?= =?us-ascii?Q?slsYhmH5IQeD15LivnOyAUAWHZ+vguW3HD1GPmCILuPJZTt7K3SbMjKOhOAJ?= =?us-ascii?Q?Pd3h6nouL7IX7I/SUbfdEwil+C2r/QtC/XMTE/c6lPuchXgogZmvBvIOOyri?= =?us-ascii?Q?ackQMGszWjE/QFy2SQ9xcamjfBHc7Z88BL/sqpTclTIRaGrHZGH5ylqIbtkK?= =?us-ascii?Q?yIs28vq6EWF5lNOk11wJgBdiEbArsejevEWaunGIZn1AbbyRyR8GFIQICefP?= =?us-ascii?Q?R7hnnHFhdWZg6GcsTlJ4dDnZfEbO/pqsU1Vk1mqnJs1oqNz83AJlSjDMmeU6?= =?us-ascii?Q?t4lNqfT495sYGorzye5S44=3D?= X-Microsoft-Antispam-Message-Info: 49CAbaEatN7YjizppV/lM0KWCAI5L0Nfkr+5HxqARM5u6iU+3lcffdvbvHt8YsBp1a7rWwgJxM7q95FXPpvLcGfUbagHSrJ4n5yatMejSubRRBFtnjS8dDXii+3Kc9UpEekKcxSRoKxwe3VO64o+o3RERr7MnAj+xEkvQujwppRCMiOoMiSBQaJRGl3PxM+CeNfVqFdpGMZznaTu4K0aQ6U1fGJiWxyyNSf4+t1/d/R760225/YRZA2B7xCgleb1WlFtRvRqaLk8UMC/nrlFSlkOoBhY2upmAT4LIXnfrI6xdXtVmx9I8JneGXkvzQi72BGbG9L0N20IuCE48HWwZUHkjkmjuSP53UO/BH04Otg= X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0393; 6:MMpPura6nWkYIUdTa+Lulgyw6+cbjAg2+lAb4ZTzTuPruo7pJ2/55TZxTup24Du4uLw4mr0+mH1nQTP2FaX6Yxc1vVnVW1VI/JKJkHkwL3JZIKdQl3PHQB9uTcfIQ8oUtRBy6d2jAUyiev3fWUGJf9TBbh0xBbNOyvpGTWjbFCa82JMrXHnLGBhOY1SRFTGmHiA4IGmhWejyoFE9nOm2ds9zQPqu1G8C01qtcIjFcBdYU/qgUyrKrt+KlwhZTgxC1yvl7xCEdWj2uwwyl0k4KIGGiVOWRDW1XZNt3aUj0NU8IYndqqyvyKP9w29CWruwbooiDHaHBUJzZhS1b0rYDUEXp031j0fxf3FzvACQG5ELhIUkUUslzxUL/Z0+bjEgUcLO7v+p9adL8XyegdxJ6klX/FZRNQSz9Lr/zVdXifRHCKc7ZlQVqHd8UpovtElZmrPG7Iyx1dc9S3BXNHQNFA==; 5:FHc3Nw+LWTHwZhYLIdWl+Y/zu3zISqaGLQyZoMFyIeH7EQqko895BOcVk8MfQze7S3iVWFc2kaJeeO2kaaDCocKR/O1Oq0nuKOH/r6J3X32hffnF6GcAn0ckhqImNHUWnxBZJj75+Kz2UjGqOH7NDuIZcnZowDjn9CDj8j/pNhk=; 24:piwfR8mi7TxT/vMdLjiAQaLIkXW4+6wRaBGYPSDvA3ChChCgjSs9+/WW1h9l7v+V7bfYTNJUAyFcpbpbl341A420mTq8P6Ma+h6nhX0lwuk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0393; 7:/bseiLh0wQ4xygA4Rx6MKutNAGwJwaGHEI+mUzDHOwBM1mPmX4APgA7diEYa8KcFUELAKizBelpV/gyHm33LIHwAx+3xaUo14sQo3aRLXYa3VXWiMRxMjxDgK/ELJUCR/PYNNBRJb68EPRhYvWHzqAPRZ8QJRpZ7bwl4IamFYtmhyZAQVy+lchylZPf2i8KBPKde+nSDhVTpn5meOe0tWt8308t4o0e+qLBiJ0yd35TtFwqXFIqb7gFgSMQZSXIl; 20:JjJt+rA1jFPknP/j4wjiw3/k9TyOtciVDn2h2+DCtepkcory5IL/Vnew/MOrbUXy+za+mjIfed1581d9pvSi1KvZCjTeCd2cJrDbBu3Z6/7LpOaP353Ouct6uMwfS2Ccjnf5w5bej6rvFLWEX4zWcOcWIF6FgbHmOM4J0BbHYXc= X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jul 2018 00:28:44.4156 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b3f75ea4-0f3a-40c4-0952-08d5e5fc185e X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR04MB0393 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 v2 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, mjc@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 | 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 0c3800fd64..f973c43c70 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; @@ -437,9 +439,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 From nobody Thu Mar 28 23:55:28 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1531182820032377.817419025346; Mon, 9 Jul 2018 17:33:40 -0700 (PDT) Received: from localhost ([::1]:45106 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fcgb5-0008Gv-0P for importer@patchew.org; Mon, 09 Jul 2018 20:33:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41661) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fcgWc-00053T-1i for qemu-devel@nongnu.org; Mon, 09 Jul 2018 20:29:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fcgWY-0008UI-Sn for qemu-devel@nongnu.org; Mon, 09 Jul 2018 20:29:02 -0400 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:61579) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1fcgWY-0008Tn-Fq for qemu-devel@nongnu.org; Mon, 09 Jul 2018 20:28:58 -0400 Received: from mail-sn1nam04lp0082.outbound.protection.outlook.com (HELO NAM04-SN1-obe.outbound.protection.outlook.com) ([216.32.180.82]) by ob1.hgst.iphmx.com with ESMTP; 10 Jul 2018 08:28:58 +0800 Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by DM5PR04MB0397.namprd04.prod.outlook.com (2603:10b6:3:9d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.930.20; Tue, 10 Jul 2018 00:28:55 +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=1531182539; x=1562718539; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=pv+yBmf333TfqMyhzMZDQNXYTeet2CxSoMidrLi/OTo=; b=ibGm5A/F8TaVoOZPBvNZzqUSJAGkInVQa5RtdKWTM/zct9D7uiPldigy fWql2WvW8u1OsTJJvfBizzYff12A7PqJE9fkEi7dkAuOJU4FWsWSimelh qY7Ed0jmlP6KG6CVT4ga4zHcDzhSlL4ccbPlw8+oJLAulpjAbh+WBfJdy Vba9vtdd+zD3qq9eCFPbNfxccjSJeXmwaHcf8bv/xphPOo4vH6y11I0mh xE5NVm4YT94pBxmXlYR2ro7kfa7nZqoeGZGqWIwuq54Pdu/q6Q72wxshO 1m6ciECrlxPSsHOXQ1s/iuNJwIQlsX8B6Hdj2NrClKfQmCsdma3eJEZKd Q==; X-IronPort-AV: E=Sophos;i="5.51,332,1526313600"; d="scan'208";a="84859333" 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=CCpJ1mK6jGs3/Yv1Ise25TAlb1ptx80S6XQQY3DCA1c=; b=SnG21gE7p93D1oCmqks3nqnzq746fToH/GO/iRLJYZiydz90xw051t5vMdcUjlaSVaJbJVFhGZTKHuXbgLAsk6fzEZ43RaN62d73Km1bZGtxi0Wza6xUukY7XTsLZ9JUSLl02EVpaP9vq+fSVpYm/GtVuWtcwFKUTK/PS7caObA= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; From: Alistair Francis To: qemu-devel@nongnu.org Date: Mon, 9 Jul 2018 17:28:47 -0700 Message-Id: <89f23a990c112dcf46597cea815a87965ab22032.1531182400.git.alistair.francis@wdc.com> 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: BYAPR02CA0005.namprd02.prod.outlook.com (2603:10b6:a02:ee::18) To DM5PR04MB0397.namprd04.prod.outlook.com (2603:10b6:3:9d::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1bd7d41c-03cc-43e1-d957-08d5e5fc1f40 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(48565401081)(2017052603328)(7153060)(7193020); SRVR:DM5PR04MB0397; X-Microsoft-Exchange-Diagnostics: 1; DM5PR04MB0397; 3:ZO1Jqc7FuZcvMCV5pRmV9yU7vaE8ozLf38hV4JSzkOpUJkJTPOEAU9yh0k2B90n5yX2AyqcHXC5uokr+rEgIyBSvzL81liGnV1Jj5rw2pgpe1cm3tlL6Q7Ee56wgJnCunpKjfMNF3jDDtyhW13lQo8XW2EYbR9I7HK7if+5GmRYjD+vI5kqvA+dEGgQu0N1ACgMtmcGkpuJ65BlYn3NfDonXgtZOD+YyletR0ObN4QBepQNapwr1Q7DW9ShEVFCC; 25:jkAQGZ7LyZWEhjtrzXS/dvfIm5kd3JYWpBCwRGTWsC5Q69TpZaw8ry1L0DTqlHCUYNsjg2QzwVkHp7frwVetL2KSQWNf3/LOFb5qF3FLXgKppu9C2+U2CFVhoDSQP/K+L+RzWZrbpGv3CfsBEKIDWKqJj/d/4f+aQmRC8ci2x2yDaOIv/NqU5JNqRgPMdr5XMmOygTdiViXtn15QYaveDDi/DGV9B5R2+tCiy1ohbSgD8BbL65TIpC66xkKyVJVj93gOobl190id3HSPILtnlPJNW8n2Cc9Jqnb64Aa14cfjt673iz0E2CFinSQOlKzQ2eTiXOgJalRcb058/DlaLw==; 31:xfhBJWGIkZa1yGxDpAEEBCO8bBVXb1KEtbKXtv8ipol7MoB7W1yZrPeprNURsyW46znPG5MklEsQ1gTkepYrrSG357WtqpfFoD07Lp7syCSSv+xaCKuqcASloKF6KKvTW82h2UubD54Ze7ErtnfUy4LVsw+xIhIrOAJDwKsmriPEUiF43s+z1JTL8QZ5HEGv+x+YNjkB4XRbxNrWLiXOUPcG2Zp6J3wUWrkJXf7inws= X-MS-TrafficTypeDiagnostic: DM5PR04MB0397: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; DM5PR04MB0397; 20:fJcAsLTsGzS7NjgV0m2m4ZvJl9jZfLZ6dYBF+tSLefGV+4Acd4ZrPTT0Xo7YzbWX8sJTZ37OG2/zmtFm3Wi9I16JZcE8Y4ohpuZp3dmwzlnp1ty4AVuCTe4iFG5Ib0+Wp0Q4cbqxWzdTgwrfYMrLDo79gQpS0jW/HFw+uVUOoFWJSOAqORIaQSGLESYTfs4hu4jraLknNLsGQVJA2qDDqeTErLPTFYhEidLMed7jRDd/gcYsFP46uRlzyVVWd+R9wVJm9JmBmCgI+8dz5vqUDDFKzDduYFjynKbBAcTV7qVYl+eqnEODe57M4/5ZsQApQ1+DN5RhSGVDdGtD2yAqjjX/jvp7CzIyknaPI1WAF8SHvhAlZBscvWz0DCdqQWYY/BxpfmZCRpHek+/mrjvx0AEN1wiqf/2/7eco0dTg3TuWGrB9b6hbLDFgFrfLLBLKbw4eaB40KiJdd3VWjXCbkiNcB/qNJYohDTbAEJie2ufEU85dbr6KU7AIR1SPT+J6; 4:miHwQ3OeRjyJH82CfEwtaA14tgIO4H0qlwhNjLYOA5r1bMMPgA4p9LbZfk3MDYY3/Y+S5Sb3OPwBRMLB2HFX2FHbrPge+3jF2FAdf+BrXpWcOJE7SPV9Dg7nPQP8B2FC/yOOVsURYgyAIzT0C/Sf+VvU2tHRs9wE1L9+sNove/EMtzEEBcOJ+vd6XgitKSktEDKc6OsLXvqUUQ041BB4BN6zRf3PyqQ6td2QWuiA8qMcfdj5SOF1LuiroitgQnxbiFu5yMKQdMz7LKjr0rtupmIp9o3BjX9KVh8nqBUmHochXHL0NHNUZYkVWQ7H7NTR 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)(5005006)(8121501046)(93006095)(93001095)(3231311)(944501410)(52105095)(10201501046)(3002001)(6055026)(149027)(150027)(6041310)(20161123558120)(20161123562045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(6072148)(201708071742011)(7699016); SRVR:DM5PR04MB0397; BCL:0; PCL:0; RULEID:; SRVR:DM5PR04MB0397; X-Forefront-PRVS: 0729050452 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39860400002)(376002)(396003)(136003)(366004)(346002)(199004)(189003)(16526019)(186003)(2616005)(6512007)(81156014)(8936002)(86362001)(6666003)(44832011)(105586002)(50226002)(305945005)(14444005)(36756003)(68736007)(26005)(476003)(6486002)(81166006)(2351001)(106356001)(486006)(11346002)(956004)(8676002)(446003)(478600001)(53936002)(316002)(52116002)(47776003)(97736004)(66066001)(39060400002)(16586007)(386003)(6506007)(2906002)(2361001)(72206003)(76176011)(48376002)(50466002)(7736002)(25786009)(3846002)(6916009)(6116002)(5660300001)(4326008)(118296001)(51416003); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR04MB0397; 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; DM5PR04MB0397; 23:LN58fCjoIaLRIZZRo1S90wgZVjehIfMP0pw8iyMyv?= =?us-ascii?Q?SGMhaeCxmJnmUUaqRAwJk8gEAutDAyvbWmta2ZCT3Tb8caGmgyC5698Y996Y?= =?us-ascii?Q?PdEeXVE0r1bObiAQ9vKyMWlKA1mB0R9QpdvB0uqOZzCys0Ux3SNDOsFtkhv2?= =?us-ascii?Q?QbZXiiTsU6ba40msv0yRf8wDIvy2OibNgWsAOLfZVR4UDa2CP/YL/fi9L7l3?= =?us-ascii?Q?8otZTPQRH13pClt5iwtH0UH6lvM2Nq/IxL4W8126jyhn6qjjyyblpKkAHr/N?= =?us-ascii?Q?01yNsrVNzInO5mURjwylCKTvTgwOtHLWCt4fpLgMCFpqtxq/gTPBewFZx8dj?= =?us-ascii?Q?K7SanK9tXnZ1gvSK3axYgV3ZshR/r6t5CF1DRYFQVIlSqg+tGoGuKgfIIZeV?= =?us-ascii?Q?hiEoFpx77NSKB3A9cGizlU6M6xBNt3SqgyrDOOX7sj41VFbpPdU06VVh5AWw?= =?us-ascii?Q?BP609YAy4o6TWlet67l9zo7iSX9fqUmJ4KjKz4N4uo5Rsp4WkDrNtLpFfjqT?= =?us-ascii?Q?QnmkLOltI77cVdU36M6I4AhP76nPxwvBND/ydccM86lJe3n9XRUPE0IGvgqL?= =?us-ascii?Q?vMEjWfRkPhYQW2nO9cHDGTD+a+Ug8RoauIMl/LROG3dDEuASg7oo/x0SYwkw?= =?us-ascii?Q?RUdo7WUNV1PmZpu6/a4sBgyLJoH+H275bdaxPp+lBAX0iFQou3HvJ950/oEh?= =?us-ascii?Q?ZPVY0KTVmo/df+eJS4R1mgi7dcWmFj4h7yY8AMqDRuP8n7+kjMyKWNj498VG?= =?us-ascii?Q?1c3Gk+YOeLpEYl3pruUEV8W0A+leav5bn4N9fwKWPAsWh1cjNu4yfHmjL4xG?= =?us-ascii?Q?KOrf9G/9YpupY55Bdkjv+qlCRMt5y7T34ESnmQ5uVgg8G6jtmszRM+sLKBKq?= =?us-ascii?Q?Ku8xRvDpjqopNqyxZPD2FZX4gZTjO/y6hj3w7DktsE2AX6AEX9n9fQggYQtZ?= =?us-ascii?Q?WdmFKcsbciTy81Kli4x107oHdpbW3i+ugfoLen95jlKYuTwCHGoNcqDUjIzv?= =?us-ascii?Q?h7z6EUXyr4o1IHrkppr3MV61fDe1Sht7y3/b4p+0K+CsTp0hdPYUMQb8cXVJ?= =?us-ascii?Q?kqkVTxvP07ZzIFct5MxsCCqds83DhZltNPleyyY6s24ncGugVX3AcS4Gz1t1?= =?us-ascii?Q?uHU1v6B+4YKhJu3diHosqBuPli/XaaaptktR9fnFgG+TIngvToaihDVr+UAH?= =?us-ascii?Q?FKMeVo7SOzELELX5Im3Sz4wJnsZJ4WEeHLBi94cX3N37LDXLt0W6JEGBDrPD?= =?us-ascii?Q?sT8qG9pKIqyQ/jBRDSNbV9UpTxRjnUz90TpaaDiLnr/JYgUU9JwUPJpaYehN?= =?us-ascii?Q?epI8GxF/KvEEEg3+QZEvUk=3D?= X-Microsoft-Antispam-Message-Info: U8c0wPDYhmFA6T2v6xFKUo/RN5mt7dmW/Vjy2bFpAimPrYnecasDhELJCgVIGM4LsxQeAz51iNnpgRshcdplEk9DotAMrfBkmaqiTGXPFNzIxX0zfwmCldn4rtNNJr1tEBBshL/e244CYzHgL5Nn+nLD/RKq2CZqzJsUa2z/8ZIELyGPHDq0X2qVnTOM5jSgq+zhNCHhwW9G+WvQcEgvqERCthDarrAW0KLJK22wan6lBuwkqBbBWyLcK0D0hUGWu3PtfAWp6FiMMLwkLg5GinM1yllOlr+1hlSioK+aQRatiOMMxqSny+fXPCrQXc7sAE7SRmigfI66rNrC3U9uzruRw20iFx1zVyTNuRsUleY= X-Microsoft-Exchange-Diagnostics: 1; DM5PR04MB0397; 6:MtvcTx+MLnA8RYp/AKRDiAakyl5KVIVs3bbMHsNK9kWZy2syGNaVV7zJfmTUyTnrSdrME0IngSBwBJIb4/9+V6AdmpGF8tENCYgSVrksDqUX0cpr36mKt3v1QGZOm9zXjpDTcIvMuk+UEhp5yxYI0w96Vzr35kPyOKbiusf1k7zIqhD+P6ndi6HbhOE6VvC9/4uD4U0Ip2FjPmI2mJBkmPUkyC1/nojV3c8/oUXS0386vwBVBQMJOm0MiX7imS1A5ON1/0UOWSUyeu5UWsaQIkHfG5972A1Pi3QjYAT5kNc0Kw5nYV5zT+F9rdQsWd+VdJHEb1VY26SbAhzR+ypxM07zk83x8bEpnKefjQwfe2KJGVqexMQazVACalFQauZ54cUf1mqXJhE9A93780pS+MODRpLDOW9D7x82czppnduz5OG8urzFz7JHsnws06yMOdzNX9UiBp0VhiEG5v/C7w==; 5:+uW1nf5vsy/6+fFtbqZz/WgFliwaIWZlWYcwsrbv/ohkQy1G0OGoCpKxScRVyJxZ6/uXyCtJAzjhlsVK91Vn4uUjyEq50MiBSYUjR4YlcubF5K5962Ympcu/XpVV3Yvn7ht/cTEkMNok6QeETd7y0rlrW+awimCI81VIxkQXYwM=; 24:GMBr6q83A09EEtAU6vy2vdTWIuZ6kh+s9QLAC+apvTvavIGJ1qGtGqJy++6vGb8IECcME1uvTEp8L8gnYWrrOFbsIfWS1X8Lu0qp2r2GsFE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR04MB0397; 7:Z3EPc6PhSR9dBxQkdXN8O8swChthGzKRJfTrJ6pGbjcx7Ha3c4OHDkv9e7vQQIPu7fBsXZmPEjZVfYNsd/7z4ca2E69K3WhMsT/GJMekP+NDsUj4EnofdgV+V2T7D+zi8a8eCPfql/Zt9RSMsZrv1B+vHV4cFkKyMztKf6gIGnXGGHr0c9uhC5aL0O6BhZLVXwYKpLLqndMy1DcW4/mELM/B5cslwbKaU4yam8rJq7bEevJTVvncCNiuwKvu3Dsc; 20:fpW8J529qLnbghHvK4wm1Hn21yL5guPGZ/l7QUT+VwUwknth0YB+t9C/GaxRtfNYpVEF+OrvVYPmoszSNBXiDMT0KIQr2yZMCfCcEB7uR7j05N6u+FKUln4t8JKDUCYl2Tyk7AQFueaCsQAqvuGAuVaSDEQ88aSBQXoEVx0/xAw= X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jul 2018 00:28:55.9104 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1bd7d41c-03cc-43e1-d957-08d5e5fc1f40 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR04MB0397 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 v2 5/6] hw/riscv/sifive_u: Connect the Xilinx 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, mjc@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" Connect the Xilinx PCIe device based on the information in the device tree stored in the ROM of the HiFish Unleashed board. Signed-off-by: Alistair Francis --- default-configs/riscv32-softmmu.mak | 1 + default-configs/riscv64-softmmu.mak | 1 + hw/riscv/sifive_u.c | 64 +++++++++++++++++++++++++++++ include/hw/riscv/sifive_u.h | 4 +- 4 files changed, 69 insertions(+), 1 deletion(-) diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-= softmmu.mak index fcefa68f1e..35e74bebe9 100644 --- a/default-configs/riscv32-softmmu.mak +++ b/default-configs/riscv32-softmmu.mak @@ -8,6 +8,7 @@ CONFIG_CADENCE=3Dy =20 CONFIG_PCI=3Dy CONFIG_PCI_GENERIC=3Dy +CONFIG_PCI_XILINX=3Dy =20 CONFIG_VGA=3Dy CONFIG_VGA_PCI=3Dy diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/riscv64-= softmmu.mak index fcefa68f1e..35e74bebe9 100644 --- a/default-configs/riscv64-softmmu.mak +++ b/default-configs/riscv64-softmmu.mak @@ -8,6 +8,7 @@ CONFIG_CADENCE=3Dy =20 CONFIG_PCI=3Dy CONFIG_PCI_GENERIC=3Dy +CONFIG_PCI_XILINX=3Dy =20 CONFIG_VGA=3Dy CONFIG_VGA_PCI=3Dy diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index 3a6ffeb437..48164f852c 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -45,6 +45,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/xilinx-pcie.h" #include "elf.h" =20 #include @@ -61,6 +63,7 @@ static const struct MemmapEntry { [SIFIVE_U_UART1] =3D { 0x10023000, 0x1000 }, [SIFIVE_U_DRAM] =3D { 0x80000000, 0x0 }, [SIFIVE_U_GEM] =3D { 0x100900FC, 0x2000 }, + [SIFIVE_U_PCIE] =3D { 0x2000000000, 0x4000000 }, }; =20 #define GEM_REVISION 0x10070109 @@ -218,6 +221,32 @@ static void create_fdt(SiFiveUState *s, const struct M= emmapEntry *memmap, qemu_fdt_setprop_cells(fdt, nodename, "reg", 0x0); g_free(nodename); =20 + nodename =3D g_strdup_printf("/pci@%lx", + (long) memmap[SIFIVE_U_PCIE].base); + qemu_fdt_add_subnode(fdt, nodename); + qemu_fdt_setprop_cells(fdt, nodename, "#address-cells", 0x3); + qemu_fdt_setprop_cells(fdt, nodename, "#interrupt-cells", 0x1); + qemu_fdt_setprop_cells(fdt, nodename, "#size-cells", 0x2); + qemu_fdt_setprop_string(fdt, nodename, "compatible", + "xlnx,axi-pcie-host-1.00.a"); + qemu_fdt_setprop_string(fdt, nodename, "device_type", "pci"); + qemu_fdt_setprop_cells(fdt, nodename, "reg", 0x20, 0x0, 0x0, + memmap[SIFIVE_U_PCIE].size); + qemu_fdt_setprop_string(fdt, nodename, "reg-names", "control"); + qemu_fdt_setprop_cells(fdt, nodename, "ranges", 0x2000000, 0x0, + 0x40000000, 0x0, 0x40000000, 0x0, 0x20000000); + qemu_fdt_setprop_cells(fdt, nodename, "interrupt-parent", plic_phandle= ); + qemu_fdt_setprop_cells(fdt, nodename, "interrupts", SIFIVE_U_PCIE_IRQ); + g_free(nodename); + + nodename =3D g_strdup_printf("/pci@%lx/interrupt-controller", + (long) memmap[SIFIVE_U_PCIE].base); + qemu_fdt_add_subnode(fdt, nodename); + qemu_fdt_setprop_cells(fdt, nodename, "#address-cells", 0x00); + qemu_fdt_setprop_cells(fdt, nodename, "#interrupt-cells", 0x1); + qemu_fdt_setprop(fdt, nodename, "interrupt-controller", NULL, 0); + g_free(nodename); + nodename =3D g_strdup_printf("/soc/uart@%lx", (long)memmap[SIFIVE_U_UART0].base); qemu_fdt_add_subnode(fdt, nodename); @@ -234,6 +263,37 @@ static void create_fdt(SiFiveUState *s, const struct M= emmapEntry *memmap, g_free(nodename); } =20 +static inline DeviceState * +xilinx_pcie_init(MemoryRegion *sys_mem, uint32_t bus_nr, + hwaddr cfg_base, uint64_t cfg_size, + hwaddr mmio_base, uint64_t mmio_size, + qemu_irq irq, bool link_up) +{ + DeviceState *dev; + MemoryRegion *cfg, *mmio; + + dev =3D qdev_create(NULL, TYPE_XILINX_PCIE_HOST); + + qdev_prop_set_uint32(dev, "bus_nr", bus_nr); + qdev_prop_set_uint64(dev, "cfg_base", cfg_base); + qdev_prop_set_uint64(dev, "cfg_size", cfg_size); + qdev_prop_set_uint64(dev, "mmio_base", mmio_base); + qdev_prop_set_uint64(dev, "mmio_size", mmio_size); + qdev_prop_set_bit(dev, "link_up", link_up); + + qdev_init_nofail(dev); + + cfg =3D sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 0); + memory_region_add_subregion_overlap(sys_mem, cfg_base, cfg, 0); + + mmio =3D sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 1); + memory_region_add_subregion_overlap(sys_mem, 0, mmio, 0); + + qdev_connect_gpio_out_named(dev, "interrupt_out", 0, irq); + + return dev; +} + static void riscv_sifive_u_init(MachineState *machine) { const struct MemmapEntry *memmap =3D sifive_u_memmap; @@ -374,6 +434,10 @@ static void riscv_sifive_u_soc_realize(DeviceState *de= v, Error **errp) sysbus_mmio_map(SYS_BUS_DEVICE(&s->gem), 0, memmap[SIFIVE_U_GEM].base); sysbus_connect_irq(SYS_BUS_DEVICE(&s->gem), 0, plic_gpios[SIFIVE_U_GEM_IRQ]); + + xilinx_pcie_init(system_memory, 0, memmap[SIFIVE_U_PCIE].base, + memmap[SIFIVE_U_PCIE].size, 0x40000000, 0x20000000, + qdev_get_gpio_in(DEVICE(s->plic), SIFIVE_U_PCIE_IRQ),= true); } =20 static void riscv_sifive_u_machine_init(MachineClass *mc) diff --git a/include/hw/riscv/sifive_u.h b/include/hw/riscv/sifive_u.h index e8b4d9ffa3..e7292ea83b 100644 --- a/include/hw/riscv/sifive_u.h +++ b/include/hw/riscv/sifive_u.h @@ -53,12 +53,14 @@ enum { SIFIVE_U_UART0, SIFIVE_U_UART1, SIFIVE_U_DRAM, - SIFIVE_U_GEM + SIFIVE_U_GEM, + SIFIVE_U_PCIE }; =20 enum { SIFIVE_U_UART0_IRQ =3D 3, SIFIVE_U_UART1_IRQ =3D 4, + SIFIVE_U_PCIE_IRQ =3D 0x20, SIFIVE_U_GEM_IRQ =3D 0x35 }; =20 --=20 2.17.1 From nobody Thu Mar 28 23:55:28 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 153118283266957.743236364904305; Mon, 9 Jul 2018 17:33:52 -0700 (PDT) Received: from localhost ([::1]:45109 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fcgbH-0008Sf-JX for importer@patchew.org; Mon, 09 Jul 2018 20:33:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41696) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fcgWo-0005BW-Ft for qemu-devel@nongnu.org; Mon, 09 Jul 2018 20:29:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fcgWl-00006q-BQ for qemu-devel@nongnu.org; Mon, 09 Jul 2018 20:29:14 -0400 Received: from esa3.hgst.iphmx.com ([216.71.153.141]:50067) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1fcgWk-00004u-UJ for qemu-devel@nongnu.org; Mon, 09 Jul 2018 20:29:11 -0400 Received: from mail-cys01nam02lp0052.outbound.protection.outlook.com (HELO NAM02-CY1-obe.outbound.protection.outlook.com) ([207.46.163.52]) by ob1.hgst.iphmx.com with ESMTP; 10 Jul 2018 08:29:10 +0800 Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by MWHPR04MB0401.namprd04.prod.outlook.com (2603:10b6:300:70::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.930.21; Tue, 10 Jul 2018 00:29:07 +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=1531182551; x=1562718551; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=1+V0QJ6S8e8tYShZWb4D6x6yXOBp6Vjt/ns0AFJIqaY=; b=h3UfcbNkej2IhSk04/+yyh+SBIVHaI8EJdMStP5EwyKWe3Ycacr7qiDe 0xMC3WV1hS9/GHnkQJfKK8r8QL+O648B6MI+xyq+E9lkLHE9GOEhkbQ+V wRo8HMzJYNIZnbSpVQSFXM+0yvYtpto/GExF3y7eoFv17eFHhI3igkIkB CLjtMnKEE021KbEZmcjQdN5h4GzwHHxrpJQ4jdsF8ylKys30+MI9wLiyo hmiPmv+BU818ir/TDo1KmikrxNj7TRbESgWNe0K2OGNtixUtVFVPmAD91 DDsfbj1+6szI3JfBk2zcVDdBnsvj4f82ILK+w4ar0BjOLpOPXcA9kPfDD g==; X-IronPort-AV: E=Sophos;i="5.51,332,1526313600"; d="scan'208";a="86550196" 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=JuxJQ+jKfKUCtkMqjJ/CeD7M7Bt6qiQ7FDbXWm9GJJc=; b=E456OxiDaYGPvhyigGp6Apow69/u7NiPpmQ6IVkFXZVDYvG0T9/IMzpUbB8v4wPMzCFj6T+DK0YxJ8bo+ka96OJ5JAtMB1MMroxu5SrT3cwreqK8H/eJ7/rv0fxZ47YhGfS0YkNPrUaQIZihTPYU15UF1+bxGsncnIY3+d951WY= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; From: Alistair Francis To: qemu-devel@nongnu.org Date: Mon, 9 Jul 2018 17:28:58 -0700 Message-Id: <93d3ddab10fa45e0fc081b7008f634b635acb204.1531182400.git.alistair.francis@wdc.com> 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: BYAPR02CA0021.namprd02.prod.outlook.com (2603:10b6:a02:ee::34) To MWHPR04MB0401.namprd04.prod.outlook.com (2603:10b6:300:70::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 31966202-3c94-44c4-2a05-08d5e5fc25fc X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(48565401081)(2017052603328)(7153060)(7193020); SRVR:MWHPR04MB0401; X-Microsoft-Exchange-Diagnostics: 1; MWHPR04MB0401; 3:w2SQf8MfRVIOJVE3CMQrSWNUGB7m1ks4+E5vXU0q2K9FnqsV/g2F/S+t7Xrv4ok4D+EEpkC/tAlQle+3jaJyrnX9zJfcSErmiWlV0U3XEJG6VMEweApIeQDFI5SknsFg7BH6REvhC5I09ZumbGoi7WVJVNf6rKSL1TMUax9mNG/KRG4HO+sVzbW6dpJdRQULodI4HoZOamEku5EXm83/IHbD1xx5TuX5lix78TmxTgh0gM7SvqwtiZI38AxYj5hH; 25:bdsYrEWelddLcpmQBdP7nYPOQg/ZrrdvSk38SRZw8qoXOBLM4z+h1twjqA0JBHYs/RfxBJXFEFGyG9LqID344P12dihf1/+8GwfZ5ZjUr8cmrKupPkeD1+ZXo+J1i3u00+BzeblFB38POGnKlc1170FohwhJSJXFsGFqBpJ0oHtqgeYq/9lSZFY9ltzb7PEi8uHfdkoVkcE0FzTAUAZFlvQ7yu4vU9Cw3E/qamlJg0mGEXYwkC/cDSpn5w4b8hS5tqsEVag2CYlBqHhjnqQ30Jn27Y8Cmgp60W8ZjDH78hTy2fcfJ1iSuYR221MCD66rjlPCcpEafRY36bRv5JEBqQ==; 31:F0tpAUTJyvT4LNV0KeGyflNgHXcz4K0Pc1sKlJhPe1QH//HMqsfHrhRQ4QbrRbDkZbGwe+8GiiAAvcjsrvtgAHOHl0zlETGFPrYp57kVzDKRSTbkii/RjOXgeWIBfp/bHk/Yj5pQhO7GFahfJdsCJO0p5cGLgiN+i0OkONg0wN07osYjivHOG6rfZODLRaQn/lwQkYH9jllzZtRjdRPf4rzUnpRfc1fMEi5xrzlee5U= X-MS-TrafficTypeDiagnostic: MWHPR04MB0401: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; MWHPR04MB0401; 20:DDqe+bCgw2tqCVlc+33QHegwktpE6IQK7fs+eJED8NRhf3VMGs3EA3D5M2SYPLRqR1pwjkiFqULVQdTaK3D+2CRnAl+8lGkIkb4QaPp2q+abW/nKKEst2RVqUh6X17p3YY9aNEJw+MGwTVY2/uRNgGqHoIDSOCQ6QjhYwbgp7owzy+mJocPKmDE4jqzV/+3ewY3A6mIGYP/5fjZJPTKLMv2Ruf54Yy/rTqE+ADI1gl2iEjdE5vMcsYCXtN44nFjtuTZkAL+Nn9LDr93d+Q4nifOEHmiTxAAgytxeUUiNOHvrKjB2+1ljbUhEEKNz+L7FfVAOrK3QePzorWC+ASZW6WAzKaeWWM8LQyuJnnTcg5701NGMZARq8XQPidrE5SpactqeVTC1qlFdaUr77igKeN4CqbMi/VJD12DONkU+Y9RrgvW2r0NfpYmfxQhc26WQDixWEC5HjzC9afJ0EUMUXjbmzgcc5a1l7cLN0DpcfMcEAcRLyfj2oAGUEeYLD1pH; 4:3Ms2mJpo8q5HIwhOvq0FGmx1O8JP66E7HQciTwWB/S7CcMbnsN8AyBg56UN/LZOqILz6LkUB7fQSh3QKlDU21i6VAtBmIj0doKySgG5jx5XFE3NDgdXfsQ8A1zQhIDI38e/ZV4fYhIYUavDOaw8i4E6q0y8a8GfzgCRcsk715Koq9iu7zpuWi/gsehFqO2cNxCDB2sf7OxN8W8mcazqL2NhOPudU7uE9hBCdd6QWw2vowm+AIwwmmBDTmkCPmGDpvkXKe7XebbYpFER6eVC2QA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(8121501046)(5005006)(93006095)(93001095)(3002001)(10201501046)(3231311)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(6072148)(201708071742011)(7699016); SRVR:MWHPR04MB0401; BCL:0; PCL:0; RULEID:; SRVR:MWHPR04MB0401; X-Forefront-PRVS: 0729050452 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(136003)(376002)(39860400002)(346002)(396003)(366004)(189003)(199004)(5024004)(26005)(72206003)(118296001)(2351001)(8936002)(25786009)(2361001)(81166006)(105586002)(8676002)(106356001)(6512007)(47776003)(66066001)(478600001)(6486002)(305945005)(6666003)(6916009)(81156014)(16526019)(50226002)(68736007)(186003)(16586007)(36756003)(7736002)(316002)(5660300001)(52116002)(86362001)(2616005)(4326008)(44832011)(6116002)(39060400002)(3846002)(446003)(50466002)(76176011)(6506007)(386003)(48376002)(97736004)(486006)(2906002)(956004)(11346002)(476003)(53936002)(51416003); DIR:OUT; SFP:1102; SCL:1; SRVR:MWHPR04MB0401; H:risc6-mainframe.int.fusionio.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR04MB0401; 23:nVOQI5kg+3FRbbuut+PNp18Z5c8RFO49Ax9XCiUuo?= =?us-ascii?Q?1sLdHtmOtUfIUTgbyGLlmHqoZVYh97F71MLkaGzvk7MubvNl109vYOIc9fCH?= =?us-ascii?Q?Is9yGRlDEjrVITYs93lu+aaU6SyQfMeonuqosTK3K26x+pHbEdl2SHYwr0+8?= =?us-ascii?Q?qteH+rfjCuzxgWricqRSX74SupglieOKPxqEcS2HFkuM+cUsApYUWp8v/KTE?= =?us-ascii?Q?zbWyA0R3i9KGz5bz9nNm9PvqqQzukOvYmkxgFAGKj7iqJw24nbWuR8xV30lf?= =?us-ascii?Q?24dYnsLeMxQS3HUfK9uqcQYbskXClbRTmAGgHoUjRXrjMIIq4IPJlhYuwAbl?= =?us-ascii?Q?jpnvtOWmoiFOS8pEHavJu7BT3ixE80uTLMXL/NZ3+TnRg3tR1bHXsIe5L2x5?= =?us-ascii?Q?f26h/YIcUf5feG/tDXt1gmle39DfzhUODNVEmzvD5Ma1+LF6OTJFgA29QNgx?= =?us-ascii?Q?YfLKhMWLmFe4fdxSDKIhtzN6mwxi2+s6R+Mv3HTvh83OlHvO+Tz4lADn4kkg?= =?us-ascii?Q?iMMNaLoGjj95IrnOqaQBBQvKXN5l6t3n/Z8o1s8LTBcIZjCphVGuQ3iA0EI5?= =?us-ascii?Q?JPCy2FJvHbD9PA0evAhCnEYvN3xXubcGfvgHJ/mzSIeYFoZWt1Mx2009yfOx?= =?us-ascii?Q?gwFS9wTqHHxao/CqsnZ67grr98MzWu77s6lCkvX/p8D6WGdzaiUCjPVds2Ss?= =?us-ascii?Q?gak21xkTze6D3cUqC2FpsPRi8pirhbZjY0l28L8pODqVcYYy7KDlgvvg7XKT?= =?us-ascii?Q?0anEQ+5R3E1+0pTQsuuk7/+4jkncSgQ67foub12YjgONEi7PRn5iS80A7vfB?= =?us-ascii?Q?8CNqUpAYymPnHQg7tS5ymz3d2M/neemngBCAjnzvBgJqDbDyfTPxPz7cJ98d?= =?us-ascii?Q?EZPrrEjOA9RC/DtQG02n/XuF1hy3kwa4wKznz5oRjfvOImCzNtHs7m4LDpvH?= =?us-ascii?Q?9zCgGeJUBQFcu93R980nvM+uH9LC/ptjOPE/YXaBb36DB2d4e2PSzMqaS3zW?= =?us-ascii?Q?KciATewiOMZWQrXIuY7xl07bMtSHYo7FlR5ppdJRrPx0+bSzBJGggLbHqb+3?= =?us-ascii?Q?PbyleAD2iqoIkcm8bi563/+KmH4ZhT495UUK84t5WinTmozIx87VhjkngEbZ?= =?us-ascii?Q?qIjQFAw+oDYq24dTLhbrhJdoGrm3ExMfYb8Iv4M/e48fPzkjj5eAP9DR0Hg1?= =?us-ascii?Q?ciKlwAb7NApagmqRh09gsWIoK/eHh5m1beFZEFMIVxurcynBRZFmNW1JV2M0?= =?us-ascii?Q?wCeqjfxRKmeOVRg3dtfH6ahIq4HuBeUWhaXUN1troi96HEhNJO3JrA/9kob1?= =?us-ascii?Q?Lu0ouq7j/XzhK4lD2AuK2Q=3D?= X-Microsoft-Antispam-Message-Info: 2OMfEO9Ky2gnc4qyNcYZ4JJbdiDS8MqDFhrlnyDmGGA+g0JeFkTkYHWfEEV0VsfuG6O8F92vfyPde00osovIWooHXpk94HdVv/S4ke930NfShBEaQMoF399xSxhmCbbyEzpdP4miAbrSTTuW3SSRtLf14MTCxqdrHqydPRHcLKaSew4hNZPH1n9Hk34sTv9ryF7qrCeXJ3t6LQBUpNd6A+A5fZWkvh9YdIcUTH58lBua86BuMmsuTU+fGgF8eE9TqZcLqGXo3xlYT334xqToDeNmiDOhOarBo0MfrNBtMM7Fpe6cOt96IaD+R3QR8XLe+QouTpE0+gQgBu0nmEeD0u+ixnfAF/q+rE6C0VC8CoM= X-Microsoft-Exchange-Diagnostics: 1; MWHPR04MB0401; 6:jihTOWwZBP7B5dJxuOdjHYYriJaDz9sRK8hhHVXEjFRPl71Qpf7UKKYwOMUsBPC0wo9rGlNZtIXkF8n0qSgXtODNKui/Yxw2XY6boAxQWKxteqZvwqNIWRvK241N+jJ3YIuqX4EyEKUxhUS5TG/rTtjt/vcgZaNW5Ei6xCM+nyww25MBb6W9TZ8wEYYtWd2vD+T7yk2PAHQhPfVEn2lIvi0qsKOe+8LxvepHxF7HEnRmIfMU+oFBdjMLAO5juuLE413C7Lw2Zc98f2h47QBIcHclAJsvZeoziOw1Ca2wDoHgdHe9lytqR1TD2W84X1B7aBECDA0eq2kAhgT6cJmQPp9pktsaAk/K3UWTnXCV9UJIOjb8Xb9w8J8OEbm1/4NTCj8+B6A0VDeO02E9CP/molK6WG/qZ6vchoXFZotxa3ST71WJpoRM9x2U/aZ8y6/XM94JgAqhSotGog4V0UTF9w==; 5:PhffjBQVU6qADSpbZmnw+ewRmDZ2U4ZIHUWbOwrCwXTE9GhZzWEJSD5rWKB4xoDvZRji3G9+QvKes9sS+J0I36FKCfIy5/MR1tRjN9/0CJxQ+BxuTjLAK+V/BSIUM9W7Oe2mTIuWNeogoEVHdJHErcDeu6Yjkdeg0+jRhaBcGEE=; 24:9vNf44ZpeTkHErbluN7dj/uLH1OYUmrcRyyCTt/liigUDfe3+Mm/KZamGUxStr6G9chD3bnq3ZGvey9zzrkH4RoiLlBYYIKR8xXIz6eV+3E= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; MWHPR04MB0401; 7:9d1Lglx37nVYCqyxdRqsib4npHHpSgw7+tW3OcS/ptPw+6/QCLUkW0FPEp2Bj4f3Cz1OAGpmHDYMVdazhMm8ZzSVo0023yU1C6UyxfZxJI7Jsm+1J23ihM6qD48iqXzYqfdNpmGqvLf41fGX8iOLnlUyUrkVw8OE+TQALOrQHFyUOHmynqwHLMd/Wj46EKZr5m0nHtCFoPlpVyVVywqr6sYF1iIJd+XfvJNkbwNJXN77xPa4dOYU/ZfyD7lrFsEi; 20:PPr9taMorglrqf7q8vaMXvIx/zj5kBnwkN/SOCkkRMQQT6rdu2+CCQPOAyYwGKzHqscQ+01WL4nKwyLgWzq2Zn3LA/gx2W2yjXrMzncduTljntTroBwYZdrGZGdn+5uG+sPGMs8CqoIPRE9P/WhCGsPfWj97siKTWrKqKdXQCk0= X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jul 2018 00:29:07.2876 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 31966202-3c94-44c4-2a05-08d5e5fc25fc X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR04MB0401 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 216.71.153.141 Subject: [Qemu-devel] [PATCH v2 6/6] riscv64-softmmu.mak: Build Virtio Block support 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, 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" Add build time support for the VirtIO block device. This allows us to attach a drive using the virtio-blk-device. Signed-off-by: Alistair Francis --- default-configs/riscv64-softmmu.mak | 2 ++ 1 file changed, 2 insertions(+) diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/riscv64-= softmmu.mak index 35e74bebe9..8790f3b115 100644 --- a/default-configs/riscv64-softmmu.mak +++ b/default-configs/riscv64-softmmu.mak @@ -12,3 +12,5 @@ CONFIG_PCI_XILINX=3Dy =20 CONFIG_VGA=3Dy CONFIG_VGA_PCI=3Dy + +CONFIG_VIRTIO_BLK=3Dy --=20 2.17.1