From patchwork Thu Aug 16 16:11:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 10567881 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B282A913 for ; Thu, 16 Aug 2018 17:01:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A20482B58A for ; Thu, 16 Aug 2018 17:01:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 93CF42B588; Thu, 16 Aug 2018 17:01:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0DE642B588 for ; Thu, 16 Aug 2018 17:01:39 +0000 (UTC) Received: from localhost ([::1]:57147 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fqLeV-0002y2-4O for patchwork-qemu-devel@patchwork.kernel.org; Thu, 16 Aug 2018 13:01:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51523) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fqKsJ-000062-DH for qemu-devel@nongnu.org; Thu, 16 Aug 2018 12:11:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fqKsF-0000BC-4B for qemu-devel@nongnu.org; Thu, 16 Aug 2018 12:11:51 -0400 Received: from esa5.hgst.iphmx.com ([216.71.153.144]:29288) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fqKsE-00009Y-Gj for qemu-devel@nongnu.org; Thu, 16 Aug 2018 12:11:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1534435907; x=1565971907; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=aFfUyWdxz7NS4zBxW71adL3WpeXwl3ZrA/x23WEWl8Q=; b=i0lofenXEbqSqUj5kgucF9fM1B5qHYT8aosKylTBWN56jRt4WxoyuMwC 3/9LezaaCAHLmJiGLwDj5KFW7v7x0dwNVX3AhiTRIWFhhIpYk8aA+pvMc QwtYSGArpruSDH8jvquZmXv4celtLT2DtXnwPerwYI7O894a3qfyo4Qg7 i7+ryQ2z7omlM0ulYobJoofai8njK1GlF+vPA3FIdnvmwbdjAROroQZx/ K1ob//DvjLSua9Flrq5GpT+I/1NureOB3CaoGgBq80L21ItoHki8I7NRw mE3UmRdQx0kSW3ISOKrr93gvPIUOATEG8i3StqJ40RVZzo7QG5aiEdSLf A==; X-IronPort-AV: E=Sophos;i="5.53,247,1531756800"; d="scan'208";a="88624924" Received: from mail-by2nam01lp0179.outbound.protection.outlook.com (HELO NAM01-BY2-obe.outbound.protection.outlook.com) ([216.32.181.179]) by ob1.hgst.iphmx.com with ESMTP; 17 Aug 2018 00:11:45 +0800 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=sHh7RZ/KnL8iTGAs8DjBNo63KpFZ98wDdNk/OZ84FiQ=; b=cjkTYu6WvgdDzApmlRlqc9Um2P4CJ/02Cq4VixQP9Egb6+69ZefbpfNTWiWwKVwEKKRWbgxmkwsYXU9+hLjf7Za4FW48dk+CrVlq24xVhQ0ZcuqkDLESEd5g5ItAq5oPAEBbfnS4jguD2mH+Rb/9GifOxRHbbkz9TfAIf+0wyGE= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by CY4PR04MB0391.namprd04.prod.outlook.com (2603:10b6:903:b1::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1059.19; Thu, 16 Aug 2018 16:11:43 +0000 From: Alistair Francis To: qemu-devel@nongnu.org, mjc@sifive.com Date: Thu, 16 Aug 2018 09:11:34 -0700 Message-Id: <170c5841b13e1854f276592dfe4296b942edb15e.1534435831.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: CO1PR15CA0092.namprd15.prod.outlook.com (2603:10b6:101:21::12) To CY4PR04MB0391.namprd04.prod.outlook.com (2603:10b6:903:b1::16) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a9ac5a6a-df16-4805-5416-08d60392f5a5 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:CY4PR04MB0391; X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0391; 3:gfFRpXIBVAD2lXkNI//6dXoI7Du66FX8ndaShH8kxBHseL/9YdD914z7mLQZ0cSZIFLkw25JoLxLwW3e2GLdcAK+m8L0MYeMFwsn6Co1BS4tydGAn1o5Ekwr00PpCPyhQjZ3g/t2IvchdubDnyPmFbdN5YqdzN/p7mjNUzQQ/jDmrWz5FaK65sO4HtipZv/Cp4/2FN0FXomN1Wrc30nyxnsUhiLjliKPW+Vk7UJrTQlUO0JHmgPqvwn4DbIiHN7Q; 25:WNypQfA+UThniYnyL8IY2dtfeGA2fdaTqKloK14CkNkxr+BnM64XcBmjkHGgm5TeL3PpVJjINK5bGtQTCXjUbp+2yeZv5nDSinyFkeNtjI4t5ih9z1olOn4CsqOcKoNrti3J4kRAqUAQi34iXNpXPthf/cO1EAkOQe6h+1qlVDhH+MjiGo43I/ifV9NdXsb/46bNwCqJL7cnD8VfDxNqH3kcnTcrjBfLhAfNhPxMqahj+epZ2k9RwuVIZ4CVNuchapSjnJ0t+vVnmBdG73pgPXsilVMcFDMnKeobxO51ads0E7wvn/eDjIRdEKc6hE8agh9HCEQtyclvjvrkNKDxNA==; 31:UyTbpZY92u8SypMU/34pYXGqTfRgocCSGzh4xk4365O2n9sOAIT8HKQ2iouF3XsfpsDgN92Ag6j3ifi/SxiSRYZZ0LTf7A8bg2ssYaA7HQxp7tKc/IyBmEpZ7j6i1GwiDgJlhuaoAu9TA1z1Aii5WH4QRKLdl7Lad4bFB+DM4R4i5SPpMpq1typhRTAN6SwFRXloNWfrXk7BRoQcAa+ypBDaMcWvTDsaffcLeaaLhCI= X-MS-TrafficTypeDiagnostic: CY4PR04MB0391: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0391; 20:KTMWYMcLV1IVTBFK4yz6HrRAFFMxtnyxRfwpBXnxheqSVbCdSjJnkuAln3wWCGY3VfMbaYTt5DyJACHHZDKS6fF+IqMTQGkm28gKjKybLuhkW0Zas0T+gGvbJLLhMX82MIWWPT/uVzzHwEzu3h0BVDpXEaumzY6noOgkkb5RzSNZUgQl7Wajv5CqGl3w2M6DOjkhb9aKhIFw1kXSTVQ1/I0CM2jna8sLtj4RE1cAxCi6mcW7nfcsp88F/hHSYkfItsb3uZKdCYAdh4R4TFrQt4wMOh+WP1Q6sf3qgUmpuqPvOhRsks72c0MMB9sKJtPB1PuV2GqWUJH7hAWiD8FXEgCuuuePyFDLorRdVHWhjqWa0P1zr9tYkWkH0U4Iqil6Y7fF+fh78fPsU+e2lz14LlmyTRSaJC4TM3A+07xFyzjWBzD+DucwaIeMKUds0pONLVUbF56VGBbuLzNvzmgyvB28TfHD5ZqAuewCl95HC2OW35AHgxzL648NbBhjSevW; 4:IAGZB84+DRtZOxLDJ23bh9p+HI0Vyh/YKKulDlF9if1ekP1PfdCRwWD0azyo4Fr7dtfkrN61JXWvzjualbhlAgq5m3IAbxo013EY/txGWGoVwwSA7Vjl3IcozPe/EIAxSJorxPlLeDq7ybAiJtLflEqD/YztKsePvkmwsq8qpSWQ4jiNe56ofowtaMv2T/ddJu+X3TX0j5VzsqvrW+TsV0bxkt+DG900B/DFERK4kP85059R9h+IVlT6orVDcc+qtSmO4g2fd7T5pjmdi6ex1g== 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:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231311)(944501410)(52105095)(93006095)(93001095)(10201501046)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(201708071742011)(7699016); SRVR:CY4PR04MB0391; BCL:0; PCL:0; RULEID:; SRVR:CY4PR04MB0391; X-Forefront-PRVS: 07665BE9D1 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(376002)(366004)(346002)(396003)(136003)(39860400002)(189003)(199004)(316002)(25786009)(72206003)(6512007)(8676002)(8936002)(50226002)(5660300001)(478600001)(6666003)(39060400002)(53936002)(44832011)(16586007)(66066001)(86362001)(4326008)(2906002)(81156014)(81166006)(47776003)(14444005)(6116002)(956004)(476003)(11346002)(105586002)(118296001)(3846002)(446003)(6506007)(2616005)(386003)(48376002)(486006)(52116002)(51416003)(76176011)(50466002)(26005)(36756003)(97736004)(6486002)(7736002)(68736007)(186003)(305945005)(106356001)(16526019); DIR:OUT; SFP:1102; SCL:1; SRVR:CY4PR04MB0391; 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; CY4PR04MB0391; 23:jUTpcO3NKI4LLQvLfImSDmd/sj01Kqf+mCg9SB8jt?= z2h/5SLpwhU/LyggPotVQ6t5TmK7WgMb8mjhbO4BDSmmJ7mMGpb/rGgwyPmnKjHZa49kbb6eZbgjFpSarnpDwAkUhQiRykJV4lxSylHnn+8xn1WQh/+4uF+6BkL2Z0hkb0cz2AK5UBsKk84uhxay+1js3gVBZOJ4dP63sX2iubLnmkjGPNGGIyJaYsDsNZ0hBhJukxO16wye52bDfT3zUzjknjPvagXUFlEncAXRuNHPloWY+bQLlz+UA1xTlrf1+MEK8y01lnQRFYYW0T5hUnYymhjdHJdIT1XMn/Cd/M7UEhpWcxc4VJ2yvfFGaDdd8LLGEp/y8O5dGZgvHHdUBzpnGGNIkNvf632KjW5B23SGVJ4ThFeRTG3/wPlg4zDKJncq9C0xzVRksjoq6Ie6B7WTrHAdfQWuGae3WIHUBP4vVKbHiyylnrsBZwGgUVZKtcjbzG3U9sG7MK4ToqiiLTl+g1WqK7xxr/Zxt7be2FXlsq5KSYmjPkEtAq3ZSEoJuaLHlJQESh3911oSbiBaSQb8yGbuxFIGlp/tEneV0Z1MBf93IM6zijVggDXBR/7XvO9VAPXhS3LC25dl70NKd+LR33CbqiNKUQkIythdCJ62Jjqdj3YprJIsQBfImdLTSqIJBWgJv2ekw6nS9GC8B6wFMLm5db+tRCtOu8TsJtl8h7hLbZZZEAzLrXbt7GAKgV730qCn1YrA7e6MP5ZCDDFjo7J/ooYIjOfNFDa9/ZlulZD1gDT1y2xNPY2T7XEoTji6QVHWInxoo93M/XgY0k8LOhyVrcNICGuZOLqpTyqHbPrp4M/Q+LJtwa6JoB75MFQiR+KV9riWoONIoaAYluxfjPKD85+m7cpvYWdad1ruGe8WRYv2Yh+TVI8eT/Y+uHJR/N63qqYx48T9EjLgwMSxYKOEyzkbOPIv6jK/mT1Y+jJy/VDCWPtuOOeXdtb8AmGrNE+TA9FEhMAU6/ykf8hUxlnr4tykTETdQ7GRVBS2uVMKwniw8tQFn7U0n8A1MzbpDcy+wCnx/Zoj9p6ZrJJYXbHzgBNg5ne/kKBHL/cgZczmB6HYVLkHl5g0hkPkmvc/wXB+Aj4CMoxM6GXFXaUhPZZgeV9CY62NyCPP4X17mupLaAFW2BDUYM/7BQzEGmif1jDVfis2UU+twnZh9qVklH8geneYnJrTN+tbedaatvLH0n+oKqyIyxfN0k3kk4= X-Microsoft-Antispam-Message-Info: B7d1Y7E4dqZAwNOjwcdF4Hc6ICLlLKrtimPy4CvgB9hoSbVX98uDG0tBc17HlT9ngoJwSEwr3mPG9dokkqUduPF5/UkKAyRpUWjkWsuB2rfUAN1R8npScyghUa1UETLMrx/lwJfG4/XfdvBBuXs0W3kKLVARwyoP6Lx32kMwZJHTRg3u8aG97Pywc8FtSRskUAP5WUhKjrdxoteGbmZauQ28PtLHigm34P6ZZ+1SQQuXjEbbkF+vEYykU5AKzNBlJuAZe3nxAfrf6CcOZh/nKcxW2g38Bb7Vw7y5fN2g769Kx1QSOEtRwSi8zeH84CwDRBQ4N5530pLkV5ghWat2qDy1g/LM+HzUOn8x72pht4c= X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0391; 6:dPvcbQ3qd+O+njgGbl90Ip6h1egkpcqY8ZJhzUrZD0FLieUkwXbIZxlP2exUwso5xUZ4gvvYGIt8NHHkFVpr5ZgnIrwSfRBcrh0djndldecJ/wFltVckDPoAwqbRjnCNcd2ewSMCh6M20RPq65cjxxUAHyynvHsibSNf/B/fcPDUa6ltm3lcmdxukw3vC320UdY5YO0pVD9GA4+VxD/SosbPYllca038iJKLhIUVQisyuoK/XEwhziu2g2n3Ns79fj0LUAILbprYnU48ycMnpaF5ifD07eBnX333dlntdlp+Dqk5jPXIp1hlJodz+LZ7DOzZGSBP17M3nK86HwFsvH9qem/hw/Yp8lMG8lGKrTGuSeaA35jXtIKwR9ynadLGYvlqDfl3fkAMXoLZLygGNaVd/X/bx0Hg8kPJA+eKgWhZbftD7yiOUBTEsVtU7QYs3CCN0mXWITvCR39Lrwkr0w==; 5:rypTFAAIG91KFuH+6nQJWuy5wa9+G9Vf9+SZhtGab0D/KYgXdH1mGgsQuQ02VcDHX+N7q1E134RgfuxBNtNzTpYY142HUcRvFKDNq3HrMagp80x3ImMosyfc2OXdenAu+LSgZzQXjTYe4hXLcBFkiHJ7tOJwpHUrk0a3O5owv4M=; 7:Ya+gZdsV+f5EAQTD9eWP08AyWMkytye7NHPbl97WYNHyFcP2f1zRTL4MHqUygDgyOJb2qJWEF+M7o78lLWblntOpWVAwuppZaRI0iKIz653BEm7Cwow7fkGdR4ijjwMHyQWOS+5q8OocSmQn0vRV9nXwu8nAPFmmhU70PYn4+5EYCJreJd2U122jQ7vi3ee1y2ulWSr9BSLuJ/PFlG+3F4xhw2mKjBf6jlTnLCtdJLO0cZCWrDMuT8U7Q0KW9QrY SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Aug 2018 16:11:43.8012 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a9ac5a6a-df16-4805-5416-08d60392f5a5 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR04MB0391 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 216.71.153.144 Subject: [Qemu-devel] [PATCH v3 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, alistair.francis@wdc.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP To allow Linux to ennumerate devices on the /soc/ node set it as a "simple-bus". Signed-off-by: Alistair Francis Reviewed-by: Philippe Mathieu-Daudé --- 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 248bbdffd3..e8ba4d192d 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, 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); From patchwork Thu Aug 16 16:11:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 10567831 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B728713B4 for ; Thu, 16 Aug 2018 16:39:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A61EB2B479 for ; Thu, 16 Aug 2018 16:39:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9A1A02B47F; Thu, 16 Aug 2018 16:39:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 34E292B479 for ; Thu, 16 Aug 2018 16:39:57 +0000 (UTC) Received: from localhost ([::1]:56917 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fqLJU-0004QW-Fx for patchwork-qemu-devel@patchwork.kernel.org; Thu, 16 Aug 2018 12:39:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51651) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fqKsY-0000Ln-LB for qemu-devel@nongnu.org; Thu, 16 Aug 2018 12:12:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fqKsT-0000Wn-EK for qemu-devel@nongnu.org; Thu, 16 Aug 2018 12:12:05 -0400 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:44413) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fqKsS-0000V1-Lh for qemu-devel@nongnu.org; Thu, 16 Aug 2018 12:12:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1534435926; x=1565971926; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=+/J2hhMfVls7SJP/DEbyHDxBN2Gwa318fTn5co8HZBk=; b=ctb32eelE+iHoX6tJUli+llUMW8pJWr9kHM1D7s2nglz9c39xqTI+XF2 tSUEpj1mE8k5Oq5MPWAJXGbDICMJSsSbrz7K+aUg9JbzJ5qVpvprsqVjS HuBuhVTjzoJ1B/YBq3rT0pDg4ZfHxCuoOi2yr4Qi9AXUbwGOfS+2b1TSt yi3kYw6AI03Jy2mK42VYJs0BUEU0J2GAGaiS+qOw3c7hV2ZlNsDl7xdGk 689yPuzrUwK2f5aN8voXj82jaAw4bqq3x2ILQ8L9Fh3tuFCsUxjEyAqN3 yN3jqHJlkAJYl3qdEFu9ef2qIQd+eRMyZvaPW9IA9/dOf3MKa0JP6JPhi Q==; X-IronPort-AV: E=Sophos;i="5.53,247,1531756800"; d="scan'208";a="185138524" Received: from mail-by2nam03lp0049.outbound.protection.outlook.com (HELO NAM03-BY2-obe.outbound.protection.outlook.com) ([216.32.180.49]) by ob1.hgst.iphmx.com with ESMTP; 17 Aug 2018 00:12:02 +0800 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=da8L7UNjnp3E2gz46YB1dMG/5A9U83fjTfPdWvmqtQOzwqn+1jA+5wq4iuM8ylvB/obofJQ7Bvmx6cUlkjVsKlnXXSklpUNbh1MQip7JpGv0gtakNi4yXnPUerhNl5Yx91R57DFR+55StKuta8R5TvczxUPDt4LLUDHfjYfferY= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; 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.1038.25; Thu, 16 Aug 2018 16:11:56 +0000 From: Alistair Francis To: qemu-devel@nongnu.org, mjc@sifive.com Date: Thu, 16 Aug 2018 09:11:46 -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: CO1PR15CA0110.namprd15.prod.outlook.com (2603:10b6:101:21::30) To DM5PR04MB0394.namprd04.prod.outlook.com (2603:10b6:3:9d::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e356f008-f8db-4ffd-ae6d-08d60392fd33 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:DM5PR04MB0394; X-Microsoft-Exchange-Diagnostics: 1; DM5PR04MB0394; 3:A/cxZSPG/yp56eW5tSgVP8CmlKvJX7r1rYXhlqC9g4Uug/ZQKHdOa8WsKdpMOSlKftQp6NzbX29/qO7p6wXqkwcgb+WrbNFHDgbwiemQI6ts4lHYexFBIHiYl6hlMlJ8wLHKvfE7ZsKvKsMUK6J82D9AnAlOtdn0VAcgRBWz8pITeNsynbSE/jXLez78UfhTNwb5M+VcslOdxMvvTzfw4QYu3ndwYvDjAHO7W9j/UtBJovXCjbD24ipnr9Gk/u9R; 25:f/ZsGOXX9lbCiwLbogY3rudDQlWw7rBjRfz3/+CILS7M1NFyb2ZSY4Rpo+iCwZo7cACKpBvzu3/Zg1Xtm+jAwcNEp/8Qz4wt0zlpHNW14g8e8TY+8yJZwH1RSqv7RbWhT+h9xNCGMWjZvj2C/YEUCwgaIdAp88Wb1TmqnSiJyyzjfu2BblRHnEJMePY2K18G8udPXlg5HHD8FJEZsBs7giVQ4RCvvPpMQzQ+4qiYBxR20T9WyoKBeFnZZl9H1b17v+vL9whB14/Z1GSvB75bPwZF1jhpxkt4EiFGg6c+qzX/eci8zOuE7pLDlvNK1FOjbuTfZ8uwu0W7qBGuwRgkxg==; 31:F8CGzaIbowF5B0Pq5hjPuS10xR3jzk/yIdd6wxupK0uFvl679s3vE91XLgg1eS72/w6Tf/57iiARW1o4sn+smyWfFVegWi+OGTbx+5W1OeIR/za2wSrM+yP1YP7T2zdtxJ0W7zjemyM1ncmEkUO8yBwmyzvYuWOhuDAwJvviEKd3IV0PVbUAlxSRUCc+j1pMIW/Ad+QqwrsIxlO9Utpvf986ZKUcRRqAkjyhj5n9XKU= X-MS-TrafficTypeDiagnostic: DM5PR04MB0394: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; DM5PR04MB0394; 20:5qWhYZkbRJ4o/q6DqweFd4zwE35biGoH+3uzIAHVEsBoTxgJP4kOlbVLCJLMK93/m+8YmqcBLKUruZEMNpMh3pI2IoAlrW3JHYfaHwg5qCPnFfZjrUZ08Z+w4Lb/yvnPKaiYgXo/H3LEfjWoDs7tdvNo88omxR2DAwzEtKqlCM99lGgre8Yy5jPo7llKAPjUaqI1AwOSAdwjB3N9BDlTSfQgBoJ0Vc51fOa7Jc0ATllRuMORcTEAgZzcdUj7UOyJIZF/dobY3Q7bkufiS4SLL2jNfQPzSKACOKfLgsP1+EJuciOAkyWmMrX0rvdlUhLEQvtjBRdu24mKN7FgfmWKPJ5LHUzUtGwSCgY87OQCrwcT/h5hqEi4VH5JafCZKJpMoa9TUobo7KMgaO6Y10ClomClctcySWukFQEMNWsGE2lbqSX55L7ESxqKOXfpJgCPNNTayQycn/dFfcVnPiYVQ8j8JqxBKXqmjyYXKkUGdp3KNv0pkB2lmYZ2Sg4KulUa; 4:9Jg8EFpRz0UHbQIB0jukSlXeAMp7WYCKtZlL4XWVHduEGnDmCxogzcSNxwC4+X7RyiiBzZLWm6OAV5xXtjZLPdgyq/GBvkspoOOLf8JAZvkgANSFD+VSFAa3tam3l/xpIPJdwmcEBwhIrdqEtU6zGPL+BWeqWCbZmOppmdZpd8h5i4687Idbgz+ojG56PpDgaqHX2a7vLAP2TaI+GFT0qnstIjVIuI4bEHzuKmAEdep1wyvmqph9Twwxcu5/ywZfYFoP04Rlk43+zrwYV864/A== 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:(8211001083)(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(3231311)(944501410)(52105095)(10201501046)(3002001)(6055026)(149027)(150027)(6041310)(20161123564045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123560045)(201708071742011)(7699016); SRVR:DM5PR04MB0394; BCL:0; PCL:0; RULEID:; SRVR:DM5PR04MB0394; X-Forefront-PRVS: 07665BE9D1 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(346002)(136003)(376002)(366004)(396003)(39860400002)(199004)(189003)(8676002)(39060400002)(81156014)(7736002)(50226002)(305945005)(76176011)(50466002)(48376002)(51416003)(52116002)(14444005)(2906002)(6506007)(16526019)(186003)(8936002)(81166006)(36756003)(386003)(4326008)(118296001)(26005)(25786009)(105586002)(86362001)(53936002)(956004)(446003)(3846002)(66066001)(486006)(6512007)(6116002)(106356001)(476003)(2616005)(478600001)(47776003)(68736007)(6666003)(97736004)(72206003)(44832011)(16586007)(316002)(5660300001)(6486002)(11346002); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR04MB0394; 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; DM5PR04MB0394; 23:0VR2StEENkQpM6k1urvlJm4eVaE/FGPbTnhNz7Mpe?= g1nOnbZJ6PhPDIbz7Dpgzqij3IcbfTDr/zCDXWMDML/LUs7eCcuRA3IRvBVRuztgRWoK4cOfBR2dn72FqpHz1pu8P+JeZvvFqWF+z7kc9aaOKwCp+hhYahehP865QGQ+GjM6VeKKSUhVD81JHILewKip5XXK2UpmXV5FRtWCCVMqMgMiok2sfdFGfALpCVL+CbmCihJ/1uQFtQhVgglS/eQv2YB35Mg0ksHsaW9J7S9JI79jX4JC2SRuQZbDt5ZmTsVhJkr5xPLwJhysrT1MJ2P5r8RAswY/DswYQVEmw2zuKLgncBIWGinxdQ5Ewww2a66AYgVVJemcONrOq7CJ4h4hQgKqMwG3gLscrMIjMLNWmBDNwY9/jVP0CRg1iFTAygRU2U2HxyjiRPJ7jy4MFX6rcXMjiBY18vIq74hh0+DCoB33F57qn4QyBb3pX4oALHykigDqnyu6blzrbp75L4k79SQO3Sv1KcdfE6Kuxu7/TRMBCPZQBTXL3D2u0u7yIxHAUp40ZP3xZ9P6qkRXpn11gIkQwAgBS0n/nvilCzHrMscBM+W0I1jglIlklPFcKn0ZvvR3u9w0Uy1nLGH9mRp0YlWYV85/GpnloG2+9yXvFjYRlfd5pgDJV3x2xZZ37ZlcRipAfy+X9rkAbil8uwgbyK6Vl8kYviYgJlBl9w1851qJHiBm70QvCos2tBldatA46ttF2nb8g6lPWX7VpqJgQFAFD7Z73L1s7B71geDecaspcncJDM/L+vFHrAKMpyYgExAQ5xyaU/y/gOPo5Hx2nJK1GG23MmZNpkhTjkopGYQcEPdYu6tKm8ojKB6IPWM9kuPnlxmvkQMkjyg1B1fAPfKXbykdV/ARVzeTXfiR0GQ+ldN9NOHQukfWxDT4tbfybGsWhRl5AgIra1NnJrqZmkqi4b7sAaD7+fBNj6NgxJJsqXowI3QjkxrjNrB+04jJnNXrfIVYJaObFRsnkURG0vJD+5gCw5eKeM06zBKX8OOJsTgHR7fP5ZZt5Tw8IWKhCVYzgLGeIxECGS4bLVm2t/Ko9Rz+rSr3H/N6bvU5UZFgw8DZa1Jm0IdWdxX4E3yCavGlIx0G98wHDaPA9THDpYKMfV1bo4CZYeyQYE1+z+5nSbPBywX4O4bWXeZZgUonZ/E9JIw5D0jKbD22FiJ7ic3FkTJI/gLsuPnqtqhaM1eQUxUEY+kTa5eYGl5KUI= X-Microsoft-Antispam-Message-Info: cLak84ZESuDuPN5JkDDzDhtAL7GjsSywmTFdWX7Yu2upEQgVqmp1QIWD6TbaUPJvB+j9DB4cfM+o9CwZ2ZBx4NGCNx7WVw1hPP9VEAMJ5b+6Zaj6OhAKeoBPNNBJviTWmyKKPjHos5tZtcG5WGeyY7GAiXkRksZcLqkNdSNgqbMEACMfEeV075vtUP1TlS2nxL6jLNJ68lFqeVBJpU2od2rAwTCoxIAt6mAI6nIQfeeupGSRcoNLyieWwQLDhgf7wpVvYQKqFNAX8eIxJ9FTjC3X1ivkJ8pzhPwPDFLW3Tq0cQvc51yeq0DguVmwVUbOFWjATwBdRzJGiK5ICAOrdxEdXZ1Ry2G0FtgY8gVJ1qc= X-Microsoft-Exchange-Diagnostics: 1; DM5PR04MB0394; 6:1sStIoIcX1kNSJ7fjefH6WThug15kt2yXMhHnCGbuEU0nRoRyieB3MxHMh+coxn3Zci/XgfUFZhVhO3E53VgSW9Cpy1Ww0KeVQcUnBtqqhM4BUWsWrTB4USWG/OKOA2Da4zs9m3BYXkTlwqfFPSaXFZIgzMrhRRo3WPh7hXBZz3lzxQx/G2OJvjt0ukcS4neJzC9X5nXKLOJT+tzG/6oqn5fRJF4L8tCWl/pXHf4FThRb/jm8ZvpBgeimkCP2kNkldLJndzptIQStf8jifFjh7/Pe1EMmbVm9Y10yVBqtfx6R0xSGzlo90q2/FwBWtG2Z42SCV3Kp1Y8ifXXhOnA2Cfn/kensRewyc0bQToF+Bomi04RP0B2nNrk5fH9s01j7hRsEfBlaY6IV+nnzquJ81mbagFx3hK0TbsPNW9s6lD/1YxT1MQzAVL0DAtTTHL70AsFZuqnAOZYilU9Jvru/g==; 5:Fn+CoMsBQAqVy2715Q1qpZiQG7M2UQpcDZH6QgL60Yg6NY3G2On2rCqXLbSW4QZf0R7n6We2p5qz0ygVrnVUePgWJSpBe/BYYYlyNWENk2jWVCYWqN9N52Occ2+51pgIP7gupv69ZZ0hdhDtjhzNpUsYVRgsgNYS6YWyjnuMYqE=; 7:4E/p5B2UTIIE0C3uKJZ8etd3A7PiEHjnkxse1uTSfCfrMZ4GpNnlEkIVOucxyFRBHOHg5stzYWTcx+C87iFmiATtxbQyCGSs0y6neta6e5Yqd5waCYjeB7rZ2JqUiRnNm4hSv+aPuFMz6wyoKOWRyYP3P2+OwQMxThtWwoIMlZIZAKj5lPyTtyDCQ7utJcvT6URtqpwYDfROAze6sF5ZC5YTRp7fmiuvDqEIwsnLW+Q/ZZwjbHT2MEEDJ27RG+xY SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Aug 2018 16:11:56.3992 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e356f008-f8db-4ffd-ae6d-08d60392fd33 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: 68.232.143.124 Subject: [Qemu-devel] [PATCH v3 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, alistair.francis@wdc.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 = 10, VIRTIO_IRQ = 1, /* 1 to 8 */ VIRTIO_COUNT = 8, - VIRTIO_NDEV = 10 + VIRTIO_NDEV = 0x35 }; enum { From patchwork Thu Aug 16 16:11:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 10567913 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F203B921 for ; Thu, 16 Aug 2018 17:04:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DEB5D2B4E3 for ; Thu, 16 Aug 2018 17:04:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D161B2B4FA; Thu, 16 Aug 2018 17:04:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 832C92B4E3 for ; Thu, 16 Aug 2018 17:04:28 +0000 (UTC) Received: from localhost ([::1]:57161 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fqLhD-0004kV-Pi for patchwork-qemu-devel@patchwork.kernel.org; Thu, 16 Aug 2018 13:04:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51761) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fqKsq-0000Zb-Ht for qemu-devel@nongnu.org; Thu, 16 Aug 2018 12:12:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fqKsn-0000jH-D4 for qemu-devel@nongnu.org; Thu, 16 Aug 2018 12:12:24 -0400 Received: from esa3.hgst.iphmx.com ([216.71.153.141]:29421) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fqKsm-0000in-VY for qemu-devel@nongnu.org; Thu, 16 Aug 2018 12:12:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1534435941; x=1565971941; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=qLBdGQ8gqHhV12nJ85RgDrE61SLwWmYdjk+4+36M1IY=; b=JPWSj2/OCT6YOvvIY9fusQcUQstjiyoFBjsHVJCx5hPq8vyu/FbLfHTX D/8zKASQ7UVyyb59EsTLhyC9glCv+LNGv18+fJH9FcLQ7JZ+9JN87Vxxu if7/r1q/AkUSe3dVGktV7QJdVjq315f/y+W50+raOM8U+jwUggnfsf2Ui 8QUECja8bjPy9kvIIAIizCRwHzbeIKt3zCWSlRlbjnIbAhF2P/we54g51 oHkeAw2zo34wJ55P4mb3mm8U8tJNKWGkpZm4N7zCIiqDe2CMsInkzU1Dv ykHu58I1LO6fKlHLmdPE4s93bmHHZvcAE7aGOpmN0OsunYlQiiPrRK3Im A==; X-IronPort-AV: E=Sophos;i="5.53,247,1531756800"; d="scan'208";a="91551316" Received: from mail-sn1nam04lp0088.outbound.protection.outlook.com (HELO NAM04-SN1-obe.outbound.protection.outlook.com) ([216.32.180.88]) by ob1.hgst.iphmx.com with ESMTP; 17 Aug 2018 00:12:15 +0800 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=1KCpFDPPs+E3Q+3UnqnGkznHHrv4GxMb+3j+b5XQYsM=; b=KsPeLUpLddLp2NQMobQ9rgCuvrofCVN1jYaN8MEqRRGBP1Ib4ogLtmtdx7uIerUHZLSafi170zR27IyghuSiEdMcZmsu+OPkFrMzlO7QO8wWcMgqlhIJl/0yCGCuFpspvu4Dg6M6MbPTnxn5Gl2vAUqpygsQpsDC/OwvU8I19FM= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by BN6PR04MB0389.namprd04.prod.outlook.com (2603:10b6:404:91::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1038.23; Thu, 16 Aug 2018 16:12:13 +0000 From: Alistair Francis To: qemu-devel@nongnu.org, mjc@sifive.com Date: Thu, 16 Aug 2018 09:11:59 -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: CO1PR15CA0103.namprd15.prod.outlook.com (2603:10b6:101:21::23) To BN6PR04MB0389.namprd04.prod.outlook.com (2603:10b6:404:91::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 633b5c06-31b8-48cf-5ca2-08d603930746 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:BN6PR04MB0389; X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 3:wWHXoXWdzvPYxfP0wmo4CNepbYH/8Xi7Frd0NmxHLlhdbxAJttufz7rYNkZSZFXGUgDVzudELzwdWsMd5evEL0lQ+wJM9hPRn/UFw9wFfc9kCB2TmGkx8WPn0mypV3tr1s1bvN3jiP8DOxP0Jc1ml+tbXMTERj9bdPm0Gl/2g6QCiwbbntZ5LuxwFQoAiBqOkeATy3/k4f+nYkmV70yxVWfxy3w4GWAAswiZJ1NzIjUn2LGl1Q0keL2RBxrhb1Ej; 25:abyWOnAUPMJU0YmdesW6ipVihz0TOtit89b4CE7rctssAlnZVFwLdDOSSkrS9RA11IIQJJHDOWiGOUraY0om9v7lqNZ9H2Xlb4y2e1CfbXOYp5H70EvDhHGgXxYQrtvwGtALJJu/SNUBifalhiZK3N62cprgw1rmwqwuS5RK0omH+NPBHwR/jYrTUpP1jMtzrfIHav/ly38G+FQZPUThPu7hCc0FiBjU2dvbs/S/g3gFAG3DWheguBKpvtbuwB5zjD9rRoedI3AxnSS6tfq5ABSzULwVZUe4rSitwyrUdhRPD6eNGNG5u32xS/bOKxeMRhoWJdlFk2quNXpTzZmNtg==; 31:ID/jG/z0j9KW/knD5varPzZax8eaV4yRbRB7nfLbE/0rCXNZZEgo9P4ZkyhGkpxtbZVpg9O6o/ciTNX4XPpYJTxYVClI6trbZFaXeHoZZy8OqzZBYk3jgSHQv/INiD0H7m5BOPlxiDmUXA8pstciH8l5OcpuOSZBfYH+rjY/syVakpEXfwW9tQSZY8CExJffHOHyA4sZegNeDzCyHzlkJHXkRxBHjR7ITtCpGftCq+0= X-MS-TrafficTypeDiagnostic: BN6PR04MB0389: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 20:91YK5x9eFe0K+k9OEg/H7nXdPUglxht2eIRCjT2ynpiNFaPVS3x7GAr63+6i46DjebOAZMIS+WqcA3AJspL40GRLNM4owmjuvrpgnEQfunqLqv81hXroIGPTR4EOkzQmdR999YzELTjtfBeCcVEma3gy1L8LJ+d/wP7wkVZW85nm+Z5kR/R2cQnc3a/DBE8E3kdjW7nn4afcqZ2nIGRFS8iwq0ihduc5MTRGPBv+zJfYkjrHdPKJBazs4DOKVA/xKgFfP3XYsYDrhr3V5DDhxAR20keqNIwgRNGrDUwra7BJAv0q7V0roIsKeBE0YXQeXyoWF6QDbreIXS7zU38/Uu1PqY+ZQdcO6xKuhSSBrpkfYlwupmMTuFrl9FxWmtBKEHvusczWbK5HiMk1PyKMPK6wFUiiX247/hhqXZ42SWg5wI2pw/r/k/kNh2brTFNTp5i2UtKw1x8FNJBTRqqExB9fMXkaWrpSbmFhrj/pCZvbEk3XB6oHabdKD9ETfp6L; 4:Ni7zrNU9Vx1HoUNvO8Bym6cnLnFMOth4T7n32nWqABp83Gm6qoLYcpeFbfi/00VnS0GH8l7OyVr5dK0VJKH/3Dr2G9AfC10wecISLfNljsx1LpPtJcvbfhU5wLOWCSL3ribcBz8C/YLD0xI/pX3mkGtUPosYrsA+jJr6019spDgxYT5BN5kfS16pdtSr0QSYwKkhrgxHfagtUqMpgX6h/2VD3Oim1eqOH3y5QALRow1m1B0H6fS3PGG8H77EUwgkH/fWqiEZwTB1qm+xaRjALPPjHnXr/0edUpMvmmzmEUURWuaQx871DE54aikhGMJp X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(21532816269658); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231311)(944501410)(52105095)(10201501046)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(201708071742011)(7699016); SRVR:BN6PR04MB0389; BCL:0; PCL:0; RULEID:; SRVR:BN6PR04MB0389; X-Forefront-PRVS: 07665BE9D1 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(136003)(39860400002)(366004)(396003)(346002)(376002)(189003)(199004)(44832011)(51416003)(14444005)(52116002)(86362001)(6486002)(316002)(118296001)(6512007)(50226002)(97736004)(2616005)(36756003)(486006)(446003)(39060400002)(11346002)(476003)(956004)(76176011)(4326008)(68736007)(72206003)(5660300001)(25786009)(66066001)(186003)(16526019)(26005)(6506007)(386003)(6666003)(2906002)(106356001)(478600001)(16586007)(47776003)(50466002)(48376002)(8676002)(81156014)(81166006)(305945005)(105586002)(8936002)(53936002)(7736002)(3846002)(6116002); DIR:OUT; SFP:1102; SCL:1; SRVR:BN6PR04MB0389; 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; BN6PR04MB0389; 23:dL1Ahuv5e9APruIB7H6UG9WG68/CKD9ntMqaZTvjE?= 03AHKRaCHHPJ4hv/88On2jUVvNF64agrcde9yssRn1q6I6LUXXJ9yOwR79yeKYsdH+brembrbFoHNiUkxCAg+uBUJXywnZ0xm+uHUuQIWeftB8DkbvjajQxpn/tK9TNY/fCYWu8vLQ306QdekjgsoGlW7xjwOKn3YbO3dLjs2II4wGEpjm4NtLrv5t/G68hxbFDKhZJyUeD4YLiay4XTk5r0Ed73+Hb392dv2YcF01EHG4GxcwtdDcDQtFSFROZWxyXx6CEkqH5rctMG1v0a7hfaOij5Zyh91kknwF5n5RnhYTW8queCJ4HlTn/MY4zEj7OcZdT4qNjc2PtHp7D9h7iR/KXSnlWZtiVhrknpNPUslEmjQ1Zpy3oWOoLwm01kZKsbv0dVWs3L5ucQpZTD84As/EF0MX7BDOsxUdgmshoaBVkVXQb2+fr0VdoFkAFznT7qTRFEzfC73yX3eiE4jk2LhWqw4ra3/keS+iP1pUa24p8B2kcrMYE5c5s9bLoQ34MPtIYYuY23IMRLCAqqQU3yGw80rM4FOT/UJyngYFJ2mUUK0yyKOhGchhFAlJvCalqfx1vbA1IvLHD7IaJbkxaqGFIYJezLMDrvvzX727LbS/eKW+pjl9MY3yjIfgGSq40T5Pvr3BHuY5z1ZnNOdGXV+Oqk9YKc5XSOKkxjuLwMcbsaAEY8+RH58Ef0IgRB9f8NWrZZKjZ4Meg+kWr2O+GyFQO8JruKaATYNBjMY4speO1lDZbGumAKvfIaZN++jb0YORytTZlJybnIxnOZ0GnGKQgQrpVhfyTGaDzU+qBOOQh3aCrfhPO89NLoI+kG8G98TVQoOo3jf0GpRR3xDCsd8pKmNsxG0ZJX4SVeK4ZehciW4CFdvZ9IJr0SnjxyJ4e5UEXRIhmKbBKJ/2Emt/+eDjiPDjWuVoo/YTrk2oFD36zjjdnhsmMkTmdNopmcfmXW9E2ZsOmYPjUpwkEgaexkZKlyni3NiWCkJf5suxbB90fnIRE8XQoq4YWcxCcFchxrcLPsA8V1yaJf8AnzlLjGgcwH7sc493jXWzzFXUPo0vltN9dtR1avdcjAYzqWbcGFE/c6vv4tWLoOY1qcERiLCAo7Zxsov8T2IIisD1G9ttcgXawxTxqQ/wuds/Voteh0PrJFIeqD8h1pP83SJsz2sK0u6032GnhCOSkxkvXHcsdoHS14lVoXUy/S1NnVF0= X-Microsoft-Antispam-Message-Info: exYRWoEtBy1dQ+fN8GDG8728R6OUtElvdVZiq5rg1zM4Bti31QGU4jvqZ3Voc6qw+S+Cv90cPr0nH2cXcJjbwBQmzeMeAL4yAzad0i7as69nMYXwxGgNsY0Fq2lTGucVaaVl3krd5dpR+tnkObAIY5ovEyjDN8TWwO2VsC5dUdELHuvEpzZq2Fb7qFDF1/voj/4phQ+SUVX4N4TmKpCPQaJa0vA4EWNj1ocU0fv0KrCzA+9WLco1rfNQLfhsrEcd42WHCK3X3+khYxOgUvEBdDafBBZE6SiYVI8nSgWHWE7T0btDXAowrcr7q5eBY0+xpoK/BtOzWvHFXke+hwPmFn2MdUnssXnXlnDLKp2Jx5U= X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 6:X6YiJv7OFHBOvz0yvt8iyFbCKO4wnB30jYW9UKAOKyOyf/VOLTELa/AOpx4gCGK8SF4Jv6H/2x1ByUjgH0goCgda4uYSv2Sn4AYYRythnZyIS/OZoWESFWcW1C6dm6JG7RydYVvjsuKP4oPrSb8Y9jClp296E9vQFAX6V1B95rv/eB9Rf5YPTHZCQekpwgiBkF7du6T861kifxNs8D5+CgNgpGZ9KaJs5gB1+H+J70fM7v9v2dFSEx2UWNESpimCdbbw8S6nThy3RxksIr+ZvMSLMOdnplQ0WVwMJ57JwA/8+q5i5Ml2vehP95XUq/nwY7jWY9jrpgZY8ezlPkm5/T9xr5IoepdvK7kk064U8MwGEBiSaQ/rBTFQNgwrD0yPOgcp75RlwxFLIiLOyHnIh8PNOWyieih0E3tewfrGoqAD0TgPBlk0ff+dgSTNg74EJ/MaoT3Mdg+erq7GnmfAXw==; 5:fn8DKzZyOOD+1avKTspH8umjlB60835DbAGzUd+D3zYO284NAr0u0Spp+1VS6x030EL++TV2xvG7glj4Im2P6Z7kbfAQY4zXv/Cb8h8bxP670z+bxtL1jKvXW9fmCsyaujnwT4IOrlE8Jkc6bBXvbAV4u4Prqwiy/z82m68505I=; 7:vvUW1igSSmmGCjlArG9eYi93KNLJbyS0p/qr28F+BDWmZ8vhFjMpWUXSWStEo44UOOsEdbjWJAfUuZdfzQoCGytr7pbGk6bR6U5qhvPavtEDBSrPO+fGTgTlRja8A70qTu/Uf0cP8V/e0O0Oz7ub9TDgQhLBG01vMBbApRu6xnPF8UStF7uxl25LJYX6o1w3dUCEw674K90UZKo0dAOdqpus0anOa4s87AaWEU74FqjltwRF5Ju9g/hTFJJ701dl SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Aug 2018 16:12:13.0796 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 633b5c06-31b8-48cf-5ca2-08d603930746 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR04MB0389 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 v3 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, alistair.francis@wdc.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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=y include virtio.mak CONFIG_CADENCE=y + +CONFIG_PCI=y +CONFIG_PCI_GENERIC=y 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=y include virtio.mak CONFIG_CADENCE=y + +CONFIG_PCI=y +CONFIG_PCI_GENERIC=y diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index e8ba4d192d..9bdeea38f2 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" #include @@ -55,6 +57,7 @@ static const struct MemmapEntry { [VIRT_UART0] = { 0x10000000, 0x100 }, [VIRT_VIRTIO] = { 0x10001000, 0x1000 }, [VIRT_DRAM] = { 0x80000000, 0x0 }, + [VIRT_PCIE] = { 0x2000000000, 0x4000000 }, }; static uint64_t load_kernel(const char *kernel_filename) @@ -233,6 +236,32 @@ static void *create_fdt(RISCVVirtState *s, const struct MemmapEntry *memmap, g_free(nodename); } + nodename = 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 = 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 = 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 struct MemmapEntry *memmap, return fdt; } + +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 = qdev_create(NULL, TYPE_GPEX_HOST); + + qdev_init_nofail(dev); + + cfg = sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 0); + memory_region_add_subregion_overlap(sys_mem, cfg_base, cfg, 0); + + mmio = 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 = virt_memmap; @@ -382,6 +436,10 @@ static void riscv_virt_board_init(MachineState *machine) qdev_get_gpio_in(DEVICE(s->plic), VIRTIO_IRQ + i)); } + 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), 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 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 }; enum { UART0_IRQ = 10, VIRTIO_IRQ = 1, /* 1 to 8 */ VIRTIO_COUNT = 8, + PCIE_IRQ = 0x20, VIRTIO_NDEV = 0x35 }; From patchwork Thu Aug 16 16:12:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 10567847 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 67E65139A for ; Thu, 16 Aug 2018 16:42:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 540DF2B480 for ; Thu, 16 Aug 2018 16:42:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 47F8C2B506; Thu, 16 Aug 2018 16:42:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C377C2B480 for ; Thu, 16 Aug 2018 16:42:46 +0000 (UTC) Received: from localhost ([::1]:56939 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fqLME-00049J-3i for patchwork-qemu-devel@patchwork.kernel.org; Thu, 16 Aug 2018 12:42:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51800) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fqKt1-0000iT-H5 for qemu-devel@nongnu.org; Thu, 16 Aug 2018 12:12:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fqKsy-0000oH-DT for qemu-devel@nongnu.org; Thu, 16 Aug 2018 12:12:35 -0400 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:53390) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fqKsv-0000mK-Er for qemu-devel@nongnu.org; Thu, 16 Aug 2018 12:12:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1534435949; x=1565971949; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=uotw06D02O5TpO8kxF2++uOoZ7lSnOcWy6LfkCJHnEI=; b=I2OUSzYaab4fhYvogkgICvTTozvMR2sB8fpvfib3WsmOI8e9DKvh8nug /2KAPIemwb17N5QwKNBb1ZrC9MNXsEW9tN1Yz1sxmHIYT0OILGPkt2JpE OjTpTb4OrkHqQq5ox/IHl+JAmiAuf5lVkxegich1kLBGTxAFutYIX3+H4 mUqLYU27aOsibw6+fNntWBgn82BtRk9hJjUdSK0gywaMbfKCuZuLnjpkV K/TiycZEKkhLCCGDEpuJ0ywZ5KDwbQJNCafNTRKnrTeNqSsjRfWwHVTU1 f7vUVVmL1m0aiJRB0UzLP1L+0cfwochaWFbVEbmYZkhI8nQwlnGDb+qNQ w==; X-IronPort-AV: E=Sophos;i="5.53,247,1531756800"; d="scan'208";a="191720766" Received: from mail-sn1nam02lp0017.outbound.protection.outlook.com (HELO NAM02-SN1-obe.outbound.protection.outlook.com) ([216.32.180.17]) by ob1.hgst.iphmx.com with ESMTP; 17 Aug 2018 00:12:27 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector1-wdc-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=VBEQ8/iUIcck+37h8K0tbRD10lAIVsuH5MxbskUvRtA=; b=Vyq2esHDNSx5PqD4ysmCF21eVXhvKKNSEcu0BDC2lHEqF80OxfPJRZ0DVOfPucH9czj1HaKlk+T1YYIYRf0oh4GiLl6bUJiDwCeIkaikc85IZT90XOD4VIb/JVao1MsgfRn/0LqEz0fLLfWTzF67r9BQ6+/NOW1Lee8KCs3n5ME= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by CY4PR04MB0392.namprd04.prod.outlook.com (2603:10b6:903:b1::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1059.19; Thu, 16 Aug 2018 16:12:25 +0000 From: Alistair Francis To: qemu-devel@nongnu.org, mjc@sifive.com Date: Thu, 16 Aug 2018 09:12:17 -0700 Message-Id: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [199.255.44.171] X-ClientProxiedBy: BYAPR07CA0022.namprd07.prod.outlook.com (2603:10b6:a02:bc::35) To CY4PR04MB0392.namprd04.prod.outlook.com (2603:10b6:903:b1::17) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 872edeb9-22f1-4a0d-9654-08d603930e7c X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:CY4PR04MB0392; X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0392; 3:/usT1n4+RYukNAoMZLCaWRJimBv20F57St4oF9I8Rpu/pLOPxtcuSdyy9LZkmk2/GU+bGZ73TTHsIbE2jUzOHa4o7yVAPkzcFtF3udl8aB9W6agNnKEnY55TIFs7dxKVFPMFyZQyOpzUREnDUw5ckbzGKRpD/1W7MPaIRcLHT7rEB+I5YuOXsKbvTkwG0KJMNVjwvHLaLc75CGhmtTDoC+G6oHX3/TCr+P3wz7hhXJ0ysHv2ztbn2F0PUpxJELqX; 25:fE1j2Vfh4c9dJLSaNPs5MLeuaOQvbjEKs7tol5+0OQstoY6xNwTuKFl+ToSseIcp+6+QMPx69+pnjk/YY2BzGUuVKP4nUC26cOUeaQcehz9wEXDS85P0OjoIWg/du+mlCJxhZrf5VyaeP7QUlqzXUXHyLSoyIiBNaE4U/Ozy9tTa8yTAJk48gXitii10iZ3tuo6H7nFmXesQiO7x5PdjXuCq2TIoZN5+valT27LBA/pZTVRliwqUP67n9uOpGKKKvGKxc2XPTSf+DmoZLgLi7H7ReMwTz+s6DarUJCyJWyuH/VK0ASTqDmS/QR/Th0c2GeQRdoayccvrdb/FqIndpQ==; 31:Mx8NJRsK6fqcB36tFKeynpvdZ0D1Xw+k7CJcN7znQvSohG2g7nRCEGHZEwTLxahE52oQz/S5qg5onSwXlUisjWWnytrAYxJH3bci3RCK/n6zAG49Qw0Uw+IExQYL19ZGlLz4nLKuHG55a24zRuwSaMQp9yjoFfL/rYp6yDGpjDpsn8UvmIdqnDjRSZlmkbgvH9Xz2sPN6erJNVMvLP0JllUSY3/1A143PMcUbCPToWA= X-MS-TrafficTypeDiagnostic: CY4PR04MB0392: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0392; 20:XTf62HsNY+mnmUdiSG4WLWGbLG8khfwnD6KFdSUjpJdkd/r7Zk3SUmNswEClAMMLsBYhy8lqIgQGnjDlMoIQw23VbTTZdnRvg1XGeAAEFEW1PngkaIiqesl4+3/lN9j+AKhDRsdIFrxAK5qhCsay0r2MQL5qsvlhvXCkb+8DB2K+IDKGLSLzWCAJge1HOQ8HSKPFU/UEt6SGb989OkQoOAplrWhhSvzWi6pmHZNJ1WZ/vyVhNvw3I9sw7xxYWd8THYj+EQBHn8hz6y3rbEUYY0lRWURuYSumtf7B3BlOUkZTbIp3QQpp5/1IvaMB7U0THBc3VtwtHYKZBWVwQovFWh3OLbQHNYDT6xeOXhVQL7oJmR3jYPAEds+zlBwzrNpX7KgTNfDfw1jPXiS1kDV9SPjkROfdLJrnDpxEsv3hMUS1+upCyPAJtKHWcHMm4dWGXt57f2wi/mKXqcMoMRpPo7OzQfYOesvCh72jIwx+JrDB0xRYLWmWT0z7Ur7pb66G; 4:UgkAk2TvNRUEMJXdXd8TbhlbepE6vGed+KDcyX1B0iQ27hsMz4yXkuhfLh1BdJycXSoORuEWGQhSd3PJodRt5Ns7QQj/mrHGxQMyNgdOWmrw+RH7eh+waGfj8HP09rjZGwOz6wVMy59lByW0dKNTUGE6ae2q2UQ0XAEy8XcfToKHKh89Lty1KIb2L/o6/Jzpzpgx6grWtcUbYNvCICgyjYlARE+FLfxzleulW8QOEDemwaDwi1kNvbsfm7kFpXrAaMVDaQT4xOCAhXT0DfwCmFUkf2MZpkJNiVyHOC6RJBoiMuhTIFHT4ll9DTtDfcww X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(21532816269658); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231311)(944501410)(52105095)(93006095)(93001095)(10201501046)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(201708071742011)(7699016); SRVR:CY4PR04MB0392; BCL:0; PCL:0; RULEID:; SRVR:CY4PR04MB0392; X-Forefront-PRVS: 07665BE9D1 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39860400002)(376002)(136003)(346002)(366004)(396003)(199004)(189003)(6512007)(476003)(25786009)(106356001)(4326008)(105586002)(86362001)(36756003)(76176011)(52116002)(11346002)(51416003)(6116002)(53936002)(16586007)(50466002)(6486002)(3846002)(2616005)(48376002)(956004)(486006)(8936002)(16526019)(386003)(316002)(26005)(186003)(81166006)(305945005)(8676002)(2906002)(81156014)(7736002)(39060400002)(68736007)(118296001)(446003)(14444005)(50226002)(5660300001)(6506007)(72206003)(97736004)(47776003)(478600001)(66066001)(44832011)(6666003); DIR:OUT; SFP:1102; SCL:1; SRVR:CY4PR04MB0392; H:risc6-mainframe.int.fusionio.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR04MB0392; 23:u0k8rVj0o2qw6afFoKUWma9OBfWPjg1KjMAs3KT9v?= IYxizobfvHkkzyMHUNwodlWe/vUP3419x/z10i6tPL7DygmbMBlvf6PyMfxrf3HLFXpIsVutqnASEBEeNMVlwef0q8L81mnfd1RtoQVp556Oxl1yGPMJCho5Ai8n4maP4I8IqqmhGakXoZpga82H9SVfIuXQhVxH2M1+8KO/xwYTF2Tn7M27PEUtvwQSL7dqAUzrn4WbvT8fYH8TSw1Jy7nrZobEZ5DO+njMv79+U+0zI86IcFRINMYnwBXFGYE2UFJIHYVJA1vpdOysqO14L6RVVGhOAEe/yDP/+qVGTXBcxMmtMKWz7CBDDe7bK5pPGAsOGeXMeYPGUfHWBYjbfxsCAvcMhwPYEqpwk8aP/EoAcla6IkdHbip0yjkE5cm9+iA3B2lFPgQ7lDQzfwgUE0e/lEz3+qvHcRJtSISG1MUPbrCrCX9eRuSlhdRXPHXzXi9FDSPQYC7y2WgNBWrRirHFBPUZ/4buC7UvBbJxI+wtf8dO9kBsLZ5Eqt4mPFp3XsG0L8oEjRtah8G4mGc9/QqR37w2fSgiD+GsL0AqmKTmCg2N+PdV5KPUinCTImPsylegy0uy2tK6lDTasLzQiJkhKXlVEttkaq7RXMew30DBy+PClr2RiS7pvezx+/MPLE/oJ0yQ3e+wQwFX1/5ee2VZ+6tcbcLO1YH4LAn5iiPiKkjBwWszpYoeeDTzFZTHvNUWTo9JMpboZJmNuswBlJ482gP5D4wSSlnFtPihQCVh1vlAHZDUZ8YOAFkMQjqtSKMU/LEKV9FUEr6CwcevO1SHWBRlIQw9i92uF/+MXzAX/ETvpDACB6MGEY1qykbX1EMrkg1bmaKhRBEV5RW3OS7WV7coLdktqjyAH2J+OvqThcukuwjEE1BZCdeWgxzJrY5a9z1obe4o//DyrmHKT5PGNIzX3lLmjdzlGppJf8Hm+jYy8qKu2WxEnHf1Jw03E4COFVZPt3FQlMSesyB27jvrpodcLm5qK+1iv50FQolh44w+lWcjkJ90IM/hn0+0mSobqUN7jlNpFgL6eZWr+Y66T93+dQHCL73miQCcw7PkzexKNBnQxNSI1dPfSg3YE51zsBCnwO1VdiO4afJhH+ia4+ct9tBGJHkQqimFmW/XH3HYJNMDY5popm+hLwdps1Zuc1rdDsg+BEe2ZnxhVqXfmqz7pk+xgYh8e3ay1FZJFBgiOX77YbGENul9ZaNatA= X-Microsoft-Antispam-Message-Info: jYqCqMGCNwmB8iPd3G4I8LGoqCRi/lMtiHLfBFdFLrX/2EyXPAk5iysLQ1zupBOVnxnqScg8VPDphD724KU7R7oKn2lGtyv2wMBFYW1eyKTb+xmUfae0L9UYnjpzKnjQlWbVhaev/WBqyUz2qCUFRyZ0vq5pbUY5quuhk91pHXPdZbDeKlDHl36HCPPHH+lATfUynTRe/qDmVTaU93K3geJ0rLCGngMXTMFzFdqot3Q6//ZIie+BKDE05/lxXygK2rK4GLQLJfFl8uyAcLp4HrwDeEbjtmyynenhkp2bhMb1MiQdklBbDxNYl/LBWBmlTjiyUNwCZVapolWnhKzQaTAoUch6+nRPFu1YBiGeMUc= X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0392; 6:QGkR+hsXSVgOg8tO18v3lYUFSGCJi6aQ3yR2mLE0qKLsLgsPV9YcMaYpOFLP1NCoMPd02UWTCn2gs8tYra6LYeq3AD+uaIXpqQsaqaQhnZhotsgJchXCZwpt7ZYVP7rFxLqi9PiPQVCdz8lN3cyL/UId2enevXDeHuzyq9QjaN/Lu4fOdoSskMGrx+Dpv1ZxzGWxoxG/S3wPGe0iuZHxG1/6qP95Pj8fkXnf7f1VtfmwEnirVx3rbrTy3NLpgqLq6nWBrxvsn/Rjjodhglb0tuIlAXfdWpdfJf/dqE/N2vdqqp6A6QJqV820Bq3rQOdKM1GY/PFL5OiymTsQrGZYrtUebtV7Mh5Boz+mHCnY3OUvQVNucG+6qxYum84Ey4UaFPPIQd23NiSfSiwVz0Ln9OsKzhTzTXzL28xgXPvXXMry7WmECohi/8A9k4x77SAgcKBtPc/HpRFNTxkkNyUQ3g==; 5:hyxaEKYd9bfqYs3s7QpfrB3fkJGOY0cwO1doGGoUKDGQ+x59/z5Ak70ei626D0bygdpHm9WMq91RpQc9DAGwpUGY3rhNDMh/9B7hQPuTSqwzRqaqKXQQJvLaE7qw8LCvOWEKBR1AnW7QUqDAMtjRrPT34LeMP1HKtt0waC++jew=; 7:CfHqT8jOZjbCLUzV8TxdCFb7diXS26Af8tO/KB5I57jaFIzM27lFns0tZQYfhZEqbEhEADjyxlJRi2oFQWyVJTxOxhWqH1ZoOIiMVnhVTvM6V/9do8kaYZECGgaKJc8eGmDxEd83Abex5O70QiR/gU4dw+Z6ZJhZxsIxSr0X0wfNSFoOrGFmThKaksM5PO70q3Evv13vG8gP++i+w3B9YvQkmjiMfC4+46vyDxu3gczpbLS3cVQ8vQN4mtqZ9oEB SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Aug 2018 16:12:25.5634 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 872edeb9-22f1-4a0d-9654-08d603930e7c X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR04MB0392 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 68.232.141.245 Subject: [Qemu-devel] [PATCH v3 4/6] hw/riscv/virt: Connect a VGA PCIe device X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alistair23@gmail.com, alistair.francis@wdc.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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=y CONFIG_PCI=y CONFIG_PCI_GENERIC=y + +CONFIG_VGA=y +CONFIG_VGA_PCI=y 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=y CONFIG_PCI=y CONFIG_PCI_GENERIC=y + +CONFIG_VGA=y +CONFIG_VGA_PCI=y diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 9bdeea38f2..02652e44ee 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -322,6 +322,8 @@ static void riscv_virt_board_init(MachineState *machine) MemoryRegion *system_memory = get_system_memory(); MemoryRegion *main_mem = g_new(MemoryRegion, 1); MemoryRegion *mask_rom = g_new(MemoryRegion, 1); + PCIBus *pci_bus; + DeviceState *dev; char *plic_hart_config; size_t plic_hart_config_len; int i; @@ -436,9 +438,12 @@ static void riscv_virt_board_init(MachineState *machine) qdev_get_gpio_in(DEVICE(s->plic), VIRTIO_IRQ + i)); } - gpex_pcie_init(system_memory, 0, memmap[VIRT_PCIE].base, + dev = 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), true); + pci_bus = PCI_HOST_BRIDGE(dev)->bus; + + pci_vga_init(pci_bus); serial_mm_init(system_memory, memmap[VIRT_UART0].base, 0, qdev_get_gpio_in(DEVICE(s->plic), UART0_IRQ), 399193, From patchwork Thu Aug 16 16:12:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 10567861 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8D890913 for ; Thu, 16 Aug 2018 16:45:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7C0702B53C for ; Thu, 16 Aug 2018 16:45:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 702D42B544; Thu, 16 Aug 2018 16:45:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C82A02B53C for ; Thu, 16 Aug 2018 16:45:38 +0000 (UTC) Received: from localhost ([::1]:56964 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fqLP0-0006vL-48 for patchwork-qemu-devel@patchwork.kernel.org; Thu, 16 Aug 2018 12:45:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51847) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fqKtB-0000qe-U8 for qemu-devel@nongnu.org; Thu, 16 Aug 2018 12:12:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fqKt8-0000yb-Pp for qemu-devel@nongnu.org; Thu, 16 Aug 2018 12:12:45 -0400 Received: from esa4.hgst.iphmx.com ([216.71.154.42]:9041) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fqKt6-0000vw-PF for qemu-devel@nongnu.org; Thu, 16 Aug 2018 12:12:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1534435960; x=1565971960; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=Bqd8ygBRwL+YnoMrFVvbAgKi0xrkPVJVFrYUGN32c/4=; b=pdCYW48xn6ieCszUgCH33aVm3EW9yNFiidDfCgcYT0ovJOUVweNWT0Z6 EhcsOFI/ga5u1D9GTzxok1jmKEo1PN3Qw9o3CKx8hJwB2iL7oHgdP2wYC sqcKJ4Ty3vr0WQDJZWXaL04Fbjemv1LwNQIePkYitnPsoXzVTbEzVqC53 GGBpdg64VgY/ZoqQZ3qFdceu5+vDh7ui6NHHXGfPUsaBsgO7atKCe0wu/ Orak20j/7HnSOE9b0OGABDCc7FUFm4ny0LnQLfzoaSDRV/cQcilsD/fYE blql+30zSwMXQr107jhsyePYcRMTBJav5Faw01PxNFMP9TAYIrdJphmKe Q==; X-IronPort-AV: E=Sophos;i="5.53,247,1531756800"; d="scan'208";a="87742808" Received: from mail-by2nam05lp0245.outbound.protection.outlook.com (HELO NAM05-BY2-obe.outbound.protection.outlook.com) ([216.32.181.245]) by ob1.hgst.iphmx.com with ESMTP; 17 Aug 2018 00:12:39 +0800 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=fIPv4U1e0eF0rATsHrvRJMR5MWy4v8sWWLj29J8jIsQ=; b=IWWYQGHXKbwIA20VYsoDyghY+ZtTb3QArTU755+dzyXen2Unm9OaKglGc4FERDEYtJeOKc7HpiSeMnFO2XrmdR0u+klxqoR5/szHDxeq+ARrwrWnJ06GO6/VdVrL0qeDYZ7CX0a7FF/fc+9kbDpQmih3086FrSy8KMJiW5cwYqE= Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by BN6PR04MB0386.namprd04.prod.outlook.com (2603:10b6:404:91::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1038.23; Thu, 16 Aug 2018 16:12:37 +0000 From: Alistair Francis To: qemu-devel@nongnu.org, mjc@sifive.com Date: Thu, 16 Aug 2018 09:12:28 -0700 Message-Id: <012aa7f7f72b7e07bcbff879566950a9595a836d.1534435831.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: BYAPR07CA0002.namprd07.prod.outlook.com (2603:10b6:a02:bc::15) To BN6PR04MB0386.namprd04.prod.outlook.com (2603:10b6:404:91::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 31440d25-cf5c-4d63-f8f3-08d6039315d0 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(5600074)(711020)(4618075)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060)(7193020); SRVR:BN6PR04MB0386; X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0386; 3:JbXEeR4YjfG5IkBWKzNhG/O4fVgb8GKWNwsbIPOVwMcD7cuTeJtKnUPiJP3mzzxEuogcb7UBY2GCmzNaIomD4oSJkYH3gkbOd/v/Gxc0qozi3NYIvcLGIcOP6apiD8H+GQayswQlJzF+u6ILG2AblukdHmsPho13Q4ZolsUmkycaAWCQHDzTRWQLoavKpQU3uTsjTyZHtBpW4S6/qlCxEXdtYUG11sEsDYbRh+CJIKSk3OisEN4K9lGbGcJRgeza; 25:N+pEG4YnlhRVdZzVj97kEhmZpu1iTYIicWGO6uSbRU9L85ZdwEdzcLPyRGNpA7FML/oTHH2Fh2hXcfbVgyF1r3u0k29owyavb3poBvMUrnZC8+Z/ikarTzCxnCaL9sHkj9A0Jm7SPV6R1Vw04SyU1kKn/x3EbATynx20LlfMfXJOgslFQu/EiKGtzdR2zuiO4bK/HBprlEcjojm6IwE1YxpR5wnZOZJc6YWoR5AExdDCKW9R77hExRviL7vosCOUBq1Ax6NiylFXeLN1IaaIFF4xwArGbpMA+Rf0FKWkjuyaQTpdCwr0Ki7f95NsdRjzSBhXZ5CAXsZrcceafOkJEQ==; 31:zJUT6DXGhfCmaxAxUS7hv5nWB76MAJX/LcX4N2PwGSnKcAdB3zotifsrVM8I5SgAtyc88nTltH8FxSPm/drhRkHsA7iVV0xOft5fLGBL8fMEAQyLOod7DABKIgbTjtRmcshzubnp3n9872u2Q+thykjrrXyOy05nNbDCBNfGTU4ibB0jOtQgCQPCiS8Gz90yVXlrFY0ruEUkRWMYe5jrQR10ea0lEDhzN7BSjZQkZmA= X-MS-TrafficTypeDiagnostic: BN6PR04MB0386: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0386; 20:3qCwOMKf8kJxt9M2FeM8koJwMy52BptMmkYai2W5Yr/cTVuLUT7MpSC9FtPNxjkVVQvRSEYg0LIUG2dgSnDHNvMqq5eamMJC91VoWeEoNkEui6V9vpwdxJEkratN8JoZuPH5gIbaUWyy/li33T/8hRIo230tAlf8TsgA2ILCSxfFsjwoJh313QrZFUSgo6uYhdkJ5nQbfmsgmrXg5usTZ2nGHhJV6xgw1kDM4yqlYkhcmQ+xRo5J6Lax+44lZsK51SOuXMRmksjE1PahgeBilyLDnsExqwAwlwkSadUyDs099G+PKLWjdIGki3jNaFg7mNg0w9459o+W9MxOY2ovnIfIl+KwleQ0gIS4hfZm2PioTUEh1XKOdffzjLhQBvek3kSpigF5PwxtH5CQFtRN4HG5JbzeENJyC6i1yCEZ4YfLNzBMHbG/AiIGhr9zDzbKkSEUlIzG3ursVlTWs/7UyGqUAKG2c4AmkebdBu9G3T6CbxAmciu8dmEegMmIp2Eg; 4:7gy6uX0RHdGO++cgOjP8Ja3zloqLdnX3EzFye3QCJMruocHU4LlrhD17VwSDbOIF5EsbIIt8pbQT05mpArMHABRRdGK2+Dix0SGvdPrt6iTny/PEpav+yH5j0buiX5hhcYQKs8iSCW/oNTmhTcgjoyCx0uMiLY+kGWG8Afw4DNyuI1GnktR+LfRoJJ7oOPVZlPXre7rzPnpp2Eq52pkXh3HwFluLW6gSn6KNwl/vkTfIPhkk4guUUDZeJfW+dsbsUevuV813VB0FK2myWjIQ0ShSXlfrHzpFNIgPVJ5lrINYBxuCtlfypgXSfo53oOMP X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(21532816269658); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(823301048)(10201501046)(93006095)(93001095)(3002001)(3231311)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123560045)(20161123564045)(20161123558120)(201708071742011)(7699016); SRVR:BN6PR04MB0386; BCL:0; PCL:0; RULEID:; SRVR:BN6PR04MB0386; X-Forefront-PRVS: 07665BE9D1 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(136003)(39860400002)(376002)(346002)(366004)(396003)(189003)(199004)(16526019)(105586002)(106356001)(486006)(97736004)(4326008)(186003)(44832011)(6486002)(7736002)(478600001)(6116002)(3846002)(72206003)(26005)(6512007)(8936002)(2616005)(956004)(305945005)(36756003)(476003)(50226002)(47776003)(53936002)(25786009)(118296001)(446003)(6666003)(11346002)(66066001)(50466002)(386003)(6506007)(48376002)(316002)(2906002)(86362001)(81166006)(81156014)(68736007)(51416003)(5660300001)(76176011)(39060400002)(14444005)(16586007)(52116002)(8676002); DIR:OUT; SFP:1102; SCL:1; SRVR:BN6PR04MB0386; 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; BN6PR04MB0386; 23:xqc23tNpTYKWJC7lYlA1FnsvCFLXOuFZzKNYlTmja?= VarWOq6U7GTrQUPBlalMX193zWwp/7PCKAKXi5GmYZ9jntkN4XYqVoFvxfrpLq9vcMRqsIXbK1+GE/ZQn9RDVlTHZUho/mBv9wSE8nc0uHPR4S8eTqH5UphsWRhcWg/fPnEMMGJQTgQXUNesnbNTMOdB4NiCFv+rfAYbjM//ZcU/LqB0jDTNkvTemP3jiOGEjqMKliTXksfoQCumor4e4l3VMKrvjYZ5d75JCFSewMGlZ/HJorir/e+L1NKU4cr0CckqiRVbj5H+KFSWxBBmxzUHa7GIFCdzCQ+iqlX07ryotEPXpmdlCeHE3cR0kJq9tCf6DdHUQL1OHYVDzlmP1on6JlyW0YXn6tpB299pj1WE5DEj1GBON5gyeovrFJQZQFIc0JwfPsc6GjFElUrY4eW/RmEy+6BOoYsbeZX5S5rpx3gIBaTXAZpTWq+H4OE2LZ/c/a/lZvmRlYn5DWY7XiWjrr+7iAP56tPDdIpoTMHgdwH8jchCdBQyIfO47GWp3RMhQeomiLUQOkIR9Fdixyf16mSno7SKc5S0UdOjjBF4ckvb+kaMD6u71AWGMxJyNG3xeu0SBAD1GY2r3vW4fF7rLcHE9HrJy3emwzntw1ygABqT3jCPYFdb6moublm8ifJ1aR3K240gOqwk/biJT3+mRCocleYrZfeT943tVs0IxpdXj3yH09EfwG+W6y9glfLppBKGSf0PzZlotSNKh+8JHU6h4YZU9UTjMT9m7JvOipFwC+4Bgwm8dpm3auxsTQHHQQXkj4qrYrAAfOl/oEjnE75NrnmIfieXmlGITgOStwMp3xmLLSThJbEhDFSvh9mojrSeJQs9r5cf1j9jRe7TUA2rfrRekq5kiQL8eN1jI3vvlqQ6ohmFEnheDA9M7xe8BaovWHiSTUmIrk1MaybmY/rdNG5vV1/X9PMmFil/d/Mjc1b0wS2q9FDQUjn+hRL3GWpgnfljaOU9ueCOsyXD+O3accLbr9MubFz1xynCCQz+CWNB6PmGlY/5r2/+Dkfz2wfR1LUIfy6GmvyuI4pExhhB34VKpVBuq/Xs7d/PnnicIagMXKEvjK11XZK5tT3b+aVPzLEFMumukbFE/3YnYofrh4S5/39e9IEPGWTkY6XCuNdnlFaqYbHxxO501g8Ld1+5/dRkoCWu63BKebPncdXMtQ3PC7b+jMAnujQI+AB6YATks8FnFDVky/AJrQ= X-Microsoft-Antispam-Message-Info: h1vGyCIiwm9CGigin1d13xWzfV0b0JsZ9l23QqruN/vmmwFD3UFuvmoNHbe5NTaeGA+/n6HAySEpm7FJGCRwlVU21LL/uMJNPAbAZQ/FQrYo/vzfvbRgVOvIdzHYHO97lE9VP+XjoLvj+ksx7603z/qiqRGXCyqkrKjB+/b2uqRkJkX9jBniXkao4dZqsNVr1751DSSUuJDFs+Ozf8/o2VfWg9OKFt7b7s+DIVdGPk9xx0N+H9+J0TIWEFteiLPYKXJ00heVR29HRakLDKYQ02iLMFgiHeV/o0V8ddrstgaIePSeVtrLM9+MI1EGaRc0C8alR86BJwuScIbt0nbV25CD1hoKcDj4z9rCKAKFxAM= X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0386; 6:e2/azpU0NyneYxRx0ljODITmcUvSW/FZ69JnU8zZ1/57YHrGShYdUJqgOaGl5/99YvqDlfLiVAEsy4zauOdxm2vubYTxpap9podEYJCt276km5ifG7vS9q189ytRcJ22t2s/gDwko56Ag2o15oiQeRJdJYnLqAxFsol/945sL3Txo29bR52T7eAuaAVrQtsqOqAP9JS6DMuG4goW0SkHkZdXco7Aki9dADrCfoZdJAroNugZ9QD+qNonq9m6fp4mz2rH/uU7dowMkFZTIxvlCSdHihKXqoeRh92FvYRvYR7qWCGapjJNr9z1E6C2nTqHIj5n+XjTCbHTr9MCIWA+5Kt2cb6QJvfmAFbM4MSd4G5ktrokTLqeAukpzhFfleFxrU6dp6Yy4xFD60lPYztDgEbbt0lFCpnQNwy1QH1fy4aOWxSo7BoO0PdWJtjM0BYZEX2xwP+/ce2iI6YNp7iT8A==; 5:qYr3PeicZ9jsUcFsh//bamaYwjhxRgqvMaFEH89vJSnCcDxVTnq5XCHWch1AIs5wce/D7zcqGsYALD4ZURNDyyPbTxFs2vgI98SuSY+kB1mUBngcWSHC4Z00rnBqCRX9u5nTi/sUuiEpk7m6EmMyvFUqDjhI6W+mEKaDpJwQm2k=; 7:RRk5GTQXT51SkjlqlruZMdeMZr647xhVZUH3CUXVoQ7QDvXMxFs6m7GzPw7vUsfy2YvUWBd5j6XgnscSuf11QsaIrb6eRgysHhl/0dKtpM/pukLmLUw9CS75h+19Df0ocayGt5MmFbTTf3/oVU2qOgYnQN0Nl2ITl3uZ00jZhkpu3vS3yu+5pdCgrSoN/Od4lmx2eup/rORtWXnFiEALynZwz1ioxzb1ufSKZmUE+vG7iwBRI+ALt61bxhOtNtWO SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Aug 2018 16:12:37.6793 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 31440d25-cf5c-4d63-f8f3-08d6039315d0 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR04MB0386 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 v3 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, alistair.francis@wdc.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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=y CONFIG_PCI=y CONFIG_PCI_GENERIC=y +CONFIG_PCI_XILINX=y CONFIG_VGA=y CONFIG_VGA_PCI=y 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=y CONFIG_PCI=y CONFIG_PCI_GENERIC=y +CONFIG_PCI_XILINX=y CONFIG_VGA=y CONFIG_VGA_PCI=y diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index 59ae1ce24a..9a8dd8eade 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" #include @@ -61,6 +63,7 @@ static const struct MemmapEntry { [SIFIVE_U_UART1] = { 0x10023000, 0x1000 }, [SIFIVE_U_DRAM] = { 0x80000000, 0x0 }, [SIFIVE_U_GEM] = { 0x100900FC, 0x2000 }, + [SIFIVE_U_PCIE] = { 0x2000000000, 0x4000000 }, }; #define GEM_REVISION 0x10070109 @@ -218,6 +221,32 @@ static void create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap, qemu_fdt_setprop_cells(fdt, nodename, "reg", 0x0); g_free(nodename); + nodename = 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 = 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 = 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 MemmapEntry *memmap, g_free(nodename); } +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 = 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 = sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 0); + memory_region_add_subregion_overlap(sys_mem, cfg_base, cfg, 0); + + mmio = 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 = sifive_u_memmap; @@ -373,6 +433,10 @@ static void riscv_sifive_u_soc_realize(DeviceState *dev, 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); } 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 }; enum { SIFIVE_U_UART0_IRQ = 3, SIFIVE_U_UART1_IRQ = 4, + SIFIVE_U_PCIE_IRQ = 0x20, SIFIVE_U_GEM_IRQ = 0x35 }; From patchwork Thu Aug 16 16:12:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 10567925 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 45487921 for ; Thu, 16 Aug 2018 17:06:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 306422AD62 for ; Thu, 16 Aug 2018 17:06:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 203DA2B523; Thu, 16 Aug 2018 17:06:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 939322AD62 for ; Thu, 16 Aug 2018 17:06:52 +0000 (UTC) Received: from localhost ([::1]:57177 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fqLjX-0008HE-F2 for patchwork-qemu-devel@patchwork.kernel.org; Thu, 16 Aug 2018 13:06:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51869) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fqKtM-00010m-W5 for qemu-devel@nongnu.org; Thu, 16 Aug 2018 12:12:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fqKtJ-00012q-SU for qemu-devel@nongnu.org; Thu, 16 Aug 2018 12:12:56 -0400 Received: from esa5.hgst.iphmx.com ([216.71.153.144]:29373) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fqKtJ-00012J-Hq for qemu-devel@nongnu.org; Thu, 16 Aug 2018 12:12:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1534435974; x=1565971974; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=Q460klEOx3rM8F83HAlIq6RWG8hkZIAQRmhnH7Qg0V4=; b=XE7z24b1VHvbGx4EKfI6lt4tOsOBhHW2t5nlVgs0o04O4fZpQFb2D4gW Vbz9NKph31Xa+vL4aaWN+VcEVvmeQTAq6jUG10nuNpJzUu6QWpmtsf0+T 27rp8OowYuej2bBkvRzLnRj5JtgxFdie3gO8ILIm7nX1PW1LmrNAUlPSE SH0sCMWs54MHJy5CZ+ty1grxu50XMdJkemSVZHuv5z6xOxnmSnnphvG12 ToC6xzF8QLP4xGtdfGhf6E9M/coytE1yxI3g1/LagBO13G5SCYD48qoWQ v1HGzu5HuOCb1/1pW70HVGbM2IW4SA7b4lIB3dWdP89l4B/DEiOw5F93N A==; X-IronPort-AV: E=Sophos;i="5.53,247,1531756800"; d="scan'208";a="88625018" 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; 17 Aug 2018 00:12:53 +0800 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=BG0y7O30qyjaPj/BuaaZYG/2snGNbLP/Zb/Hltp3lWQ=; b=MQfgXoPGstIDZCK1XuxERgv+4f/sCpF4IJvbpftXOYqElJ2VNc0slQ2LUDbrj5V+jptqIqAj66TdlX/1RGPI1F7JJfyNitDYyikTgvMN009vlatced4aoAjyoxPaH9fSuYcEdk6OtVkUEGE3PJ/jzNf/Rpkmg14G9oD80uVJk+k= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by BN6PR04MB0389.namprd04.prod.outlook.com (2603:10b6:404:91::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1038.23; Thu, 16 Aug 2018 16:12:50 +0000 From: Alistair Francis To: qemu-devel@nongnu.org, mjc@sifive.com Date: Thu, 16 Aug 2018 09:12:41 -0700 Message-Id: <5c23e0fc0eb0009a9339392bb7730a0b7cc97e31.1534435831.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: BYAPR07CA0016.namprd07.prod.outlook.com (2603:10b6:a02:bc::29) To BN6PR04MB0389.namprd04.prod.outlook.com (2603:10b6:404:91::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 84bced43-2437-4c8d-a154-08d603931d59 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:BN6PR04MB0389; X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 3:MGRj2eiMqLWSVxvxbyiZbyMYQ+yqiuMLevIop2tq/WDkWld2BDexBhJjbIbDff89p09OsZ5L7YHVL97yVaaS/NXE89H8/UHk0swFR7LxVp+gAzm1K4S5Ed/MnnaN3y0d0Tc32huQOq5RsK6+EgMRSPF9mU76fa+vxet9EJacmtSZWPXYNwLkPkmj4mITDGg80GGQ5+FDHzPjhn/ZxT5P+fC9B8AQHSJwxNnv7fxs6LHbVGy8X9rjIpdjaRP+BH5b; 25:aRO7AsHuiIBZMgO22r/BG+3AdGnmcDxhJup/0T/+POBdQGBao6otmfNGeaMWny2eufFV105uGEtdMVe8pdfe5s/Pz6l4jCxytTdhQh3uqcYCXBQD37gKzwkpSwy4Sp2++8SDwymIeHJbUtUVqCJlkkHexItmTyXwC28Zgq2nOCekIGRrzGir4QQ3hNMU7Z6TrJ+ZdWawHf7EY1Sq9r71ClypNK19bbW6WMSnV9un2N07G0nJogyk4qchJcjaP/7ymzyHop1+QcZCihOx527kxMom5E+nWP4clMqJOj5d7EvgciccaitYmmYIU2s0CTPRf1pxaohG91+NlXNgbcz5aw==; 31:egl+j+nf3PxPkkK4GHLO/icBaDpmNCoE7V6Cijj30654nOsm/MCZtc8BqZSeMpjPpOq7xAzB2feqvlr+0c5heRcw0Y/bMkWqI/ikQI9WqRaocvEHXyyw/88O9saP0xGIaXzP/VT3jNwdG0vX/7PTfouy6nydvLJEl8R2aKux8woK5Fk6QPsOZ6y3KyKz/YFiPihZYP9vrvxL4Yd1kLNGtfzsgoyrmoMaQulNm6nXtP4= X-MS-TrafficTypeDiagnostic: BN6PR04MB0389: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 20:lc26wtJpz3nPA9j+tZORSHnokQtyN76Klk2xIjzSW5kt4P9mPouI3gH5Y2f2WmKwa0soFFjAjkbzij71vUlMeSfNTydtvekNt0sSEQYjoX8rVLUrN/j+cJDi9YBqRJygLulKGyAPhMQCA+QIXVNZQIqJplm3X74QNS4sBBJCExb6mjRHpLZcp8H4/90SUuPZ6AKyQAszdhYZk+XZldewpgym/mr8WEYG2vbRNAEUcoW6bdAPi5szeAtF7fJpnMJGUAwlNLUPiIoGsuEWwpFrZAta/WCoeyxkU6KD8MesNYFoCqATjHAEcHh9pZaFjUcMHmBZCYJH7gltMjK7tzJDK764mcW0PU28/TKYsUMv7zMA+1l7QpnB9c4d4Bemokkd9JB0wxlwmvdREFSsB5mInl5mhUguJt3qfepwRKekOM5/DYq5/Cru1T4isZvuoyzmsq5kBv6Fq0EJGk3CNZNtpLfu88Zw2hijV1XINmwAo3WxpfBJSmXbd/gIXDygkNqn; 4:Pr5Fz6jusXEmj8b6l82jc6roSnBs5+w3G1zxJ/Ch8u33z6Sj27SoyrpknK1yGWb2hHUn1tUG6ygo/XJ7RxqcnjxYfFKnGNki9561Ve80GcBbuvuflqS4ze8xtI7G35pmmRsAXuOcG0eZ4MNbyQusCzwP/21cq/TkQ8unPCjN0CK8kiaPZV6FvmBg3UDUuDbggELaNYa+ULD0/q0NLuCTzunkFLU5SBouijR9QsagiS3h+usTZAeXwy0tPeOx4thrhCZVSYz72zf4Z80KY+LsFVZr3tzTsomtEM23uZq114bZMFOADNTqZmfkwcc4o9MV X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(21532816269658); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231311)(944501410)(52105095)(10201501046)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(201708071742011)(7699016); SRVR:BN6PR04MB0389; BCL:0; PCL:0; RULEID:; SRVR:BN6PR04MB0389; X-Forefront-PRVS: 07665BE9D1 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(136003)(39860400002)(366004)(396003)(346002)(376002)(189003)(199004)(44832011)(51416003)(52116002)(86362001)(6486002)(316002)(118296001)(6512007)(50226002)(97736004)(2616005)(36756003)(486006)(446003)(39060400002)(11346002)(476003)(956004)(76176011)(4326008)(68736007)(72206003)(5660300001)(25786009)(66066001)(186003)(16526019)(26005)(6506007)(386003)(6666003)(2906002)(106356001)(478600001)(16586007)(47776003)(50466002)(48376002)(8676002)(81156014)(81166006)(305945005)(105586002)(8936002)(53936002)(7736002)(3846002)(6116002); DIR:OUT; SFP:1102; SCL:1; SRVR:BN6PR04MB0389; 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; BN6PR04MB0389; 23:kVXeeNj/aa8l3M7BEcg29hxVgXDXUNeQjVmmvg7mV?= eSqK80OTUgstSI3fwU00BiBAdor5mx80CEMok+uLHZLCec2XUss9Nf8Rb5UkscFGAo7vOyvf3cXJULjXjnMSjW7GgYTuJZEFh56i2+ciAhicBtIFC98wLDhYGxQi/5P8Y+NiMPS3sk327FGyNhg4p/fU5ojIoS8D8+YHtee3HtO5hfIqi7sWWi3ThwudR7bQ68JIUq/NlkzQibKZ9ct3bAGnoM9txSlzrmenipr+fkM0Lz03zQjvjUE1TOy/K1dgD1d5HGAR4oH1RSdPMDMDqpJ8tI+TcDTyGSUEvZprBFhN/UzEoxSrNS8n1NzYkVEiZbWsYmJX4dzljIHpnyHlVSng2TCKwlzuGE+RSv5DAPdVT3QtoFUEGIaOfg/J4HHBImOXcALEf9h8k6q8ewgCFzN6xLhqOLU87HJcgyH/SZ/ef0iziuI2CF6FeShT72IZd/i0y9yfkyGBc7hRiO4BAOIzwm95Cf7aToTOGoo9hV+ff4znsYZ6KtCkpw25+Y1JgydXIf1Ipy0ER/CQye0qdmVT1N51EAyCTB14C/VKkHzRyUSsuhAP9zYZN2mM4dEvqsidIzRmNCivEccrKnmqSNC6fG+lfqK1z++51csy/JjMEmbibQNeAAbapUgM4R1ZTKCWgteZp8Ga8Rn9HYNwBeOoavXonuaHXEoY7WlYmzpBOQBfF4ZSHqQ79WHW82ecWwFyFid2wVZYh4iwtS3QYERk+W6n1WIaqwmLtGO17kpYoYGSoJTYKSovrAWItEfmveLCX2f5Kxpcbxxt/L7zNdWzJ40z3HIItuLhsb5qd+iPGteyGS8Nz8qcVFj8Hmu/PEAObwXeV/LJjg7i/fYLvFqPCR2NJbJBd5VngpZMoGPOvjG9yJe62adBJ+YezdX8DSNfD/ELEtAme0sXoPLZ4Fy5kEKrc+3vzgLXqWCtsELq/t2Di56YBsiLgcbT3n+UMalAGpLAsQbQzZQBFTlN4oGPHugKtKumEoiZlOCV7lp0nknCpItFWqViu4unkfISy5tGbIEin7h5FYDiA5gJWC/fFShn9GKcEgWOSl32DfkmtAn1vW/ofB8i8SdAVzpD3/T6Cr3qpqvVVXSd5sGAPKQ4dhZdBvtf3tiVWVw5nwdeOV6aghGO4N1/RLq+ScbU2e4B/thZtam3yrE+7z6085YExdkzeOT8MIWk3cEXjPNWWZ48UCQV7rw2+Ejg02dFSc= X-Microsoft-Antispam-Message-Info: 1esPa4Q5WdSBJcEZbzQKTnunDQxhUhQFg0fWHCUIF0sVyptvLtXBfmLMD1Uokax0RU2MYkvhLDN2AhMQ3NzdCxHUGgLZ4g5nmZVK7mRBLgOWQAJrn6R3RjpbbusZSirDpJ9cERdrTcQjom+iUbpMy9/ohQnxmMMo/5YKmNYRYKfOxmc62DTBe9X2h+FgqX8KWoG5l9CWS2MaW43sck3nwUUWcnWv+LgPcDxAGcNqxEEp9MjNK65uqkHSo+a0ARnyamK5LoVQHpTGWQgy0fAmSUkVWNBqRt/1Pj72C3wj1omSmm/qnWJw+orBZXCOqpgpGzYoTwEnT04DO9qkgECVAFyWqxdtfQstn0Msdn7a1TY= X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 6:jfMqJW6JfSHoZI7Z0czCKeKlYMb4sD+ZNmwWspANP+UPrJxYU2t5+geOV9HG6hYFzcOf/JntI6VMXfYMSvR1WF4jSQkUewp4fcSBcg82m9gqamaAnWuH4prtS8KrZWQDZ8x/QsFWEvSLhvlpioXFY41SgZRlVh0PbaVVI8kkKS6zSho3YTawzC0yxL8seTmBksHS98Y89XM9jpYgfKhUeMlKk/tOXilCEKn4QqJb/YOZm8ouOL1s0pYwQFZ7ZGQMUFl8HApjmnyrBZr4jJveNAIVqeDkyobAOqHLGcNE5vkieQxtpytben28LmP95T441asTdNLcqjX8CA6zbgjHTtnH4GLBCkhvTWGubBrkBPryIoPfQE1FfyVy8jBOnPKTe172hbXMtTcs2lLZUxeyhvpRXVPearjME/ZPHwhFH4lQiXdfX0JYndGuxeJM+2CTqSZ/e1dahQ5SfngjDWsd5w==; 5:KrvGsf0SJsUdfzpV/osmJZ++Vu/m7u5TS4suqMp4Fs00B3oSGtjcx5eaoo49C08k8HXePb1iQlsaOy4UC/Faks0cm0nVYwJT0YvP43mHjm4FpXLKHYTfuUioYSOZ5cNNNkUrriSbxsiAd/lBhelZQqC/SAXXMwi84jMEufHQx70=; 7:JbY6y1vjIOWOGdSIquXLM7V6E5lW7wDr68IJJYb/r6DFxsE1o5WS2J4tD4x/Ge2DFI9550L3X6lKj0AChJuU6eWXp2+0R26Tyq20zWYXJm0GnxGGekUWygIr5RUMd37LDogwtIhScNHmTNc0X5Tf0jptv2tNm+/jJvj7rGUWg2mZ995xFvI9finHm6EUOHBhwdFu/eGqB0lJUt5epnf7rWd3m8+GLahLckpMjdnaf6uPz8rI/WZqKBi00FVjuNcG SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Aug 2018 16:12:50.3169 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 84bced43-2437-4c8d-a154-08d603931d59 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR04MB0389 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 216.71.153.144 Subject: [Qemu-devel] [PATCH v3 6/6] hw/riscv/virt: Connect a VirtIO net PCIe device X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alistair23@gmail.com, alistair.francis@wdc.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Alistair Francis --- default-configs/riscv32-softmmu.mak | 1 + default-configs/riscv64-softmmu.mak | 1 + hw/riscv/virt.c | 11 +++++++++++ 3 files changed, 13 insertions(+) diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-softmmu.mak index 35e74bebe9..6e19fdc935 100644 --- a/default-configs/riscv32-softmmu.mak +++ b/default-configs/riscv32-softmmu.mak @@ -9,6 +9,7 @@ CONFIG_CADENCE=y CONFIG_PCI=y CONFIG_PCI_GENERIC=y CONFIG_PCI_XILINX=y +CONFIG_VIRTIO_PCI=y CONFIG_VGA=y CONFIG_VGA_PCI=y diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/riscv64-softmmu.mak index 35e74bebe9..6e19fdc935 100644 --- a/default-configs/riscv64-softmmu.mak +++ b/default-configs/riscv64-softmmu.mak @@ -9,6 +9,7 @@ CONFIG_CADENCE=y CONFIG_PCI=y CONFIG_PCI_GENERIC=y CONFIG_PCI_XILINX=y +CONFIG_VIRTIO_PCI=y CONFIG_VGA=y CONFIG_VGA_PCI=y diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 02652e44ee..28bf35ea56 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -36,6 +36,7 @@ #include "hw/riscv/sifive_test.h" #include "hw/riscv/virt.h" #include "chardev/char.h" +#include "net/net.h" #include "sysemu/arch_init.h" #include "sysemu/device_tree.h" #include "exec/address-spaces.h" @@ -445,6 +446,16 @@ static void riscv_virt_board_init(MachineState *machine) pci_vga_init(pci_bus); + for (i = 0; i < nb_nics; i++) { + NICInfo *nd = &nd_table[i]; + + if (!nd->model) { + nd->model = g_strdup("virtio"); + } + + pci_nic_init_nofail(nd, pci_bus, nd->model, NULL); + } + 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);