From patchwork Fri Jul 6 01:22:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 10510505 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 048D0600CA for ; Fri, 6 Jul 2018 01:24:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EB0C528387 for ; Fri, 6 Jul 2018 01:24:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DC2602837E; Fri, 6 Jul 2018 01:24:05 +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 500ED2837E for ; Fri, 6 Jul 2018 01:24:05 +0000 (UTC) Received: from localhost ([::1]:55378 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fbFTf-0004Nm-Pw for patchwork-qemu-devel@patchwork.kernel.org; Thu, 05 Jul 2018 21:24:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36334) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fbFSG-0003CM-Bi for qemu-devel@nongnu.org; Thu, 05 Jul 2018 21:22:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fbFSD-0007dU-Nd for qemu-devel@nongnu.org; Thu, 05 Jul 2018 21:22:36 -0400 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:40750) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1fbFSD-0007aO-Cq for qemu-devel@nongnu.org; Thu, 05 Jul 2018 21:22:33 -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=1530840154; x=1562376154; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=Qw8RS20j2wCv/q+tNixYxYFjbuaLLKlaCJsPjaGKm8w=; b=rmAt7yxDZ0euOUMmEo+yY6IJV6+RuZ4xXrLguoDfdaMZ/+BzD30/veas aqHtpZV7V6d0RzrhbcbUqd/5bCnmfgKilMTLxGmtpEXsoPXzoPVnU9hY7 uIm5qs9upLRubrJUERLjN7E3G3/5PAvvqFLhFRzXx5GUuWJpddaL6Y2Hv 2gdace6WboGizg1c1IDZwBhoeSgbY8DKSzOWUcChyrbb/lMe1sv8EYVwt r+O6A+VeOXZ/NOLOfp4gLwHLBPZt6Up7YRxUhNpNyJydL2zuyRGQFsAxj 5Oh0uU/CuEwYiZ7Xu7Q+4J59ifPIYUX/DB40MCOXskQ29kEy2ne3kZgGy w==; X-IronPort-AV: E=Sophos;i="5.51,314,1526313600"; d="scan'208";a="84619626" Received: from mail-dm3nam03lp0016.outbound.protection.outlook.com (HELO NAM03-DM3-obe.outbound.protection.outlook.com) ([207.46.163.16]) by ob1.hgst.iphmx.com with ESMTP; 06 Jul 2018 09:22:33 +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=CsnErxji9celZv5b9cUryPDpSXIpKk9ciksceEdi52Y=; b=DmMDaEoLPlloXATZSg9X7ucCQ3C17Wjh3LqzDkwiThLLoOZgkgT0Wd/ERGxQfXBGlxQOrXMV74wkU01dqX5A66G9Sd5J18uFTk4IfMW6AKhvLPMlORx5SoZeQbYAVKWNLmjLNPhqD+lK4txXmBG4U0Jh9FEUUs+7Ji2omrcbibw= 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 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; Fri, 6 Jul 2018 01:22:29 +0000 From: Alistair Francis To: qemu-devel@nongnu.org, peter.maydell@linaro.org, mjc@sifive.com Date: Thu, 5 Jul 2018 18:22:13 -0700 Message-Id: <20180706012215.21714-6-alistair.francis@wdc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180706012215.21714-1-alistair.francis@wdc.com> References: <20180706012215.21714-1-alistair.francis@wdc.com> MIME-Version: 1.0 X-Originating-IP: [199.255.44.171] X-ClientProxiedBy: CO1PR15CA0105.namprd15.prod.outlook.com (2603:10b6:101:21::25) To CY4PR04MB0393.namprd04.prod.outlook.com (2603:10b6:903:b1::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1c363548-8919-40d3-4caa-08d5e2def14d X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(48565401081)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060)(7193020); SRVR:CY4PR04MB0393; X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0393; 3:4HBgd8elYIOWs4jQ1flOwxZG4Q6gUJUJMqhxXvdXSVG9udychdiXGtsHk8gyyUFRh++XmX2HPeum0sNhsWkGy6dyPGJkwlamtnpI7g4cJfeJINbInxBJ15Uit5uz+ucmKW4tgCG6uLPylmopkB5VHGzvDxMdmegLYCt0/3kMUefYvSBqZzr2r1FNef+ct29bBzQQ+NZrfvGWitQAoPkxUuY3tz/cQetadpjwtAf/HKB2BP2K6ze+sNbD8g4BIaX4; 25:dvS7FAvSBEXMRhpaY2FJH0Ppz0iEdz20nnxjqUvfU7JZCS67klak5p3jT9uXxYBw8+UcVL5UmCBlsJWz019UsGTOmspGZH6xc+97c/V8khMrGWZVe62kKyum508GOuqLnivPT5TyITpPjeN/t6gZILCv+hPXCGFGvDPQvwSAh9KCW53MctUHSGH6DpTv4UdvtCK3t9tKTfw86q5DLRN3osmgq0wdsldZuJaSusuK4wIuJsYS7QBdMuwGshXhCeEsrFkOS5o0Vii+fkRhp8hEq2PfGRdZKABsCi5XGP7fRrR5hZaA6gZcANWYylIO4q2D1+sQEV7beJOk8lLSmVfxcw==; 31:+BkyXXLrf5iMVL6qwTXyFSorDT3arHgfog9MpLUJC25KBmts/tRVCarK7IY778p/gbU0ldq4yCvehiHlY0LqRYYZpirGGolX31nJLNMdIIYXFO80VqOoe+QCctBWP+O0KNuYTn+B8zMtsfUWCyuU44pxA3IU/OBE/iOw5AIiNc+8GpW+CVZBAsUsVXztyfTnhtQrNS9IKJudnyMx+6dcIKs+mde3Yqeg9i7lDfzU9U8= X-MS-TrafficTypeDiagnostic: CY4PR04MB0393: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0393; 20:KO1gw0vznMDYfuWKXvYY7UgJ4wcJM833gDKiLvYVwtKLi7oVAAg3uSXioL7pVbCRgIl5Pc+YN+Xev7MmVUqmZjJO1zXpwsfRF2WZiqvDOxVu5Qe/S6bZhLVcRJF7TxAQzaOjnN+JorJcjQxy0lTvcDb4Z3FhoCVNrJ8jRohwuoa7BYZoPUp9etzfmLy/UOg3LTvHdfR+sDbrmdO2K1xFVJaSToKzinqzyYAH3R62rdoNbcnCoubJfoRlvdCIJ/GFR0yUZBFE0yTxRqNk79PcCJee/qGqgcgEE1vim+EqHBv5wnzgSa7RB0/H8mABxe3yEO3uaWmsyHwEEEyujUW2bTUZyoAHvqBGhUoWrqbZs2aPwPZQ6lEOFGDX3fibpe0RCvtPK+oi6gybzvQD0PNd2I2R1l9qUxJO8775T7dFnuBf2fr5eU25D/m+jx0s7fIGUysy143+15fb7WXaGDE/YjEOit8NoJGE+U6JYMZZnPC8RvncMBD0XiELwscw7dm0; 4:wXwlHu5BZydKmIFkm6cVgvFfdJYIfuX+SWLvTzDIWswyFmLAf1gOcfmx5ZlvKlYXSkZESGiR8++YiKeA3qNXZ+VY5hE6oCFOOReQcG8/hD2a+tlDW/HwK1QfC+D8Cx0I4yuANPdmOFlOCk0m0eyZwvtNvnuoghoWGczLl+bbj/bT+KDvpywlE7UEwoFr1sQPSwCzem/R1jr038EjBK1Gh0SP2CGEusxeILUqsCBV+jeZt0CbHT2A/PLUYLlElWYLYqmV+WjbCdA0pZHkqhNQ9w== 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)(3231254)(944501410)(52105095)(93006095)(93001095)(3002001)(10201501046)(6055026)(149027)(150027)(6041310)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:CY4PR04MB0393; BCL:0; PCL:0; RULEID:; SRVR:CY4PR04MB0393; X-Forefront-PRVS: 0725D9E8D0 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(136003)(366004)(39860400002)(346002)(376002)(396003)(189003)(199004)(53936002)(68736007)(50466002)(48376002)(97736004)(81156014)(81166006)(8676002)(8936002)(3846002)(6116002)(44832011)(106356001)(26005)(186003)(76176011)(386003)(16586007)(316002)(16526019)(2906002)(51416003)(2616005)(52116002)(11346002)(476003)(6506007)(956004)(446003)(7736002)(6486002)(1076002)(25786009)(72206003)(50226002)(39060400002)(105586002)(36756003)(6512007)(478600001)(6666003)(47776003)(5660300001)(14444005)(4326008)(305945005)(486006)(66066001)(86362001); 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:nfnsuGbJuFlK9pVHOBgK3Rhq4cr4aNf+UvTexYnrd?= =?us-ascii?Q?FWTw1bTO4BNuxBUd1//b6Kus7tiMvO5P9mG4HBId231GJjYqelxK14vQF8a/?= =?us-ascii?Q?12zEWeYlp3ODtmWNqSkpjHZO1nDZ+h0b4V5qe3xNVS7tFY3ale8ghws8uhuz?= =?us-ascii?Q?Vc6AWa2Gskis+4uWF1L5nf8TbFgmmQi2gYEqXimeTJhhja7aUliICNdemOkx?= =?us-ascii?Q?/oyx5M0azMGYnahzB2kt7g1gYmpMN66lQxCmfxAvg/7MOGwyRkE3S2Wu+YpJ?= =?us-ascii?Q?bVeT6ARkmvUiomo7qs594eEhCxN5pchJxH1WOkGmZ38kSP7UDSB7C77YLNYi?= =?us-ascii?Q?j/PvuRmwAusl89HqhQ6OVweDI5YStBpBR52gMXoZXm9IVFqGhGqOusxWw7ut?= =?us-ascii?Q?TZJyb6vHWLFfXz5DWjTuFwPljKdBLEW3WqwtPXTeyRJpDkjKaG3NYX6xilqz?= =?us-ascii?Q?OakFD2mDs9MQScv5/Yt2A2M86KZ7rmNZN6HyUAEtt6SwXuL2OZ32c/LWt5TW?= =?us-ascii?Q?6+j7K5evt5GJMO+FdqzEThmp1RZVZ5n1dreKFWPtw8JmndoF0oMN4YSLGitq?= =?us-ascii?Q?eMhyEe3oyZLiTWJP+oQiDg/3c5XKPMYdk8Iv3HpNYENIWiJU9iuqpnlnj0RK?= =?us-ascii?Q?2+DmuTPZv1FC4UYLehWHJjXSVEICI+a5FKqRiYTEzBPtrM3EmkdnvKlx1TNs?= =?us-ascii?Q?PU/fPtgtIJ+isyveK3/WZ2Vz0tjJwTuOd0A+VpuArVNRqCk87ZbQX3pO9l08?= =?us-ascii?Q?3OIP1loNKrYrySaWeiog6I4iKEr1xVA0NUDA1U4qwEFGjmuYi3T1Hx1gzrsT?= =?us-ascii?Q?2auPt4ip89+A4l/tvW9W2HcB3zt+M2i8R5DKLG33reb7Upn8oqB92QNE2TUV?= =?us-ascii?Q?C2Jqqn2AO06VeDOPVb/m6tCsos7HZiSZiTIh/OlDLwLoxRj/Nyqyhuaa/vxz?= =?us-ascii?Q?8F1jtSABabccpd/Edw4hhuXH4x2txAx4LDoGRzrOenPVH6Ni7ypGshlzV1In?= =?us-ascii?Q?aFKYEm+XpsSKVRwzxZDrMwFkexle7hyG/r0cbyUMEXoZh2e0VUQ/9YQitczw?= =?us-ascii?Q?vHF0xN+MEsYu6orwcw11t97eXyKzZNzV17N+IcLU9kfhppZfO2qVi1F9GI4p?= =?us-ascii?Q?OhPVk8yZ9VCRnGTQ4kzRWXgfpsyBFYW4W9IfBW2dss2CDkAkaCBKX47ccMco?= =?us-ascii?Q?m/dmTiujPx2kKGn4TpzFK4VmjQwOr8e0a1A+bqvTnPAj2qrJ/PMGUBxjTvgn?= =?us-ascii?Q?L/4AmmOHctqUa87m4g=3D?= X-Microsoft-Antispam-Message-Info: rX5viz6zIiCqZdMmZj6/h39wyg6zD9+Pk2rxuxK6aAuBxBeS9xJ2vSaLmgQ62ofZ1EY46lOLpVHSFTRM0/7zwJKkSrTSL8B46+qcpDhspnUDG2YzbNBLaLRfEntJBzVY1tXIyrzaUNUa8IipAG23uW1tDDfYUPr+sAtWGkgyaXpSGBBJkuRX6rbiW83kzXFnMQR2Mv7YYeNpcnpJ+SrWar58wMSQN0WJEdBjvTLHzVPjeE/IWggARj/ArT7u1D5LVDCysmCiOPDk+4xmJevYuNHP5orAEszQW2g5SB9yXFPvVzCk4Gek0wz0s9wHE0d9NSc5PDbNmTz8sTbG2LtuzBeLmg8hAzUx9Ex2zBM/01s= X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0393; 6:k9GAQG1kDIColIgKRe7OpPk48YD6wgEV0HwMsY9cii5Ni74ann691eX2hRA79kcx2/iM5JZm3pvp3EvcUft1PlGK6Ito0HxPL1Rp+O8/4AZNXXHVdWAfvzqvoQ4EqYeOYsLaO1tZgXlEM0Mg7CzLYSbdgShsdx7DE27pBtqTjsvO5KA/zcEf8jv3YhG2KyQs3arvEBcEgBrJgufMET7rCAt8jntchfk0spsWuxG+QBNDDQCYICqe2245HWzptJXH8PdR22FRNaOFhIUxfs8udVCnelVE60HR2aZHoMGQ+MJ9UYWaFfi8ahVDXwI4tDNVHa9y3T5uZZ3LlaBC3qlIXQHbt7u/QFjadzYaHNC1lgnahXiVuU87KwEEd9GG5J698WXBjhItFi3FOWuS6GEKiV/qTHlVzwVAvmTwvQU4PVSI3Lkz1QiIl2XquuRmORHr77oRzfsSp/2/Ltu2mXPBjw==; 5:qZh32Hhy76wM08/LFRTIvOpqXSLfvdd0+fPsrrW+U6J9YARhx23iKfUBBinHCTOHlhzpleZc6SiPKaCvElrsCiAmr+jWl+nb+Uuzjva3hTlW/3r6BEL3DHvb0cEROJmD4YckaSB0YAaDwCQOl8AAY1MnekUzhatQ4KrnCqAVYo4=; 24:7RcngJAZVbor52x4ohJeN+kxfoHKDGmlahpIpKJSgS/rtTF9xanqQ+dOpo10PNTgDElP9gkwZwhpYLxLqkyCFdLJiUs1WL2GmK0o/nIge4I= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0393; 7:tKlBkJ1LbPEVcw95cXoei60VFvPzip/j1OVtYpBof7ZjmyKEzOGB12cOw0BYjug5+msb7aP1z0hRArdohDwcBTL0cb2LxrkU96QV0NZEQhSJ3uT1w2+wOQPPpj22hyrgRfjAL2W/TEkiNmGF0y+VJfgcvgy3aB8aE5K/yrbYtxuzBrKgNUxYEGt0cKqlLOaLFhPtyl5ePLWpCjpso55N4SdFrmKjzt18Hf8KpiYTBVjX9Wxh63CQbUWGrm94vUoj; 20:QNqO1NssC5mKcODuswC+20NyftJvnls1bAnSNtqNXppDIprUjPp+5Kj/VDbkIPuIWFseLGokZWNqu9yV2b0pCbJUl58mG8x4Z+n23HFfwhNWaizoU+le8mHHMx/O3EwuNIKOUXqCQKY6r0CMZEIpHU8ISWOIfIz+gp/9er5nyLU= X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jul 2018 01:22:29.8042 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1c363548-8919-40d3-4caa-08d5e2def14d 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: 216.71.154.45 Subject: [Qemu-devel] [PULL v4 5/7] hw/riscv/sifive_u: Set the interrupt controller 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 , f4bug@amsat.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Set the interrupt-controller ndev to the correct number taken from the HiFive Unleashed board. Signed-off-by: Alistair Francis Reviewed-by: Michael Clark --- hw/riscv/sifive_u.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index d3db8ab9f5..4d3ba4e624 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -187,7 +187,7 @@ static void create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap, 0x0, memmap[SIFIVE_U_PLIC].size); qemu_fdt_setprop_string(fdt, nodename, "reg-names", "control"); qemu_fdt_setprop_cell(fdt, nodename, "riscv,max-priority", 7); - qemu_fdt_setprop_cell(fdt, nodename, "riscv,ndev", 4); + qemu_fdt_setprop_cell(fdt, nodename, "riscv,ndev", 0x35); qemu_fdt_setprop_cells(fdt, nodename, "phandle", 2); qemu_fdt_setprop_cells(fdt, nodename, "linux,phandle", 2); plic_phandle = qemu_fdt_get_phandle(fdt, nodename);