From patchwork Wed Jun 27 17:44:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 10492321 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 E7C4060325 for ; Wed, 27 Jun 2018 17:47:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 101B329954 for ; Wed, 27 Jun 2018 17:47:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 035E829960; Wed, 27 Jun 2018 17:47:13 +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 7BCA629954 for ; Wed, 27 Jun 2018 17:47:12 +0000 (UTC) Received: from localhost ([::1]:60689 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYEX9-0005Lf-Nb for patchwork-qemu-devel@patchwork.kernel.org; Wed, 27 Jun 2018 13:47:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49447) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYEVW-0004AK-6K for qemu-devel@nongnu.org; Wed, 27 Jun 2018 13:45:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fYEVT-00014R-1Z for qemu-devel@nongnu.org; Wed, 27 Jun 2018 13:45:30 -0400 Received: from esa3.hgst.iphmx.com ([216.71.153.141]:22602) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1fYEVS-0000fX-Ju for qemu-devel@nongnu.org; Wed, 27 Jun 2018 13:45:26 -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=1530121527; x=1561657527; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=n38QefGu1hzLx5+T2Bh9Ne2r3tsq8YXzW1VuLA+B4+w=; b=cRm63rk+1l5T6cwT2VVfRrMFew0JGQcMMWRHlkWi9LcB55oXcsk8Vt4r kfXLo0XcoLc5IT67XUMbtw9Vhzs+Y7UBBY+ObqRv1Lq2NopIMJhzjxtB1 BXi24UVwKOXCjOVVaQBozPZmHGg8wPl+lI0Kv8t2cT9x5TYeMcs1dPNMz vGxarccUapSQycIZUtnRe+pEBXoYga0N6SaCiuWdHuX100N7bPSwj/BT9 XA9wcRMOsES/yaIoblKPpfL363FjONhykM/Ud630tK3MImEoIU25Fmgpv hq7TJ4tU6Np6A8mwNcKzMfwsFMLwthWvAtp2O2Sbez0p556Wf6KC4Wuq8 Q==; X-IronPort-AV: E=Sophos;i="5.51,279,1526313600"; d="scan'208";a="84764323" Received: from mail-co1nam03lp0023.outbound.protection.outlook.com (HELO NAM03-CO1-obe.outbound.protection.outlook.com) ([216.32.181.23]) by ob1.hgst.iphmx.com with ESMTP; 28 Jun 2018 01:45:26 +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=FdGczF+g96spsHOp6St0pkbPsF9+DyEnU0aRI+ASnQg=; b=OCfPlaThcAAXqGjxWDcabZVgfAbFweGfSj3Z/bQjyY6V/NTy1qistVj8RRRx6S+Qe4gTjsBQ2vf+ycCqEiev8K+LTIPjgmKvUxxRc37Y5XwbaDSDJg7Erili3UgHwlliPp0yQrRMG1NY/gI7qoWmfmJZ471VxGAzty0K35Luq+I= 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 DM5PR04MB0396.namprd04.prod.outlook.com (2603:10b6:3:9d::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.884.23; Wed, 27 Jun 2018 17:45:21 +0000 From: Alistair Francis To: qemu-devel@nongnu.org, peter.maydell@linaro.org, mjc@sifive.com Date: Wed, 27 Jun 2018 10:44:33 -0700 Message-Id: <20180627174435.31800-6-alistair.francis@wdc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180627174435.31800-1-alistair.francis@wdc.com> References: <20180627174435.31800-1-alistair.francis@wdc.com> MIME-Version: 1.0 X-Originating-IP: [199.255.44.171] X-ClientProxiedBy: SG2PR06CA0125.apcprd06.prod.outlook.com (2603:1096:1:1d::27) To DM5PR04MB0396.namprd04.prod.outlook.com (2603:10b6:3:9d::17) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 02f33eda-cd30-447c-a7cb-08d5dc55c2e8 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(8989117)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600026)(711020)(48565401081)(2017052603328)(7153060)(7193020); SRVR:DM5PR04MB0396; X-Microsoft-Exchange-Diagnostics: 1; DM5PR04MB0396; 3:CklzLAKQQogQyXtoHQegOcasjwRn5c5Rr0p9DjA/VL0HaCZwWgyF5zgZ6fYGhPWmWjy5jiX99DuBxmnhkj+Z6L+o5KF8oKLnYdPKqCJDS+y3iOdB0Ezdy0C1aDTV80KVpFScNOfQbII3CCQIoz7wKE+eX6AOetCUCI51yHBEONxfhLxQcXcXMGpnpAudqwbRAW2kmtGeDNXkAcccnN9up8zgwOsA/8X7/KRQh6XpXKZMZTLOns6PIXIBDX5DYVCk; 25:LISIQXWPHFGRg0OUHjeFTOTGz3P/slY5kBiGDag1QQQq93cfkaTOSkra1DOZPAj15QbGcL4gk5LkIdI9/remkJqqUzq4Kyo/7aHWgxrAKDtYqtKj6OfJHvbIwUfcMTmnyOChRc930KbesKgezaqmCZlaC4rKTycjxq1NXIxHfqhdVezBQnk+atOjFG3OFyUeTZzvyXi3N8Y+IpPK+Sr3prY4MTL3zB9MtCy4PyvupnaQYUbCjQCBC30hvtBQc3/n0nRE7uURE2NRy1SdOIexaYLLhkfAOLXTL1XItBu2vSjzL9FirLPKVoBpTz7OWW6LXscfUyNwn0UDz11jVLT/RA==; 31:JPGJqmG+R0eV9i9yR/tCdrZV0O9N669HBTM5OkrtuE75+8Nmq0c+5T1RX/zRYFKE03CVrtSUjIeOvYlrPWl4FZ7DD2r0d3EXBttoZgTGoEVFld6HhRBZklXaj6uE99gbE/DEeF4uVlrUOi8/WoYv2qFN9jmq+8tXhtxedaFH61TBNYGEY2Ul/6aJc59pTALm+lpOyzSOw5TGREFYdFB9XP2xQGUhF7pvY+oOEGPaow4= X-MS-TrafficTypeDiagnostic: DM5PR04MB0396: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; DM5PR04MB0396; 20:Mmh7Bb3Adp+bT5HlMYkq8LwAz/Z5prXGO1kG738Ct+XKbReFpRJkbHqznbo2gHlD2XYOy7p4Vqf56MHyiFvZLSqwkQPGtvgOasFM3Os9NNjUO4AIg4Ien8d1BFivSQheyaGdYg47gLhQoZ18Is+Y3oqoYFpj5JhS5V/3G5Knzd/24Jm8fXL8olnGJ+xr8STMO49YvNsQda4/J8W6rufdnVRoH9b0vuDMKNbRI5pVl3SEMvnD5tp5PMFYNwDyszfpZ+8IBHE1/Rl5Fb578zK/keI66SNtLrpzu1rFiEWJPWML2zth6kvZq0j/TTaq21xGrROimaxsVWX3+59JPCMrLYJPwR5zTNVVbzKRpYpYqulAtBXCzxK60mYc21wqclYtAmmnYOb/qIGkx5u4Y200H+3a46Sttpw99IWUuR6NO1puwZR7yjHEahkdnwgyT95G0J6UsoBbBNUzWnefsBliJDT/JvLeV0BehmxT9LLOVzBytTyq/jpxqHUWG+thhkcM; 4:zKOkEko35X06vT9LRX3C5G5YBxSMOvbOnLkxlBJb93tGGPdpJXHaFu8RZKZ26xFdYLUuJ4t7WvK8bjx0MCpjKWxjuISWDLgmiz8OD8v4EXyNfwegti1z9MARQLQHgzkthc8L4ZzIqcpalgW+Qv+TCGS/jEsEI1vJGlmEHbURjLyz8bptYCRIDQ3bAxXkHFN3Db9Qxqb7NPCdBtAKbAkPkMao0kDPjYWBOhbsuwJeTmZKg0dM0Ioj2SRp0ivl9vpnx/is1nbkweno4OjYVoUMng== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(8121501046)(5005006)(10201501046)(3002001)(3231254)(944501410)(52105095)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:DM5PR04MB0396; BCL:0; PCL:0; RULEID:; SRVR:DM5PR04MB0396; X-Forefront-PRVS: 0716E70AB6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39860400002)(136003)(366004)(346002)(376002)(396003)(199004)(189003)(14444005)(6116002)(5660300001)(105586002)(44832011)(316002)(86362001)(50466002)(446003)(476003)(11346002)(16586007)(2616005)(486006)(956004)(1076002)(478600001)(6666003)(53936002)(305945005)(7736002)(106356001)(48376002)(2906002)(8676002)(76176011)(36756003)(8936002)(51416003)(52116002)(6506007)(386003)(6512007)(3846002)(72206003)(68736007)(66066001)(97736004)(26005)(81166006)(25786009)(81156014)(186003)(4326008)(50226002)(39060400002)(16526019)(47776003)(6486002); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR04MB0396; 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; DM5PR04MB0396; 23:dopMlIA5BDSqq9XiBKXXJ+i8KoVwPam0D0zeb+jse?= =?us-ascii?Q?t8oqLpImt4RpRAxGTBgkgNgoYroMII+ufFmA4flkZbnHX8NKiYZWKcNOvOdh?= =?us-ascii?Q?5k3U9dYm4xLuXpzFZgHpi7fgJqAKz7cPadptuE8nHGIvYCaxLg9hk5iB5jZW?= =?us-ascii?Q?o1pxrn6C54Kpl4Mq8GhA3USIaRzb7ZkQXCDjhfG5lPVPNNx1TgSHpM0y3hQQ?= =?us-ascii?Q?vCKrZlwG3yfYjfTz2dGmKnwwumrHooSpAYEhQanW1gNOUr6W/fvbEY+N7+96?= =?us-ascii?Q?hpWRlqyYjs88iiogKT9H+7j0frrh/oiwBMDC18SE7Jfpi8HE1NA++yMoc/LF?= =?us-ascii?Q?6zHtCwsXRGyA9IbY7wFRNHO7J++DR4dWO8iz1LAOCYR68mNJQ9YYiEnpMugC?= =?us-ascii?Q?cJaG9N42tgGTltuuF2cRdaK5Qzmc1cGt6mViQtJykXfEONTh4PqZ3zCQmuFn?= =?us-ascii?Q?USgXZFNMC7GZAb4PkSN5dyVfsIW7B4FE5DfGX9vYAL2tH9Lowfbw50Jtz5pR?= =?us-ascii?Q?ZzOhReqoIFpu6iTWh4GjoT9E+2RSv09vwO/MR5EI9Hq8CFLJmxJAyhNP6oA8?= =?us-ascii?Q?rHdr6Ei58W+eWfztVsLMP/x9Pe2J9ApptLFLtGVhaDfOLhb4ccaj3OWTbE5Z?= =?us-ascii?Q?Jh50OflFIOaKfVvh+d2YB/DUShrIqbARojXC5k6AGBgh3Vx8DT1MHcWhkMO+?= =?us-ascii?Q?95+5FYFKgzhORZOObR9nP1wqp/b51c/mILslIM6exKxdaED5OF0NNGt4m0pX?= =?us-ascii?Q?tLrB0OQGQMeovmT26szEKclswSIkTVQCiE50UhgZ9NgPpQ9G0HhP5rNROYlq?= =?us-ascii?Q?jLbihz4x+C+wNQ9ZeeAguOMMJuRcoCh/GiLTZTokHj2naTvZLhX15aGopBY5?= =?us-ascii?Q?7EvX53AaD0ln8RTFi4KgSuGzxQ5QGWRi/Z2uDle6mY1Jj0ELN+TfRVWTWznz?= =?us-ascii?Q?Ww9G8mHndkNFC6GoPDtLVBVH0s/Dz4wFXdsblElZAlvF4YtI7e94HVfamYsk?= =?us-ascii?Q?ns/TBEiNg7xWseS2rErphjpsg0JlY1sImspg7UBVLvf8j1yAs40uPmpujIbu?= =?us-ascii?Q?UOv62pQfSfcrDARvaBnMaGJUjn7RGebwM/9rGUT9xcRibOfdz3FQmrWYsKgy?= =?us-ascii?Q?OWCWv9Bf9N38SCPXwqBc6WOtR3Rbo0gUCXQaO0yYkgx6YXBVSX13LxIKpux5?= =?us-ascii?Q?KXB2p+1zZRnvFaQC8bnWqcPxUDVV3m8QbAw6frhuzr8b1/ioOuh9j6yum1ya?= =?us-ascii?Q?crWOpzgecdQed9ffbU=3D?= X-Microsoft-Antispam-Message-Info: n4DdcXt41BbKwx/cyuGzEOMG0nPnVl5SutyOu4luCmUcyA4/4YHjoC1QP7hoPGXLbRqpZ0xVMOfRr3N5RQXpv2X71qP2nd/ou/EFSh2mQF62tG0+w3Z0ZOhLVxv0n+uguwOrjxh9L1KjuyEJFluoD0GDPwDa0A1NE5oIJ3dgqi3cwG6wzq1T7LoJm8svmlOgU7VzmEOCKji2dEVMth/zymVbB2ITemTZTzkhMeRXSFY1E6oCq/e54KLFhrZx5mDQihYtpoHcVAf3zp48sLFZRrLmuIznv0LEFTPjswh9YBF9PkVg8T/vN84R2U0H285w3FZqxeI/jL2QLJtxdPUZ2JY4bjIDm4joRh1fup9ICsw= X-Microsoft-Exchange-Diagnostics: 1; DM5PR04MB0396; 6:AsrdZbH1xBEpzHZ4A+j8W9Bo2eoCjTh7Odh68xAg8R0XhtRWBob407xEx8uL8ajL1QeBUniHScXiHjsY/NLwPnXvi1s6t/E2mP9LjEpKMllhwFcMC56WawakhfLsAseujtblsbi3oDgx7NiWzCOdK5N4a5ppKNO8Ht6NPLkba7ImA26h5rFX6hNPWyvjCy//6jlNkMjgcnhohz/C2A1+T9eshN1RKDuHpJFIONmnuSaAXfDSA55UR5d3im+Yvmbr/OHvNoCW1IwV1c5HC1Dow79dRl/lYw6sJgaxkCyfvUG4pe3I+1xzN/FU7iuWviKJXegnWryCi8JMCWypnrge25e7hV3p6/7XbdpEe4eXE6vS0MFGXbCXepjXkQBtjjSqxBJqobYvaYzxOWzhAZoRt6BoXFfOKLL4Fmkt9U4RG/C8F0VHxA8mTT2hBu8m1HIHO0b52SyaW9F/7URoMsLv0A==; 5:R4x9lQTHmFZMVTLI/Zrgk5ZcuFr+CE8gY8nxuu/U6qyeHhTaoyS6w3VL55GSBIKfNrwF01990Sdriev1bLTB7uhj6loopbEFiP56dU/Egi+sHf2ix5Iupc6Gw32nK+uDIeSC7cwS8EY+MigiIu5SX51HFlomIxxdB1Q4BFVO/o0=; 24:oWz+YB/HhlQtxQnxQJus5D2aAoOLmnDcJiyHehaiG3fHzXBep0RKNMaAYARnj1u8tfAM56mtmwjsy1X2tHFW1kWJ3vXzIn1c62KLeiR25dw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR04MB0396; 7:pzMB83eHWloHYdsuaZXdBxSOlgMvZOnoNtex/AVJc5S35sxCQ3WTuNNiFRVR95ihu3Rn7aAT+0If/gmy/0TDP09SXz0dpr6tRgluSW6Fyv9O5n8fnE+ZwrGFtjSjlWCe2HijtCwodwwMF/zSVzzAFHgMespG53sWkqwauZgz8O005RIsCGpiZKt3a2zLzX6K9BEBwnvmeIVBCWLYU9VZH8Q3wsWnmwjaLXQnjlP/po0rm5f0xhcqXgkYLvoPptpv; 20:EpCH1m9AGvR3GLZo0CbnBnK/CW1to4TN4f+awEzsRjA89RHrkCz3viRfyfisOMhkfQlPbj4qcvq1HuADRktgftYVbD7ocV2rCcVU4FRkWjS7l6+Lb+4j5FgCOlQh+M9ClzI49/XV7DqBiWLJxSNz0NgniurGuHRG8qeXtmNLK2g= X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2018 17:45:21.1432 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 02f33eda-cd30-447c-a7cb-08d5dc55c2e8 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR04MB0396 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 216.71.153.141 Subject: [Qemu-devel] [PULL 5/7] hw/riscv/sifive_u: Set the interrupt controler 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 f438a72c27..f71527eaff 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);