From nobody Tue Nov 4 15:30:23 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530636372042458.1177445607807; Tue, 3 Jul 2018 09:46:12 -0700 (PDT) Received: from localhost ([::1]:41692 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faORP-0008Ox-0A for importer@patchew.org; Tue, 03 Jul 2018 12:46:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49758) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faOGl-00084c-9R for qemu-devel@nongnu.org; Tue, 03 Jul 2018 12:35:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1faOGh-0005kQ-Di for qemu-devel@nongnu.org; Tue, 03 Jul 2018 12:35:11 -0400 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:62998) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1faOGg-0005ir-W9 for qemu-devel@nongnu.org; Tue, 03 Jul 2018 12:35:07 -0400 Received: from mail-co1nam04lp0047.outbound.protection.outlook.com (HELO NAM04-CO1-obe.outbound.protection.outlook.com) ([216.32.181.47]) by ob1.hgst.iphmx.com with ESMTP; 04 Jul 2018 00:35:04 +0800 Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by BN6PR04MB0387.namprd04.prod.outlook.com (2603:10b6:404:91::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.906.24; Tue, 3 Jul 2018 16:34:59 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1530635708; x=1562171708; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=QWL4sg+r8fWzmU9vqIsxhgM+Zr3dXrL5AYq6SnOvmdg=; b=Dp/j5mZ+V2d6mCB0UvsvzIDxy/mp9pps+mVUppzZYFCiWhnO34MKUZJa OA9nwIvHOKMrAM8JXMLsXEBkgzybw4Pq4gkQeg0Wa1Wzmt+NKwQNtYYeR f3lDFYftJg0wwNxsAM4UXsPm5St26uWaPXgWYxep0PJo6SVOgw9YR2nO4 nG4g7IXgUPsgdLCHoRaJzKx5AeUuO2Nt6n3W2nvjXi/dFiq9FxGulhleP VBhVHDgfMIFS8KPtWJqwoNKnEcVag9lCf2Qwmsa9nsvLIF3wny+i4iA4I uYd6KQ6IToKq3Wzd7Gz+nUITmOKill8WREfkMQjgt4woAn0ln7C/1SMjT Q==; X-IronPort-AV: E=Sophos;i="5.51,304,1526313600"; d="scan'208";a="84260489" 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=iugC6atpqNXUgJ3fkZK/Wb6KKkWCQNtCqQ1n8ExRzaY=; b=FWOK8J0/ekSUVYCcQLlhWiiVBq1T+XBg6GrXubIPilMYGgLlAoBOxWBBNy3JeJZ8ZY8UGH6wf66t6e8K2paim2mKZElMtYDq3Y2xmu5y7esEEAw2/kQk1BmR5DF2Dlpzd83Nr3hc1kuU0/zeMq9sEnkrslUKhNTtBl0XFycBweI= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; From: Alistair Francis To: qemu-devel@nongnu.org, peter.maydell@linaro.org, mjc@sifive.com Date: Tue, 3 Jul 2018 09:34:40 -0700 Message-Id: <20180703163446.9943-2-alistair.francis@wdc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180703163446.9943-1-alistair.francis@wdc.com> References: <20180703163446.9943-1-alistair.francis@wdc.com> MIME-Version: 1.0 X-Originating-IP: [199.255.44.171] X-ClientProxiedBy: CO2PR04CA0095.namprd04.prod.outlook.com (2603:10b6:104:6::21) To BN6PR04MB0387.namprd04.prod.outlook.com (2603:10b6:404:91::16) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5246017c-1509-4b97-f97c-08d5e102ebd7 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:BN6PR04MB0387; X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0387; 3:vTiaCE6ms3pFXyjwzEsXosJlXxTGOfyCFhHi8m3UW/7KTSiQZFs85WNz2BChAjhd2yAiFaifCsR5VZ8Vsv7SYK5+pvkr12UFfjTKUo1xZ2L8xXJDfJsnalnhL4+16M91lcs+l0LIJLsl8w8uMlynhJoEHp3HdeTw9h//ex5ocft5ltVS1YBMEyZiRPIQMaFQFvJVjZtg6sR8LVWcQiocLsSooVI5NgcDyo5/MERmyRZaakRqXJdxpL/8ccz0kd79; 25:JM+FmZBUZMtnbiBO50cINxgxzsIBJX0qSgK2KuSlcSKXxLZAlHT88EO1acTkzhHEmF7h3nFuZaHs2Oy4B9oP1Sjax8+GVmj+214yDWhkQZZRqWGX4FCEdILlbnfQZ+ZKCjB8RrpMvCV47YJnuhn+SHeH2BLimqA8jghkrO+ehdi7EdIxPD/ch3j94AAtQOenQDzT0AatgEfM3dgGXVDBTGfR3dP2qoHek48Fyxb9AYccoqFVk7d4KcZ/U4MukDh46W6v12VWPI1R0JjW3LezQENzGtiDZJWaCZaPH4NUGfGPYpEExXT/07JOv8MWI3YWIjFuxh+/wUHk1ccTa3nwYw==; 31:xs7ZTmYUK/d+PU7idjZwW9DA98y24k6HREwMMdcGb2AeGG1dfyEXs5jILN/mqOJJfEA2ibCuq4+l/mYFEEC4GczDmwD9sAQ8A0c5iENvS2rUQGTSXAgVwAdu0NEjTVFpbaKuZ9EN8lUrX16iNOkGC0e7GQanSDOC9/NcA7d9oyy5qQtbia/fpEaJbBQHj6+55ZGCYQ9GOjFj+djpX32Gdly1/OsXxFE3WuUa/F7H3+8= X-MS-TrafficTypeDiagnostic: BN6PR04MB0387: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0387; 20:pRyOHnVgqErz02eXsy9AD8RIDDZ2R8A+YVrUKa39OUPDVu08jTs1FoN646viAwVFQhe+sZ4l4rKY2R3RsfBfzX7VuUx7t9OirXr2nLjWlA2N4OSLMe6Wflhi25eSO+bRAr8Q8BI37dgJzaET3RgE+oPoVJlGZQKJ5oj+RH/av3ygj9/+bCWpQI0r4/mhOvu4qyLXjgcloGSgUNLLvdyI4wq5AZWZvbjl3HMJvaT7Id4k4XXkUdOqW1PHgPKZmNKWgPvnKGiI/YhL5yzqwA4CZgNrUWKjkwLhxdMlGxAssWRTgPDKz0RNX/Vmqg6iL/4t14MtdSnRbvcfzgFewvYQPlwkq1zUbBxjQxaLBmewvBC5aWUg2YTInlpqH2qZrQ+t9PZS8p1+opIvYH1q9yDylymsbxQR2ZIh/w2eyaFMnbasOOIb77SDa9g0AN+qq898m+YponRe0AxLqsK9myT9XNeN0ZtO16kh8QCXUnz8Y0tSUGrBf691qKZfJpmn74CF; 4:yJxnUDFEUcvKsGhCrQNbeAtSH5tM9ugLUWbWY+89pa1qMS+rTf2OxhAYboMdCDyMNubhq6ErHdL6ijY9HBsY5dzFVatL64dbN9BF4gTrs2fS+5uzB28pVk9OHTGmBLHDj8lqEUaNcSi13ABWLkcl8+Qx8YNrLlxGMWervYe9HbUX34hIh0mB68DTOxO9T1E5Dd26c9ptmivRk0H7z+es6L/WaU8qGMMF7YX2VPjessJjTYg6nUqrVL6L574qScfaMNwq7jwc9W7pOlF9Cj51KQ== 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)(3002001)(10201501046)(93006095)(93001095)(3231254)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123558120)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:BN6PR04MB0387; BCL:0; PCL:0; RULEID:; SRVR:BN6PR04MB0387; X-Forefront-PRVS: 0722981D2A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6029001)(346002)(39860400002)(366004)(376002)(136003)(396003)(199004)(189003)(44832011)(50466002)(48376002)(39060400002)(446003)(956004)(476003)(36756003)(6116002)(25786009)(5660300001)(53936002)(86362001)(3846002)(7736002)(486006)(50226002)(316002)(68736007)(16586007)(2616005)(6512007)(6486002)(11346002)(305945005)(4326008)(8936002)(1076002)(16526019)(26005)(106356001)(186003)(81166006)(8676002)(47776003)(81156014)(66066001)(6666003)(97736004)(51416003)(6506007)(52116002)(2906002)(76176011)(386003)(72206003)(478600001)(105586002); DIR:OUT; SFP:1102; SCL:1; SRVR:BN6PR04MB0387; 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; BN6PR04MB0387; 23:hKbw9lWh7k7QfCKusCduEZH/Z/TBMHgOUvPCrRnJG?= =?us-ascii?Q?uSr4zhV3m2+I+jSjGi9Caui0CEev6y9NRX6+0ZL95kKg8VDNDafH5U0lKq2Z?= =?us-ascii?Q?G+HBkQo/wRZkFZvZXll97SZP7zgOpk1PQdNNzmdCIbRKkC4IYNtlqbPgqaJf?= =?us-ascii?Q?wRz6zh3r7OoIFKNqwKcq32zd7M4hAZSE2GpQ4t4ijBP4E6e6Auzq3N4lCBqc?= =?us-ascii?Q?1Tqs8RuuxtW+EZsU8AB820tiigCgycfgGhVNNUf9CbwL79JFki1gqbJPRvz5?= =?us-ascii?Q?fU8HGmgJj6MW0mX5R+sFsJNSgkH1swNaROtROFuDE7FiBHP0mCoyq9O28n3K?= =?us-ascii?Q?6vxFCN+8LvVJx7sJZm8spLmYD6LWzsctrGvG5GSJI8HZLdk14/qXLD8CyqsW?= =?us-ascii?Q?mOCJdXqjH3RKsjyeb6URCpgwEuTn+j/uvDKs++TDhzIXdoj9kCjlbrhyhlY5?= =?us-ascii?Q?Sm5aAtYvm+6BdzlPMOLxHNLz9hmCvZTx2BckiPWddupThPtwRXyDsu4tWao9?= =?us-ascii?Q?HjycWhh3MvGhtazdSm3Ngm2bUhzS6QezsvEUfIF36FWLdxU4MhJq+WdSLJsa?= =?us-ascii?Q?gDh+VX2hBb//Z+YnHo9UtaOmHUJmZNJnC6i7Mtgvg1Qc417N99fBDgtcXj6S?= =?us-ascii?Q?24h2VQnc158H2oxZVfM6RBvyQBt1gmEM73dSjPbgWILmJJVUHBRbHtJ7q3eE?= =?us-ascii?Q?7bQ4pVk4j5K+xOPcG/NmdwVuXqh+vHWQg64WG4LUgBBKD+MjmsVXdkv+qYcM?= =?us-ascii?Q?s2bf9Ud5WRHSEZ6qt6rgZCzUkvYT/bTfc5sfmfSCF6JMKxBbGxO/FTojpSrp?= =?us-ascii?Q?00DtPlLfr6lzgjXBHYRM+joICwonLXyPGl+RVV3a1mPzgJm+revruKdBuOo7?= =?us-ascii?Q?p9bbHjDUOO+nIpJuRI0wDdl8DWlqT89MRRZ8JUgBj/IhC4Ph2cAsSz3llMWT?= =?us-ascii?Q?TnKsDtUCAnGUtXYmlMkgBy02SWAG3Syi8l6X8JoTI1RPqfQF/Pz/GAmN2Hte?= =?us-ascii?Q?9zayijh65GX6ObfmPsz+cno463Eum+N17Vm6E8xqmqRn452uVgXE2bf0v0Xx?= =?us-ascii?Q?NtZlKn8SO2Ykm8a0bY6BVOjE8zpilltDRfitaXF6xpjtjw/asssTLxhYxBTX?= =?us-ascii?Q?YyCKpP2XQANmMNbpykPfxqmZ6wGAE2w6JF+NhTCG9Cp7nBGeyTnNVwqQPWLg?= =?us-ascii?Q?TRr+/hd+WqktvuZL0N3SeAjkxkXkij1AdB3A72bv+1URYz+vmgA7FKpTWqAk?= =?us-ascii?Q?mmUw9tJ2FOEVrYm9hg=3D?= X-Microsoft-Antispam-Message-Info: 3k+zlPH8TskNxi49Ev+8wRgf1cOB1pqxDzSzsFAwZGYBykU87w4lFFAkGAaF5+A7MdaTbzPsCwOV0KjUdnu9hBSdTcEG0MYFCDc9SKtH5JF6OuE8GJCihpe5NRwziud4LCK9b40+WeNfMHDdMYamNB9iyABYxPLWiE+MD9XDNPpvn7rdvVQVIytoqEaowKu/MbSWWlWiHPghcKi9jRxipF6ZhyLQKGH0Ofh6P46Geg2C/JuPl3QTvMm5068a7ewn2wBrNQwqwnP2PANxGQvlUtdNe9x0JiPQVOAxAiCptcBrxaV4xbwMDeY3ZwRqL3jWSUktiHc16FBjdOubVln6vJjjk/Gv2KVFbbtSX6FTjac= X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0387; 6:bqX4vylSMvzPXUesh+cMYnRsqcaw17GJIF+6MW7AWAGPSv2gi+JX5Jo6JoNMII0cOBI7a59j+4ws9CqO54r5bFa6MqtfhAtrk6MxSfXoSEersepR5Dh2lyA6WZC9AADxh9QCKzfo60NF/Q8oGCulxk6PnWq/mYUOCvSbFkPd1EWJL5hELXKy1jOm9bHQk+KDtk0VN4wgriy0KGovg8A1aDzbBE3h+uWH2tWxjv8QbkUx2Mr+zaogbrbn+tARcPvVWXOpO6o85AcKadcID43EXRp4kA7rbNqjcTOByngeVb30Jzk/p2RNoeN3KONGIbWb6WAUHZXNvjR9Nb6SOYmTMEaM28MNYZz/CR8jDOINPr6GtykyPDvFyzQ3Dy8zI3t/2DlGslyeBkkx93Kch8SU8nqHfY1XLCk+aKVDN2xDPqzsSWgp28nRQWRXRnHeq8C+uqPsczX3U/7a3klSwGu97w==; 5:MGXZY6RXhqo6KQVwxvkSII3ZH7gQhxxeah+8LZ5NcyjY557y+RHQdvtCo3GCYL7azcLqVt4uLTGCK0DG0WxOeNmHSQgPoEn9MZNsdj6FhXF6llIAUc1O8T10VrdVYzjo4zfSKWmiaA2ehOcJZCcwcD8NiA9LxpvIiESc/bdLAEM=; 24:mTfSNVd3NxTr8wGHMFbgziv76pKGlxpK5iSWCZ8Tajn8Ba/7Q6B3xQW00M/u5+WuFMQvVU+nkia3xvkcoPCvCacoht2S+LUFBVLMvcPpM+w= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0387; 7:/vjvFDiBkSQOK95nxdj79+4vzw6jXIXSHLuHuO4O0fpMPrznVW9xZIqrrn6mrzj3hewu2GaMWKoohxxida9Yo+pvCk9OhGEsg52s4FDSlQfpdVHoUzwdD1HTso41wZ5U8RkioUHV+wpJ7GY9OO3KXWVtvQHAvIbNNHRqC8IqkWQq8bIpo9J3Z3SB0B1Lg/xG63NRSNDdNdaTx6OP85DBJWaY1PIP0B97T59d9B9KdhOAXYG3cAWY0YqovWABy3UO; 20:av2KwT//UF4mx9yS6IF+Z7bE4LjeI3M9koyB0qoSps5jFu3SdHGNbFf+eyNTGf5ri8pG2In7Gt2DaQDmGbJCXJmPCWdua1GkSsU4saJxVje1Yx3QG4Dst8sxe6A8ui/S0wlhTbMg9r93lmNs/2rxbEkMEMNT6dHPwAEGm8OEaxw= X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jul 2018 16:34:59.8070 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5246017c-1509-4b97-f97c-08d5e102ebd7 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR04MB0387 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 v3 1/7] hw/riscv/sifive_u: Create a SiFive U SoC object 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (found 2 invalid signatures) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Create a SiFive Unleashed U54 SoC and use that in the sifive_u machine. We leave the SoC, RAM, device tree and reset/fdt loading as part of the machine. All the other device creation has been moved to the SoC. Signed-off-by: Alistair Francis Reviewed-by: Michael Clark --- hw/riscv/sifive_u.c | 90 ++++++++++++++++++++++++++++--------- include/hw/riscv/sifive_u.h | 16 ++++++- 2 files changed, 82 insertions(+), 24 deletions(-) diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index c05dcbba95..45b6aeb36b 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -116,10 +116,10 @@ static void create_fdt(SiFiveUState *s, const struct = MemmapEntry *memmap, qemu_fdt_setprop_cell(fdt, "/cpus", "#size-cells", 0x0); qemu_fdt_setprop_cell(fdt, "/cpus", "#address-cells", 0x1); =20 - for (cpu =3D s->soc.num_harts - 1; cpu >=3D 0; cpu--) { + for (cpu =3D s->soc.cpus.num_harts - 1; cpu >=3D 0; cpu--) { nodename =3D g_strdup_printf("/cpus/cpu@%d", cpu); char *intc =3D g_strdup_printf("/cpus/cpu@%d/interrupt-controller"= , cpu); - char *isa =3D riscv_isa_string(&s->soc.harts[cpu]); + char *isa =3D riscv_isa_string(&s->soc.cpus.harts[cpu]); qemu_fdt_add_subnode(fdt, nodename); qemu_fdt_setprop_cell(fdt, nodename, "clock-frequency", SIFIVE_U_CLOCK_FREQ); @@ -140,8 +140,8 @@ static void create_fdt(SiFiveUState *s, const struct Me= mmapEntry *memmap, g_free(nodename); } =20 - cells =3D g_new0(uint32_t, s->soc.num_harts * 4); - for (cpu =3D 0; cpu < s->soc.num_harts; cpu++) { + cells =3D g_new0(uint32_t, s->soc.cpus.num_harts * 4); + for (cpu =3D 0; cpu < s->soc.cpus.num_harts; cpu++) { nodename =3D g_strdup_printf("/cpus/cpu@%d/interrupt-controller", cpu); uint32_t intc_phandle =3D qemu_fdt_get_phandle(fdt, nodename); @@ -159,12 +159,12 @@ static void create_fdt(SiFiveUState *s, const struct = MemmapEntry *memmap, 0x0, memmap[SIFIVE_U_CLINT].base, 0x0, memmap[SIFIVE_U_CLINT].size); qemu_fdt_setprop(fdt, nodename, "interrupts-extended", - cells, s->soc.num_harts * sizeof(uint32_t) * 4); + cells, s->soc.cpus.num_harts * sizeof(uint32_t) * 4); g_free(cells); g_free(nodename); =20 - cells =3D g_new0(uint32_t, s->soc.num_harts * 4); - for (cpu =3D 0; cpu < s->soc.num_harts; cpu++) { + cells =3D g_new0(uint32_t, s->soc.cpus.num_harts * 4); + for (cpu =3D 0; cpu < s->soc.cpus.num_harts; cpu++) { nodename =3D g_strdup_printf("/cpus/cpu@%d/interrupt-controller", cpu); uint32_t intc_phandle =3D qemu_fdt_get_phandle(fdt, nodename); @@ -181,7 +181,7 @@ static void create_fdt(SiFiveUState *s, const struct Me= mmapEntry *memmap, qemu_fdt_setprop_string(fdt, nodename, "compatible", "riscv,plic0"); qemu_fdt_setprop(fdt, nodename, "interrupt-controller", NULL, 0); qemu_fdt_setprop(fdt, nodename, "interrupts-extended", - cells, s->soc.num_harts * sizeof(uint32_t) * 4); + cells, s->soc.cpus.num_harts * sizeof(uint32_t) * 4); qemu_fdt_setprop_cells(fdt, nodename, "reg", 0x0, memmap[SIFIVE_U_PLIC].base, 0x0, memmap[SIFIVE_U_PLIC].size); @@ -217,17 +217,12 @@ static void riscv_sifive_u_init(MachineState *machine) SiFiveUState *s =3D g_new0(SiFiveUState, 1); MemoryRegion *system_memory =3D get_system_memory(); MemoryRegion *main_mem =3D g_new(MemoryRegion, 1); - MemoryRegion *mask_rom =3D g_new(MemoryRegion, 1); int i; =20 - /* Initialize SOC */ - object_initialize(&s->soc, sizeof(s->soc), TYPE_RISCV_HART_ARRAY); + /* Initialize SoC */ + object_initialize(&s->soc, sizeof(s->soc), TYPE_RISCV_U_SOC); object_property_add_child(OBJECT(machine), "soc", OBJECT(&s->soc), &error_abort); - object_property_set_str(OBJECT(&s->soc), SIFIVE_U_CPU, "cpu-type", - &error_abort); - object_property_set_int(OBJECT(&s->soc), smp_cpus, "num-harts", - &error_abort); object_property_set_bool(OBJECT(&s->soc), true, "realized", &error_abort); =20 @@ -235,17 +230,11 @@ static void riscv_sifive_u_init(MachineState *machine) memory_region_init_ram(main_mem, NULL, "riscv.sifive.u.ram", machine->ram_size, &error_fatal); memory_region_add_subregion(system_memory, memmap[SIFIVE_U_DRAM].base, - main_mem); + main_mem); =20 /* create device tree */ create_fdt(s, memmap, machine->ram_size, machine->kernel_cmdline); =20 - /* boot rom */ - memory_region_init_rom(mask_rom, NULL, "riscv.sifive.u.mrom", - memmap[SIFIVE_U_MROM].size, &error_fatal); - memory_region_add_subregion(system_memory, memmap[SIFIVE_U_MROM].base, - mask_rom); - if (machine->kernel_filename) { load_kernel(machine->kernel_filename); } @@ -284,6 +273,39 @@ static void riscv_sifive_u_init(MachineState *machine) rom_add_blob_fixed_as("mrom.fdt", s->fdt, fdt_totalsize(s->fdt), memmap[SIFIVE_U_MROM].base + sizeof(reset_vec), &address_space_memory); +} + +static void riscv_sifive_u_soc_init(Object *obj) +{ + const struct MemmapEntry *memmap =3D sifive_u_memmap; + + SiFiveUSoCState *s =3D RISCV_U_SOC(obj); + MemoryRegion *system_memory =3D get_system_memory(); + MemoryRegion *mask_rom =3D g_new(MemoryRegion, 1); + + object_initialize(&s->cpus, sizeof(s->cpus), TYPE_RISCV_HART_ARRAY); + object_property_add_child(obj, "cpus", OBJECT(&s->cpus), + &error_abort); + object_property_set_str(OBJECT(&s->cpus), SIFIVE_U_CPU, "cpu-type", + &error_abort); + object_property_set_int(OBJECT(&s->cpus), smp_cpus, "num-harts", + &error_abort); + + /* boot rom */ + memory_region_init_rom(mask_rom, NULL, "riscv.sifive.u.mrom", + memmap[SIFIVE_U_MROM].size, &error_fatal); + memory_region_add_subregion(system_memory, memmap[SIFIVE_U_MROM].base, + mask_rom); +} + +static void riscv_sifive_u_soc_realize(DeviceState *dev, Error **errp) +{ + SiFiveUSoCState *s =3D RISCV_U_SOC(dev); + const struct MemmapEntry *memmap =3D sifive_u_memmap; + MemoryRegion *system_memory =3D get_system_memory(); + + object_property_set_bool(OBJECT(&s->cpus), true, "realized", + &error_abort); =20 /* MMIO */ s->plic =3D sifive_plic_create(memmap[SIFIVE_U_PLIC].base, @@ -314,3 +336,27 @@ static void riscv_sifive_u_machine_init(MachineClass *= mc) } =20 DEFINE_MACHINE("sifive_u", riscv_sifive_u_machine_init) + +static void riscv_sifive_u_soc_class_init(ObjectClass *oc, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(oc); + + dc->realize =3D riscv_sifive_u_soc_realize; + /* Reason: Uses serial_hds in realize function, thus can't be used twi= ce */ + dc->user_creatable =3D false; +} + +static const TypeInfo riscv_sifive_u_soc_type_info =3D { + .name =3D TYPE_RISCV_U_SOC, + .parent =3D TYPE_DEVICE, + .instance_size =3D sizeof(SiFiveUSoCState), + .instance_init =3D riscv_sifive_u_soc_init, + .class_init =3D riscv_sifive_u_soc_class_init, +}; + +static void riscv_sifive_u_soc_register_types(void) +{ + type_register_static(&riscv_sifive_u_soc_type_info); +} + +type_init(riscv_sifive_u_soc_register_types) diff --git a/include/hw/riscv/sifive_u.h b/include/hw/riscv/sifive_u.h index 94a390566e..49f1946539 100644 --- a/include/hw/riscv/sifive_u.h +++ b/include/hw/riscv/sifive_u.h @@ -19,13 +19,25 @@ #ifndef HW_SIFIVE_U_H #define HW_SIFIVE_U_H =20 -typedef struct SiFiveUState { +#define TYPE_RISCV_U_SOC "riscv.sifive.u.soc" +#define RISCV_U_SOC(obj) \ + OBJECT_CHECK(SiFiveUSoCState, (obj), TYPE_RISCV_U_SOC) + +typedef struct SiFiveUSoCState { /*< private >*/ SysBusDevice parent_obj; =20 /*< public >*/ - RISCVHartArrayState soc; + RISCVHartArrayState cpus; DeviceState *plic; +} SiFiveUSoCState; + +typedef struct SiFiveUState { + /*< private >*/ + SysBusDevice parent_obj; + + /*< public >*/ + SiFiveUSoCState soc; void *fdt; int fdt_size; } SiFiveUState; --=20 2.17.1 From nobody Tue Nov 4 15:30:23 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530637638742753.4015617934064; Tue, 3 Jul 2018 10:07:18 -0700 (PDT) Received: from localhost ([::1]:41822 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faOlm-000127-7m for importer@patchew.org; Tue, 03 Jul 2018 13:07:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49756) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faOGl-00084b-91 for qemu-devel@nongnu.org; Tue, 03 Jul 2018 12:35:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1faOGh-0005kc-NP for qemu-devel@nongnu.org; Tue, 03 Jul 2018 12:35:11 -0400 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:50428) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1faOGh-0005jL-Dk for qemu-devel@nongnu.org; Tue, 03 Jul 2018 12:35:07 -0400 Received: from mail-co1nam04lp0047.outbound.protection.outlook.com (HELO NAM04-CO1-obe.outbound.protection.outlook.com) ([216.32.181.47]) by ob1.hgst.iphmx.com with ESMTP; 04 Jul 2018 00:35:06 +0800 Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by BN6PR04MB0387.namprd04.prod.outlook.com (2603:10b6:404:91::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.906.24; Tue, 3 Jul 2018 16:35:01 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1530635708; x=1562171708; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=/KuvZZNKysgI2G0BykqNNF2HqGNRfOu3vCQ4mktBpMk=; b=VqY9oolnffwQK9uR63CFkaTiXw9XC57WRIof7I2H/ZNrm5WygO9ZZ8Do VBZ/9gThxqZjFCMaZyXxDYksbww6vngrkBaoUqDaH84JF9dE4rUG3zafz XPD4YfUzMeGI7716yU9FEOu44udU8T2Ch3VHTKDe0Gguk+6XpovhQe/xk 8c7JWASEjZ/ZYJTDmEvaU9iJBN9EsHBCeDvKuWmtoGjLu64CULnBhIaww dVBsjfxE1hBQZlK0g6swvPmmkboO3axjUrkjHBU3VmoS41cW/opUU2Y7w 4ILjlhzMJOuobaahYWzlSHlFArtKkh8CK2brPe4Iv3zjBUqOX4JP/ba6i A==; X-IronPort-AV: E=Sophos;i="5.51,304,1526313600"; d="scan'208";a="84260496" 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=P5Fw967ZvfmeSlYWKt4fON/PFEIAr/G0m/eKNUF8F/8=; b=F6SvTA6FS1u6Gz4fLCBbDgyTU9P0DsVTkngeSNjT0uxof0AyNAEp0v2tIEcjxK07EO7VP3UOi5Bh570XHyolvqsjpgN4g19IZezuv/serpmOK4RYutHGYKScJUHTSJDH7HpkuyoErKUul3mtOZFzeNLp5PWZhZRbxCaRU51wZk4= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; From: Alistair Francis To: qemu-devel@nongnu.org, peter.maydell@linaro.org, mjc@sifive.com Date: Tue, 3 Jul 2018 09:34:41 -0700 Message-Id: <20180703163446.9943-3-alistair.francis@wdc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180703163446.9943-1-alistair.francis@wdc.com> References: <20180703163446.9943-1-alistair.francis@wdc.com> MIME-Version: 1.0 X-Originating-IP: [199.255.44.171] X-ClientProxiedBy: CO2PR04CA0095.namprd04.prod.outlook.com (2603:10b6:104:6::21) To BN6PR04MB0387.namprd04.prod.outlook.com (2603:10b6:404:91::16) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f389b8e6-6667-46b6-b49b-08d5e102ecae 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:BN6PR04MB0387; X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0387; 3:H0vFmAlFkZY1n1hheOu1cZs2q0IJJAbn5/C+hoYWAT+PR5OPf4+50R1CaTSOTrTu8I+1Q9XNCK3vREe6KxUaygcEouAJebfRAIW1bl7Dphvj09WroDgQCbqQUGZ7zBsiemwX/XEWe+Dplpd9Z6NbDmzDAWWPo5uZI6TsAWiYcsemZqnGiL90FwQyXw+e8I2FT/sJjDme6iVS6EOHvrAMNNUzXSJxlWjaY1NOsXGSSJ2cyGJsCqLVUYdDl8o448yz; 25:XlZAHfOunj/SD7W+lEhuUuQndrYYUcWTR412faHmW4TRYzw1nw/WYVJH3grseGbxciWvJiMrppPsY/s4FWJSKTVvnOh+QANOPXa+xANHjo2cFVm4EQIW8TCILHGjfbivfrO60iGB3ZL9GCTCcxjt51Xi8PoCP9HozbvADQadu9Tbl65svlbMRZgBav1rDtgnkltUlYH7sRYYMGWi0LNfLNDDyAw29697aiaHPOmbupFDoeRTy7hWPcE7qNVEOZIXAjPS3T+Sgn/3XE915Fwm3kCyTCscOZA434Wr/pcQH3+9OgwHk4kXJC7upvlxeZgoYIc5hOuAptFT0GhJ9wr3pw==; 31:GMvKErocPtsOCBmvTSNGuzfS+tGODXUs0h8W5dINlMd2hXlP/O2OziS9bu/VdWED36JjW9W/Hu9Fm2gVNGhtXnDTFf+QXOSwkFRqauPaPdMjxDECqcJ63+euPYjl0hgRBSQqnahvOgTzUhItdZBerCOjYXCdyjJgNMI320v49ft0Ykq2ee7roZS1wSiLCF/XM2mzZxOSRAZ6RCRgZooEmQ/tr9hXTyqJ4dgNQMNUmxo= X-MS-TrafficTypeDiagnostic: BN6PR04MB0387: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0387; 20:AYTT9gpuw565E2OI5t41ZNGP9s3DmRBMpgzjgzlNpnElT3Y2GDYEdJvI3B3kZJIlQvUVJlznSBlIIXnsbTCvo4hQKTEFnlG35IFHLm7DmK8ldMSrhG1xLopcg0RYswaBIklSQp0/CZd6AOrzqmuNdBLYa9bi0xCIRbDx7xouJRC0U8bj6FTZeo0z9KGMaz3lkA5+qDpZxFfxDvMjqfGmBv4M0ylCB7krX0pjBtRdMfHM0lxviEn4kxOtg6SlqBVccWUWmLyxiM7otq4rTIa2SBydnNbjakaFWCrEZNCF7jc7B3R4e4hNk+VdVdM/Uvm28x+kqKanZWUcVm/jt/CDP/tWnU41cxtx7CyJJJCAfHCxiIi+KEArKBR1OubmjG5ju0juCubgfpXHN6Bz3e20J4vcV0fa2ddtzN7gC4VH85aKDm+3VYSMKBkmPT1MFzz3PdiZDXit/OiPx/wI9+z61cgyiDzpSAyz96zjJ/+jp7m54AuO0hNY9gWIlI6mt5X3; 4:1RsWzKygCUHBpoLs8yBSbbnTbOqfPLDGlyHnA7CAbcu/w2hmIUyxHUNDCVguWoNkNqNrnHEUH7am7Nxu9fQWMoNLebZaDrcbHY8bY1DKj/3qaghST+0Z2oJ6WmIT+kPivfhUBfluEAil/4K1Tf5W5c/YboZmd7CtkhYpPrzv2hE0Af8cjnkIX0HoA3vym2Y2o+9i+RR6e9tzz8lCyUY3kMPfiFrfF/GsB7GAb7vHfSk4Z7oMSdKyekY8zcPpKyH5DtZlcmIIhQz5taOWbiCJGQ== 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)(3002001)(10201501046)(93006095)(93001095)(3231254)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123558120)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:BN6PR04MB0387; BCL:0; PCL:0; RULEID:; SRVR:BN6PR04MB0387; X-Forefront-PRVS: 0722981D2A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6029001)(346002)(39860400002)(366004)(376002)(136003)(396003)(199004)(189003)(44832011)(50466002)(48376002)(39060400002)(446003)(956004)(476003)(36756003)(6116002)(25786009)(5660300001)(53936002)(86362001)(3846002)(7736002)(486006)(50226002)(316002)(68736007)(16586007)(14444005)(2616005)(6512007)(6486002)(11346002)(305945005)(4326008)(8936002)(1076002)(16526019)(26005)(106356001)(186003)(81166006)(8676002)(47776003)(81156014)(66066001)(6666003)(97736004)(51416003)(6506007)(52116002)(2906002)(76176011)(386003)(72206003)(478600001)(105586002); DIR:OUT; SFP:1102; SCL:1; SRVR:BN6PR04MB0387; 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; BN6PR04MB0387; 23:UWMa5/U4/0joJZelMHlpO2G2TEc5iXVCr2rFQNy0P?= =?us-ascii?Q?bnNX5ytl8ueczcm3UKWJtMxnbY6TNkSwManJl9LGuAqYl57QFs6MXefHTRCj?= =?us-ascii?Q?ulsgyT/6mLf5kD9Jzq3sjNPiC2HN/6YHMyiQOYqHJiqu5zJaZ4gJLRZqyZL7?= =?us-ascii?Q?woMEXknPyMHS9ww6eEor2tVipX0LCr15iCQJtW0LOYs/viPy1Ka67Djsg/F4?= =?us-ascii?Q?wnZn/7SD+z9anKhEDouqmxmCJtphCrLg+QGj6/44gnipFXnA+dnk7Py/qzWc?= =?us-ascii?Q?D3fFy8qNUZ2cvIpWsku/GoBnLfnE88zq39fS798Cu+PRFCaoZvzUexAoRPyQ?= =?us-ascii?Q?9CSo9Ij6V51zfW1R31RP30pPpPQLkXXjb3mF8beyXclJH9lL7cNweKIwGFIy?= =?us-ascii?Q?Rjx+qUoxr6Tqulfl9qw/8NxSl5GiAXIpkJZgeLxuFve80exQZqVBPXky87zz?= =?us-ascii?Q?0b7OoIWkeHc8EKqX+N89L5FonHW8DIP4EByXUOVuHUxH8P57xPfbOh6N0zzi?= =?us-ascii?Q?RsH0R5BKeiCdHt5wfS84RbGS+iRCxwXyI4fUksv8VoC+Li2Icw+gq/EqKNSb?= =?us-ascii?Q?o2LLAzS4Vfi90aMNeg4yG/zutbXlt+e7eGTs2721f4s9wkl6JVYx0iTO0gkK?= =?us-ascii?Q?ZHdXc4mQr6JiWKIawFbH3lrOhu1+YHnTp49v0g/fy6oCnI7XNxVC3dxxrAAj?= =?us-ascii?Q?Oda9f5OnvZgQ4uVjR+y8QZ4s4G+Fe+frZ6SWXavSjpOgqb2zWoyv6h6zoWaH?= =?us-ascii?Q?wF/ffZrrqlo2neUIoEEsOKsx8NDCYlge34vcQzFA1NVD4TQKEKttyu2HwMiy?= =?us-ascii?Q?ezTu1imbqOIBZJOKxScFWznQsfS6w0kb8GQYQnn/IcPhPj1L0BXvGyt53WmY?= =?us-ascii?Q?mYqR92uwxE7rMPkGVisBOtYZreloygwZ2Ni7FJBBo4L58HWoLf8yb0/8AkFo?= =?us-ascii?Q?NVdCgozuUk4JYaWEWDV9kAiAitevB0QYoNXjXmEuo5STp7uvcPJVW7XfPURP?= =?us-ascii?Q?0hZKqkEpuQyHsjl505C3gPxBNxnUg9GJ6Zcls4rgpXLLbGcI9Y99fUKny+Hp?= =?us-ascii?Q?spB8iALfO92DzJNhmM3G3ndBa2UOGw2mNKK7AoVneSEQezFY+2wEpzU5Bjgg?= =?us-ascii?Q?8YJDEzyfNLmYZh76JtXEywZe1VpkIL1OmX/JltAEryQGMVlKbBDlR9lPEUmg?= =?us-ascii?Q?5du1VKHHKqzGKtWGzif3tB1sfIIe4W3VR9YT/tb/OioBs+iwmB71X7S5u5s6?= =?us-ascii?Q?6pIEUnbn5dJuX+6QZaarEFt0Wesown5q4QAAS5e?= X-Microsoft-Antispam-Message-Info: 0yUoEo3VNSqWzqq+Z14r2ptS0duo3qvZj0G6/pnL3zsMUxLAd77zn8JYomppw28PAgxboFe4ZX2cnp6eMos0Pn7h1TS5VdefnA8QAiQ6mBfM3O6VgvE9rAfLW3DIzycwD5vcoaZboxJk6AOCFPJO/hz1PPuIYZy+Nia2oYZvoyUPvzqG4qINDnRVlljr3TqJcx+DkX5sm29c1w2FGRFPFVOAEb0jnHgpGQ9W0cyMrEVkRF1ZkaEyg1q9U8rVIAhONLx77Nf4CFJK1dMhB12Vmzm21eUbbhCHZ700LMzmK6Pp/GNXe3Ho8+rSxxRm4MN3nPaJPmP//uXS4aAj6btKStuSfucuahEj0+JDIlLVRuI= X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0387; 6:Yau809vvKsIJZ+4c2SD4Aq3gDIh8SESXKw5f6OT3vwK0YYU6UtE35wVA5T65GQ1ZZCPjnNQ1t2+fF8jpszjYGKZtn6l1S/oZtjIE3CdLPmggFZw/bF/bUdkl5akX2Pljysoxt+HX+NlWrKGH7nq8prL5hn4FepHuqebsuwGih2NvAiSdj+3bMpgV+LPxo2k1K7iglvrlMOyW6WFmJBTcbTEJgyHvC2XhETrMonurMy41JbQNYTRhUICeNxqnG28Mrz+GHBw4lqgWZ2RwYwZt0FADPQuhnnY8hKUlB/pppFhlWTxzUo7e1JsMeuNeTX6aYIzXFFPPO2wdZGdG5MSeu+XfHNAMaUU/1jHjJpTPLG1XBXGR6xsk3UVK9jsivEqdeWcYGAfFbv4fxhDKf1pv79jTJ+kgRwPFhtDtXH5JDRkCndWMkZLnuk4r3BZPt6lY8VhTLXURxjrb69hwh64h4w==; 5:EQ/eVCeYv5fTJkM/LlxvrQEUy0RMlAZrFlp+XLHcZgrge1oPIxdKewspi7auxrfKsYEUiF7FNGMFWsKKuRiflXIChF38lAJ4S2WasVVWR+nNBwmpjKUaqRU+D+vkk+MjVMhQZF/l5AGm5cKGYRlSHmaq1fNUq5pcmVatm3S6XhI=; 24:VGDuoPGjm/l8YeZ6Kh/OVEFMmJ6AnUMgDDfTuYpz+IbD+ijR6mPrvz9Jrs6i4U8XoUw6YXJDP7pkW7SXY7gOX3wvJflxm/EMx9rqhPUyZS8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0387; 7:OGbwMsfjeZhcVFKAX5YPc+3w7078N2lXWQQsydmPaKSDBslxDrw3bJyggq0yN/+Mfp3LtEyLZsdpyALR+9pgbZRl/TvZSt5ItY7CK8SV+75GlvL7ZL9RWZAvzAlrckcmm5U9fg0hCb3j6Vhrbkyd5pYjBKM/3cz8cBVhW0kWwSZHzy9chApDhHoNJXWNr/OaBYK7RHRWFx/WHxirag6EIhojxXWrKWzhQ2GmFUz7cAVBafYfiARKBPspKl9dxmps; 20:Nf82ZbzyN8pR1+Z91XHFId/s5vuO7jnW60aGev2yYmlwgM/jKSiMelhRh68nnu9zaDumF9sTK0diZ8qMECIRD0hRdX6KHOmXXnpje+RqHzstydPwaynKhVrYcO0dQ5pbg5C30aPxPJPKYJur1y84t0zyKjOZi9AvbJlyz4m0C4k= X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jul 2018 16:35:01.2042 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f389b8e6-6667-46b6-b49b-08d5e102ecae X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR04MB0387 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 v3 2/7] hw/riscv/sifive_e: Create a SiFive E SoC object 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (found 2 invalid signatures) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Signed-off-by: Alistair Francis Reviewed-by: Michael Clark --- hw/riscv/sifive_e.c | 97 +++++++++++++++++++++++++++---------- include/hw/riscv/sifive_e.h | 16 +++++- 2 files changed, 86 insertions(+), 27 deletions(-) diff --git a/hw/riscv/sifive_e.c b/hw/riscv/sifive_e.c index e4ecb7aa4b..384b456540 100644 --- a/hw/riscv/sifive_e.c +++ b/hw/riscv/sifive_e.c @@ -102,18 +102,12 @@ static void riscv_sifive_e_init(MachineState *machine) SiFiveEState *s =3D g_new0(SiFiveEState, 1); MemoryRegion *sys_mem =3D get_system_memory(); MemoryRegion *main_mem =3D g_new(MemoryRegion, 1); - MemoryRegion *mask_rom =3D g_new(MemoryRegion, 1); - MemoryRegion *xip_mem =3D g_new(MemoryRegion, 1); int i; =20 - /* Initialize SOC */ - object_initialize(&s->soc, sizeof(s->soc), TYPE_RISCV_HART_ARRAY); + /* Initialize SoC */ + object_initialize(&s->soc, sizeof(s->soc), TYPE_RISCV_E_SOC); object_property_add_child(OBJECT(machine), "soc", OBJECT(&s->soc), &error_abort); - object_property_set_str(OBJECT(&s->soc), SIFIVE_E_CPU, "cpu-type", - &error_abort); - object_property_set_int(OBJECT(&s->soc), smp_cpus, "num-harts", - &error_abort); object_property_set_bool(OBJECT(&s->soc), true, "realized", &error_abort); =20 @@ -123,11 +117,57 @@ static void riscv_sifive_e_init(MachineState *machine) memory_region_add_subregion(sys_mem, memmap[SIFIVE_E_DTIM].base, main_mem); =20 + /* Mask ROM reset vector */ + uint32_t reset_vec[2] =3D { + 0x204002b7, /* 0x1000: lui t0,0x20400 */ + 0x00028067, /* 0x1004: jr t0 */ + }; + + /* copy in the reset vector in little_endian byte order */ + for (i =3D 0; i < sizeof(reset_vec) >> 2; i++) { + reset_vec[i] =3D cpu_to_le32(reset_vec[i]); + } + rom_add_blob_fixed_as("mrom.reset", reset_vec, sizeof(reset_vec), + memmap[SIFIVE_E_MROM].base, &address_space_memor= y); + + if (machine->kernel_filename) { + load_kernel(machine->kernel_filename); + } +} + +static void riscv_sifive_e_soc_init(Object *obj) +{ + const struct MemmapEntry *memmap =3D sifive_e_memmap; + + SiFiveESoCState *s =3D RISCV_E_SOC(obj); + MemoryRegion *sys_mem =3D get_system_memory(); + MemoryRegion *mask_rom =3D g_new(MemoryRegion, 1); + + object_initialize(&s->cpus, sizeof(s->cpus), TYPE_RISCV_HART_ARRAY); + object_property_add_child(obj, "cpus", OBJECT(&s->cpus), + &error_abort); + object_property_set_str(OBJECT(&s->cpus), SIFIVE_E_CPU, "cpu-type", + &error_abort); + object_property_set_int(OBJECT(&s->cpus), smp_cpus, "num-harts", + &error_abort); + /* Mask ROM */ memory_region_init_rom(mask_rom, NULL, "riscv.sifive.e.mrom", memmap[SIFIVE_E_MROM].size, &error_fatal); memory_region_add_subregion(sys_mem, memmap[SIFIVE_E_MROM].base, mask_rom); +} + +static void riscv_sifive_e_soc_realize(DeviceState *dev, Error **errp) +{ + const struct MemmapEntry *memmap =3D sifive_e_memmap; + + SiFiveESoCState *s =3D RISCV_E_SOC(dev); + MemoryRegion *sys_mem =3D get_system_memory(); + MemoryRegion *xip_mem =3D g_new(MemoryRegion, 1); + + object_property_set_bool(OBJECT(&s->cpus), true, "realized", + &error_abort); =20 /* MMIO */ s->plic =3D sifive_plic_create(memmap[SIFIVE_E_PLIC].base, @@ -171,23 +211,6 @@ static void riscv_sifive_e_init(MachineState *machine) memmap[SIFIVE_E_XIP].size, &error_fatal); memory_region_set_readonly(xip_mem, true); memory_region_add_subregion(sys_mem, memmap[SIFIVE_E_XIP].base, xip_me= m); - - /* Mask ROM reset vector */ - uint32_t reset_vec[2] =3D { - 0x204002b7, /* 0x1000: lui t0,0x20400 */ - 0x00028067, /* 0x1004: jr t0 */ - }; - - /* copy in the reset vector in little_endian byte order */ - for (i =3D 0; i < sizeof(reset_vec) >> 2; i++) { - reset_vec[i] =3D cpu_to_le32(reset_vec[i]); - } - rom_add_blob_fixed_as("mrom.reset", reset_vec, sizeof(reset_vec), - memmap[SIFIVE_E_MROM].base, &address_space_memor= y); - - if (machine->kernel_filename) { - load_kernel(machine->kernel_filename); - } } =20 static void riscv_sifive_e_machine_init(MachineClass *mc) @@ -198,3 +221,27 @@ static void riscv_sifive_e_machine_init(MachineClass *= mc) } =20 DEFINE_MACHINE("sifive_e", riscv_sifive_e_machine_init) + +static void riscv_sifive_e_soc_class_init(ObjectClass *oc, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(oc); + + dc->realize =3D riscv_sifive_e_soc_realize; + /* Reason: Uses serial_hds in realize function, thus can't be used twi= ce */ + dc->user_creatable =3D false; +} + +static const TypeInfo riscv_sifive_e_soc_type_info =3D { + .name =3D TYPE_RISCV_E_SOC, + .parent =3D TYPE_DEVICE, + .instance_size =3D sizeof(SiFiveESoCState), + .instance_init =3D riscv_sifive_e_soc_init, + .class_init =3D riscv_sifive_e_soc_class_init, +}; + +static void riscv_sifive_e_soc_register_types(void) +{ + type_register_static(&riscv_sifive_e_soc_type_info); +} + +type_init(riscv_sifive_e_soc_register_types) diff --git a/include/hw/riscv/sifive_e.h b/include/hw/riscv/sifive_e.h index 12ad6d2ebb..7b6d8aed96 100644 --- a/include/hw/riscv/sifive_e.h +++ b/include/hw/riscv/sifive_e.h @@ -19,13 +19,25 @@ #ifndef HW_SIFIVE_E_H #define HW_SIFIVE_E_H =20 -typedef struct SiFiveEState { +#define TYPE_RISCV_E_SOC "riscv.sifive.e.soc" +#define RISCV_E_SOC(obj) \ + OBJECT_CHECK(SiFiveESoCState, (obj), TYPE_RISCV_E_SOC) + +typedef struct SiFiveESoCState { /*< private >*/ SysBusDevice parent_obj; =20 /*< public >*/ - RISCVHartArrayState soc; + RISCVHartArrayState cpus; DeviceState *plic; +} SiFiveESoCState; + +typedef struct SiFiveEState { + /*< private >*/ + SysBusDevice parent_obj; + + /*< public >*/ + SiFiveESoCState soc; } SiFiveEState; =20 enum { --=20 2.17.1 From nobody Tue Nov 4 15:30:23 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530637465349772.1419572982435; Tue, 3 Jul 2018 10:04:25 -0700 (PDT) Received: from localhost ([::1]:41810 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faOj2-00082X-Ko for importer@patchew.org; Tue, 03 Jul 2018 13:04:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49749) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faOGl-00084X-7r for qemu-devel@nongnu.org; Tue, 03 Jul 2018 12:35:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1faOGh-0005km-Rr for qemu-devel@nongnu.org; Tue, 03 Jul 2018 12:35:11 -0400 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:62998) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1faOGh-0005ir-J2 for qemu-devel@nongnu.org; Tue, 03 Jul 2018 12:35:07 -0400 Received: from mail-co1nam04lp0047.outbound.protection.outlook.com (HELO NAM04-CO1-obe.outbound.protection.outlook.com) ([216.32.181.47]) by ob1.hgst.iphmx.com with ESMTP; 04 Jul 2018 00:35:07 +0800 Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by BN6PR04MB0387.namprd04.prod.outlook.com (2603:10b6:404:91::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.906.24; Tue, 3 Jul 2018 16:35:02 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1530635708; x=1562171708; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Zw1jLbQVKakFcKolQ+mCze05++lWEYeSKOZzVwlFd8A=; b=QkrY5DakLznaYDCx30TbIKdMCcKx6u4K2Og398CWMMeZHm69z86irGz8 i7EIiVp3pZU6y/F9jzXaSisJcKs5ehpVEYKQf3lBz8Jyd841HPWvqKpin TLVHF1U9Qz66lWar3U5xk8kv2zwcqcQRInpExrqs3unT+T9jTahn5DO7B 1BQ4LrILrOSOtRT8FJtZJIsOUvo1Z0u4OKMMhkrOhl/fb5xbFR44fyUk5 Ca4RYxcHmIcIgJTlY3kjpZ6YTWNUU9bjzscQFGrkN89zVordUGb9vd5rh FXpaA040DmuOl8W/GibgBTCbdmz7REcGHjoP1cGllrSqxMA11mXnYlA0Y Q==; X-IronPort-AV: E=Sophos;i="5.51,304,1526313600"; d="scan'208";a="84260498" 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=RG4d1E8hQlGp9GYBsdxMjG7mlwyOKW7aberum6UNVwQ=; b=n36azlXga0+ZMJ09x17HJG+yTBmfkxIghcANYNubPUrdPFvEVuE3nQtHwXNycyk+9x4/M/OyhThFTZyqlUZis3FfS0Hg2REBW5yD+BQCJhc1ynt1+HcqaQlUOqiDdHQTsl/N4+fWEdjgfx3Zxa1MlMTZKWiHunO7elQ1+rPDxAA= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; From: Alistair Francis To: qemu-devel@nongnu.org, peter.maydell@linaro.org, mjc@sifive.com Date: Tue, 3 Jul 2018 09:34:42 -0700 Message-Id: <20180703163446.9943-4-alistair.francis@wdc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180703163446.9943-1-alistair.francis@wdc.com> References: <20180703163446.9943-1-alistair.francis@wdc.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Originating-IP: [199.255.44.171] X-ClientProxiedBy: CO2PR04CA0095.namprd04.prod.outlook.com (2603:10b6:104:6::21) To BN6PR04MB0387.namprd04.prod.outlook.com (2603:10b6:404:91::16) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 062eb85c-8139-44ad-b5a9-08d5e102ed6a 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:BN6PR04MB0387; X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0387; 3:AhsIW/mbDOcUv8sNhLufw/bIrBoEbNZhCyZZQMBmJPhj3LcesAb0E48KED61VyKPUEgPllrv4eePCEadog3+w0ispVfMBes07PPzdQkKZfppRZVKqGavPhCA0pbTSHhbuy0F7SwXS2rEwfieLDkqtwBngsR/tk6EjOeaGCFNLE0lBxbfUAS7vAkCj6aAofqt/QhU7oZEU/f15xi6628LCQfEBEvQpuyKuG7Ug5gfDcrgBt3oB1878KvvDMVUSPgU; 25:MG93ttdM1CDfaafQlv3nszG9XTNMSLMfKBpGg7oxJb18lr5fUR8ItaY/LJ3z+k5BJGGwVc2fHjXhKN8gAOrqzPkSFgulGdFVQ005pkD/4vDS5dGFvCE8f1cc48Y4eNV9UsuJgIcMVs9+QyyVFdXiAI5llBBkIoz1N93Q6GsAB1QLHJwqY94NksWil0X5ZQSPUp5EfGdkh9t8DMpEHWgLCtw6YcHSqG1P5lMZcW9JT7JiROs13PwriURGGWB9A9hsrfuLHWVevm0B066pQwLYGfzte9YU6u6bMk7vTckSsMRGCI05sT2SNX/CGPO3s28/L1kiIPN8+b0ZeGGDzmb4qQ==; 31:WAiDke96IXFPZSoRdz7NC9xCrLt5ZbBvM/eum0goDfbVwswH1RzlvVvQSrh+crDtolZuzmNBDtTBkLzaroY0KkThyVKKsdgxUxI4oxc9Lder8b5GSAjrj9XI1xRaVhVSNBIqauozZ3ElVYxT2fXL1NtkGkSqxQz2frfkY42YGZBiql4m4Iecgsv4l78uJgqK3lpAnEy7vd4rrpTg8uXtFFm9F/FWwjK31xFCAJ/5AcI= X-MS-TrafficTypeDiagnostic: BN6PR04MB0387: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0387; 20:rfudvA5wzilxViipICg0nNMF7PHDDwfQThOko66eV6IvNW2Tz6GFVc3knWl8rECiPViabCGJ9PbvvKdioEq/upt8D6rdbKrRZ8kEq1IXx+jTo7lX87STaG00feVUft5fLv2QozaYHI7rI22EQ590BobZgXPE6j052awbEkH3Xm7itlSDZrNiF9R0LbClXPFs/bCMXltzOPn1HdGrcpcmtlH5PRpcf0r9MZNSZ+i74vMhSDCdcBvUolF9HSmI1cL3ikQl8CyB0rfeEXiO7qo2nckgxYHZP07ZytJzeXQlC1rrKnwF9i+0FrIsyLrtBeb1qetWIQd9NXgJ31glrjeLTCNsSD705mkN/jTUy937Bb/ksjImna3crhfUAV06m+beZBRCnswFLFpmOHBR3ZmiUoi3ZFvEoqCgnGcYkW6ue2bN6+4WbKM4RmIi6TJjnhJrXFyp/P0AgvLXlY9qu8yB07Dg9Srz7egGmxrhB6aIJNS7YZKQfCJb0y6szeuEkj7/; 4:ImUow/YuJ5fWe3wJQKkPJBk3lUh55J9vfhthHbZbfdFFIhEwP1wd7/AoSMwB3zp0wImSYYdmL/F8YpTIOYpincWSBgZGaeT9iRFeWhEDuCEkF6BDNRnYN9G33PxaDIGbZWfNcZMuAZx+ZgG5ZQVKLgSkseC2Lsc1T8dVj7pakI/jpQYVHiI8lbUAUptoC7r+bN6U3a7/FroX1Dc+Igg/Mcl28qzFmlp5rCkEsQvwPpGwy8hWjv/U9xLRwaSSCQzHWA2CuXrKcLMhoAj8PUrWQA== 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)(3002001)(10201501046)(93006095)(93001095)(3231254)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123558120)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:BN6PR04MB0387; BCL:0; PCL:0; RULEID:; SRVR:BN6PR04MB0387; X-Forefront-PRVS: 0722981D2A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(346002)(39860400002)(366004)(376002)(136003)(396003)(199004)(189003)(44832011)(50466002)(39060400002)(446003)(956004)(476003)(36756003)(6116002)(25786009)(5660300001)(53936002)(86362001)(3846002)(7736002)(486006)(50226002)(316002)(68736007)(14444005)(2616005)(6512007)(6486002)(11346002)(305945005)(4326008)(8936002)(1076002)(16526019)(26005)(106356001)(186003)(81166006)(8676002)(47776003)(81156014)(66066001)(6666003)(97736004)(2870700001)(6506007)(23676004)(52116002)(2906002)(76176011)(386003)(72206003)(478600001)(105586002); DIR:OUT; SFP:1102; SCL:1; SRVR:BN6PR04MB0387; H:risc6-mainframe.int.fusionio.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtCTjZQUjA0TUIwMzg3OzIzOmFzWHFDT0xjVytxNDI1SmJJK3Rha2NNTEJZ?= =?utf-8?B?cWphOU1vbVI3eG9IYnJPUHlZb3c2L2pWSXoxajJUOS9VRHgya2FLbC9tVWxY?= =?utf-8?B?MjRNekw3VCs0VHRrMUxQY0Y2eTdYRzhEMnhoM2hWK1gzcWwyVklXVkZqc1hB?= =?utf-8?B?R2R3ZEZCbFhSdmZYWG1Mc0g3akxBT3U5MjNBdEM5ekp2cEpjeHlBdXBZTW1v?= =?utf-8?B?dElUeDBhVU5KVzBHcERZOUZRd3VUd1kzNzN4L1NyNWE4M1RNdWMreHNuckN5?= =?utf-8?B?OTI5YUFrTXdYRDY3WTFmd1VKbWpGR0s4a2VmYkNiVCtkTGZQazdIdHlrZGhF?= =?utf-8?B?U2d6dXhQWEVGZk9xNUhSMjNkYk5hdU40MzRmOXhDRmRqVHpVbkNZRlVlOFds?= =?utf-8?B?N2hhUEl1UldlYkF4S2RiMzQvMnprRHpNVGJUbXpKWUlOTmU5UklzdDdCTm5s?= =?utf-8?B?OUppWXpTNlJhclNUVEN6S2FWOFFycWhGTWo2bmtncVpOZ2szTEtEaHVyYXdC?= =?utf-8?B?dnorRlNSZWtXZUh6L3VBbkpQL1ZnVnBWZkVydWprSUNVRDRUenoxM2VmdFBl?= =?utf-8?B?azhQdHNjd2xsaGJ0MmhqUFRTTDVCcjZTVEYvanZmWUNBZ1lEWXg0ZThqbTVB?= =?utf-8?B?RWdCYWM3WUNIRUgzdW9UUHZpZjFkcWhqbHRZR25YRTcrcEJIVWVGeXVoYmps?= =?utf-8?B?MjExUGw5NkViWUYrQlZDempYWnIvd0hEajE4cG5xMTNEeWFsTHFPOHZ4aGJO?= =?utf-8?B?Y3d3MStnSWNjSHRtSDI1bzcxUG1uQlZabUIyd0pkVlBMcGkvc0UzbjRFa1VR?= =?utf-8?B?dUFTKzVpUW1NVmJlZWxQVHRnM1NrZkVQait6T2c4NXl4RkxmRXAzU3hHQjBK?= =?utf-8?B?eWVMU0pkQ255T2MrcjZuZUpXdFNqdWcxdWhiUmxKWk9RU3lvU1MxdUlqbC9s?= =?utf-8?B?VUVGWjh5SXc4TGlVT1NhcXIvM3UwUGNjUXdrVFBXZUZiY3hMMEl5L0xubCtY?= =?utf-8?B?WUxPaFZnLzlrNGxDTzdXMnpQTUVDRnEvY25TOWEya25NRTg3VU40YVFWM0FC?= =?utf-8?B?TTZqbWZTVEpXcGl0QTFFZlhsbVZHeFJndDZMSEkrY2VmMDhvV2xaQWZIWUtk?= =?utf-8?B?NGQwekt1eExkVGp6TVM4U2c2OTBIRmZaa1VpSjUwRjJSM2hhdHErUVo3WXJZ?= =?utf-8?B?eDFjbDRKRytVYVlaaEJVS3hyeUwvU003dHNFdWxzdGlTTEl0STJ5R0lnTDlP?= =?utf-8?B?SVVYeDQ0YWRrZzBvSUJSVDFlYTRuZzh0REx5RHJBSmFrWWhXL3RVbHJzTHZ4?= =?utf-8?B?alJkZ0R0K1cvWGszbDF0U3gzWnFUbTRPMG1RMDRReVhKcTJOaFZOSFhlL2Iv?= =?utf-8?B?SmJVNTBBNldaV0VrMU51a2ozOGllTXRuQTBDUEVsMzlFYUcrTi9qOHBKS3pk?= =?utf-8?B?ZlBSVTJQY20zOGlabSs1NzBJemxvT0Q0QzFtOEwzb1FjMXpkSzQ1c1ZVZDIx?= =?utf-8?B?YVJtOGljUFphaC9iWDlKQXpPaWZYZ2ZOdFkwL3VmRHFOL1kwemZ6UFVQZzNt?= =?utf-8?B?Q2ZOQzR2a3E5VVRXRHVOeWVSMCttVHdVK0k2R25rL2RKNEVSNzRwTDhPSkdD?= =?utf-8?B?VUZJRVE4SXhWcS96dy9rS2YxV1crV256UGpQbllkS1BQWkYxZDNRWXl3dDZU?= =?utf-8?Q?CZuInkhRCZw58TfMCk=3D?= X-Microsoft-Antispam-Message-Info: L3FYZP4O5xQCkj1hRoOyjkWdwVI8NsCAFVTDDn5a6r2+79Qtws+k8+uaWodbErvS86Jh3yvIM8g/QJDVjucK/pCrbAgk7ThJ+Wc9CZm9/f5WQi9v/0/EM7MG/Mj10HTLxf85qEiWaR+Qv+K7ruWRvQjjCCsc2WvvVrb2bZdPKDZmXH9Qx4V81K2oU78xVpaQ8EMXAOU5sRvkjaIQlcUGq4mXOm45fwYmcUHeqEVd/RwjSG48D+9VghozK05ZCFhAKau4Yr6Op1vqYG8dUAybqkKZshW12B5l+HIoF8NiVESpsBE4bkvff4j0x1Q5DKrPTSL95uPToBGSTG8LSsHA8hrVkCo5C5dT+iWJAR8OklQ= X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0387; 6:+4cviOQKnLZhggThWXoqYvoAZmvnxUNrk4coZYu4ffevuhSMmjFW7SHC5DJ0rH5TGuW7U1Sry/7Ks1VBiDZbeW3KXenEk2b2ae9SvVuhwhFccPmNTMktg08e6JFlOCg7nnWmOiEobm486rOtacxfg+xWd2tMD8OJq5drVaUa+Jd7tvTD5OKuHDTeT5Cuu9yRurp4oYBc/073I6ooja0RyDDFOcWh/40XjIqonB/sXCeUfK5y7M4T3Bc2a88BlLu12KxSCvNzR1juzTbqWkU4o65feZ3huOj25EqASvaHk8ijKUrjFGRifQm/MoRq0aWK7zlft1YxR2ur6gYc11yZflO2I/rulScQFYNd7H3Zjk/gg7zG0pG0Y/rPSuF9stLcG4gHwwrWsWU+rNDmpR5GGzo9Q16QX+Upi9sOGL0ZjXBqaDXuFZ0zXuCtD6qudTta9rx3TAZQUfqrv/bUbOdC8Q==; 5:C/t/nQYaafTEhhPRTc3XquB/3cHC/PooslddgemvnlkjvhDYgnMbLMibd6eorN/J0tlmYQWMPILY+/ODL3GMYdwu6N6HAikW1AO+dC+ain/CnI0nT7RucF5nix/smYX62hGhvFxaihVSwyDrrGScg4hH0lUqmrrVt6rsRTiGUss=; 24:m7vQX4OiwlApM3EAoxnMGJ9wEum742BtFIy2SVjL/A8zc5h60NyWZ75wrVTbP+0+6AkBfBk6gwoU7d3qA3Uj/fX0Rlx/K+KaZtbNTLlUmhI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0387; 7:ugVSVEVpAYYeuTLdl020Md2eh9nuR297eTrMot6xjbS1qo6rS9j2bvyHbdknYIipRYUfAddjBFQbaq3l2YtHwsTxQKNaUSjpOwHFbPFmXBtV5sG+hkE+IgRYM/UKGdnmK2ahG7Mff8hNTehbSVCcDW/0bwSLvr4SM2GGz0FOre9h1lHvecbHjjONBrShmQaCl/92VpKu2QzLi/bLFYjyqMA/tvoZNeFyxOd+NtNe4MtNcaBM1P9i8s7WxNgEagNX; 20:F1z0z/LAsLgcQ4kZP1TgFf1C315LnjUxHvws5Y2KzkPVplwrauze7mn23GwuXtKWO8PS2aALg0ss9O28zo1eOB0MP4ZehsHm+4iSforTFmQ661Yv53P8xgCsPYChMwemz/Edq5TOHFkk0Dt4GFIK51FjLeYvdqWfKXMbH2wcwvE= X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jul 2018 16:35:02.4403 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 062eb85c-8139-44ad-b5a9-08d5e102ed6a X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR04MB0387 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 v3 3/7] hw/riscv/sifive_plic: Use gpios instead of irqs 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (found 2 invalid signatures) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Instead of creating the interrupt in lines with qemu_allocate_irq() use qdev_init_gpio_in() as this gives us the ability to use the qdev*gpio*() helpers later on. Signed-off-by: Alistair Francis Suggested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Michael Clark --- hw/riscv/sifive_e.c | 5 +++-- hw/riscv/sifive_plic.c | 6 +----- hw/riscv/sifive_u.c | 5 +++-- hw/riscv/virt.c | 4 ++-- include/hw/riscv/sifive_plic.h | 1 - 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/hw/riscv/sifive_e.c b/hw/riscv/sifive_e.c index 384b456540..006703163b 100644 --- a/hw/riscv/sifive_e.c +++ b/hw/riscv/sifive_e.c @@ -190,13 +190,14 @@ static void riscv_sifive_e_soc_realize(DeviceState *d= ev, Error **errp) sifive_mmio_emulate(sys_mem, "riscv.sifive.e.gpio0", memmap[SIFIVE_E_GPIO0].base, memmap[SIFIVE_E_GPIO0].size); sifive_uart_create(sys_mem, memmap[SIFIVE_E_UART0].base, - serial_hd(0), SIFIVE_PLIC(s->plic)->irqs[SIFIVE_E_UART0_IRQ]); + serial_hd(0), qdev_get_gpio_in(DEVICE(s->plic), SIFIVE_E_UART0_IRQ= )); sifive_mmio_emulate(sys_mem, "riscv.sifive.e.qspi0", memmap[SIFIVE_E_QSPI0].base, memmap[SIFIVE_E_QSPI0].size); sifive_mmio_emulate(sys_mem, "riscv.sifive.e.pwm0", memmap[SIFIVE_E_PWM0].base, memmap[SIFIVE_E_PWM0].size); /* sifive_uart_create(sys_mem, memmap[SIFIVE_E_UART1].base, - serial_hd(1), SIFIVE_PLIC(s->plic)->irqs[SIFIVE_E_UART1_IRQ]); */ + serial_hd(1), qdev_get_gpio_in(DEVICE(s->plic), + SIFIVE_E_UART1_IRQ)); */ sifive_mmio_emulate(sys_mem, "riscv.sifive.e.qspi1", memmap[SIFIVE_E_QSPI1].base, memmap[SIFIVE_E_QSPI1].size); sifive_mmio_emulate(sys_mem, "riscv.sifive.e.pwm1", diff --git a/hw/riscv/sifive_plic.c b/hw/riscv/sifive_plic.c index 874de2ebaf..a91aeb97ab 100644 --- a/hw/riscv/sifive_plic.c +++ b/hw/riscv/sifive_plic.c @@ -435,7 +435,6 @@ static void sifive_plic_irq_request(void *opaque, int i= rq, int level) static void sifive_plic_realize(DeviceState *dev, Error **errp) { SiFivePLICState *plic =3D SIFIVE_PLIC(dev); - int i; =20 memory_region_init_io(&plic->mmio, OBJECT(dev), &sifive_plic_ops, plic, TYPE_SIFIVE_PLIC, plic->aperture_size); @@ -448,10 +447,7 @@ static void sifive_plic_realize(DeviceState *dev, Erro= r **errp) plic->claimed =3D g_new0(uint32_t, plic->bitfield_words); plic->enable =3D g_new0(uint32_t, plic->bitfield_words * plic->num_add= rs); sysbus_init_mmio(SYS_BUS_DEVICE(dev), &plic->mmio); - plic->irqs =3D g_new0(qemu_irq, plic->num_sources + 1); - for (i =3D 0; i <=3D plic->num_sources; i++) { - plic->irqs[i] =3D qemu_allocate_irq(sifive_plic_irq_request, plic,= i); - } + qdev_init_gpio_in(dev, sifive_plic_irq_request, plic->num_sources); } =20 static void sifive_plic_class_init(ObjectClass *klass, void *data) diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index 45b6aeb36b..3883d7ff9c 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -320,9 +320,10 @@ static void riscv_sifive_u_soc_realize(DeviceState *de= v, Error **errp) SIFIVE_U_PLIC_CONTEXT_STRIDE, memmap[SIFIVE_U_PLIC].size); sifive_uart_create(system_memory, memmap[SIFIVE_U_UART0].base, - serial_hd(0), SIFIVE_PLIC(s->plic)->irqs[SIFIVE_U_UART0_IRQ]); + serial_hd(0), qdev_get_gpio_in(DEVICE(s->plic), SIFIVE_U_UART0_IRQ= )); /* sifive_uart_create(system_memory, memmap[SIFIVE_U_UART1].base, - serial_hd(1), SIFIVE_PLIC(s->plic)->irqs[SIFIVE_U_UART1_IRQ]); */ + serial_hd(1), qdev_get_gpio_in(DEVICE(s->plic), + SIFIVE_U_UART1_IRQ)); */ sifive_clint_create(memmap[SIFIVE_U_CLINT].base, memmap[SIFIVE_U_CLINT].size, smp_cpus, SIFIVE_SIP_BASE, SIFIVE_TIMECMP_BASE, SIFIVE_TIME_BASE); diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 34d48993a2..aeada2498d 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -380,11 +380,11 @@ static void riscv_virt_board_init(MachineState *machi= ne) for (i =3D 0; i < VIRTIO_COUNT; i++) { sysbus_create_simple("virtio-mmio", memmap[VIRT_VIRTIO].base + i * memmap[VIRT_VIRTIO].size, - SIFIVE_PLIC(s->plic)->irqs[VIRTIO_IRQ + i]); + qdev_get_gpio_in(DEVICE(s->plic), VIRTIO_IRQ + i)); } =20 serial_mm_init(system_memory, memmap[VIRT_UART0].base, - 0, SIFIVE_PLIC(s->plic)->irqs[UART0_IRQ], 399193, + 0, qdev_get_gpio_in(DEVICE(s->plic), UART0_IRQ), 399193, serial_hd(0), DEVICE_LITTLE_ENDIAN); } =20 diff --git a/include/hw/riscv/sifive_plic.h b/include/hw/riscv/sifive_plic.h index 11a5a98df1..2f2af7e686 100644 --- a/include/hw/riscv/sifive_plic.h +++ b/include/hw/riscv/sifive_plic.h @@ -56,7 +56,6 @@ typedef struct SiFivePLICState { uint32_t *claimed; uint32_t *enable; QemuMutex lock; - qemu_irq *irqs; =20 /* config */ char *hart_config; --=20 2.17.1 From nobody Tue Nov 4 15:30:23 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530636954620615.774733252599; Tue, 3 Jul 2018 09:55:54 -0700 (PDT) Received: from localhost ([::1]:41761 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faOaj-0002T9-Dg for importer@patchew.org; Tue, 03 Jul 2018 12:55:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49751) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faOGl-00084Z-8K for qemu-devel@nongnu.org; Tue, 03 Jul 2018 12:35:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1faOGi-0005l1-8n for qemu-devel@nongnu.org; Tue, 03 Jul 2018 12:35:11 -0400 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:62998) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1faOGi-0005ir-0V for qemu-devel@nongnu.org; Tue, 03 Jul 2018 12:35:08 -0400 Received: from mail-co1nam04lp0047.outbound.protection.outlook.com (HELO NAM04-CO1-obe.outbound.protection.outlook.com) ([216.32.181.47]) by ob1.hgst.iphmx.com with ESMTP; 04 Jul 2018 00:35:08 +0800 Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by BN6PR04MB0387.namprd04.prod.outlook.com (2603:10b6:404:91::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.906.24; Tue, 3 Jul 2018 16:35:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1530635709; x=1562171709; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=j6vb1k+ihCUbLKB0CBaq6ZBAuh+rST7SIJVGcwdGq2c=; b=V5tV9gDn5yS0ckSqW9mMEhkw8z5FKVrKiY8xxIIdG9I2ljjKOHtS+/nL MKgqyZK9050WJCJUyBL/cuTrIZZt+0nhNDvs/r0qHDn9igGddmE0fKjhH IIk5yuBb6YKTtNJrOfTpHEVaYntFwu0jyGYPZlwcFDhzRdSvLKh2bGkCx PCc3KcRGvjvBUDK992xP2+Jk0o+YoGuX5xBHmvoWkhw5fTE+Y+cR3iFU3 okUY2wsx1b21YtKGqcXFWiKX+i33PZCoGAlk0QUddYSgptYAvcpo+bJeM n5/B+vSO/CcNQmfzdQ4m1Sv6JJ+mU6tT8F+nMjI7YsUz8hszpP3ZBhPdF A==; X-IronPort-AV: E=Sophos;i="5.51,304,1526313600"; d="scan'208";a="84260501" 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=lhngcJy/Uy4Gt5FC8V9wZOF69X107Ul8AyJGuHA2Iz0=; b=jlhrekz23o92uxM8mQKMhQEdKO5a0B2ribcfXeW1fDGHHCutCxm6MJCdSAiw6VVo6qRFZF7VL10vDGTkqOUxvVv9KCJMBK9fQgvT2CIMysImNvFmfa4MU272dS0rKeWeP7Y1wXF6kSZrZrLQqLMz2egMrzAMe4KaWE0Z8NyLq/4= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; From: Alistair Francis To: qemu-devel@nongnu.org, peter.maydell@linaro.org, mjc@sifive.com Date: Tue, 3 Jul 2018 09:34:43 -0700 Message-Id: <20180703163446.9943-5-alistair.francis@wdc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180703163446.9943-1-alistair.francis@wdc.com> References: <20180703163446.9943-1-alistair.francis@wdc.com> MIME-Version: 1.0 X-Originating-IP: [199.255.44.171] X-ClientProxiedBy: CO2PR04CA0095.namprd04.prod.outlook.com (2603:10b6:104:6::21) To BN6PR04MB0387.namprd04.prod.outlook.com (2603:10b6:404:91::16) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9eed2ba5-6822-4c34-8174-08d5e102ee4d 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:BN6PR04MB0387; X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0387; 3:kHN5WwjZTVeWogZcOEnr0ZLy5fMM/7CmMRtfJMDRj6eDSvWfQaL7gwGca3lMWTnyeuuZnvN6Cyb06TPCILpl4dR7AXNE3QVMd08Hbh646MBrkvmXAA/6UwHcsZvDQrRqELQdiFNLgqgwwhIk9YiT5UbFanAVK/lJeE1Z4zHW91FYVqfv3EruFENdY5tjq63COgep9r7BlGKNM2KGCL0qg1MM2b0gQzYOaYU/9CIux5qQxB6Ahj8jpZSleALQpktP; 25:FCj7ZX82ETfC6WAEpvEUw2Fete1DCkFyMohedWidEyodkhfPMfGxH4xVo1XqyP+W49SSTO9ufeqYBOTizFw9vkl4WzuuplAW9ZkscBOU6O/vkxgVcTlm7opmMYNC0vFPeeh3DNnHOUFn1d4RJ3iRraD1fvBtWGxgnRLSTwgih2/7Bvv6YSi1o4wsDYmPkU6uVFzApcr9mcF5pvCfYT1eJLGMSHKCqyPLgakgYM5fEcWx3Rlya+H5wXxBa1+5tBVWXr/EzDHqNycKgVubaq7GuMUk+1znyhvGAUwyxW+NnS4vBFLk4zSuMst6do9LqjVFl6oMZjmx28LHiT/AqSQeLA==; 31:btkPrjTdf3itb3vfAT43hXU5yhPPnxeq5iSpAlwD3HDszsyrqL4rOnpNDstxtSLUfe86QF3ruDmK5L/Iyv8zALnckGcTnHDn4syFjcKu/McLVSZPYEwTxmhjTDgnhsix1CeIBik3VhNrT6/T1xH2HGESMQuzhjyqxKfdcRHnHX/2idzZmC7Z+UG4h0pX9ElXHDFv5y1LencLj5PgWIXMfvKxFjpCXGH1B4+9DGDq6Rc= X-MS-TrafficTypeDiagnostic: BN6PR04MB0387: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0387; 20:aFtbiCB/zoG5/rPmVN+d/MH6P54SGbIaXDeyuBiFvC2L6mV/DzudlThdaAxZIfmUFmbv7u5GBwh/VvJa27LLMTZGN+klfQOZvTlVmOffWKdEdfAtPNKE/9qrWFmvevq4HXPTCqjxFQ9sHEimmJqVmdufpq1FXrhmwsmnnRUmTZnj6Gn2beaElwLVFF2FxFGRqOE+tZWqVCSwl+3rMryzvvRYO8L6oZL1kBPn3wGqFMdsw1izCsUFiK3bBNWRh74BDhp/U8UYP6w+e/+f55zd2UVMeJowRBZ68ORIUVJfycZtEUJ4IUi0Qtc0z5IQn1x9rRM8BCICOEsC4m4ULjRV/FOFzsb1REfjnsz8EDTIap3J6o00CQRxrtLlZHp7KeGhZqQGc7TQSiSUxKOUWJ8ceIofuqf2jv1x1/8TNXugqUW8lMsnAYZRu9B86VjCNtAZb04oR52y7cEO2w7TlLmbG/wxSAa6nfXVMca3uQBdWZIIto0HdiIUKWEPOQTxnjaw; 4:7GwPSCA2KlV/N8NOvg5vIOmWlOVhR4cuvAN/f/lFlYp6jlxq8cv/ORkXzdFHkKaMHasy5HtO1QW7LKOwheQNq+LtbmMcoSMTkHJQ0Bm7AskcTd+NAWdV8hjQ2KbB3UpeznN2oeG5mGtWgQMmdBLOpA1T6eG+Ae1dT10IfnIKnDM7KAP6mFFLmfUf/M96nIWkuz9xMm+kNa7F1f6WN/y2Un0G0vHI9AQqoveNHa1ADn3BkY8EYuxfp4Sjofsb+vmgoOd93KB4gSPgt/cgIJZsuQ== 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)(3002001)(10201501046)(93006095)(93001095)(3231254)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123558120)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:BN6PR04MB0387; BCL:0; PCL:0; RULEID:; SRVR:BN6PR04MB0387; X-Forefront-PRVS: 0722981D2A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(346002)(39860400002)(366004)(376002)(136003)(396003)(199004)(189003)(44832011)(50466002)(48376002)(39060400002)(446003)(956004)(476003)(36756003)(6116002)(25786009)(5660300001)(53936002)(86362001)(3846002)(7736002)(486006)(50226002)(316002)(68736007)(16586007)(14444005)(2616005)(6512007)(6486002)(11346002)(305945005)(4326008)(8936002)(1076002)(16526019)(26005)(106356001)(186003)(81166006)(8676002)(47776003)(81156014)(66066001)(6666003)(97736004)(51416003)(6506007)(52116002)(2906002)(76176011)(386003)(72206003)(478600001)(105586002); DIR:OUT; SFP:1102; SCL:1; SRVR:BN6PR04MB0387; 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; BN6PR04MB0387; 23:tmSyMgcAo3rSObOmj6j0o6SVOmLcSxbtNe4OVUR61?= =?us-ascii?Q?isa5D5POu3VWNrcC/+KhginhwvEF8vwLIQ1IIbV6rWbTKwOiuUI4adjRi599?= =?us-ascii?Q?JIKeUxXLHHJgGa4+KjDXDs8yx7OTFgFPGQf4klM7Q/pOVuLQZR8QCKCtisRz?= =?us-ascii?Q?xCGqhN0d6z4SYns3ZdsewPXQkDdfDT6QhOCnu6oK08TZIBdaKmhqQpIbwNJc?= =?us-ascii?Q?jR4Tno7OQF5Dd9wzXXW1X3mACgjxBonCAEtuuYe9bLdQ6p3dSXclgAbEtlp4?= =?us-ascii?Q?hVKtDiRuHsDORsDGX8sz2WSJgnYNmpQXM30EHQU7raCeKdToqE0v/6CNBfNw?= =?us-ascii?Q?tGMO+Zw96zwriwxQ3s7HU4uU4xA9/vHY45tJoM/BxRwrwMj4U2dI8y53k3p7?= =?us-ascii?Q?SkxrVZ1zg4jSTUypb+rmk8YDQXK2SgonYx3mlnhaCPzJN3Cmvmd2750D4I/9?= =?us-ascii?Q?wR56Y31+nMf9ywx1gxhoP+7Vam522iQVm8j2m+y7REsJUrxAZ3AB4aliGGdh?= =?us-ascii?Q?h5QltbKxkvtRqVrA0EzXGyghmESsdPqtckCnNPwW9M1vXQz8z/KoM/Rn2osy?= =?us-ascii?Q?r5frCqZ5a5+w4vYVGZv37Q9BSazgbupWZUIoYaMkYkQxgBMFdbxdqTC3z/S+?= =?us-ascii?Q?0eGlU0sYtWTzxECqFUp0va6J4rCJvIxMGS4BDWCtkEWfQJQvQ/UXK5rVBJDQ?= =?us-ascii?Q?0RoTu2jLBMqAF492SlUU9SikL1KPivBaH5+yRsxbrwE+MXX27WU3hue2vD3D?= =?us-ascii?Q?q5YD8Hq5ie7OIT6Etd1BVVa7Ajz1aw7EKjtFkDG858x862TtY4xKkwe/DZSf?= =?us-ascii?Q?TsHGANxEPfAqCLGZHp1NVSk/hNOWkkbgFyY2bLPTvVm/h9JM6T2brfcyCzER?= =?us-ascii?Q?B7C6pa5URfM5BjX2x0GmNNmkLG6FJHACWjVSAHKKcuGGHDeTMadXPbDvn3eE?= =?us-ascii?Q?ZKO90CbjnRkN+CrcaIYDsK5kG2T3VNm97pcNcI3yldb2LW1KGcm5o3/fs94z?= =?us-ascii?Q?6s0Jaby+SN0CvGQLLTBXL8PIfLkJTc4QOTfIIhToEhndQX7pVOwxYeCMyhDY?= =?us-ascii?Q?TmAS9lOdlRQS0W4Ly34p8Rp307OnmbARcYO/7hM3OVFWyyS7W73y/5xD5eE2?= =?us-ascii?Q?2yTXTnBXzuCE/4xrQZqBbXvalNb4AqtHvjHiL6aEl8LfaL8/2appO22Ruvsm?= =?us-ascii?Q?XdNaiaT7GAYfNYMDagWSauk9UAuTpc/8xIpG4l7GGbTApECljwFjjfjqAbIm?= =?us-ascii?Q?nkixB+C6a4CWc96iuo=3D?= X-Microsoft-Antispam-Message-Info: h7SOFLTy91nA7PjD7fNfznU1sdsRbR9ur4oeUulgoQ5Qmto5XGol6d+tVG+NxeFjAsQD5pm5L5TOigRETnUAG1p7SVwPhREDSsVIJshyj+lkth/cuh7FQVjiYMGmtVPJR4n5toDPt4kTX/AORjHU6Wj2LI8fnuaoJrJUA29GXdZR06TQpXKVnaB734CIvVbBGeFhuDWsiSbhFaHLUseMkoucc8zfeT0V1slqqsnjkpytYNNJ2V3j60UNIW2qttJaEF60tds9heWhb0A2P0J6ThSsd3LeJeNIAC9aorbZhjNbkShR3v6yR12SsuwtQ9dKDbYfN6sJuJNo5n3I/LwqW2DWl7JmHYdj3waZB9Y5ATw= X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0387; 6:VJupVZaXCgR9zc9beriizLhHK0xNcrwTidR6JzGPimuttjJPPzrgWMlcjqG2RWPa/ojpRqoomAqD3+tW3nXBhStIxrd2J+GjNkiz7+r1PILX6n1nOh0YRHdOheqywmHCvJ/tSu26bLSdERtftVa76CXFaV67zB2Lrn1ZCjlwVIWucoWdZ7w/ENZlUCgjcYFvh+CECjqAMHpaROGBZUTgNc+cfCffl9DyKeaamW8yJ31NjUob+YOs5G3+xjEi2Z6u04G3Q46LSVgAot3nZQvOUEjSCbxVI/vlBd0xOGFhBAnYYW54h5jmhsZYukx2ylBNXPKeVi/LzXNhu8xycxXcFOFxjoEgYU3mbY4dgRlTx59HWsR0mF+OVRuHbEuZbSGo5aHxavv7nroathMCB4E2oity28ld8fe4yTIyjUMSD2yw7jpIr6a8FN2mBhz9u46ezdrOmGWNwJTRXDn6khxabg==; 5:0hHW4tOmFb9t+Es3HE9kO8Zpd7UIc1D+WDHBQrpKhdKT2ivygaiVKVbpSnTUM1eZbu+PtmjJXj72yqCJuTaApORx5q8gU7TupwL0u6LiVgrybnqGMUmfOXlgElSgknO2wFYNMdBd/g1IRLdqbrs5C8bT4PjE1IKAZfzJdLNkETs=; 24:BoBLz36XPF0lP9HuvG4MP2d3LYzXqiLs7Sr/jHKQifq6V3SEciO5fG6gngUgg94aXNPZycgPX5e+ZX0HpBxkukYLBk+vtpUOrF0v6A9rnA4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0387; 7:0uS148Cv6uICD+AkTabjnzQTw+s5uPA0tkLtV18aZ5uQxrhCoJ3XBpX4RdZVy4oSue13EdAJG4KpLHG+yOy7BrYHXvLqNs5Ae+0no5PioaJA5YhiGKyFISddiGzn0ygNSO5GfiFxPNnuLDm85EjfsZ1Ja2TCP8IahnMjtBrfrawlTL2BT85klQJOJboee3eVbc/k/lThX7pI+2RvCyMpP4Nqiak1i0dsg6Cmt9i+XKYhegLjjkT3ECA46nwGE4qi; 20:8vS0r5SG+lQCpYa/HYaTBPO63ewrwe60aIysGlS7RU3/dJFjuEyvUi3mE/fKd1vbCZzFruLGgaVRJxoLR3NCypAJpmIP4/rGjamqftyid8Z3XHvu27ohhlpedQBwMcTLp9nPpwTH6goXdftBvm1ErB3AoGnr3ZBiEfL5GU7UOCk= X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jul 2018 16:35:03.7535 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9eed2ba5-6822-4c34-8174-08d5e102ee4d X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR04MB0387 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 v3 4/7] hw/riscv/sifive_u: 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 , f4bug@amsat.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (found 2 invalid signatures) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" To allow Linux to ennumerate devices on the /soc/ node set it as a "simple-bus". Signed-off-by: Alistair Francis 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 3883d7ff9c..f438a72c27 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -97,7 +97,7 @@ static void create_fdt(SiFiveUState *s, const struct Memm= apEntry *memmap, =20 qemu_fdt_add_subnode(fdt, "/soc"); qemu_fdt_setprop(fdt, "/soc", "ranges", NULL, 0); - qemu_fdt_setprop_string(fdt, "/soc", "compatible", "ucbbar,spike-bare-= soc"); + qemu_fdt_setprop_string(fdt, "/soc", "compatible", "simple-bus"); qemu_fdt_setprop_cell(fdt, "/soc", "#size-cells", 0x2); qemu_fdt_setprop_cell(fdt, "/soc", "#address-cells", 0x2); =20 --=20 2.17.1 From nobody Tue Nov 4 15:30:23 2025 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530637548671774.7979666486973; Tue, 3 Jul 2018 10:05:48 -0700 (PDT) Received: from localhost ([::1]:41818 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faOkL-0000QT-Cz for importer@patchew.org; Tue, 03 Jul 2018 13:05:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49750) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faOGl-00084Y-84 for qemu-devel@nongnu.org; Tue, 03 Jul 2018 12:35:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1faOGj-0005mD-7G for qemu-devel@nongnu.org; Tue, 03 Jul 2018 12:35:11 -0400 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:62998) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1faOGi-0005ir-Sd for qemu-devel@nongnu.org; Tue, 03 Jul 2018 12:35:09 -0400 Received: from mail-co1nam04lp0047.outbound.protection.outlook.com (HELO NAM04-CO1-obe.outbound.protection.outlook.com) ([216.32.181.47]) by ob1.hgst.iphmx.com with ESMTP; 04 Jul 2018 00:35:08 +0800 Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by BN6PR04MB0387.namprd04.prod.outlook.com (2603:10b6:404:91::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.906.24; Tue, 3 Jul 2018 16:35:05 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1530635710; x=1562171710; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=n38QefGu1hzLx5+T2Bh9Ne2r3tsq8YXzW1VuLA+B4+w=; b=ck3iWhap5bzUaQI39zgcI2FJvaUu7+nlVuY6zPjvXnorWYtuX2Y+8eZz lyMeBwA2LJsVgREKuhv1Q2tOgCO6GHguXDiyCVOG70KKsw9C8oT15Ga3P navg0lZppZxgle/HwdT3EqBRzW7nz3/LfwkuwZXTmiR9cp9fRF/MZ69Pa DesHgtxEAxR5lVFdDFckBVg4JhKB0aIUW9M/L+1K0Z7M5x0CzyzPJxmaP Q8vSn55sstWz0Q86fJCz8QjbLarInEAK+eTzFWAq9XaYiJg6pJ3wn7jHB jZeUL7Tt8mKP0nMX3mQFq+26PhTARWkHk00HnhXFRtr24Z5IFF43q+pe3 g==; X-IronPort-AV: E=Sophos;i="5.51,304,1526313600"; d="scan'208";a="84260502" 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=XtRbnO8eRSjb35ANJNq2JF5DrtCuSra1YJlUNpD2o6426TIc/sjaa2FlzwRlGuQRLSDZAIz8X9JNp6eEhAU7C5vLzcvBhx2Xrt9z8l2D+znrnbNXS8Cu0pIs0V9wrHiso8aqN6Yw5nHZgI7cLAP80bm2JOUbV+dQaYOoRFTZRv0= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; From: Alistair Francis To: qemu-devel@nongnu.org, peter.maydell@linaro.org, mjc@sifive.com Date: Tue, 3 Jul 2018 09:34:44 -0700 Message-Id: <20180703163446.9943-6-alistair.francis@wdc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180703163446.9943-1-alistair.francis@wdc.com> References: <20180703163446.9943-1-alistair.francis@wdc.com> MIME-Version: 1.0 X-Originating-IP: [199.255.44.171] X-ClientProxiedBy: CO2PR04CA0095.namprd04.prod.outlook.com (2603:10b6:104:6::21) To BN6PR04MB0387.namprd04.prod.outlook.com (2603:10b6:404:91::16) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b90110f5-c3dd-43ac-1cec-08d5e102ef20 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:BN6PR04MB0387; X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0387; 3:wEPa+wjqtjprdyi+YI5GnGPoLqDmuB14wOqRvlQ8OHjNYb1RYg6Rg1fPJYBJbfB4d6AmLAJXnfPkbdpWSLJqoKDdvh/zsSbIEJCmvbzLnVtgNs/pGroX3iqi8/vPsCkBcRyYw6Tu0UcgJD62ZNh5QMVvayeNISVoo/z6uygY2MWSZocSakrpncZK1KYMWArAgYbKaZPeTA2NDcVlXo/C+EC65GKw/WYfQHT2TfrU70XJMDMc3vyuYBK1Nd7aE6q9; 25:4B18RUFGgdUDwK0fTTmtk64Qw3K4EUpHLfAqUdRxQxIY8p+SrxJ2ezs1Oys6QPBxpSxpZDNIN/B8sbaq/OJo74bJ4S2jDTfusK7fwXgxgrhvpoAZ7+ETQcQuOB3QFJ58SK2Hh7eSokNDhmShtD7YgvcM4menz6o9QEzu+N1QFTZ6j2mKhWPXLNodPamNm3hrqlkIeMGkezlIcpp7+1+fATdomq4yaKKslaSkxUhzrAMPCH6sq2fSs7K5Mqo8BieLSMnHWDilbvbt/O4GKvxJrczDRtts7vuU/WYMsQU/hoUe+Rfq650MTp31LUnVIu/7x9uD1xbgQDZhujssdoeHjQ==; 31:+3D70Dip0pbfAo/VDdWNDJxet0Si4OO5/NHDkF5bw4adHUC3U8JqNFKHBKpI7OGL7Ji+YyFXO4b8WC86GYkgSdyHrpO8JVXtpJwjVMJn6xtijnVJ8okFNtDNLYun9DFb0j0ODqRRhWB64fO5eDW2h2++yu/DmUgRgnqx5PTW1JFNRmbHwEqiy62QVIShiaF0LGrkWSOxZISVwbRWBSvaqAisoytX4MMXzoE1CvIncH4= X-MS-TrafficTypeDiagnostic: BN6PR04MB0387: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0387; 20:MbzNRfdboDlQm4y3e4Ltk5QKxsrNb82y6Eba03IUHTugG4v3h57nMSOvJrCzUMfuDuSB5Gb+Z1N1CZAbJKUTd2XomJuGWQV1lZfKQsEJvsIHvt6f8g3/+1FpReQ96YEOLknomFotN5QxXdo8pNtpEPcDuZAA61I+ci72wrcf8qaIk83enjZXgwFm9VBDfxF47w9cpz+ttYuFaulR30wn9ufFsx8SaVwpaTlfIz6OQIvcqmUnmutO88TVqaPfx5LebVsCIp5//tqSzPSUnLKxlIDhPu+FIe/1sYftYhPIWJWIfB5ljfFbBuO7EbCbPukJJGWd8KnYU42pNLYL030DAj7ZmxizgGbQ1Ey00JeGEEgJDsAHSlSJc9d/F/6jBLXxRyj+y637akQO1Ph2Xv1KerEBXBoWuJbudi/ptI1w7gTTL9golPnA8XLmCi+L9ETHh7XHLZyIr0SWvgbyoI+83X8RgE7Y+ZMDML/lyq1zdyjKxqOuFZtLu4itLmwqzbAp; 4:xKXfk6ViTuT5Z2CsvQC5r6K6Q1irC3XRlWljivZ8USNNhLCVDYMM6WtpGwS7cn7t3XWEDKjNKhCjjCW2GD1APKKwHjfHfzc53oyIZrQaliGO8F5TO1SvA3Zon+P5NWAB80Bkd0NwcC1FIEUSOaVRWlYf+C2ziA3junE1Khy/yHvBObhVGUyuV69/TcpXwWgEAE08nOg9C+J2N3ppAmwNc9hgo4mYqmDLj7G5Sq829Zckh/PZHQcahdENpwveauUOsFZlvNKLLSsfJg4Qoj8jWw== 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)(3002001)(10201501046)(93006095)(93001095)(3231254)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123558120)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:BN6PR04MB0387; BCL:0; PCL:0; RULEID:; SRVR:BN6PR04MB0387; X-Forefront-PRVS: 0722981D2A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(346002)(39860400002)(366004)(376002)(136003)(396003)(199004)(189003)(44832011)(50466002)(48376002)(39060400002)(446003)(956004)(476003)(36756003)(6116002)(25786009)(5660300001)(53936002)(86362001)(3846002)(7736002)(486006)(50226002)(316002)(68736007)(16586007)(14444005)(2616005)(6512007)(6486002)(11346002)(305945005)(4326008)(8936002)(1076002)(16526019)(26005)(106356001)(186003)(81166006)(8676002)(47776003)(81156014)(66066001)(6666003)(97736004)(51416003)(6506007)(52116002)(2906002)(76176011)(386003)(72206003)(478600001)(105586002); DIR:OUT; SFP:1102; SCL:1; SRVR:BN6PR04MB0387; 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; BN6PR04MB0387; 23:KKvE2y0PVAYELS4Si8WrfQ15ggMwljiaYqJcBOC4c?= =?us-ascii?Q?vyV3IjzznX9G3HsBbp5//7Spz2+beqHwcN3N1iuvr50ITBu+IgXJSsd1Uf42?= =?us-ascii?Q?DbNka5dySYBPbZ0gbqqbTOeaJ+9Ng9JV4+pX8VFTxXLoLvPcMVmHOGu7VUg4?= =?us-ascii?Q?oRltrvLFlOKTN7sotVjCDcGwH4+xJRmOCqvOiExHXTlVI//+ZOU59ZNFPEQh?= =?us-ascii?Q?RbuDdPXx08gDT5NNPIsAyv/W1SgiUGNYbILnR8khNPHXBt5WjhdrkBQfHWdX?= =?us-ascii?Q?YI9I7hRCrrxYpKPy+gKHmFBeReuC/WJ//233pkkIwP9jXD+0z4s9+AZIqojE?= =?us-ascii?Q?oyV69tRGYzxZG47m/np8cjYq/lIclJJg+7KBLJKZqJRm2S/fWbuEcHGWPXq4?= =?us-ascii?Q?ShrKNkTe4X7Mxkm6CBQYvvT/3rfJyDmYLDMIs0GwsEpTyjJ+tFQV/LcNcTIG?= =?us-ascii?Q?1PUY/i7isBPsGFYJb5ECA53Kkqwk3+DyPFye3V+i97k466qAeiSxi+exSAWg?= =?us-ascii?Q?DVAg6rCOstnx7jo7f+XIXUliP0XAvrgAiXIDM39scwYpb3Ql6f21xISmuxCR?= =?us-ascii?Q?Jl0zKs8x3Lo1wQxlDEJ4zdT67VufCtQwtt/k3Vl5htwLT1Q3S8K6ifwZj+rL?= =?us-ascii?Q?r+T6swfAoWg79OjYicfP9Nj/SySzFmPvMYPSwA60RvXUYXKzgDATMzMPALkn?= =?us-ascii?Q?VSv9v1BFdTRgqUDpr7BEH6/OhPmb1LHTTtqc5G7gAamWUhXaijWg40i9xy21?= =?us-ascii?Q?Ob77bff4HHhn36v8B5DDW+Pej6O4NiKt/IfKs7uQ11PX59mifXd5qPvJ/9sN?= =?us-ascii?Q?oymMbjg23imfp7/295YdC+TGT2KJoW98KlxdsZfQILTeok06s45nr4LQ5U2K?= =?us-ascii?Q?5pbqR51agOjC0G0gLKVO0a6PCx+5nQQRpzjsFZb1mZVveBaTH7ZLnUhiCDXJ?= =?us-ascii?Q?kfHWx/Ou8pW9zyMkNbn5cNhYk5OR8C75w6yL68jGs345nKDg9wzYXS4OpooV?= =?us-ascii?Q?oh19YICYJe1Wx7z4OghOpi/UILsjKqB6C5VphZpicJ02hD9INXWdrLxTZWY0?= =?us-ascii?Q?0yZ//YG4vrUkjMfTJOozmIqKRTFv7rx4IQcO6xGlPLZVNJnj4Ff0++AtSf8o?= =?us-ascii?Q?J36/vAOaAmGu16xmqChDPHNX5+ouCIV459yoUmkzoXf/hUETPxq2TGstOn4C?= =?us-ascii?Q?la6ll58zxCdPs03D8tXDhuaTu8+oYQdOlSNPVQ3wMKJr1ejQCEm/pycHoNjh?= =?us-ascii?Q?sb0pAmNtxSSzmTwd/A=3D?= X-Microsoft-Antispam-Message-Info: pDsxKUUXGX9AsflgAb8dl2FsxGGHC9PtWPNPx5kWW6b6NWjBoedV4d+41AkXDXj5+IXhLgLEMKcl06kDu9SU5DYsV4YjteazyuyHnClqD1B3ENI5i28C7KqBg34AsE2anNdYjHdqMVbah3Wh8urez2hKPqwiWGawu/gibboBWK9lEhzW+y878v7V3e1dpZPBMyYoPIsJtYi4xzA7REXFzjUrCXoWN7iSKfH/HQtZMvNhmx/L1BdepJBGTlJ6rPBHZ1XSfNGv5vP3dWf9FkofuQliY+cd9L1iAaO7N/iZlauAYgYLJFJyZHOghzWYpV3fFID/WyFK2WQUU3Jl0Rf3XVETUj/H3hRR9SPVVcNTOoE= X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0387; 6:V3M4ePnhW1G9A8icTu74XayAe5he4dUCwxFhIQWOEHv/rZ1cNE4soICIjiCuwKvY7lF/KMy0gtE7B7cuQ+NdbvGN+y402oZrc+ERgi+d2MievuYSAobxRsHT+TqM9yQcC9yqj0+hqG+XnFWrGe4V7fi/VngS7PjdhZXZKyYXE2QK9xZI4Yibm+D2PJ2/YthbVoVS2jNw4zIV293A1JosD0rbtF5di1iUbdSjExQawjFV8UrOucQYV+TCqSZtub9KD4b3JXmFfGRouBaNAS7ufIHz09Npg0dXfETrl/Q8uk+y7xIIFzBQq0S8ihezx1A3YaX/IWxHN2dAIA9hpTK0+1AWIAwmMhG+zBLg2iy7/I2yfA6SL9WhcYeVt3ibv9htsA7KpKwhmdfrqrLEhyeI4ZpxgEEyFRhYvh+4PE4I2v0jHnStPc0PyXW+/yhyZRInrZlZqrWExoNllD+NvzUmfg==; 5:cm9Nz6CkAKDSfWNlAzokQAIyTHN0TlXVt6dVz25pHH6THO3aMOjhtHPNtmCfK1As9D/ufG4GkopbCKtBjcqNgT1CcXPq5iZtdPdby0V/eicS0HTix022I+4EkjGp9yYDqS1h3qKkIvuIWj/CtkrM/65KX+fMfVNeDAYqBdcChlE=; 24:a293sfNTcVamSKVlIERTmccW6FJRzBqrI73Y5imOn6TCUwmRxglc2MPp+W7MJFKrWoki7taeEekxbSs5YphL5lyQzC/IuTCV7Z8aKwLP2Eg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0387; 7:LecXKbLLUJ1bn2aAso1zv4+Mnj9wHcZ8Kf2BOyeB5nXDmKVdJxQWDun+d3WQs9/z1A+1Yy2727ChCHzAwrlyKyuW2TXdZ7qmirUgRV0FNFAtoTUlnkluQuf24eH8p06aVcq7N7qElSLLn0+FkwIQOyeuJKLQZo75YZltY2w2DZw5LOn8y7lVPmOXF1XQEHSwxT6SRNVJ+JpGMjNF6FnYTAYUJwor1kVGw2tGisPk72+C+dO/U1FpdoG16BPx4tPR; 20:ffW8jo53SXt2o6CwN/Z8XInuQM0iQIJqRAMNt5JXIyiy5pp5brOQAQzub8uTqNOxgeow6Dz7MpoavEwQuakuS5vhAPpdDGB7MLJlc752meSHip7TadNSIb0iRPAB7bun3r5ki6VpxxFdz1PwRLg4nfNFSMN68G8POnY4GPTVtfA= X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jul 2018 16:35:05.1888 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b90110f5-c3dd-43ac-1cec-08d5e102ef20 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR04MB0387 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 v3 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (found 2 invalid signatures) X-ZohoMail: RDKM_2 RSF_6 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Me= mmapEntry *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 =3D qemu_fdt_get_phandle(fdt, nodename); --=20 2.17.1 From nobody Tue Nov 4 15:30:23 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530635841196822.2723823003693; Tue, 3 Jul 2018 09:37:21 -0700 (PDT) Received: from localhost ([::1]:41590 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faOIq-0000y1-Dq for importer@patchew.org; Tue, 03 Jul 2018 12:37:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49800) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faOGo-00088z-I6 for qemu-devel@nongnu.org; Tue, 03 Jul 2018 12:35:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1faOGk-0005q7-Gk for qemu-devel@nongnu.org; Tue, 03 Jul 2018 12:35:14 -0400 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:62998) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1faOGk-0005ir-8z for qemu-devel@nongnu.org; Tue, 03 Jul 2018 12:35:10 -0400 Received: from mail-co1nam04lp0049.outbound.protection.outlook.com (HELO NAM04-CO1-obe.outbound.protection.outlook.com) ([216.32.181.49]) by ob1.hgst.iphmx.com with ESMTP; 04 Jul 2018 00:35:10 +0800 Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by BN6PR04MB0387.namprd04.prod.outlook.com (2603:10b6:404:91::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.906.24; Tue, 3 Jul 2018 16:35:06 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1530635711; x=1562171711; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=ITeb9/8S0gESBsNy6CbMdhnty6HWgJlF9cXMBkVvOMc=; b=VUqbjYkI+mUqABegsUtroorCVtCDUn9JKh7T4wtbwrTj/9QXgyE8NIxh BSc98YWh6lqYdhZV/3/sd4dSTjZG1KEO7thMXXaEzMDMZppl2weMqGbG5 AQYiChgVbGesbW9bjvTqTBy1MTASfGuIdlGGrlkjkhXC6wqyeTpFm96Yu 43ULtOQ2QMGchvrjqZnT7Qzb5BLDNMYdR73y/g0p68dXxcInHZBM8KC7Q riCNFX5JkI9BLBF85XMpxUNToVGdbA872pIVVYK3qO62OTpa52wvpDUPj wkU4nc0kiu2fmuGRJ1y042QSgRCiAI11hYmv6XSDngsA7y1HUf/4eWAEX A==; X-IronPort-AV: E=Sophos;i="5.51,304,1526313600"; d="scan'208";a="84260503" 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=KB0lsHi1YglslERcaSRcvVlZAOccBgfiyqwuvHUP300=; b=TysfN1AAYVGKb2WLjq/1tmjoX1jmkHzRmbYBvGV/gRCX1SBGRpLOMy62qp38isz/dmlGoNXljanAUhGbOd9S+3BHIVZnm1ZhnpWusF8SK2ZzJPDoiDoWdqFOGtPo6F+LiCWUfDJoR3MKP0r40hFVFxAai56s7E95/e13m2KdG3w= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; From: Alistair Francis To: qemu-devel@nongnu.org, peter.maydell@linaro.org, mjc@sifive.com Date: Tue, 3 Jul 2018 09:34:45 -0700 Message-Id: <20180703163446.9943-7-alistair.francis@wdc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180703163446.9943-1-alistair.francis@wdc.com> References: <20180703163446.9943-1-alistair.francis@wdc.com> MIME-Version: 1.0 X-Originating-IP: [199.255.44.171] X-ClientProxiedBy: CO2PR04CA0095.namprd04.prod.outlook.com (2603:10b6:104:6::21) To BN6PR04MB0387.namprd04.prod.outlook.com (2603:10b6:404:91::16) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: eec97b99-0cdd-4be5-a8b8-08d5e102efdb 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:BN6PR04MB0387; X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0387; 3:+GDodexemuPKsRkzIknqSZY/wGkScyXoWvajswXMdPNdxtl1+mZ+WBgmUX2L5QHR3JAum4VlwXXY6lTptnK/xc8TUhKqAPBoe5Nf2G6xPTFfNH0TCyh+QrPzhNG/uQPNbXCQarv3jWmnkjzSh1+RdgqEZKxwnb0FbsF2hDmVvqIEzyA59iZ3nAeLIN1edMHE/VZbAa/VyzOXEkTg3gcLsStjRI0MQTQj2uXaRD+Uv+9iA7SQ2ZFZ40suwfGZqjGe; 25:ugZcoOAnUoFNFHYNnPoMVvtNhAtDcawcU6w+pmhJgkFLYgwiQGaFaXxzYrXfMedA0wSptLNtISV1bkxwvof9Rko3J0LN2wF5O/eXVxoVgTtSfpR64dU114aHvUde+drrMMZsZnJ1++4Y0qNK1hhxS4gq0SuUU8dg94u2E+a0JUi530pjtrCsiea7rU7l+NBuklPIDvim2uDFJKD8RGEaD2ZDICL9/gtoLUJvdcrAH0lpWT0ngFrO34Qx6axP/4kWECkCo8J9x7Yi2R7vWh5iKDQCVuYS7kaBdJa4XVYN1CAyLm9IsxvKfSib728HPSyVRF2cQdvPFgZAIhfGbBnQKw==; 31:AUaZzyOG8we5xgSiOD87aMj8miM33zAE/G9Kvi0pNfOOAyrL6BDDRwSkg9K7oUx1kMpsdw4BonZ+rbvQy31fJ5aXG34F7o4ppZQ6Qx844z56cMTO/f1/gg550b1w++zJEqccvq0dXq3iWNqc26OS6WzCdM9agMqUT6zIDg4CEpOm6c9kl1nF9HH63wCbLJxvaB8SQlms7SfaAlCWU0wbE2T9EYAzbYCJCLL3SoUZc3k= X-MS-TrafficTypeDiagnostic: BN6PR04MB0387: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0387; 20:1uug8nZecIjOheLFhxZYGsqmVxoeKCX6lzRsR6w6E4pEjWB+1yIwORgyCElkP31n8U3Q+QOf2qRoEtOALG+I1zmdueXaPRWsoUYaKe+3/vB5jK3qgJ/0I2PzhFowPn2Abin933ZnDcVG5m6fM63WPaLXJWNpYEeu9x98pjUMQhoyGW+FWO+usNK87vb/RgUzBKc2Ahp1RJGpGgKjIYyU/Fc/+ClyXHh97qgWUFzivllpL0NAd0oh++brr4g2U2kjFlwfuQufVAa6+HlDUcj4MdNr+fqfsmik2OqoAmu8KxQBju5ywJ8wNq/ny1/CgPnZBC5saUoymsjcI/GstqAvgIGm1uRcMucCzngzQ7+fEnkVPm91RzU/8XBD7zSILveovgsNpHtSvq3UrlCwuYNT9eD6V1Vkzq8+p0REnxTDZKSW9oxDLA7hN+0ksfKP3iHjRDhO/83zqNktlRJwcPrnMHZ2Af9Vh78+jyYubdlJACXaZjsUxZLxppOw7Ye6N1q+; 4:3Dh3UZJQmRyILzajd86Yd5cOATuzpOptvoTSSe7TqJ0DTfqAh/lOqnTHa+6fc9kfIB9SlUNqMgle6zboeWYOPXffltLcgezpp0T7arQm4AylZu+yNuvN/iPzTVZWnQs6UyFX/Jyvy+1mrJUYWZf5T2+ymTqhsVXIHbBmkc7LEbu1688uwA1CBwGz8yZziJ4oGsx47gybdeYUv/QY5rb4wcucfHOGsiMP6fj7X/6gTQl+L2OSP4IPOICl5qRTnkouF52zSxYZ4ySDXHPPf7goXw== 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)(3002001)(10201501046)(93006095)(93001095)(3231254)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123558120)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:BN6PR04MB0387; BCL:0; PCL:0; RULEID:; SRVR:BN6PR04MB0387; X-Forefront-PRVS: 0722981D2A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(346002)(39860400002)(366004)(376002)(136003)(396003)(199004)(189003)(44832011)(50466002)(48376002)(39060400002)(446003)(956004)(476003)(36756003)(6116002)(25786009)(5660300001)(53936002)(86362001)(3846002)(7736002)(486006)(50226002)(316002)(68736007)(16586007)(14444005)(2616005)(6512007)(6486002)(11346002)(305945005)(4326008)(8936002)(1076002)(16526019)(26005)(106356001)(186003)(81166006)(8676002)(47776003)(81156014)(66066001)(6666003)(97736004)(51416003)(6506007)(52116002)(2906002)(76176011)(386003)(72206003)(478600001)(105586002); DIR:OUT; SFP:1102; SCL:1; SRVR:BN6PR04MB0387; 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; BN6PR04MB0387; 23:CzhvBL9lZGmFzCJLFvoXQ/NZ7M5WNm+Uy6JsHDdix?= =?us-ascii?Q?UBgyI+DpRjyBf5kq3krE2iiKIb4J1I+C+Bqb3NePTuaaPKO1F8mXqqSO891c?= =?us-ascii?Q?w/EZ+MZB3SORLdve+rdOnpbu6IByIrDisM2j5i1pjADSgrjRgclK4o8vROo5?= =?us-ascii?Q?saWyAAJpMfZbXAvTGtg7rfLptRhssw/marz67kVCdj5AByPSw4PhW8luyYNY?= =?us-ascii?Q?FvfQIMI7ddXMUZoIvWiNJ/pDAHxtoMHPwdm8qlDBmnS1pg+kHPOddlhIXZVF?= =?us-ascii?Q?l9KXvccpnLuW/T+uJx3ZSm9DsP5OzkwSVQQoIKxEr8OYLuJH17u8uqboumGA?= =?us-ascii?Q?/HxoYNhzkMxixRzYzzdRuSJX5+1mqYqMmhmmnytaKBkVFd1Fz0zNMXnbM2cG?= =?us-ascii?Q?Rg48Jhrza+3enDE0nGcK6uVoIiTjwi9muJui1+RRI2eNYbxCQz6nbM2uat6v?= =?us-ascii?Q?/AfpqntX400qCGUqGRf9qIsn+dfFHzCaibJjvlARtErMzMP8xh621KAcX8Vh?= =?us-ascii?Q?6jLa00QtX6PFeK5l7olXsEDVAwZUNNUa4AchLZHi2ETEql8ub4cFhAQ09L9+?= =?us-ascii?Q?kRYLhKm6l2jnbH81u3rNg1p5TcP6NHsRDIiGDD+BOMSqpfA6yxlCfpzEPMkJ?= =?us-ascii?Q?FZZHcxxmz7W3EYoGhWQU/9uFCFl7JduZxhocH6CgVr7GWrVw+co8D5VYHx01?= =?us-ascii?Q?2hIPMtJ77QGWo6gKGmi6+rXvQgE8DHrOez/3VFiUghEJnUASm+BvGidhOajH?= =?us-ascii?Q?EEyUKmZmXXxTWai8uzvxwHkATP9LrPN2UNldK4701DrsClsNl93RsCU9edFN?= =?us-ascii?Q?WidDdPx7Eh72iaF1OmRS6HoOZkfh9G4fak1QALxTXY+njyd5J81t7L93wAZI?= =?us-ascii?Q?v/4FCL4mcs016W3IsrXoBsfLUGMEVucp2+Ru2RSFAq3qBiaD3PHBu71zIpj/?= =?us-ascii?Q?du198tu1XbB/n+UjgQCJjNF2+ApBLpDZpUxrqKW1KBKxWJQlnzkQJPqrBLvY?= =?us-ascii?Q?3RBEynDoZHOgiRjBzFItmXV0K3/O1uPKv1QS57jaytDl+eKUyumUHzgdTK20?= =?us-ascii?Q?pqIO+eNW40a1iWNoN/rTJMN9UM1mpQfwKlx9H6SOZw78uFLOlqQDCC6OwjoN?= =?us-ascii?Q?nwuilx7CUh/dwMkaAPnTEGXn9Qv7aPGcM649FkJSk0RWzI+HomZKIT3eJxvn?= =?us-ascii?Q?KggAlov74tPX1aWoDfUQaAKzZkdpG43QeyhCRrMuLw454914DAbu1pyxK5xf?= =?us-ascii?Q?kktrdUjscszcMKMasU=3D?= X-Microsoft-Antispam-Message-Info: b4YmFIgB3tVCSd8/6ERSP3OHGPCUVGV4T9pgqj/oyGfn6YvGyUy6bUwUzUyhkvR9rd0NP+PKkx9Dlc2ncXZT3RQMTZQVS+k+/KPg6TlU+CcJpXCb/ty6klIEdFeYHxX+eb/p9x3HTWJlaWv3yXY77t1AHMmWCNP/mRg3TrbhQVg8jrkNKgIdh05V2SO7IExsBrfmZ2S3WUJWjUC65W8bh7WqEj/1RJi0t3Xd1jwBlqltfSM8QEUP4ZGHC9pfItzCQUGO8TOxemiDZpg9r1OdFVTa0yfy0NdmRMsWwTUqBjwsqTaaMqDoLar9oacFj/MsK4tuO14S5SVEY75uLmqgaSNysSYn6y29CS8pidb8Gd4= X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0387; 6:mL1caa+t7j6VobwPnu6dNAehkm/IVykN/j4Hni73fLBMgd2Hp/Fp5N+SvT0zgRhVonuWJv7Y6kJkV4kteMbZRsDDYoUfwYXKmQmSy3t+TOFAEngeW80j6Vec4UgsV6nWTftyujBrnTm6uqgAW5OCI1yzYQI2D/yu5l2Rji8/TR5X0znO4xq/CFFZ+fOjFkrLFkcwzeCCRBmSmfA2oDayWn+xy4oN2rjVlUVnpx1CgdeZjE6oRKZ4Plsdgf93q1uTq61OhlG740xjYwHuwrgWCDcIitaK/0ohBZh5Adgl/+y9my4jyN8DJh05Qb03whnzKEcas0m+ndWWWxv83wgoZZ/9fzB3OsyS77vHgpha8L8rK99/8xthpsav+DDri2TTrKHy0W2EejKt1HjDF0J9aZBmjAgyb3mReqpSE8rivaHGMZ/M137X+HMZUFEx7DnLTGyj1MvdTKCc39dNHfyjzw==; 5:rL/8/Qysl4Rat6KHbO2JzqZbHIMD+kNkqyKaaXR0VGOf4ji+QP3XNAAY0qaRiWpZZMZ1YkJgblAzCFC1EsGfzY46ZzfGTbA7WF5yd3ZzBaQOCtJKS43TDHOHIoGAdzdLjL7RkZylpkzyboxym0ypvZ7PHM+MraiE+N3gOtGhs2o=; 24:+p4X+M112nU7TBPa1S4+/k8Z9vvQxQhTCXpotwCqEbYm5Cm5Np1ydHq0twRfK3nwvg2eznX0avSGHaeDqdgA/MxVdENfsyLEjM1GsJ0oZB4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0387; 7:2jvHec1o5NS4luGWWp7KrlrV/nsoEyraMF53ur6XMbVrBjKQ5LKE6jdTSxawwaNa4vZoeFFm3dPmi7+JoexMqEZP08P/tv9Y/W6HhVECe/VbCp54fH9jBgGqS9qjgx9ZXfzzn35v6y5VG2P60sP/AVgMnfm/S+DgsNCdc00nXrWjvBoUaA1u1D5DkpcjMQR1kzx100Yc/3Mp+5/djJyIc+MZhpPmfneeoUZmfXiLb5dCJLqRtMVUQ2yymq6BXNky; 20:Tr9kpJN9UsFR2eD8NrpYr2fbNmMV/+QWdSmJMS5iNXrYF5eiDW50pKWveW0s/fZddplY8vndouQ6W8J6xOgHMQa7IGxekG6x1VUjuZFV/55LrZ0eKQj9/FsG30e/NJKwRqqW7acPQ5g2Kpvk8BBRHsd00Ek0eszMFaifuqkBs5w= X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jul 2018 16:35:06.5420 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: eec97b99-0cdd-4be5-a8b8-08d5e102efdb X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR04MB0387 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 v3 6/7] hw/riscv/sifive_u: Move the uart device tree node under /soc/ 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (found 2 invalid signatures) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Signed-off-by: Alistair Francis 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 f71527eaff..46459cd368 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -194,7 +194,7 @@ static void create_fdt(SiFiveUState *s, const struct Me= mmapEntry *memmap, g_free(cells); g_free(nodename); =20 - nodename =3D g_strdup_printf("/uart@%lx", + nodename =3D g_strdup_printf("/soc/uart@%lx", (long)memmap[SIFIVE_U_UART0].base); qemu_fdt_add_subnode(fdt, nodename); qemu_fdt_setprop_string(fdt, nodename, "compatible", "sifive,uart0"); --=20 2.17.1 From nobody Tue Nov 4 15:30:23 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530637742757506.9557716427489; Tue, 3 Jul 2018 10:09:02 -0700 (PDT) Received: from localhost ([::1]:41828 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faOnW-0002Cg-1L for importer@patchew.org; Tue, 03 Jul 2018 13:09:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49810) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faOGq-0008At-4Q for qemu-devel@nongnu.org; Tue, 03 Jul 2018 12:35:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1faOGm-0005sG-70 for qemu-devel@nongnu.org; Tue, 03 Jul 2018 12:35:16 -0400 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:62998) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1faOGl-0005ir-PI for qemu-devel@nongnu.org; Tue, 03 Jul 2018 12:35:12 -0400 Received: from mail-co1nam04lp0048.outbound.protection.outlook.com (HELO NAM04-CO1-obe.outbound.protection.outlook.com) ([216.32.181.48]) by ob1.hgst.iphmx.com with ESMTP; 04 Jul 2018 00:35:11 +0800 Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by BN6PR04MB0387.namprd04.prod.outlook.com (2603:10b6:404:91::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.906.24; Tue, 3 Jul 2018 16:35:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1530635712; x=1562171712; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=tIFythTc30TA20epLQleSsAsB+4bAdI3ceDXEA5Ecyk=; b=TtEme73v/iR1TzfP5IU899NvQEJu5F1BoFhWPuKKt/L6TxHjXCGg7VVV PCfMs28ANTCprz6jKrhJguHSiooZf1JIcRjGqFtGpOrExVUYjtIzY8yby ImVZO8dFJ31egbJl/oe8uuAKA/lhlrkXh5WWSHtWJuM7zMGQAC8NydjKg 6Hv00yd1MuNbM/WljC6KkVcnDGGn3xrG6Qg+O7ntsWHamZa1CKkGxjBK0 +hw860ir2SIhvTjPdIfSODuXe4Iv2HtuL7nRFzStMPRza7t+MKffH559j qjjyLhNI/Csq0DAc3OEM4e6zSbPBek+qEOuNByADjkxcpYnBqPtudl3hn g==; X-IronPort-AV: E=Sophos;i="5.51,304,1526313600"; d="scan'208";a="84260507" 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=LFWSei7swbXasP0yCnBnrJF4TUhdG7ZMOa9gpknpcnQ=; b=K6eHQqCuNJ48L2Pn2W+gtMuCjd8R3Fm/ejZUgs+Q7KgOwSj34BBkmD2E4MJM20V1w+ajo69Rqff9waNru0nMaD6iWYy8w9obMlK5cr48GyxFwfhrfBf/2x8eksVGwOl+KdZm8LM1BOfLnKrhvlCFAOah9uqlnU6DnCcl4a4DEMA= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; From: Alistair Francis To: qemu-devel@nongnu.org, peter.maydell@linaro.org, mjc@sifive.com Date: Tue, 3 Jul 2018 09:34:46 -0700 Message-Id: <20180703163446.9943-8-alistair.francis@wdc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180703163446.9943-1-alistair.francis@wdc.com> References: <20180703163446.9943-1-alistair.francis@wdc.com> MIME-Version: 1.0 X-Originating-IP: [199.255.44.171] X-ClientProxiedBy: CO2PR04CA0095.namprd04.prod.outlook.com (2603:10b6:104:6::21) To BN6PR04MB0387.namprd04.prod.outlook.com (2603:10b6:404:91::16) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5c103a12-7b1b-4cff-fe6c-08d5e102f09e 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:BN6PR04MB0387; X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0387; 3:6/hvvZ0uALhE7B12H9uB0SPdiQX6NLBWp66+MZ6vQI9dKiG+44wXB66u/rwrd25fPqG45x2QG++eQwwd+tBRePyEYtZn8RrUpMsIlJLGJDJ7eN3K89jxMTIfQR4vo/j49LLSw3mhKUhPPibnc+fyFXczuRMezo3kP9tUBJJmNlYjNo9JXgyAexV+IfOftF45ne1lZbOH5x/qaA4SXGewR1T0AxAlIzLHagmSarNTQjOBtNAdNEa4ZBvDnvbZJhMo; 25:heNie8bH6eb8jVVdCyJDa9tGBeWn59OXw9+DgkgS2zOg4waFXigJAiFteR7ytkzT7tQgAlyF/xOaKFUYNAbwbbAtefUIMt6IFA38Vk5A5KJFMTiVt+Y+s9H0sW2f7bB9N588pctBMZrlF7+OstH4TtVAYXLR5rU5aQkbFqdffQGeEN3YqzABAWwSaLHlgEbUpHxzAIrgC8C6FGylXJUarDtLj+G/5v84Ep8xOptRKmELTB28V4phIrx3hn85BnJGP7lxfCmuLspWUQLYQa7cu8L2iobhmfGrex/A7knpa/lf2xqgqVcHQJEEQJFLkPxnEC+ZT2Qt2RnF+JWHAlbjGw==; 31:CX2s6Akd3lHyNELqpqNdpVlS/pwkUufpUzDUWyvPfdfBskfhXQcz7pk0PhD9qE9FejrNDmaPHz5Xo1S2CCMikwn23c6A1+Gx1lY+WI6TzK68Qt71lkN16V93VzmP3h9Xjxwp1DU2mfr7VVX0k+rtgvMQwtgLqcs10HBb0z9VVLkQFjpT8KEgB6RfN8JXq2haZDCa9+THSdqujwNMH6/bh2n7zVWQfMRu7eCUCGLcumc= X-MS-TrafficTypeDiagnostic: BN6PR04MB0387: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0387; 20:KrzWbXw1BeQUV8BTOBb1xdtEKdVR4rBwOZk8BooC6g0uxATaMNJ1PZuYeRlcCdXHnj5SNqIEuqh+iTOSd8BydowQhs3qsmYV4DhP8JIaJYixE+K35uNDfiJzueJNsjc+gU+ybwywJ9Aeq11T1FsdZ70qkYDpmG5pudBL5K4Yzh8BM7e8AKg22guWtgR+jd3A2ibVHe56xbvOfFgaWf5nUjnYVelGLtNtGOThO2EWhhq2cu405oZ9zNjPS0TRTjTTcdPlgV4bz/kzIMxKD1xT+8PQs0/ZULV83D0AIRufp2BR5u4fFdSLNkz6ZWLQSD690u4k02eI/yk2j/4e45r/F0tzMfDQW/H755dEieAg0iCh2wUZATA3hJf5axO9FAuvVVxZ6FJRULtvmHPt5eG6VbTzI6T6Ilfw/z7wwF7YQyN/ecHgnbPakWUcbNv7w2eWvIVWRDuTotNNfUIzC/rKJjqzsd3js3a2cr3KcVJXmRNPwrWQ26JArQHSE2WwH/Ft; 4:k/V0qAGMPSEybKV2hNjTleNKLtfHDaVV8VBeALCvvzWnzj8NkMfM+uvCELKHg+Giqz9jAlqbDD/SXUMCw6LOWcRgCvINXxLfxxGPFS5WnMdnw77wq8IFcFKF3UohxUMRkdW2uxI/MeoR4/Av7QvgehSoDb1eJ39xBCfZAo99ByrUH8tdiNw5mIaYwAzT4xWGaE8qpHkM8I6qYR7IwJFrlY4nJQ9o+0uJbxTDuBSq/brN99BqqKcKWQpXCdS9xIg8RMAYjbcrBhPi3xoOwmsPua59KtwO2sL0KQKCPZ1mtjCvQII91keVyCc+ODtSdx7n X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(21532816269658); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(8121501046)(5005006)(3002001)(10201501046)(93006095)(93001095)(3231254)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123558120)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:BN6PR04MB0387; BCL:0; PCL:0; RULEID:; SRVR:BN6PR04MB0387; X-Forefront-PRVS: 0722981D2A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(346002)(39860400002)(366004)(376002)(136003)(396003)(199004)(189003)(44832011)(50466002)(48376002)(39060400002)(446003)(956004)(476003)(36756003)(6116002)(25786009)(5660300001)(53936002)(86362001)(3846002)(7736002)(486006)(50226002)(316002)(68736007)(16586007)(2616005)(6512007)(6486002)(11346002)(305945005)(4326008)(8936002)(1076002)(16526019)(26005)(106356001)(186003)(81166006)(8676002)(47776003)(81156014)(66066001)(6666003)(97736004)(51416003)(6506007)(52116002)(2906002)(76176011)(386003)(72206003)(478600001)(105586002); DIR:OUT; SFP:1102; SCL:1; SRVR:BN6PR04MB0387; 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; BN6PR04MB0387; 23:e99yBAG0SI+iDP6OxutbFLGw+boHYC2zzkh3R/UQA?= =?us-ascii?Q?4iPWj0AHHnzcPSifcNvlqSFP2BWLkzKXinhy2tltOP/J77doQURIPW2AFSyj?= =?us-ascii?Q?NhSRqzHbnTrj21a8bTCJm86VpoHl01pTF6XyYSWOLczuxp0ECus7yEMM3LBR?= =?us-ascii?Q?betw3UGc3QNpKr336o58OXj9aA0Nlj4bfmHANQKTHiXwumDqdZBvf3tqESeB?= =?us-ascii?Q?8Yl8CjPhfDoKGJmkum7ATNZblFkVPGJ4B9510AWqgq5I/GVjpfKFU+FbN2SQ?= =?us-ascii?Q?4XNEkrrVGFGAD3WlV+NtRWyqi5oL7cf6o9VRvwMAXXsc+Sfk1j7dw1P8vEa+?= =?us-ascii?Q?iHIRr+mQTOrD1mIPSH0IolkZf6R6+veTtmJ1TyIf72ifgkQqu28Oy8VFQuGQ?= =?us-ascii?Q?BegFIQEeiyCHvGwY+PPJba9AkCtooVZk52g3x7NqjL1+jTcXF5TwodnW/2/2?= =?us-ascii?Q?92Bm6XO2jv55uMQ5wAZqA8oczx6jBz1h6ceEpbswAgxoIZY9jn3+M4Q7SDx1?= =?us-ascii?Q?m3ALotyrVHgLjOwebohznV1QPPo66SSmsNdcXqq5s4y8vCioigcjvFAYFZU2?= =?us-ascii?Q?r8CXs1VChBPO7LzyClf2hJIFnDyWQACbkS+ACaW0L7eLSuadDm/cr6uYsQxQ?= =?us-ascii?Q?UCUzkwWRz1Zjt25mCRDKC+IBzMZe+jsm1J27SUMX9iOAbbyQ079+e7TdOdUN?= =?us-ascii?Q?U8bs26J2fFtZfiBwxVv64V9QNj2gIoNnD41EKVh91QsCM6IytaPMz1kd8J//?= =?us-ascii?Q?a/wuaQw4jNq9wtekKakAieu4rx/jlaWpYPGiCAcvj3ftNEeLpP8dXXpnjPgq?= =?us-ascii?Q?ZDEEhG71SGzY2swJaaPUQmG/GDLvgiTro01saCGAvVZGtQV3tO9hvIJSjTUQ?= =?us-ascii?Q?lYV5120beOqGXAwqbZDjweXTTRdnuAwRWnI69BSpcqY1Un6/xtEdzruOyIxE?= =?us-ascii?Q?zZz6qWLiQGdQ1iM6Yu0ZuDz1PcaLX7ZkI7ItmfFhdQ6RaCc2PiMbebfES7Xn?= =?us-ascii?Q?Yf7sf9FHqE/CvrBZXhC3mZpjpwUKjlpBntEwoUJOdnAGY8vIUDKjipEHyCs+?= =?us-ascii?Q?XD09KuISgckXy4WZ4IOPwnsbs3T/xFY8rPES4vYZJke2y+QieJphx1CxjLyG?= =?us-ascii?Q?IX1ERHKMfrFAJAXRn66woJa5ou92QrfD2GT9xvPiuiCzEAkm7CXf2TL4Axz1?= =?us-ascii?Q?g0O+KMBmN/0vFQFiXEQAaSIrYvyigRFnbSl24Tp9cf7jl34B3YjEsBW/A=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Antispam-Message-Info: ajkNeOIogB4HXO5Cx0s1SV3vgZpLg7C+DpTNcZu4eoYgq2dKr1E+97d7ZTk99CxCXGUx5twz3Y09E9FdCV+bxyTWf1TKJpaKxob8KY8RJxrsuWNmTLs2qiE6hnXC8lgCZWuAE+S4gDFD9X6miNgQIgVtWi/UTLoLrIt87PIP4xQSojV5KCMOt672EsLu9/NiZqE6MX53GAIhrvsnR3NWE71K1GQchmATmhQ1w7rV6eZYJ/2oujlxYdyzCDIDmgLVZ57xZRwmWpi3qD3QB0nGg2/n4OhIlL6semfx+duP5Gy/1lWdt371k982cDog40mf86juiSV6v8pEFZpbQjq1l0XDjC4LC/3/QgD+Qr6mMDQ= X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0387; 6:wmhHcOtIC2JAWINTMGuxl2p9JzQoGF0ULDDSr8wtaL6EJdQpjgFrkZ08kpY7ZV9e2Z5OYQKOuRmSPg6Zivb3yhLT3Fps22+wRBEmp1iXr6MwYB8uijJD+NGr9Fjv0ALagx7KSaycVmvQAdXfPU+1tkq7sWAVGpAWRT+lZzOxdrC1VFtm0qjW4gtWZbQSEMk1KV5lI4ZeSWGILbq3geFuPGuIl0ZdwjHSRAk59AYs/BhZhWcMtLrAlzRUZzgx3+adDYv2VCAqaMGTcoFxnrt2Pq0sFigk6hxM5vMXuV8digGamXroNPbuz+4qNWb8V+WXX5a6619An/N/rSpaUDgUFD+7c6vAOsxSBq9eiTYFylDhNvgh35qnLiACLxs+hpwv428tJT9TGLHh15i4Z4sUtW+tLJJO/rOcOfJH7GhtxtOsxe1plo4CLtt1gjwLvM7KHWYn7Tj+gtxfgEnEES50ug==; 5:9oUqi6pobnCLGYPzxYY5Fef5J92GUYna7Vdlj0RKnkNiZMAisz3/BztV9XauPTEZX3z/NU065ajG3iJQK2r/2N5LEQlRLhzjfAjQ/bCF07aZMxBnf8YrG3lO0q8GQ3wkVSZBQaAksT3FZbeP7xtJ/aia739r4Lwb2sh7vkqqfvQ=; 24:WIVWGc21UY8l2L4H848/RldxlYYW9SpI/dRFw5frJOXQ+D0Ze2+6M3XcAn5gr4SJOq3A+uET5MrWbMmJvO0dz9bfcFGAs67e5ZISWTjLsQs= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0387; 7:mexZDo7/Tos8+0rNPXaydjc0P1qvH4SslGoH9NPOsfT1YYxAlGxqPfZlp04dzeC+GVqG9DNmhCwS2fqRmOVy0zR8rw0pj3STYc3QUaBsXEfPjiOiJT/Jkfm2CoYS71wqsmUL8L/W4iVUnTDoYurtdt5yS45t7LIHS/83hWUPjyR+l2LXkXLA/pk1VtZZVL+rpzyVPDCOKP2ZEOTEHyMpyq3asQgw6Do9fj8AD76EeJ3KR9eUJYeEfny3OGmiWnbi; 20:7uo0Hpgxjrmnm3Okfk0ez5DQPa2aJg33QT/BTgBuiM7O5vHxztooHBz4CcbSumc+bkGpEq6AiHsVaCaOncFcx4vNXB1WmUCU+CsUFo59oROjKOlQhBXw+s3UP/fiDrAgf0pevp4ZRVJI1Lqr+DmLN9HJKDLYsCPos5OlEQrsdjU= X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jul 2018 16:35:07.8122 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5c103a12-7b1b-4cff-fe6c-08d5e102f09e X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR04MB0387 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 v3 7/7] hw/riscv/sifive_u: Connect the Cadence GEM Ethernet 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 , f4bug@amsat.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (found 2 invalid signatures) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Connect the Cadence GEM ethernet device. This also requires us to expose the plic interrupt lines. Signed-off-by: Alistair Francis Reviewed-by: Michael Clark --- default-configs/riscv32-softmmu.mak | 2 ++ default-configs/riscv64-softmmu.mak | 2 ++ hw/riscv/sifive_u.c | 50 +++++++++++++++++++++++++++++ include/hw/riscv/sifive_u.h | 9 ++++-- 4 files changed, 61 insertions(+), 2 deletions(-) diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-= softmmu.mak index 20e670d99c..7937c69e22 100644 --- a/default-configs/riscv32-softmmu.mak +++ b/default-configs/riscv32-softmmu.mak @@ -3,3 +3,5 @@ CONFIG_SERIAL=3Dy CONFIG_VIRTIO_MMIO=3Dy include virtio.mak + +CONFIG_CADENCE=3Dy diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/riscv64-= softmmu.mak index 20e670d99c..7937c69e22 100644 --- a/default-configs/riscv64-softmmu.mak +++ b/default-configs/riscv64-softmmu.mak @@ -3,3 +3,5 @@ CONFIG_SERIAL=3Dy CONFIG_VIRTIO_MMIO=3Dy include virtio.mak + +CONFIG_CADENCE=3Dy diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index 46459cd368..1a06384367 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -60,8 +60,11 @@ static const struct MemmapEntry { [SIFIVE_U_UART0] =3D { 0x10013000, 0x1000 }, [SIFIVE_U_UART1] =3D { 0x10023000, 0x1000 }, [SIFIVE_U_DRAM] =3D { 0x80000000, 0x0 }, + [SIFIVE_U_GEM] =3D { 0x100900FC, 0x2000 }, }; =20 +#define GEM_REVISION 0x10070109 + static uint64_t load_kernel(const char *kernel_filename) { uint64_t kernel_entry, kernel_high; @@ -194,6 +197,27 @@ static void create_fdt(SiFiveUState *s, const struct M= emmapEntry *memmap, g_free(cells); g_free(nodename); =20 + nodename =3D g_strdup_printf("/soc/ethernet@%lx", + (long)memmap[SIFIVE_U_GEM].base); + qemu_fdt_add_subnode(fdt, nodename); + qemu_fdt_setprop_string(fdt, nodename, "compatible", "cdns,macb"); + qemu_fdt_setprop_cells(fdt, nodename, "reg", + 0x0, memmap[SIFIVE_U_GEM].base, + 0x0, memmap[SIFIVE_U_GEM].size); + qemu_fdt_setprop_string(fdt, nodename, "reg-names", "control"); + qemu_fdt_setprop_string(fdt, nodename, "phy-mode", "gmii"); + qemu_fdt_setprop_cells(fdt, nodename, "interrupt-parent", plic_phandle= ); + qemu_fdt_setprop_cells(fdt, nodename, "interrupts", SIFIVE_U_GEM_IRQ); + qemu_fdt_setprop_cells(fdt, nodename, "#address-cells", 1); + qemu_fdt_setprop_cells(fdt, nodename, "#size-cells", 0); + g_free(nodename); + + nodename =3D g_strdup_printf("/soc/ethernet@%lx/ethernet-phy@0", + (long)memmap[SIFIVE_U_GEM].base); + qemu_fdt_add_subnode(fdt, nodename); + qemu_fdt_setprop_cells(fdt, nodename, "reg", 0x0); + g_free(nodename); + nodename =3D g_strdup_printf("/soc/uart@%lx", (long)memmap[SIFIVE_U_UART0].base); qemu_fdt_add_subnode(fdt, nodename); @@ -296,6 +320,9 @@ static void riscv_sifive_u_soc_init(Object *obj) memmap[SIFIVE_U_MROM].size, &error_fatal); memory_region_add_subregion(system_memory, memmap[SIFIVE_U_MROM].base, mask_rom); + + object_initialize(&s->gem, sizeof(s->gem), TYPE_CADENCE_GEM); + qdev_set_parent_bus(DEVICE(&s->gem), sysbus_get_default()); } =20 static void riscv_sifive_u_soc_realize(DeviceState *dev, Error **errp) @@ -303,6 +330,10 @@ static void riscv_sifive_u_soc_realize(DeviceState *de= v, Error **errp) SiFiveUSoCState *s =3D RISCV_U_SOC(dev); const struct MemmapEntry *memmap =3D sifive_u_memmap; MemoryRegion *system_memory =3D get_system_memory(); + qemu_irq plic_gpios[SIFIVE_U_PLIC_NUM_SOURCES]; + int i; + Error *err =3D NULL; + NICInfo *nd =3D &nd_table[0]; =20 object_property_set_bool(OBJECT(&s->cpus), true, "realized", &error_abort); @@ -327,6 +358,25 @@ static void riscv_sifive_u_soc_realize(DeviceState *de= v, Error **errp) sifive_clint_create(memmap[SIFIVE_U_CLINT].base, memmap[SIFIVE_U_CLINT].size, smp_cpus, SIFIVE_SIP_BASE, SIFIVE_TIMECMP_BASE, SIFIVE_TIME_BASE); + + for (i =3D 0; i < SIFIVE_U_PLIC_NUM_SOURCES; i++) { + plic_gpios[i] =3D qdev_get_gpio_in(DEVICE(s->plic), i); + } + + if (nd->used) { + qemu_check_nic_model(nd, TYPE_CADENCE_GEM); + qdev_set_nic_properties(DEVICE(&s->gem), nd); + } + object_property_set_int(OBJECT(&s->gem), GEM_REVISION, "revision", + &error_abort); + object_property_set_bool(OBJECT(&s->gem), true, "realized", &err); + if (err) { + error_propagate(errp, err); + return; + } + 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]); } =20 static void riscv_sifive_u_machine_init(MachineClass *mc) diff --git a/include/hw/riscv/sifive_u.h b/include/hw/riscv/sifive_u.h index 49f1946539..e8b4d9ffa3 100644 --- a/include/hw/riscv/sifive_u.h +++ b/include/hw/riscv/sifive_u.h @@ -19,6 +19,8 @@ #ifndef HW_SIFIVE_U_H #define HW_SIFIVE_U_H =20 +#include "hw/net/cadence_gem.h" + #define TYPE_RISCV_U_SOC "riscv.sifive.u.soc" #define RISCV_U_SOC(obj) \ OBJECT_CHECK(SiFiveUSoCState, (obj), TYPE_RISCV_U_SOC) @@ -30,6 +32,7 @@ typedef struct SiFiveUSoCState { /*< public >*/ RISCVHartArrayState cpus; DeviceState *plic; + CadenceGEMState gem; } SiFiveUSoCState; =20 typedef struct SiFiveUState { @@ -49,12 +52,14 @@ enum { SIFIVE_U_PLIC, SIFIVE_U_UART0, SIFIVE_U_UART1, - SIFIVE_U_DRAM + SIFIVE_U_DRAM, + SIFIVE_U_GEM }; =20 enum { SIFIVE_U_UART0_IRQ =3D 3, - SIFIVE_U_UART1_IRQ =3D 4 + SIFIVE_U_UART1_IRQ =3D 4, + SIFIVE_U_GEM_IRQ =3D 0x35 }; =20 enum { --=20 2.17.1