From nobody Sat May 18 11:46:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530840427915810.5369808601527; Thu, 5 Jul 2018 18:27:07 -0700 (PDT) Received: from localhost ([::1]:55396 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fbFWd-0006ft-2U for importer@patchew.org; Thu, 05 Jul 2018 21:27:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36322) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fbFSF-0003CJ-KC for qemu-devel@nongnu.org; Thu, 05 Jul 2018 21:22:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fbFSC-0007bB-DD for qemu-devel@nongnu.org; Thu, 05 Jul 2018 21:22:35 -0400 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:4059) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1fbFSB-0007Yv-UR for qemu-devel@nongnu.org; Thu, 05 Jul 2018 21:22:32 -0400 Received: from mail-dm3nam03lp0019.outbound.protection.outlook.com (HELO NAM03-DM3-obe.outbound.protection.outlook.com) ([207.46.163.19]) by ob1.hgst.iphmx.com with ESMTP; 06 Jul 2018 09:22:29 +0800 Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by CY4PR04MB0393.namprd04.prod.outlook.com (2603:10b6:903:b1::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.930.19; Fri, 6 Jul 2018 01:22:26 +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=1530840152; x=1562376152; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=QWhg1p1BChcAcX9AgSYSYl1QatFWlIH0Ss6zSCGjZMc=; b=MtWdh6MNQc2lZFp7ldC/KtVKPrEP4HB9eZll1kEwb5/6SShj1krXZsPW qmj7aOK6hCeAvOlwk6iDsWhStaohi0eVxP6aLw2i9K2DhPHmOoE5d9WLC 9cBRNiOSgd3oeyBKvL4vLTTLFcQr/ULlDdHLr+YkIWqZiDuFJZEA5Lrr3 Mt3PS70is7C1yKpupY7dPHimHHmpLyxX2f8g7Gx6eeoGzul70bey9oUpz H5fxoFVPd0dPAmw+FdmiOTM+KLSQEP9AMAzkcNgX1oyr7AsS5Ab9P/brr 8JTkCG0bt1ri5xYcwD/N8ecevnPc88DOniPpx0ywSDGUpPEJERFSkGKmM Q==; X-IronPort-AV: E=Sophos;i="5.51,314,1526313600"; d="scan'208";a="84619618" 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=skviYfk+LZZPyxCx3/sRdIER5zki4NewNUODfiGjzJc=; b=PsaKczl+Dho0KK626Hpe+DI6w6P4tY6YgE8CArqSbgJ4c9D5ANphhDAR1nu1mViSWzMFnBP/gvIHmQdsW9T9X/VQulBEnDs3EcmJM/d5Yn56YgbMmqprYG0G8FKLjipotIOvlXKVghX2QRjI7B9uPPiZGUegWpFyoM7+WK6Jo10= 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: Thu, 5 Jul 2018 18:22:09 -0700 Message-Id: <20180706012215.21714-2-alistair.francis@wdc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180706012215.21714-1-alistair.francis@wdc.com> References: <20180706012215.21714-1-alistair.francis@wdc.com> MIME-Version: 1.0 X-Originating-IP: [199.255.44.171] X-ClientProxiedBy: CO1PR15CA0105.namprd15.prod.outlook.com (2603:10b6:101:21::25) To CY4PR04MB0393.namprd04.prod.outlook.com (2603:10b6:903:b1::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 999602ac-d60e-4bc1-7a40-08d5e2deef95 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(48565401081)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060)(7193020); SRVR:CY4PR04MB0393; X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0393; 3:M9Id32hn8Nlj5w4Npj5oekTA7p70KyAoRlTe9lx3KcvGaDtF9K8uKeSKgmT/Kn9oc1D/HcowNsosB2do+LlMRZM80QQoDoLTTHTlitAzxAqXQLNmsnfhEamCioXOK9XWWz351f261jdb9sgB0AWOHtMxknuHfifLToCv+MovQ0Bdh22+MQwLO9/sDe7PJDmCyg+hplLsQVB7aqLfHi1cnHrgssh9OPhSxMaqbaMRG0hIzlqa7i5Xd2WuEVx2uPN6; 25:+p0qHPJlC2OOyj0Vv6LAMxVicD4R4J4Yncu1/thIvd8JQRlR2EKuTd9BBr7haVXs2fBQCSb74GnGz5rbTchb/xrady72j1guMs6AnNhcquFEvCHDJy+jg9nPUg5GRY19Xto0NIyp4GK68Qi+e7E1O8PKYlNfT2JnDiyFlyQvjPBEJD0k5xz9pGLeNggB8CsgDmAH6FmD5cKXdLf29a6lHgcwurANJmKyKSCnQGb3Btc5voGeow9P8Yb+Vwf+7nyakARRdqjwArMbHjMf2FOLhvq+t+OH4ICvtV8nOiBd3jM7MRiydSRsLgA47BY91mhgpmCFOJ/p74nWqNOrPU6UAw==; 31:Kj6sN7lmrjiYBIuwAL9qOp8DRf8qXHKaijc9QUSsLLV+zy+XYzDL82MkA1ZoOPGUaGF6abDlTECC3BI5rqc7k+KD0rotOaYGUtK7y0zSkk9GaUy6w49K5ZlG2QookkEJSojNHcCyTLXm7LLnHnilNkysAs+TZnfEYmpgwUHe7txt+VaE2zBwd1QuE7hztwlb2i2pSzZJabFslUJSOISY7bhjN4NkBh8y3j1Ts9p43Y4= X-MS-TrafficTypeDiagnostic: CY4PR04MB0393: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0393; 20:F7EOQNCznIy4LH47sco1IUWo/bt1KMMO9LdFp+37TWmvEWFRiqZqU4J8iOhPkvHlw4i9qb9sjCF1t8gXIo05d5siUy3dDVx6u9RK/9JQwJ+o8QHDRtS9WsE+zgOrN19r1bK7P9IxpSdymdP8VUYDynR3CEv3xmbsQBhAdQRhRzNMuybGH4jodFYHQAmn5sEhbhPkBNmriC8sWqTFbvq3XbhO2kSLhvLAidZm1VmGZtYmKEYrqi7AQRJsRFkGVWBnHUraH63Nzj/JMrmfQKdZ1+Nt/wd1ssWnT+zRGwIlPsgIxhTbXpmbwFlLuhS0MawQNalfeb8e54mer68ZdpFJ9Je5rF2UkIBhfmNGBIt33pp/w5WwMTPzVgknKy81uhcb8iekoAkS6u1joWrXf3WEq732RVpvwv0KTbK7iN7kLMWOSS38mAGT7tJCJLSs2bXqDFcJRcYkoDdMBOgyKdwiX9LhqgkL+V5khr2KAURl6okJlTxc8LEanHyTIDIo2sVi; 4:PH5KxOwwyDsRWxosnoOxMfAT6+222Cfmga5KWo7q1EG9TwmOuWt9/w53ZrNkyB1jF++7RFzkw+TzGs/3tF2KDGbfQ54a/4JSZVWzg4hCC1ImVFRJRGpu7vHWmkioDddoUDRnKfX5Qufzt6GZ6YoMRkh5n8i+cACIvYcC0WiHYXoxMSGL8FPlFSshQlanH3nP+plaVLrA5EWYsq9oN1FwCGozc3UFoI24GHMWnNKOD2I65xHdRn3G8OGewMF6E818BeU4qdjq49ODUJxLSZLhsQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(3231254)(944501410)(52105095)(93006095)(93001095)(3002001)(10201501046)(6055026)(149027)(150027)(6041310)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:CY4PR04MB0393; BCL:0; PCL:0; RULEID:; SRVR:CY4PR04MB0393; X-Forefront-PRVS: 0725D9E8D0 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6029001)(136003)(366004)(39860400002)(346002)(376002)(396003)(189003)(199004)(53936002)(68736007)(50466002)(48376002)(97736004)(81156014)(81166006)(8676002)(8936002)(3846002)(6116002)(44832011)(106356001)(26005)(186003)(76176011)(386003)(16586007)(316002)(16526019)(2906002)(51416003)(2616005)(52116002)(11346002)(476003)(6506007)(956004)(446003)(7736002)(6486002)(1076002)(25786009)(72206003)(50226002)(39060400002)(105586002)(36756003)(6512007)(478600001)(6666003)(47776003)(5660300001)(4326008)(305945005)(486006)(66066001)(86362001); DIR:OUT; SFP:1102; SCL:1; SRVR:CY4PR04MB0393; H:risc6-mainframe.int.fusionio.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR04MB0393; 23:6AIhpgUBIpCwBFuKwl5BVEodtobsjVOT8U/YLE+Wd?= =?us-ascii?Q?AC5zrhIVcSlEh81i7mYckTEpe14NYZvTn1eXY8sUMqqQT3PW2CIGnxqbswml?= =?us-ascii?Q?nzC20ZgnfVGP5S5Hx1YLClgI/LEar09vrRWXNaM6JD3MGd7l3xt+G5HAqtdO?= =?us-ascii?Q?GoEWPiDHtrHFkI/s7d+TGOtU3PWZIMe/CDW2Nw3DnKjkVFJFl2V4jRg3tuZs?= =?us-ascii?Q?kpnjrSRllx4VthavnXsd8GUnfPL67PY7wb3FgpPCk6Mz665+wOKkFNhh4znj?= =?us-ascii?Q?bmYpR/RISzX12PYTaC4tkWUMARoBAHTBdVht5kp8JOmpOjGqzltw1cEMzxot?= =?us-ascii?Q?W5p0iYLgFUXH+0D44h3dVE0vRqpiZ4TFhuHFCZQMu4V+UasLHhIu/+7msKCQ?= =?us-ascii?Q?OKP/nPluZap+ZDeyM8s5ShzfBOfeamwR8I/+6cH3UQcTjBui8PVOPw0nQQDS?= =?us-ascii?Q?zVYZZsrSvxGO7SOsRTTczWA0odsgPVp9BMCuSecwdtzKuD/BwXA4pr+1g6Ia?= =?us-ascii?Q?+nNBhAWySktyxuaC6U9SfJeV8q9w9IQZRJd4fdTrfA1bdvd9i2JEi/9JX9Cy?= =?us-ascii?Q?ETesymz+Igm58ezB5UIjgqvCplkGb2ksMdVgoF4+xjmf35MgtkMvv2JvKcoo?= =?us-ascii?Q?AD+FQ87xwNyFhMhd7Wuxm3Jd7p0lHG/sK7xVvrU0O8Jejqog/753tMipv1Vk?= =?us-ascii?Q?GKmoq0WIDHmwqnyyJSbv7vXbjxgdsiLnLkxbYMfzbnHOPKRZ4SslUFgvJfx3?= =?us-ascii?Q?EbP8ZFarjlRswSRzAIntoXBnFGBnNzFjCBBJVcsm6JLVLmkpmWHCP/sq+5Xz?= =?us-ascii?Q?dKUZ4wRcTxqqLWcRmEK4oZUc4GfWM/7+xwEMbxHTICPrt1u4zejwh+lfkfff?= =?us-ascii?Q?Qni03ipFnpLP9Ob973Dwbm4Y2LnDe5wx+UBCT//Na9vxU59fkh4OzoN11lf5?= =?us-ascii?Q?32le3K4xVb9HIeBAhFYAO5ytKX/1FlXh2d2tokDhadGQXwnLPh9s8BaXddI9?= =?us-ascii?Q?pyIEucOstZGr952oxaf6T1ynwFL7uOdlsGCmwa5OMz3/UADLz8xCMPEAJ14W?= =?us-ascii?Q?lYwF+vhdqD1fqR0lMfuxD5r4/c/xJQdejel/+5xzcVujX+bL2kL5N9fcte/r?= =?us-ascii?Q?QSNqkWywNy+CRS37asm5tsAskeRDAB6NnG3Zivbu4aDzJM8iDHp6ojiID3TU?= =?us-ascii?Q?mwf1UyTgQCJB+z0heuGFgUqXvTW71pSkkGsg+Cdb+d6lZivRDETVw1KnJGI+?= =?us-ascii?Q?nLxc1nP4n/wzW3x+BQ=3D?= X-Microsoft-Antispam-Message-Info: SGcsfRo9B631R+KN8XPRtLRIXqQID/DI9FcPsNT9UnFZkzU/xuUnjOCrkCxUOnFL1Hert9E3YUPa7JqO2LGPMvevkf/uIZM0bpo4Phal8wTmVlyCdlUJL93GX5Kpq3R7HCs7RFdVJt+rFypMJmXZwlmfffymADF45Be+N0EcGWbEaix1mxHjs5l+X/CPVxbbFANlthSBohrRq9zCpcLKaSiN/x2kOHe0AdOJ6Chd+2LNF9b6apk0q5njiCuhT/9z+XyzgqIeqF/Eolzo2hQe1N350SCclkao5WyocqaEju78PAmLqtKegHz03IeiVfmr6l/qWqCmpCvKPWit6S7p2zPpwYI6lWR5CmI8NkLEdQ0= X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0393; 6:x5KrNQjhRmgNrh8wTkx5Q0Xx9pBCHam7OLykijyb7URO4UUhsVErHGFIxPRaXaN53Vkbx0WyGWV0B37iH/NKnKV/ryrxYWSq5Ka9MB7AqJoHXLxFBonQBTyFz75dzu1wsf9aC2pM5OpF+BDEUvf6ClLZXLeopwInQ2nA83WOjM5ZfWaUEzMizSYTMHuBswP/eQLvtAa0yJjvrIFy9BImy4+slmEKQB19D3a5rZd6H26wTRXBjdJPjGZ05fa3Ea7i8vDuO8qNuOvr7a9hZf54s37Tk7XilVvFFgZyNeLfBWFjw1qf9jJyS/w2NOR6Pr/s6OaclcllVm66ImCIY3BV/PNBBl6VXJQJMIfxLGZm2WISxsQLFBZqRT12poP7BFVuvjM5Y9nYF7BMWtaqCo+HZ7rQPycFyBfEadeA6QDHZbmGQQ31o6c6sXDz/Ck1pS7y86n2QpzV8myZ5udtzB/klA==; 5:c5yGSQyOFfmpSbLye4oKmPjiSi38v+eW4CVY3lWf0NSw9+ibF5BdSpIbGUYel+C5RwLS3LgoR3eF1npoMrPRjXtDO1q5B3JqFWIOSqNxXN/+O6VdqWU2QOpR7u4dJtRW5nqLw+ZK3RvVpUd4oz6gdMcOTocQuSKEyNuCw9+8Y9M=; 24:tCS7swWU31qhGWenYqS4idr5kqiJmEQ5Wx3fz/p8B9BfrQMYWYPXSv7JmHrRhUcy0uw2mWqgEGLVDcziYHHdDkdcwALO7YqtPQKYtNoiMgs= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0393; 7:yjEQiym4TtmdkRDU1RrFRhap0CriRHTqRp1M56lUya6gPCS4mSRFYIKL/TKdOrNn2Vked5gi4kNkaz0qDM57ZDleqZpjuYbapqlcjrKRDT1t7SS4fyraUnavoBiuOKUDYD9Seg0cbCeNLglgKz0Yd7jk/fUE3e5c9cZUpGJP14rECqjwa/h4Q0fzas+pkbZkOR6b9PHekRrhyjsK2DewKScRSmtSaWP8xcUIgclw3qHXBrokqi3tzC0U6u+mcui+; 20:MDDKeti5NqBBxXWAhM99mxqdTq/LRGEDGobUwJLhdaroMi5zf17oA4rIFDvrp7Ipbc6KrCEUpXz35jv7+gggz9BLfEtC3DATOfj7Eu0CA3WdlCvY2oDHLgT9wMq+1de8rHdiy/wSC/lEw9VVKu1tJMV/kaJsCTKoT7YVILEEBAE= X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jul 2018 01:22:26.9207 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 999602ac-d60e-4bc1-7a40-08d5e2deef95 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR04MB0393 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 216.71.154.45 Subject: [Qemu-devel] [PULL v4 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 | 87 +++++++++++++++++++++++++++---------- include/hw/riscv/sifive_u.h | 16 ++++++- 2 files changed, 79 insertions(+), 24 deletions(-) diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index c05dcbba95..e2b4f97b10 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,36 @@ 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) +{ + SiFiveUSoCState *s =3D RISCV_U_SOC(obj); + + 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); +} + +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(); + MemoryRegion *mask_rom =3D g_new(MemoryRegion, 1); + + object_property_set_bool(OBJECT(&s->cpus), true, "realized", + &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); =20 /* MMIO */ s->plic =3D sifive_plic_create(memmap[SIFIVE_U_PLIC].base, @@ -314,3 +333,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 Sat May 18 11:46:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530840287676724.5150397604763; Thu, 5 Jul 2018 18:24:47 -0700 (PDT) Received: from localhost ([::1]:55380 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fbFUE-0004Oa-9h for importer@patchew.org; Thu, 05 Jul 2018 21:24:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36321) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fbFSF-0003CI-K1 for qemu-devel@nongnu.org; Thu, 05 Jul 2018 21:22:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fbFSC-0007bc-O4 for qemu-devel@nongnu.org; Thu, 05 Jul 2018 21:22:35 -0400 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:17069) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1fbFSC-0007YF-FB for qemu-devel@nongnu.org; Thu, 05 Jul 2018 21:22:32 -0400 Received: from mail-dm3nam03lp0019.outbound.protection.outlook.com (HELO NAM03-DM3-obe.outbound.protection.outlook.com) ([207.46.163.19]) by ob1.hgst.iphmx.com with ESMTP; 06 Jul 2018 09:22:30 +0800 Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by CY4PR04MB0393.namprd04.prod.outlook.com (2603:10b6:903:b1::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.930.19; Fri, 6 Jul 2018 01:22:27 +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=1530840153; x=1562376153; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=UsL1R6nSk9FCGDgbxZ6vZCfnhhAQE1GCwXF3PmZa0KI=; b=I3mBp8K6IXOXN8NQ86DwsR9NYCOLL0DFraEa9sca5TwChPteb4m+mPnp f8jZ1C7S2tBnQgzfYBl2TKZrqwk/ZonqT5Q3E9Me6cVw4qtQChL6TRCZ/ TJ58Y1YdjIPEJenfcGUev85TSennaiMyLY2hoPVRSZmWB9vVH/isT4K+x y9ESGAElTvMzkL3E0P0lxpx3EyBLK5e6t9+N+F3smh3f2Nuz5/iRr/0WH tKChljX+IpACgg2WKBCTkoSdya17fylpgxt8YHJMvMp6GEqwe4tzs1Jmm NaZ6LpFvv7W014FVxV3RJDPCQV07TFDeqU59DphyJEUBr16aYJFTw2+FF g==; X-IronPort-AV: E=Sophos;i="5.51,314,1526313600"; d="scan'208";a="84619620" 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=zdTRgHk6FaJF9RUEd7X5gPInSKwZr+GZNuE0/EV31Oc=; b=S2AY7nC/oJwVe3d8c63g/FFy733KePCObivfPtjVEpwNYO1YzJRfys0sjv/JunmK3ONZwJvloecQ3fqQoe4vzWU4gvJO7NaO0JL3mFK9+uEZbjV1zRdg7LBUUR/o63x+p9+VWyyvNWwqGyJ+ut7ERd5pEdheSRkxPpxrM/VUzVA= 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: Thu, 5 Jul 2018 18:22:10 -0700 Message-Id: <20180706012215.21714-3-alistair.francis@wdc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180706012215.21714-1-alistair.francis@wdc.com> References: <20180706012215.21714-1-alistair.francis@wdc.com> MIME-Version: 1.0 X-Originating-IP: [199.255.44.171] X-ClientProxiedBy: CO1PR15CA0105.namprd15.prod.outlook.com (2603:10b6:101:21::25) To CY4PR04MB0393.namprd04.prod.outlook.com (2603:10b6:903:b1::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 739b402c-d8bd-4778-0780-08d5e2def006 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(48565401081)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060)(7193020); SRVR:CY4PR04MB0393; X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0393; 3:SOGjeoQYeFIiCCDncjTpU9Iuh2tuE3OmN0KE0c01wW/kAqcIV4Dg0VgBuYVzw/guyQPThJH+fXjWTJgCEpJvjbSE5/c9fKudXQZWVT6mE0fnW7xPiqK2nRKd2VfpXkHC8kGh0fL+H634hQZypeEKGTbQ93svCpWXH2vc137m0CDjAF47mj1ulqL+cNUdrJRMhbUaDQF44LTL/bOjbH3oCMDRUV9rF1HkVxVPqs4NVQ18CftnYRuawaBoavjIClLk; 25:/f/OqPg4CNBBYa9gdGpvrJJ7OFuCyEwAwxQMuk9phAMOaTCchq6rhILMAEIX65qaxM2IWk9QYfPo0VS7rT5QiiIj0upFoIs2hYiWqUlElHKvRv2/lpQxUNM0uylPBfIm4fAqSe4YT5dmiJs+euGx7KCYyBdHXvDffIhl+5P+7j638XT9r6w/YdICPNbESFquS/lU3Z5Jhdu+ox0rN8HcJ1AitUfjYr8Zqag6yk7610kzgoLAwgEG6meiAyMxlvbW3SY25JHUHse3gVYmZ/jhT/NL14JUNTPbZrwHQfczUwtC5x/AJdTu+NdGTrEnIYT2Gl/4VyI/LA556/7A1th1Og==; 31:LYOzXddU7O14dyI7PIlduBhBaYg6Ano36DDyDzfv1MBUR+83DvnlUiXCxIHA/LaGIZwHP3YfedDO4gQicyHP/abptFXpGt86KHdaa1pP8cKW1eqfh2kxVqB+OJyYJTR5lH+PWjT2RBbopagfMwSjmr2LsCRD4EhvBhbk1tNjVh0EavMPxmfxMgC5r5WXVQUPUpm2jCGjf+YAL8Mhq4W0HUPu5gPcurkKwLgTpZ5A59g= X-MS-TrafficTypeDiagnostic: CY4PR04MB0393: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0393; 20:odYe7aiwKS2voWFUoo7KpTLfDguVpbV5Yn/szrkntdffCbNdkKKa6p3H2jbjzeIYrmHgx/HpPR9kH446rqCDTINrbqOmn7RRP0aLkpZK2NG43u9mrcIu/+dIBWHQy3j+6JF3EgyzC1jlM+9ndTNhpapgmFE/oNjeFWfW/aWmLgBbtZV4sQ0aMbl4efNr7fxBVuweyea3LuETvO2SXaKdVGNVTAlVnZDSjhlMqAcwbggyDmhiwTUhFahGKHTNrqgrHVaURObVa9UYLcbH+qPI99RpyVvONuLCy5Y3awMeqRawtIzjvItce/ZUcrgKpH6IWUC3tfukQ2uZiAk3DpsEA/A7HdnEIfOyW/buT9h87CTsI96/gfYmrXwTqMfSnBlXNcqdjBGlJRK0O9Hgcy4eV+/aLFKggsxDh6OfKMNZGwM37rB0pYQoDWJh5niRRDjYKWet7tnyv5y9DOBJcHhDJm9tYqA/KO3uK/UPXpeupjc89a+2GzqaR3trxuoNPZ9K; 4:/MKqNZOzDGfbAUm+3dslfMlu6CVcYe7zBmZzjxh3oBeq50TY33BuJXUuVM0Gt780qV4TstICaeXavv5vAqCXAArnIczK8aG6Fu8UyEbvX9WToeqflGJyPOpV0pKf/YuMpVO9RTURtRYfS8mVOmuAjkL58UgQzrPirQzS+ZZldLbK/J7HE/VitYiJGXRmThbGup85Sq1Qqt6l/xtoRR024G4ZPsTDK9blnPMbcZJdxE2dgO0lh70Gi1lWcRzYjewRwYZKxT+9XruB6SadzqFHqA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(3231254)(944501410)(52105095)(93006095)(93001095)(3002001)(10201501046)(6055026)(149027)(150027)(6041310)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:CY4PR04MB0393; BCL:0; PCL:0; RULEID:; SRVR:CY4PR04MB0393; X-Forefront-PRVS: 0725D9E8D0 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6029001)(136003)(366004)(39860400002)(346002)(376002)(396003)(189003)(199004)(53936002)(68736007)(50466002)(48376002)(97736004)(81156014)(81166006)(8676002)(8936002)(3846002)(6116002)(44832011)(106356001)(26005)(186003)(76176011)(386003)(16586007)(316002)(16526019)(2906002)(51416003)(2616005)(52116002)(11346002)(476003)(6506007)(956004)(446003)(7736002)(6486002)(1076002)(25786009)(72206003)(50226002)(39060400002)(105586002)(36756003)(6512007)(478600001)(6666003)(47776003)(5660300001)(14444005)(4326008)(305945005)(486006)(66066001)(86362001); DIR:OUT; SFP:1102; SCL:1; SRVR:CY4PR04MB0393; H:risc6-mainframe.int.fusionio.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR04MB0393; 23:JDix8P/FM3kB3CcixMtqpspTHZuvYKoU4SJK+xHTf?= =?us-ascii?Q?+9ljFx2flhdlaB9YjvvCKhg+R/9F/BLR/QJv01j+a4emizQzcirg3vzx7ToS?= =?us-ascii?Q?EPiwJiCevbkalQcY1zoacLtkNvM0hjvkt/4CGK0K5KOrur4MteX9ZKoK0MMT?= =?us-ascii?Q?a5z0sP06ilD1zUiFoZ9iPhsTNYxBrk4NjG3uXaF9tR5ebasfe37azN6kGtoR?= =?us-ascii?Q?w50oPeTcA+S69vPgYcy33xi51rpzixwaRJBpdWaH195KWYgUF+jzpZ0Wn2fE?= =?us-ascii?Q?0FNaF3WYwPdK6PaqiLlVpahp2RrC/0wJfQv/exG2lY/nanKA3gGHAf16xuJx?= =?us-ascii?Q?9Y81m5NN/G5dPV14g8Vz6JeniX7zQ5cCPpr+tCqElh2TsV/nXPwcSGdExAoc?= =?us-ascii?Q?ojzOur04WEhbSojOM/DmApc5Syd23uFiWbSpweX8vfvP5pXohJ1isv+DlAX6?= =?us-ascii?Q?QFYk81Vr+s9ip+ih+StRt38iZCZP4Ymiua4z3c2vmaIq9ED6fI5xRhFqFnVN?= =?us-ascii?Q?Njjr16EwV9lDCXYtrARe4br+oSFY3VUyfg9Y0u4BhkOHblXG1FzcWji4HlIG?= =?us-ascii?Q?IIMlgWXLSmzfNEpXNydOowPccRiYIDSn7v9ryTq028//XGk/opDQG7lZxJds?= =?us-ascii?Q?9m4fusONF07ghMJGnxZfuTEfJXTOFfLBrcDfLub+r1Ngrya3+yZFx4RHkHn0?= =?us-ascii?Q?beIOdtmxpAdQ5q1svHHGFbxnqPQznqroIVYEmRqCqstgjb8Bj9Lp9cUWEp1M?= =?us-ascii?Q?oVFxE05+qu+MdKuQIfG+1Gcga4IW1JJpjBSuh7d/X4jL//TzR49nr43/O7og?= =?us-ascii?Q?dPaKXk7cLFtWqGPBkKIdTHvuydOLzDukjJuiAbon2uIOrAs0tIelMvnPL3Ul?= =?us-ascii?Q?ekJZvcS0jVCzbEY3KeMvnh9/IY+TBMK2Yj0cNhHQMEx17i0OFHcnyKMddms2?= =?us-ascii?Q?R1mLDP+efUz78q2OO6GOF0MPqSklFW8TW7an/2ETt786u1Y4d6f1HDO/N4TE?= =?us-ascii?Q?UKKPPAt1rOzgxXFpQE+OsCzHeQ/q5Vf64abpnX1Nh7jhtdDWD50pBAHt3Sb3?= =?us-ascii?Q?CCtnEC3lPRYjKWG38e9tKdDKPKNxecAZq2G+EbLLsXoGuzyZLVzmDjFESY03?= =?us-ascii?Q?cw3uX9CrgME3B9XEIbgICm4kB3h7bSjrMV22RGFXBuqs+JcHDfmgw15IA2C9?= =?us-ascii?Q?FLwNNTkn0idYK9oQkBAsePfLTI09J/gjTRkNy5fSshHkcOS2i96a3seUYXrM?= =?us-ascii?Q?ZbxClsuIE7OXaXG7C+5ZE72PFUBO1N7JuinzTQA?= X-Microsoft-Antispam-Message-Info: WFEU+A4AT3oW9IEmLcIagrNbwFUrmInhD0dWSiZkvArlYlp8HL3oMESWK5uE6K4YNRVnF2WewqbG6OyJva4JF4sEK0Tbbvo5keYwuIrCdZGI4ViaM0L0wE7ZgO/NnWS0PBM6oM+MvT5bLiwTC1hjJo21z8tx67Ak3owqz3ZltsoblclRs1+HacjAqZ4d/nQA05zB1ScS3VyqvxkJwYJOy1/nAMoYiHMqOKnO6ND2fMdqEx66a6SevTJ5ETUOur+VHLkhYFbmU0a+Z2+Frd/P+L1hVDxpbOfUZ0WMi17tcixH1Cxti03IU4xBkM3XpwXBSw8RzLStJtFb4T4rl2coO4MAKQcrojrMuCuKsOldk5U= X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0393; 6:yZboTuYc7zetRDm30M6d7M8zx/D+VoI/mYDPuEolrSoTAGNMM2fe0a64OPKdMS+hAGi8Qpr7vRVkBU/rkYhVXJGLn862P0wAINt1CGHTAe5oUQNChZztkA845EThai1iMgIqNPxxqUc6KYkUQI4+etBOr6vQqE3OPZZKv1ungpizghYh8DlykLsMXGxGE1eWpXL1QjvM4evEtikbOW9Sr0KdBk6Zt5IAnFq0subQ0wXxjIf2kbE+N90HJ0LZbjsi5zZhDmfB8L9cVr7u+s5+RPgTOLm2o01bl6x0Xw2SJg0EeHIdnKfCaXZF+8a5JZtsy4nqzSWO3WEae/+KUYH1yS1sY3EJF0dGkA8/1/lvOTcWLIo/1sDzNy1HfO6Ic/quv/XUmEgYYjpxhc6aGo3h3Xfe3vOo/4K/aivEmBnTrhZav4riKhAOjHTGKghWUTHFB5eEXb/Ji7ngK4jhHqXrqg==; 5:D5TbofR4LKd9Gd0Y04kEygPLYnJOMKK9rAiO5N4CdKK3qEMhhX8MHC22h75087cDcEy+K22iVEC1/YxKPn1O6LgQqjp/1CX/1PIFopdPmE35D141XzZc/ZzAzx+IQ+KkEmyuBCVA+Lg20cIKXAZBoGQR+88KKDy7YFykwF31Qfo=; 24:LtBQldJLj+WSsQbLvNkzTaIJvz/RSCiCsceTy4A1LLk2FPCLGA//4wQPVIvoKBSYjRuAF9TkucxlLErisJJv9A7YEdt784Qqf8eaNsj8giU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0393; 7:n0qGPZeg5IdkM/NkBo8gNOIH1Mux3yooLIMltDQyJhCa6xDfvYwUemFHzaF9TI8GF430Hvq4dlzQO91Cc348eYElK4OKDAR3ecvJA4xvkFHhMhyxfgYvF57Q8A9H9iwMms1PkcWID77BhkP7BbwnXusMSFiXFQV+nCpXyj7MQmgMjlIQsf25HplI/LlXHo74k/eu2f1tEYk1KUbP13gIL9LWnKTd2VqhWWY27M7sxUsrZv1v9zRW0/Tl6xn46tMP; 20:TJ/iyK58TpLzrZWYrOpKGq0SnDabm2bgTZ5KV3YUIhOrEFG71RZ/5Cf6KIYqMD1FL8wtbeQozBhATG7j6ApGGo+edGRHHvZz6IIhwGV4SUpqu0LDmzywyddVKb8uVwHizpWhHfF8jTTqvPHf5B1iWJxanmTAamXQbzxNQmEwSoI= X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jul 2018 01:22:27.6494 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 739b402c-d8bd-4778-0780-08d5e2def006 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR04MB0393 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 216.71.154.45 Subject: [Qemu-devel] [PULL v4 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 | 94 +++++++++++++++++++++++++++---------- include/hw/riscv/sifive_e.h | 16 ++++++- 2 files changed, 83 insertions(+), 27 deletions(-) diff --git a/hw/riscv/sifive_e.c b/hw/riscv/sifive_e.c index e4ecb7aa4b..cb1b6948bf 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,6 +117,49 @@ 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) +{ + SiFiveESoCState *s =3D RISCV_E_SOC(obj); + + 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); +} + +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); + MemoryRegion *mask_rom =3D g_new(MemoryRegion, 1); + + object_property_set_bool(OBJECT(&s->cpus), true, "realized", + &error_abort); + /* Mask ROM */ memory_region_init_rom(mask_rom, NULL, "riscv.sifive.e.mrom", memmap[SIFIVE_E_MROM].size, &error_fatal); @@ -171,23 +208,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 +218,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 Sat May 18 11:46:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530840426639409.6506177351624; Thu, 5 Jul 2018 18:27:06 -0700 (PDT) Received: from localhost ([::1]:55395 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fbFWb-0006fq-QR for importer@patchew.org; Thu, 05 Jul 2018 21:27:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36344) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fbFSG-0003CQ-FC for qemu-devel@nongnu.org; Thu, 05 Jul 2018 21:22:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fbFSC-0007cC-U5 for qemu-devel@nongnu.org; Thu, 05 Jul 2018 21:22:36 -0400 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:40750) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1fbFSC-0007aO-GR for qemu-devel@nongnu.org; Thu, 05 Jul 2018 21:22:32 -0400 Received: from mail-dm3nam03lp0021.outbound.protection.outlook.com (HELO NAM03-DM3-obe.outbound.protection.outlook.com) ([207.46.163.21]) by ob1.hgst.iphmx.com with ESMTP; 06 Jul 2018 09:22:31 +0800 Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by CY4PR04MB0393.namprd04.prod.outlook.com (2603:10b6:903:b1::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.930.19; Fri, 6 Jul 2018 01:22:28 +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=1530840153; x=1562376153; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=niyPLMTkyQLgFIg3cov0VNlOR87r8qaXz7rEmAoiObc=; b=k2KKvTh3nsVkoEFWZ822UVVw5fUmZmw7nu4M1cO7cyjgoROxVehpnSWO Xoig3gRLjVuLPDx7Yf09IKkCcHLN3mBxNmyAt/FN3mExoHK5dkxG4vq3j J9rZpwQL9X+sk+ha2u/uX8eQUwFiEpCaL72mBjCPLQgVKl7u1m5NmJEox 9w54Ce4zwK+gUk3ZhpI0x2iAI6/PrMIqV//EA78OH7tz4uVn3y7AOL+7o Wv8jDxgsEqfQ8k98GZrfe3UTkEFTgLqh+YHjU5ht617meR2vuqzY7FBN4 2hMaLsGstookWcL0dJLnJtcp9tsNri36AjjnvTgKeV7dkETrqWkVMQuPe g==; X-IronPort-AV: E=Sophos;i="5.51,314,1526313600"; d="scan'208";a="84619623" 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=e0H/XtYsrBD2FNoH0pGhMwXWdgZBeccz7x3/IOMqkWI=; b=U3UwwNmT+PoKp0OHGptTm9Uj1xAPK0GMfXM8uOE/wYHBT/eKUo/tAUAwXuRLz2okLptiVBSYXqSEX9iJJFW3eLcfdNsrAE7FmdwpuHIqLbe6+6L8k24juSXZky8cjpD3mKliXIKCzU+C1hC0P6XQyZMEgKmhjfEavKVq7dcJInk= 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: Thu, 5 Jul 2018 18:22:11 -0700 Message-Id: <20180706012215.21714-4-alistair.francis@wdc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180706012215.21714-1-alistair.francis@wdc.com> References: <20180706012215.21714-1-alistair.francis@wdc.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Originating-IP: [199.255.44.171] X-ClientProxiedBy: CO1PR15CA0105.namprd15.prod.outlook.com (2603:10b6:101:21::25) To CY4PR04MB0393.namprd04.prod.outlook.com (2603:10b6:903:b1::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7dac609f-af09-4a94-1f6d-08d5e2def076 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(48565401081)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060)(7193020); SRVR:CY4PR04MB0393; X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0393; 3:b7s78h1TquKwscxuT0ceW1mD37HSRkUiNch2zaED8F2PvqwaYdLgTbZFIPTd+yMj0BqewvM2QQMgyqpF2LShmFK/NzMUiXtjIfawqmwRIII8Mns3ivPfOgGLP3XReaYTjlgUy1HVs+jAPcywHEe5d5stvjV1q1z4U7v6hRbxrngCTllwPKMnrR/nq6PuFvJHY3WgqAXaYCZzIMdFayjs+L9K6J7hkavjpYXgYAWFyI7QMBA2bw+4jQtimJW+g72H; 25:9R00SqW0mS5WAK3UccIXZB0kxWuNXOpTZe6y4X/TFt2o2EfDxNMnUI268TU5/WeDJGIxz4g/Z6ySM4Cj32iLcwZ3qLvMu/i7dS7BbU3A+fIM9mZpMXd4+ktxHzB96kQjw/k7Mys1uTzmgnva3olI7PGX39WxG5RlGH1ZxNN98/bqsedYz7HiybfeqG48op0wnklTzfdHOYhTHocKDOgK5ASaOoUW4EFWzv6oLVp48GWs96gTNvf8IwgpkZ9Ayj45TAjYUVDUu89euH/sH4QkMCqJZSkwxa22+Cu/F2eOCZcx8lLuqSB4cXSpcfkwyTDHinWDxHSd3q5Dvef+kwA4GQ==; 31:WqTY0Vqf+JSjHr8OpXeaUwcQZWDTmjhdbbCQPVHuE9nKqcdmtrH0cDAUR0A8152+amk/eCJTqwdmnx0T/4D77xomHsCSqfau6kEIRObn4pQseDeBnC3RQPIYMKuzELa2himk5XzS4YyMmDr1ek4EShFut0dwTvRDNKt5aWjGoYpVdyLuxWG+V63x8zCNN/eWxRoWXEyu05XIm4lmFQlYn6vhj1vyd29MaB1rhi4P7pQ= X-MS-TrafficTypeDiagnostic: CY4PR04MB0393: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0393; 20:JsD0mvpGLEGpvoswXa1KyaiTWLFEhPjeVfeLv12+IpH72DZAm47l7o7vI5aK647Yg4r2VeVHT5/mudDo3cWZUU7FiMWj7m/+iZ8ecM4+5lLNQZ3/mkEHm53o0984+rLC7CoAfcwFkVZokDbViTeAez/uDXGZ3pk69XQ8ozNifNewZtz+iE+5oAL+HjSiCvOgrhesmud4W4k34MTNly51E3K2XBYTrhwA5dlKJkTD4ZfRilcPpVlgLNWqLCIqmw+Y60FfP0Oi130QVk6D6BDDnHP4g0pYB++8qObz96l9Wzy9z9WdkVz/a4d5TsEmFH3v948a6GvLzIWt/D4V70+ySSWMeeo7fbKp8h5JoIt+SE/roKvMSD2B5lTiFL5lCh0y2u0fQm3X9YQV7vSo9bbbP08bME/YjHYjPHFTpyO1bdC1b8plMVCx5vbQUCdmI/B8yVsmR5CxnD05OK2D+t7H+hXLut4cdZ3QyUegKKq8ZECVIQKjM9oA/rYf0HO0H+yT; 4:iqqASPf2l9cuP08eW0jNxMnzmXcwVSQUj3Gpbd/aBjTJtneQTFulzcjJZTIgu1s53ZObdiVvittOXH7sY7AIdHSNa9143vHYxbA+QRn05YCxfR6H6P/5Q5HfiY5HieDCRGajNb/oA28zNoGG0Gam+SUspEnB4Q0XZLkBj2wwW9dflYVdz1mpLkxCLqSOnamszzDqNLrh7uC7OPNtipX4spNCNs/sHkMH1hZUXDC8FdgoPoJQ7NGYx0cQU0FB0et9ZW1TND4bRpJXQvYCdpXXxw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(3231254)(944501410)(52105095)(93006095)(93001095)(3002001)(10201501046)(6055026)(149027)(150027)(6041310)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:CY4PR04MB0393; BCL:0; PCL:0; RULEID:; SRVR:CY4PR04MB0393; X-Forefront-PRVS: 0725D9E8D0 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(136003)(366004)(39860400002)(346002)(376002)(396003)(189003)(199004)(53936002)(2870700001)(68736007)(50466002)(97736004)(81156014)(81166006)(8676002)(8936002)(3846002)(6116002)(44832011)(106356001)(26005)(186003)(76176011)(386003)(316002)(16526019)(2906002)(2616005)(52116002)(11346002)(476003)(6506007)(956004)(446003)(7736002)(6486002)(1076002)(25786009)(72206003)(50226002)(39060400002)(105586002)(23676004)(36756003)(6512007)(478600001)(6666003)(47776003)(5660300001)(14444005)(4326008)(305945005)(486006)(66066001)(86362001); DIR:OUT; SFP:1102; SCL:1; SRVR:CY4PR04MB0393; H:risc6-mainframe.int.fusionio.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtDWTRQUjA0TUIwMzkzOzIzOjJBNlFsR3JYb3dqU2FzY0VRTW5CU3FEYks4?= =?utf-8?B?SjFsOHJmMlhCNEFTc0hIZDNEdVc0djJwcGJodUNsU3dwcktOZHVZOEtGY2Np?= =?utf-8?B?aFlTOWtRUGRHNDlrcVptNVIrRWdwRnNURGZyWGY5THR3TFFsSDJ0YTU5VUFa?= =?utf-8?B?NHRDOCtrcWl2dXBmKzJjL3E4Q1N0L2pBenZ6SkhMeHMxanhJcVZjZi9CTGJj?= =?utf-8?B?L0l2TXJ1Q2lEZGE0Q2g0WVlQOERWVjU1eUw1UzhDbW9GbFJHRWNMWTg2RU9Y?= =?utf-8?B?cVZkdGZ3Vk1hTkh4V0pGVVhyazcwd1d0cWhCak9BTXVKZHNTUjdGak5yMUZn?= =?utf-8?B?MERFdTBrWjZHUmNZTUpMY0orQUZ2cGsrNk5DWXlJK01lS1cyZ3p1V1dPc1gw?= =?utf-8?B?MC9tZG5HbUhqKzlKb2lNTWlMdW9tM2Jvcysxb3doVU8xQlQ2S3IrVElkL2VN?= =?utf-8?B?M0U0dk1OYSttbVhjOC9URSt3bXUrUVIyK3hOOWtVVWZWV2U0cUtoK3hVUGdu?= =?utf-8?B?a2RrM0h3Z3dZaHdpVUc1SW5ZUFRNbS9wajF2cElDN1BMK0pEdm9haDBxNEpv?= =?utf-8?B?dTFGdHhVVjhFRERHVTVWTkdZTW1EVkZaTHlVU1ZENFBHSmN5WFNvSkVWVTRN?= =?utf-8?B?cnZvMXJKandYQlBMMy9sclpNemFtVy80eHR6MW4zU1NvSnZwalNtamZ0cGxz?= =?utf-8?B?TW9LNnJVM1FCVmo0V2tON2Q2V293WENSWHhzbzJTVGZsbHVKRUxaR2NUWG8v?= =?utf-8?B?MHQwRVhpNG5LZVgzdXhVOE5UQTdIdWJ6UzRWQkduYjVkVkdRcmo1TVNLUTZi?= =?utf-8?B?bC91bnpmYUhiWExXeWtxOFBMUHFzMDV3NytQYkErOXlncGZwNE5MeWNuOE5E?= =?utf-8?B?OWsvZ1VHeUhvUzhRbi8vMXNzMTVFdjR1MDduQXlWUlhRdXYwZVg3M2g0RGFT?= =?utf-8?B?VVdoZ1JpdlRCSGxxbytHOEt3U1ZxSlUxTmgrRmxXamFYNWRrdU45VjlzYmts?= =?utf-8?B?Q0d2b0pFblF6dXhHMWN0R1BoakpjNEUwMkFTSk9wUGZOa2NTek82L290emdv?= =?utf-8?B?R2VUb2Y2b2JkeHJxNEdqYjlCeUxkZVVzajBPMUNSUlowS1hKT0FNSEdtSXNQ?= =?utf-8?B?TE5iN1hEVWh5SnBQZW1PMmZCZERlNUx4ZVg1eVMzdUtTdlB6QUNiQ05rdXdI?= =?utf-8?B?bUlBN3dkaHlBVjF6VkF5emlWeGxveG1nczFydnBBYXJ5SVpjbjhaVGFvajhx?= =?utf-8?B?czJrTkNmQzNyR2lFL015TVhSa1pFTmVQMW43dC82VkpHeklReEFaNTJ1QUJB?= =?utf-8?B?SUI5dXZrNCtVRnhJUDh4WHpXWWw3MVVHNzZYYlFrZ1o1WHJMaGFZWFZYSy9j?= =?utf-8?B?MG51VFFGR2pkK2VkWFlTaUxObVJ2Zm0xaGcxYUVWNUlGbGtlZm5TYmE4SkE1?= =?utf-8?B?WFpIaEU4RGtkSTZueUthd05Fd0ZPMFdTcDlnQUZpWE4xZnBOTFF4dGZ5bnlj?= =?utf-8?B?OE93bkJneU5oSTQrSjlYRG5iejJ1WlRmT0xCZEdDNkZOeGJsditreVN3OW9p?= =?utf-8?B?WFVWZFBMVkhFVW1NT1ZwL1FHSGdnbjQzNzJBV2dpYWdQMjVyTEJlNzVabnVD?= =?utf-8?B?V0ptNXBWRFdGcU5mUDhUSlRVcU1ZeWMxK0VNTDdncU9VanZpa3VEYjRWSFlt?= =?utf-8?Q?/VqfciT60k70E5wEm0=3D?= X-Microsoft-Antispam-Message-Info: 473E5DB/KnNpgkNVu5oxlBB2sBuasK+Y3vTmARuJV1OZQsyu3L8cOCwTB9yb7jap+UsLXXmYlooTE2UmJv9ZNMpjMe8Y2CmxKKVh64cX7aeoIFIZOoolzw3cUeaTlcQ0DNh/ogS8VkOOfrFPzZuxnj5ViDpmXJ1Q/HQqXq7k9hTcyZ2c4a8J9F9yvQJErr/iUgHhCZwl34+L5VVTbKL+LzQdezlvbCYb2y6HeiibILSFhg88zqqmuvgjpWCofMJ3y2tRYc+hk1N7OX+eqR98nqJJ0Mag2c/HGYF9S7N36WS7rrK/uWn2fsSk5mjKWKAU2TK5zq/qkIZdVNCTvK9ZI5ZUE2ye3rT+Mf1zetN42X4= X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0393; 6:uuzq8e2u6kamKYhYKwuKGrg+Iw0Iy/FbabSovx3AA8RnDlVz2IQS3RZz3HqockwFe008rbdBiIdbN8yFl/9qZ+mXuxI2O8YOY2MSVBIVWpTy9WYdo/C54nVafa76hZacivdUkMKMXiLNKhWRBBJMrKG1dR8Mvgz7rI/wK7/23qYJtuc74JPVr2e7qU2oEOv+mtIH+lds2YLg4Pyjs0eg7xPc2kxm3qc67v7m2cRrhm4wEBQSk+oPDXIyvQ1HODsydJSUCez/RkkwqATV/aXqreaSunBKoErSvsf5Ac6HEwRuuE+C+f/gYi736OiRZ2xXBKH2kgTfmPx5MBbijdWVZi+hP6pO6NdtGfulWGmqoVrCrShk2QYcuwV94Ka/WFqWZBBnhpX7AuvjRQi0QCS6gjse/cyqR1gpZgPofc4IqGi4UXAhr9aKuB3XpTjJfML1Hnklld5O0CYmLDKpz/yliA==; 5:O4NIMAXFSFnDV5wdmFe8fu/fC2M2/lSZedlX1KRqzAzUx0ZVlHNQBybRiFhS2VCXk/aG+lLA/OhM0hbDXUGTEpYO6OJJNjppFJ/kAxvtUPNKl8oe2xfz3tsrM9SgM4FtD1Pc/TgB6iscyxldkfyKbKDKxeAgTyW4o8Qmqaib2uY=; 24:JFJmJ5uW2hUO8b5E2KQmbmD+Rb0RDR8oqsMYCjQmkLiMkl2HVUIviYtV/EubMIf1i3wPM7sSO8/TtKQJGZoeNcu+2aZ+NNhE6LlAxhaYoU4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0393; 7:vsZM2xYgabzK7stqLGVbWjJNzEI8YxKMkKhVevALup6OnEUh+GXQIC33fC/s9k4NtKroBAIsn8DzrSNbO7m4sIFXL/ytTK514qKsOnvku9I/Qu5xO5A9V3NB1O6YhrNhzzOeFSQETTd18H2Y7WXwdz9XZ34ocVJLxv2YtDY5esdktsXxghW/0zyBye5XUHerIfbw14avr0rCKtdgJ/z5aFGGsBXrKuGUjB4WMA1QJZntJlAxesN5z6SQDvCRYwbR; 20:pfoTxKK4nvdM2uM6s1b26KAigXeXOVtZSdnaYLlJefUUcs/DpOkQHspWf0VjV76QjHnobUyLBvZsq3lr3ZlKB0fQjcePnKi786jzQ9MDB3aFLcxT7GJz0WkoRc/QxiJhnmDSJy/8BHuI+PS6t0Icp84PLj6vyhis1TcE+nZqEdM= X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jul 2018 01:22:28.3880 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7dac609f-af09-4a94-1f6d-08d5e2def076 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR04MB0393 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 216.71.154.45 Subject: [Qemu-devel] [PULL v4 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 cb1b6948bf..8a8dbe1c00 100644 --- a/hw/riscv/sifive_e.c +++ b/hw/riscv/sifive_e.c @@ -187,13 +187,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 e2b4f97b10..1a548b71e0 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -317,9 +317,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 Sat May 18 11:46:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530840428747605.1122107744548; Thu, 5 Jul 2018 18:27:08 -0700 (PDT) Received: from localhost ([::1]:55397 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fbFWe-0006h3-0f for importer@patchew.org; Thu, 05 Jul 2018 21:27:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36337) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fbFSG-0003CP-Ca for qemu-devel@nongnu.org; Thu, 05 Jul 2018 21:22:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fbFSC-0007c7-T6 for qemu-devel@nongnu.org; Thu, 05 Jul 2018 21:22:36 -0400 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:4059) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1fbFSC-0007Yv-Jy for qemu-devel@nongnu.org; Thu, 05 Jul 2018 21:22:32 -0400 Received: from mail-dm3nam03lp0016.outbound.protection.outlook.com (HELO NAM03-DM3-obe.outbound.protection.outlook.com) ([207.46.163.16]) by ob1.hgst.iphmx.com with ESMTP; 06 Jul 2018 09:22:32 +0800 Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by CY4PR04MB0393.namprd04.prod.outlook.com (2603:10b6:903:b1::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.930.19; Fri, 6 Jul 2018 01:22:29 +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=1530840153; x=1562376153; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=v7+8+RCRqZi65bBP0YU0TkkdUEtjdX/5DRG38H0w1j0=; b=PxmTWeHagh6NR3tuudfNpklGk/uY1bhMtObCLtKk32mZtOQha612xMtP UgY3V+A9G6MMBgiLPKHNprdd2BDhOaL7NLIk9CmgYmqr8SokSt7ewoSrm 03kFGsHDgzYxGjM/hYJ+ow7HwHnt3ALGoHGPSVCHIRt9pYArvQGTEu/wJ PZF4V5pMdxy9T4pkJ01S98zZrdE5Vz4oxzLvWA7yUvEiIfQ7CCp0hd6DV VHUv7Nl8A4eX6YLqKHUtfQYBYWZX+2a0TqlRKdEDJkRHg+6deYSThkeGk VVGCv+5hwsL88vBJo/7vd2P2JNkxzTn06KaIDwOrSjaFaxNrVz7QVKc6o w==; X-IronPort-AV: E=Sophos;i="5.51,314,1526313600"; d="scan'208";a="84619625" 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=ibda6f4thWaf97Q/3guiR+G7uTHmxlcALyCvlvxpKag=; b=OFlieOIylp1ASlzT6Zf4F89WlLq2YTjFfx55clnWiIeamybbuKvVvYqpxD7/ILn9HZ2yMAL7GKAg/Kk+6bnOavcFcMo/egLqjS1K6AnxFgfUsjuD8wFOy8SBc913GJkZfa53YQBGhkZui7jegt1T8HJuk/I4fTsrZoQeZn9EcUI= 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: Thu, 5 Jul 2018 18:22:12 -0700 Message-Id: <20180706012215.21714-5-alistair.francis@wdc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180706012215.21714-1-alistair.francis@wdc.com> References: <20180706012215.21714-1-alistair.francis@wdc.com> MIME-Version: 1.0 X-Originating-IP: [199.255.44.171] X-ClientProxiedBy: CO1PR15CA0105.namprd15.prod.outlook.com (2603:10b6:101:21::25) To CY4PR04MB0393.namprd04.prod.outlook.com (2603:10b6:903:b1::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e6e0d686-de11-4439-fbf5-08d5e2def0db X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(48565401081)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060)(7193020); SRVR:CY4PR04MB0393; X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0393; 3:p7R/+tepesXM8/IfwMAddl6sReBKRv4pNA0r34tnFmDDTu3hEuDFa+3YrGmwCBdQ5XERUmeOxdBjuGpivd6LTky1BOA5JHVr69Faxg7EnADWKaojECxiXdCFfSVwozMAFxyNWCdaKzuDd0TxkfD2Yyjvf/oTsUZpZwkBiJVfqExwy9iGwhYHSHzrE2oGk6BNuFN2VQqadKx+vS9Qu2el9rGWlZrT6Aa6R54M88ZRmbLBdSgLPx5qU4RCYfo+HeRz; 25:xg/zyct9qBWTCij6OuiehOHaUvt/K3ZO2zLUE9osoZkdyY7xE79+TgHdiks02bo1jz2ACk5uG74Hu1x9w6Q9/5roOia+WNl7SUDlbLzbjLAhTVMKVQUy1yL88abkcRyXw3TB6Y8JgS27rH9GBxvA51R5eQYQo9QJsWxh3MugKvQRBr64QlrgIRaqEVVd25t/dCYvO9l5AZXj+q20m1iNyPKGXd1A5f1t+l0fPJg1WGZDY9aoi0d5zUFB+MU/oXlGMHuQfEWzjytxqIjFR7GCzNI9yxsaWLEHY32m6wCjrexDCO/Ufgcz/Qk4gybPOXzuS7AWxrxyGZ23ixpw0X8WNQ==; 31:2JArMbw6FIt//0nf8lCJot4KOzjM5kXB9bbkJtJQh+liSoyDiUc78mLqEsyFyNxkDMfltK24LMTEIMrV8TSfTcePDlE9zo1fvSSt7eg7nNUP6klH9Db6xADLUdL56IRWItrSKn39r1vhd6FJjDKYqVGYimXZ9X+098n3c8hjR9sjJRh69wPnxbWEp0/ZN9eQSSHeUqmyt727avcPZLlx8TzeUASdLWw1rvAjPLP6PvY= X-MS-TrafficTypeDiagnostic: CY4PR04MB0393: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0393; 20:x+xSItA1WXSv7j5TeN2NLGSRSvo1DoXpXGwir4EIE63+VcOrAhqhL+yt+mKoKndDG3JEJEbr/7QQzuWzgTx+QOlAjnsRcQmxWuQzX3WUNwsc1OHfFXRhWPV5erl8uOB916nT+k1Hw4sG+XsDSL2zy2S6LUdGcnI0QGvc2t2YfWcqwNsPBdYYFrEp9uwEgf9ZAqpfFTUTncIpID0OpxHXi68PldyvsnNw6UTdV0cJDP9D1bEdVmb1jWZt2XuN04ARRn1xs7aP7ititRc0YiinabHdx/pziFdwoDAn9DxOld4pZONVWkMPXT64HsblhsoayhM1Wv2lItAU64990dXyvqwjm7ckTEovVhyEzaAL12VRRNgiuKZXn+iNYnkjZ1Tn0gfmZh2Ju345dNt5wP6IfMSIrwe5qz1IdunHX0GU9P0yEJcTqNxanPkrIz3Il5HU05Pi1gEZCvNfq3ingJWjyfhfZPi/w2LupLJNuhRkf37iKaU1ZVDVXySabPsfxZPN; 4:6OaTed7MHnjFFaRXZb8eUAL5TZkruSVb5CKxm+zJYgg8eCS1k3fQSIJ+PC+SqJ5zIiDjclkoYbyM9zD1Cdn6JHV4hc60fairBmmEo44xP2eIuUAbxsKRJKmJkRTeAblgH0lSwI2m4VpBHju188l4sFhfsmTokpXHasFZFE4vv4R42C3+PY6E2ydRF3s8o+wjt8ILnfe3eli426NSAFa5UeJ42yz80AeXCUz3143Uxkg8DJvlpEmP4mjPR8ptlS16e/XVmwmHTTj9JlgxZu+QVQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(3231254)(944501410)(52105095)(93006095)(93001095)(3002001)(10201501046)(6055026)(149027)(150027)(6041310)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:CY4PR04MB0393; BCL:0; PCL:0; RULEID:; SRVR:CY4PR04MB0393; X-Forefront-PRVS: 0725D9E8D0 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(136003)(366004)(39860400002)(346002)(376002)(396003)(189003)(199004)(53936002)(68736007)(50466002)(48376002)(97736004)(81156014)(81166006)(8676002)(8936002)(3846002)(6116002)(44832011)(106356001)(26005)(186003)(76176011)(386003)(16586007)(316002)(16526019)(2906002)(51416003)(2616005)(52116002)(11346002)(476003)(6506007)(956004)(446003)(7736002)(6486002)(1076002)(25786009)(72206003)(50226002)(39060400002)(105586002)(36756003)(6512007)(478600001)(6666003)(47776003)(5660300001)(14444005)(4326008)(305945005)(486006)(66066001)(86362001); DIR:OUT; SFP:1102; SCL:1; SRVR:CY4PR04MB0393; H:risc6-mainframe.int.fusionio.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR04MB0393; 23:U6fg14/USJfYmI/qUnEvof1zSGUS/A/itPmrM4u+j?= =?us-ascii?Q?6kqZkFMToPo1/FiM8FhX6GDdMjsghrz1VhsZMvJO+PfmlLAAydyutXko8f2I?= =?us-ascii?Q?PgXI6pJ/Um3dB/8A4mtKEAHLXpc1gWYrUcbGZyx5TS/l6VyX7z3OtPw4JbSX?= =?us-ascii?Q?2egRkgGv5Nbv5cHLGbybz68sxc+wXSPsKEF/RiAcf1Z1YkqbuAJ/C0A11m8t?= =?us-ascii?Q?ZCi29AIZdfGsi6RXY+AA7Mkp1EfULDzyWQbCdW2U2310wGze5DR8NtYXCg1k?= =?us-ascii?Q?7OTb39uwJKTcIRlV0Pxapj23rmk1JMjULqdroPEQJ/FozaI3z5tY9q/cnr6J?= =?us-ascii?Q?PRIjZ6UDb+mCU34H+ngDmsnTJXW0mvTQNvCGcRdYvwCssIcTCEmK6Yyow49L?= =?us-ascii?Q?PH1l5dc/TiTxeSqZ7150y0hQFqFHgCVTHcIIi3cS2RYE3HsWTshlMZUVBuph?= =?us-ascii?Q?VaPAvIxcgldUzqskdZRmDiLABVDfQ+GJrjDiAfCZzEMAyPq4liiM17IaKdZY?= =?us-ascii?Q?/OAFQEUz4KEXntfw5BIB89Db56lY8Md7bpm5L+GyMdD5qYolQI42/kqQ5+rb?= =?us-ascii?Q?umaHL+8acegJLe1+9VUXI4XBOUhxsHVmH/Ot+DoY+X6CVIXXFBD89r3QQE9B?= =?us-ascii?Q?VPZWjlO5vG2i4Vxbwu1qolDuHweNINmCWuJFpgkeWzVtd37DDP4Af5bKW/9v?= =?us-ascii?Q?T3Jg38iKqSmchcXG7sVd/fJ8yzCAQFaXIw8Ns909lcSC+M7Lt3QyobhiwXUC?= =?us-ascii?Q?LcwhIqLxo4CZPh8qkK6n1F8n43bq1wiu3bg/e04c1lWx/NSukbUYUmnPcG28?= =?us-ascii?Q?+wTUTwn3KCqzYGKJo+85IPrBhXqBbmV5NBVvaN6LqzcVXww6nzT2Oo8HUO5E?= =?us-ascii?Q?I5xfen/CtPhhWqR5GI4yD2D//N3T3piXGxN5uumIBZ/uhPjN1kmHe9IapWEZ?= =?us-ascii?Q?/lNSze4TUduFPmRmmJi9elR24G1M2ljZyHcb8F0/jx7RN561BKz2Ia/Jm2Am?= =?us-ascii?Q?Q/IipunA7lXchWeqtGjxPaoINYHuuZPyjzVlqsJmSXpikkic72NHIPdfKrB5?= =?us-ascii?Q?CHyeIlJyAeF3AsrFB7ZIra+uf3GF9qMRq+ztUVp+VuZms4uI3wWOhqpwKMdz?= =?us-ascii?Q?R9AXpZqwx15ihHL7Usml4RTzIewTFWKN7oO2SRRL546gBMxBSGU2UMRL7eTf?= =?us-ascii?Q?WfG81waS+I97K8D9P9cegE/9r2qx2sPx/dJ9KIUkDavWbjTwPrGvxsX/KX6b?= =?us-ascii?Q?nKB3ZpQG4U0rQhz9+8=3D?= X-Microsoft-Antispam-Message-Info: PCusHGtRuoUGZQQKrnk+mfQSd1cl7desMFxlPY+jDgT/uXOJ0gxDFMeLqp//1dqpD3itCwRPO5n5xmaQ6UgzJ3Q61eI8ye7gtQ7nkSwcMXVicRS6Ayoi6YY71ljLSJ/KohPuycxESZDjrg7gwEGmosdWE9EHF5JKBC4Hq//TZ4ElpDGbmj5B7AMSgX0Dk6AiP3Q/xBYuSYFM7daPygtPs7RXGEWOK61DFEMG4fKCgS7VXgIdTSmkb7w+vOQiilkQwTEM4tlHh0lOQne7J6peG6T5ng8Ijx1dxhVjrq1nuUw3AsIc7lIrGGDjOgORo8K70HnlG3zjOKJXdxPR7pAa/CcqZb5MWRGxYZBu1QCPNHk= X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0393; 6:6UMM+/e602BRPk0iv8SJbM3xIRw/0l7auoxk+r0KawD4PelaOwXpqpJ7Heqcl3mfGKzT5HGocMlpgwBTU0MHdLeus0NKQlnRjP2TU2mZAHZrC1MBJsNSQmSG8sZTEh3ofdl0MZN1+TgpUs6tM/tlnIUU9iuH/4eBpJpMzPXVCiFKlpquZvn02mI9X5I3LBisrX+7ZirCJCFrH0Tcq3w479T4VvK3c4o3cbo6hDWjvqXb91u5zfkIILeprJTHPfLqmg250PEipsXZ23aZGbU0D19efQxjGNFAP8ABkOYdqVVgT+nl+iE2vNxHq5TxOCbBE1TPzBmU9E0H/5sTbHOD/IduoLesqmH11ebBXg74DbT6eRY/QnemZOsUU8a/toHM9eIqM8pDmEWyP1u8DO/BeKLWSO7PmJKoXH2N0zJTDkpl4GyyfzNEmMzzt35mZGWswkfj1Zc48DPH2ypXUbU4SA==; 5:4lc45x6tXyLhCIulj4eSiBWgMlnkFc9szbh0YQXooA+mVKV9qf6BWA1LJ/uPUvI75Re7i6pkkub1RuDH1BO7BzuOlocozyBY9B0QTY8RBpifXyLk3uNYA+S8UEq9UAr/yVu5xnPnUowxG5BL4UphBPQAhY4+41IYX2CNiVCdGz8=; 24:zmsv2Rb3P00brA2+HhS3M0XukQ0jIxfWEi+u7kDllOoQ0Smf5TXwHm40uRrRPBZS6DnQKgYy/xcJ/3E5evykglO6JsF2IbctBAL5J1OfR60= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0393; 7:No/Am8hlJjWV4IfCSbfv6aTnnwGX2Bzf3Eza1JC6+/osHdslWRZvWCBMZA2idjdXxddDB3+2HiPvPbl+lwZftnTy62A6wsguR0oNWJ6Wp7/VNPPJ/euimCOmAiQwmmnp2dqdyIN3Y8ZdeV9c3OJaT7vNYOd788zaXSlLFd6514pYGZ3c2muOZkCxE11FVewTEM09zNQ3LajKq9HMlgEqxIpCckCesyXcZ8ennIadmS4fRiIjQ+Zwo+moFN2cZZq9; 20:xzeB3F9wQBBeC0cGgRFhMrYF6kuSxTHOUo4vvPRUd9NDWf6HHHBPZC6INUhPzX/0ttLPMNtfyph73Mo8qOLRF4HdiH8rFg7yTZGsqvBYw+mnuG1V1YKMqFJ92hSEJBJSD2Q7kd6MHDEacnTSleItKiUOyb5VA3jOcL7Sw3/31bE= X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jul 2018 01:22:29.0615 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e6e0d686-de11-4439-fbf5-08d5e2def0db X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR04MB0393 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 216.71.154.45 Subject: [Qemu-devel] [PULL v4 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 1a548b71e0..d3db8ab9f5 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 Sat May 18 11:46:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530840282847905.3924265337257; Thu, 5 Jul 2018 18:24:42 -0700 (PDT) Received: from localhost ([::1]:55378 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fbFUC-0004Nm-Nj for importer@patchew.org; Thu, 05 Jul 2018 21:24:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36334) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fbFSG-0003CM-Bi for qemu-devel@nongnu.org; Thu, 05 Jul 2018 21:22:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fbFSD-0007dU-Nd for qemu-devel@nongnu.org; Thu, 05 Jul 2018 21:22:36 -0400 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:40750) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1fbFSD-0007aO-Cq for qemu-devel@nongnu.org; Thu, 05 Jul 2018 21:22:33 -0400 Received: from mail-dm3nam03lp0016.outbound.protection.outlook.com (HELO NAM03-DM3-obe.outbound.protection.outlook.com) ([207.46.163.16]) by ob1.hgst.iphmx.com with ESMTP; 06 Jul 2018 09:22:33 +0800 Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by CY4PR04MB0393.namprd04.prod.outlook.com (2603:10b6:903:b1::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.930.19; Fri, 6 Jul 2018 01:22:29 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1530840154; x=1562376154; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=Qw8RS20j2wCv/q+tNixYxYFjbuaLLKlaCJsPjaGKm8w=; b=rmAt7yxDZ0euOUMmEo+yY6IJV6+RuZ4xXrLguoDfdaMZ/+BzD30/veas aqHtpZV7V6d0RzrhbcbUqd/5bCnmfgKilMTLxGmtpEXsoPXzoPVnU9hY7 uIm5qs9upLRubrJUERLjN7E3G3/5PAvvqFLhFRzXx5GUuWJpddaL6Y2Hv 2gdace6WboGizg1c1IDZwBhoeSgbY8DKSzOWUcChyrbb/lMe1sv8EYVwt r+O6A+VeOXZ/NOLOfp4gLwHLBPZt6Up7YRxUhNpNyJydL2zuyRGQFsAxj 5Oh0uU/CuEwYiZ7Xu7Q+4J59ifPIYUX/DB40MCOXskQ29kEy2ne3kZgGy w==; X-IronPort-AV: E=Sophos;i="5.51,314,1526313600"; d="scan'208";a="84619626" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector1-wdc-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=CsnErxji9celZv5b9cUryPDpSXIpKk9ciksceEdi52Y=; b=DmMDaEoLPlloXATZSg9X7ucCQ3C17Wjh3LqzDkwiThLLoOZgkgT0Wd/ERGxQfXBGlxQOrXMV74wkU01dqX5A66G9Sd5J18uFTk4IfMW6AKhvLPMlORx5SoZeQbYAVKWNLmjLNPhqD+lK4txXmBG4U0Jh9FEUUs+7Ji2omrcbibw= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; From: Alistair Francis To: qemu-devel@nongnu.org, peter.maydell@linaro.org, mjc@sifive.com Date: Thu, 5 Jul 2018 18:22:13 -0700 Message-Id: <20180706012215.21714-6-alistair.francis@wdc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180706012215.21714-1-alistair.francis@wdc.com> References: <20180706012215.21714-1-alistair.francis@wdc.com> MIME-Version: 1.0 X-Originating-IP: [199.255.44.171] X-ClientProxiedBy: CO1PR15CA0105.namprd15.prod.outlook.com (2603:10b6:101:21::25) To CY4PR04MB0393.namprd04.prod.outlook.com (2603:10b6:903:b1::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1c363548-8919-40d3-4caa-08d5e2def14d X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(48565401081)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060)(7193020); SRVR:CY4PR04MB0393; X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0393; 3:4HBgd8elYIOWs4jQ1flOwxZG4Q6gUJUJMqhxXvdXSVG9udychdiXGtsHk8gyyUFRh++XmX2HPeum0sNhsWkGy6dyPGJkwlamtnpI7g4cJfeJINbInxBJ15Uit5uz+ucmKW4tgCG6uLPylmopkB5VHGzvDxMdmegLYCt0/3kMUefYvSBqZzr2r1FNef+ct29bBzQQ+NZrfvGWitQAoPkxUuY3tz/cQetadpjwtAf/HKB2BP2K6ze+sNbD8g4BIaX4; 25:dvS7FAvSBEXMRhpaY2FJH0Ppz0iEdz20nnxjqUvfU7JZCS67klak5p3jT9uXxYBw8+UcVL5UmCBlsJWz019UsGTOmspGZH6xc+97c/V8khMrGWZVe62kKyum508GOuqLnivPT5TyITpPjeN/t6gZILCv+hPXCGFGvDPQvwSAh9KCW53MctUHSGH6DpTv4UdvtCK3t9tKTfw86q5DLRN3osmgq0wdsldZuJaSusuK4wIuJsYS7QBdMuwGshXhCeEsrFkOS5o0Vii+fkRhp8hEq2PfGRdZKABsCi5XGP7fRrR5hZaA6gZcANWYylIO4q2D1+sQEV7beJOk8lLSmVfxcw==; 31:+BkyXXLrf5iMVL6qwTXyFSorDT3arHgfog9MpLUJC25KBmts/tRVCarK7IY778p/gbU0ldq4yCvehiHlY0LqRYYZpirGGolX31nJLNMdIIYXFO80VqOoe+QCctBWP+O0KNuYTn+B8zMtsfUWCyuU44pxA3IU/OBE/iOw5AIiNc+8GpW+CVZBAsUsVXztyfTnhtQrNS9IKJudnyMx+6dcIKs+mde3Yqeg9i7lDfzU9U8= X-MS-TrafficTypeDiagnostic: CY4PR04MB0393: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0393; 20:KO1gw0vznMDYfuWKXvYY7UgJ4wcJM833gDKiLvYVwtKLi7oVAAg3uSXioL7pVbCRgIl5Pc+YN+Xev7MmVUqmZjJO1zXpwsfRF2WZiqvDOxVu5Qe/S6bZhLVcRJF7TxAQzaOjnN+JorJcjQxy0lTvcDb4Z3FhoCVNrJ8jRohwuoa7BYZoPUp9etzfmLy/UOg3LTvHdfR+sDbrmdO2K1xFVJaSToKzinqzyYAH3R62rdoNbcnCoubJfoRlvdCIJ/GFR0yUZBFE0yTxRqNk79PcCJee/qGqgcgEE1vim+EqHBv5wnzgSa7RB0/H8mABxe3yEO3uaWmsyHwEEEyujUW2bTUZyoAHvqBGhUoWrqbZs2aPwPZQ6lEOFGDX3fibpe0RCvtPK+oi6gybzvQD0PNd2I2R1l9qUxJO8775T7dFnuBf2fr5eU25D/m+jx0s7fIGUysy143+15fb7WXaGDE/YjEOit8NoJGE+U6JYMZZnPC8RvncMBD0XiELwscw7dm0; 4:wXwlHu5BZydKmIFkm6cVgvFfdJYIfuX+SWLvTzDIWswyFmLAf1gOcfmx5ZlvKlYXSkZESGiR8++YiKeA3qNXZ+VY5hE6oCFOOReQcG8/hD2a+tlDW/HwK1QfC+D8Cx0I4yuANPdmOFlOCk0m0eyZwvtNvnuoghoWGczLl+bbj/bT+KDvpywlE7UEwoFr1sQPSwCzem/R1jr038EjBK1Gh0SP2CGEusxeILUqsCBV+jeZt0CbHT2A/PLUYLlElWYLYqmV+WjbCdA0pZHkqhNQ9w== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(3231254)(944501410)(52105095)(93006095)(93001095)(3002001)(10201501046)(6055026)(149027)(150027)(6041310)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:CY4PR04MB0393; BCL:0; PCL:0; RULEID:; SRVR:CY4PR04MB0393; X-Forefront-PRVS: 0725D9E8D0 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(136003)(366004)(39860400002)(346002)(376002)(396003)(189003)(199004)(53936002)(68736007)(50466002)(48376002)(97736004)(81156014)(81166006)(8676002)(8936002)(3846002)(6116002)(44832011)(106356001)(26005)(186003)(76176011)(386003)(16586007)(316002)(16526019)(2906002)(51416003)(2616005)(52116002)(11346002)(476003)(6506007)(956004)(446003)(7736002)(6486002)(1076002)(25786009)(72206003)(50226002)(39060400002)(105586002)(36756003)(6512007)(478600001)(6666003)(47776003)(5660300001)(14444005)(4326008)(305945005)(486006)(66066001)(86362001); DIR:OUT; SFP:1102; SCL:1; SRVR:CY4PR04MB0393; H:risc6-mainframe.int.fusionio.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR04MB0393; 23:nfnsuGbJuFlK9pVHOBgK3Rhq4cr4aNf+UvTexYnrd?= =?us-ascii?Q?FWTw1bTO4BNuxBUd1//b6Kus7tiMvO5P9mG4HBId231GJjYqelxK14vQF8a/?= =?us-ascii?Q?12zEWeYlp3ODtmWNqSkpjHZO1nDZ+h0b4V5qe3xNVS7tFY3ale8ghws8uhuz?= =?us-ascii?Q?Vc6AWa2Gskis+4uWF1L5nf8TbFgmmQi2gYEqXimeTJhhja7aUliICNdemOkx?= =?us-ascii?Q?/oyx5M0azMGYnahzB2kt7g1gYmpMN66lQxCmfxAvg/7MOGwyRkE3S2Wu+YpJ?= =?us-ascii?Q?bVeT6ARkmvUiomo7qs594eEhCxN5pchJxH1WOkGmZ38kSP7UDSB7C77YLNYi?= =?us-ascii?Q?j/PvuRmwAusl89HqhQ6OVweDI5YStBpBR52gMXoZXm9IVFqGhGqOusxWw7ut?= =?us-ascii?Q?TZJyb6vHWLFfXz5DWjTuFwPljKdBLEW3WqwtPXTeyRJpDkjKaG3NYX6xilqz?= =?us-ascii?Q?OakFD2mDs9MQScv5/Yt2A2M86KZ7rmNZN6HyUAEtt6SwXuL2OZ32c/LWt5TW?= =?us-ascii?Q?6+j7K5evt5GJMO+FdqzEThmp1RZVZ5n1dreKFWPtw8JmndoF0oMN4YSLGitq?= =?us-ascii?Q?eMhyEe3oyZLiTWJP+oQiDg/3c5XKPMYdk8Iv3HpNYENIWiJU9iuqpnlnj0RK?= =?us-ascii?Q?2+DmuTPZv1FC4UYLehWHJjXSVEICI+a5FKqRiYTEzBPtrM3EmkdnvKlx1TNs?= =?us-ascii?Q?PU/fPtgtIJ+isyveK3/WZ2Vz0tjJwTuOd0A+VpuArVNRqCk87ZbQX3pO9l08?= =?us-ascii?Q?3OIP1loNKrYrySaWeiog6I4iKEr1xVA0NUDA1U4qwEFGjmuYi3T1Hx1gzrsT?= =?us-ascii?Q?2auPt4ip89+A4l/tvW9W2HcB3zt+M2i8R5DKLG33reb7Upn8oqB92QNE2TUV?= =?us-ascii?Q?C2Jqqn2AO06VeDOPVb/m6tCsos7HZiSZiTIh/OlDLwLoxRj/Nyqyhuaa/vxz?= =?us-ascii?Q?8F1jtSABabccpd/Edw4hhuXH4x2txAx4LDoGRzrOenPVH6Ni7ypGshlzV1In?= =?us-ascii?Q?aFKYEm+XpsSKVRwzxZDrMwFkexle7hyG/r0cbyUMEXoZh2e0VUQ/9YQitczw?= =?us-ascii?Q?vHF0xN+MEsYu6orwcw11t97eXyKzZNzV17N+IcLU9kfhppZfO2qVi1F9GI4p?= =?us-ascii?Q?OhPVk8yZ9VCRnGTQ4kzRWXgfpsyBFYW4W9IfBW2dss2CDkAkaCBKX47ccMco?= =?us-ascii?Q?m/dmTiujPx2kKGn4TpzFK4VmjQwOr8e0a1A+bqvTnPAj2qrJ/PMGUBxjTvgn?= =?us-ascii?Q?L/4AmmOHctqUa87m4g=3D?= X-Microsoft-Antispam-Message-Info: rX5viz6zIiCqZdMmZj6/h39wyg6zD9+Pk2rxuxK6aAuBxBeS9xJ2vSaLmgQ62ofZ1EY46lOLpVHSFTRM0/7zwJKkSrTSL8B46+qcpDhspnUDG2YzbNBLaLRfEntJBzVY1tXIyrzaUNUa8IipAG23uW1tDDfYUPr+sAtWGkgyaXpSGBBJkuRX6rbiW83kzXFnMQR2Mv7YYeNpcnpJ+SrWar58wMSQN0WJEdBjvTLHzVPjeE/IWggARj/ArT7u1D5LVDCysmCiOPDk+4xmJevYuNHP5orAEszQW2g5SB9yXFPvVzCk4Gek0wz0s9wHE0d9NSc5PDbNmTz8sTbG2LtuzBeLmg8hAzUx9Ex2zBM/01s= X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0393; 6:k9GAQG1kDIColIgKRe7OpPk48YD6wgEV0HwMsY9cii5Ni74ann691eX2hRA79kcx2/iM5JZm3pvp3EvcUft1PlGK6Ito0HxPL1Rp+O8/4AZNXXHVdWAfvzqvoQ4EqYeOYsLaO1tZgXlEM0Mg7CzLYSbdgShsdx7DE27pBtqTjsvO5KA/zcEf8jv3YhG2KyQs3arvEBcEgBrJgufMET7rCAt8jntchfk0spsWuxG+QBNDDQCYICqe2245HWzptJXH8PdR22FRNaOFhIUxfs8udVCnelVE60HR2aZHoMGQ+MJ9UYWaFfi8ahVDXwI4tDNVHa9y3T5uZZ3LlaBC3qlIXQHbt7u/QFjadzYaHNC1lgnahXiVuU87KwEEd9GG5J698WXBjhItFi3FOWuS6GEKiV/qTHlVzwVAvmTwvQU4PVSI3Lkz1QiIl2XquuRmORHr77oRzfsSp/2/Ltu2mXPBjw==; 5:qZh32Hhy76wM08/LFRTIvOpqXSLfvdd0+fPsrrW+U6J9YARhx23iKfUBBinHCTOHlhzpleZc6SiPKaCvElrsCiAmr+jWl+nb+Uuzjva3hTlW/3r6BEL3DHvb0cEROJmD4YckaSB0YAaDwCQOl8AAY1MnekUzhatQ4KrnCqAVYo4=; 24:7RcngJAZVbor52x4ohJeN+kxfoHKDGmlahpIpKJSgS/rtTF9xanqQ+dOpo10PNTgDElP9gkwZwhpYLxLqkyCFdLJiUs1WL2GmK0o/nIge4I= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0393; 7:tKlBkJ1LbPEVcw95cXoei60VFvPzip/j1OVtYpBof7ZjmyKEzOGB12cOw0BYjug5+msb7aP1z0hRArdohDwcBTL0cb2LxrkU96QV0NZEQhSJ3uT1w2+wOQPPpj22hyrgRfjAL2W/TEkiNmGF0y+VJfgcvgy3aB8aE5K/yrbYtxuzBrKgNUxYEGt0cKqlLOaLFhPtyl5ePLWpCjpso55N4SdFrmKjzt18Hf8KpiYTBVjX9Wxh63CQbUWGrm94vUoj; 20:QNqO1NssC5mKcODuswC+20NyftJvnls1bAnSNtqNXppDIprUjPp+5Kj/VDbkIPuIWFseLGokZWNqu9yV2b0pCbJUl58mG8x4Z+n23HFfwhNWaizoU+le8mHHMx/O3EwuNIKOUXqCQKY6r0CMZEIpHU8ISWOIfIz+gp/9er5nyLU= X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jul 2018 01:22:29.8042 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1c363548-8919-40d3-4caa-08d5e2def14d X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR04MB0393 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 216.71.154.45 Subject: [Qemu-devel] [PULL v4 5/7] hw/riscv/sifive_u: Set the interrupt controller number of interrupts X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alistair23@gmail.com, Alistair Francis , f4bug@amsat.org Errors-To: qemu-devel-bounces+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" Set the interrupt-controller ndev to the correct number taken from the HiFive Unleashed board. Signed-off-by: Alistair Francis Reviewed-by: Michael Clark --- hw/riscv/sifive_u.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index d3db8ab9f5..4d3ba4e624 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -187,7 +187,7 @@ static void create_fdt(SiFiveUState *s, const struct 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 Sat May 18 11:46:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530840282389771.8600144731856; Thu, 5 Jul 2018 18:24:42 -0700 (PDT) Received: from localhost ([::1]:55381 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fbFUE-0004Ou-K4 for importer@patchew.org; Thu, 05 Jul 2018 21:24:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36335) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fbFSG-0003CN-By for qemu-devel@nongnu.org; Thu, 05 Jul 2018 21:22:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fbFSE-0007dt-53 for qemu-devel@nongnu.org; Thu, 05 Jul 2018 21:22:36 -0400 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:40750) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1fbFSD-0007aO-SE for qemu-devel@nongnu.org; Thu, 05 Jul 2018 21:22:34 -0400 Received: from mail-dm3nam03lp0016.outbound.protection.outlook.com (HELO NAM03-DM3-obe.outbound.protection.outlook.com) ([207.46.163.16]) by ob1.hgst.iphmx.com with ESMTP; 06 Jul 2018 09:22:33 +0800 Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by CY4PR04MB0393.namprd04.prod.outlook.com (2603:10b6:903:b1::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.930.19; Fri, 6 Jul 2018 01:22:30 +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=1530840154; x=1562376154; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=nuWmcrlT3xmOG68ZXBvh/k/x3/mbZ9ZBZVK0CNlSdWU=; b=Fp0Rfez+ZEKV2hBrT7M1QqoZ7V3U4PEfi8R0Z+zC0eUsNT57ANLaeEXf oNcWGo+IbwYJDJXoiu0jEd4BZlq2dc2ZkHRIc8fp631kxllHtFfFFqY4r RS+B6LO48u1hvxx9x7Mm53JbLrl6drGd9iqYp6ZswiTZuQUfZ4Dg3WgE9 uc7TkQjnaCB6Y93gQ5N7fUN+S1JkuNQE16/Nx1f7uptycM9VKsGB7Liw2 5kPNUyyBWtTAh8wgFa+oWL/seh0ogXhrBefsBVVhnLTtBeHIUgUaNHIFy QeBHOFJb/u5mMMNfkQPZLKG1EdA2lS2oNAmdVtmbaRsagb0SHYfQaXvL7 w==; X-IronPort-AV: E=Sophos;i="5.51,314,1526313600"; d="scan'208";a="84619628" 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=2txGh7r9P5cnPNMLlIUfpX1ra07Miv+O4M8sdid/9EU=; b=hdyZgvTLsxqXBYiF+VqEG+Lg7+DZHOK0WXZWfJcyAYcCPRYPUj4E6pzvdEGnEv97sC6zaE7dFJt+svt7ed4CJ4coL8oLa/1hNtxnqrb1TG/TuGrUU5Rn9eOvEYluGVAg/Qa3ezxjfuTMBkD6vmkvHC4qMdWHyTgqIY9lCso1xBo= 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: Thu, 5 Jul 2018 18:22:14 -0700 Message-Id: <20180706012215.21714-7-alistair.francis@wdc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180706012215.21714-1-alistair.francis@wdc.com> References: <20180706012215.21714-1-alistair.francis@wdc.com> MIME-Version: 1.0 X-Originating-IP: [199.255.44.171] X-ClientProxiedBy: CO1PR15CA0105.namprd15.prod.outlook.com (2603:10b6:101:21::25) To CY4PR04MB0393.namprd04.prod.outlook.com (2603:10b6:903:b1::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4595f173-eb59-42ef-b02a-08d5e2def1b4 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(48565401081)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060)(7193020); SRVR:CY4PR04MB0393; X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0393; 3:gPAhEuvmUspVMFgCUyNVjqU64lEaMWzpLILZALQL1/kdR0KYPRxeo2IZ2Y3/7yb8XDn3jCRFK++dWoqZMbP/cJ3L72Gn8Ica6h/t1Nws3Wm8YJqgXnA9GDRctT4iOHWlUG3jEVtk4+HbKQlHgHerIe/Eqk6DONdnor1drdrXDixR0/ls+vyTjgCCS3A3xlfQDwxaZCKuRkwGamz4haN5vcAJfpKJnJwmBWizTUTJCaUx1VFrSa0WHb2PLOb1W69D; 25:KEevYd7xxJPJCwA6Alv6kkbuoUaxl3OOIJd61CQU7SkmwrGAgPsmhp97zxsrM4Pn8gLBRuSZTR4map14V7PqiNu4xVueY+AEiPesfhRD1+vN6DDyVs3pntY4xCQ8lpG0vbmK5/U4gmDArqw07iwljyXMt+scCfIbeSSwyXfN4KiWauc3+w6tAIHQoIi4wJqWDCjJMK1Lwr0Qq/L24Oe1UqwjO5z11Ti241TGL23C2iweh8ikJYcSmjCntY01ScBHJ3MJZaJOgN/ss3DylOuNdABoYgZBAI4HiZuKlzGKJFiHT5hmbdruf+Trh7k74jzFu09N8drXWAzZEqDRsGsoRw==; 31:sZgnb19hn8XAxXpFHtR4CpRqhSboN4taQYwDv587tIiO3ht5CEymxOSe0BoxsR43WpNO1zMzjqQB1JysDEbH5L/hoK+qwCj+kgNdQX8P9aSqHJXP80wzpfeZmbjJ2HQwyEJIfYvsa5bC6jMGrqgEiRGJjKOJPltsSMNbXoCDSKTxfzMVcAyeZQ2DwvEKjbvXfeuZHyHLhF1fdLvwQR2fofrKp5zBAOws7X+3HxSnkKo= X-MS-TrafficTypeDiagnostic: CY4PR04MB0393: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0393; 20:I9ajfjCoGRZ/fgpTrYgkafBiuTKGkHUuJgD8LCrCOr3NdloGawTMoZr+gIYGM3il4VRb9inueUcL03yn0E1X4gRLYVRCppajVTvsFZA6RWxK+PQjWh2J29ZQx1N19ARj2l8dMx4P6m2eGA3NBBXECrAZn55sU9BiySciDVFOqvIxSXO0zSuj+HFX0tyUDRuOTJsdajWx5rrW/5aRfF8tpOs0yTYDDkd9dxdA9GBW5Gt6o1DxbyZin7fvtzAox+GS+3TKpu/RsUEkHUjOOsMQOynnCrjk2ldJ68hj9hU/TWrObkUTvOB1RtdGRSIEwAORpNrJBR/pk1jvLn4hHtXwAB9PRJ+Sh74Q9+kC/vvXGOAOgLrIF7vqCKxpmVZekbxnXl1o1uN1fMLjNtsZ9+P9NfuGh+lkg1YlaPvpxMpGX8WIedEIiBgPJuujEzep7nYPiaCrxcIcduIYOBaODsioOWqmtfUYdthtazU4PK+xOozw/+8BXZLFIYS45bsvqVwU; 4:yv+WQi9dmbW3nZnSHSGwFM4TxhZp/mKhq0GNpNkKMVKdQihyehTktk/8oR8ya/EDKjPjdD/UfkVfLjpMUxd0U1NL5gAHeu9rnQl+sqnmS00m4xGDuD6v/Ps9HdbRPQ2OrrPAkh9fhAxq4dzyArMRHiVbSR7AzRfUBe3s2MbKc0S8woPQxQw6atfC4J/udkAAcCJRVWsmmzpYCYqMtZzK5hBLKMgRg/NS4X6dKBe61nSegQnMQWAIOFnMkA6UFvg54b76zVLOyXbZa1KhkLcz5w== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(3231254)(944501410)(52105095)(93006095)(93001095)(3002001)(10201501046)(6055026)(149027)(150027)(6041310)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:CY4PR04MB0393; BCL:0; PCL:0; RULEID:; SRVR:CY4PR04MB0393; X-Forefront-PRVS: 0725D9E8D0 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(136003)(366004)(39860400002)(346002)(376002)(396003)(189003)(199004)(53936002)(68736007)(50466002)(48376002)(97736004)(81156014)(81166006)(8676002)(8936002)(3846002)(6116002)(44832011)(106356001)(26005)(186003)(76176011)(386003)(16586007)(316002)(16526019)(2906002)(51416003)(2616005)(52116002)(11346002)(476003)(6506007)(956004)(446003)(7736002)(6486002)(1076002)(25786009)(72206003)(50226002)(39060400002)(105586002)(36756003)(6512007)(478600001)(6666003)(47776003)(5660300001)(14444005)(4326008)(305945005)(486006)(66066001)(86362001); DIR:OUT; SFP:1102; SCL:1; SRVR:CY4PR04MB0393; H:risc6-mainframe.int.fusionio.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR04MB0393; 23:yrvjKtylcJwdSpUek0nvXbCfQLfON02XSnjxNZ7lS?= =?us-ascii?Q?iRr6Gkvs1g5Zhh7BTmFYQv7TraK3cub/ESs31U43dyp8DFlC5CWS7CA70H9T?= =?us-ascii?Q?tc+2U8MM/fgvQGBbkPNOFoAgku/fB9Fkg6PDRiTvaxhySt4pmphREKFNB3ev?= =?us-ascii?Q?ZSxsWoZDyyMWZTZIhuzEO9nbFG0zO87mUIn96PuHc5sAc5KiHaAa84zMRMbC?= =?us-ascii?Q?RVjWyxwQk+DkBttzeaXkg1a7ztZdKiLYQjCE/3GrE8NrdztA2BOuIPOauFn0?= =?us-ascii?Q?yN8B6awHynRlhTnmq1z9Rfjh3y4xQ+arDGp7Y5Y34zfjD/6MuspmgYbDlw6E?= =?us-ascii?Q?xsQYQhJWzlGj+JIRR2W3gQeeKFqNPEnEzPgrbFXgIVCHerR71OpphHO3FB4j?= =?us-ascii?Q?Ph3GlgfWg0FiY2zyZf3pDyQrv8qDdrFnBcYuLs0TLLM2OZUpU75dUf+QiGcv?= =?us-ascii?Q?x67HSmY5a1y4ua1ztXaLRlNm5z97FdRxidUSeuPuBNEH8xfy64xerubllL47?= =?us-ascii?Q?qxACotS/X+oEVw9s6UsRO2s4AQJS49Y8yI6t58GIYQPSSQ/NEyJWFDhAdZlX?= =?us-ascii?Q?5x8L4iy8pL+xXjq7BQfWoOvl4gj1acLpZWOR6yQT4sjeLV4laVvk6ALqWA/X?= =?us-ascii?Q?tL5LeKAfd/HnDJcYAaa7+Yeb2vAteMS7NidJSbSh0xuNmrM5qHq4qk6v47ho?= =?us-ascii?Q?QI6FCihOzhMJy+QiJWE5d4DlH2knDhrXBN1P1SAzm7XeX3IVw/nrG8+AfCPf?= =?us-ascii?Q?C8P3OnNMnaIN+EqeSj0SljxIiuXsLjMScISzT7OdvQfwm64w8J/uDAGfWKMg?= =?us-ascii?Q?NNhnqwCwID2cbHaxyFrLPh7dIjE3kO4LMkJkcTv6t18SxUG1elV+8+xmsLL3?= =?us-ascii?Q?CtBBNCfVZImMjoZUHwCG5GL5ZSLj+IbupogGY1rPJpHb4GNc2Eaw/1HFCUHg?= =?us-ascii?Q?yg4LucSJ4Lc0CehogYloCx9vjOXndmyMNnm1oFLY0EkulZD1+NeSG9DqRo/b?= =?us-ascii?Q?7rimVWWCzwZKmVffj9o5tLowUX1pzCP9FOZTrtpnEg5C9qL1/8b4FdQx45/E?= =?us-ascii?Q?eXEFBgx+5zKoFqlHI8tEO2tMdikm8o0vokiqCNHYQWBswQXFngtvfOYRHNKI?= =?us-ascii?Q?fCLgAk/hU85kX3sA26N6ij9l0Gfq81U1r7EUp/VAgddRI5GzxqHMcOIeq8wx?= =?us-ascii?Q?W4Jv5GtkaCuhKW4r1gq0SVqUX1Za2qWRsmyIKVEh/lOaBvorrwOqQgJO45aC?= =?us-ascii?Q?8h30M6yzmO9Rqsiux0=3D?= X-Microsoft-Antispam-Message-Info: wSv+XB9C177jUnSsk1MPO/UmURyWP31+respkkHH447s1SazZLU+jJjgsBMiSHxhEWjfDg/dzDxYjThxjAfcKuq/QisDtAiBBrJ4RghBu5eqzDOZQX7uiJz3x6tD49XHh3op9nMayLxkwEflLRufjCAsVwO+V7RiXMdAf7lQQn5eXcPvApBwHx6wuwVKn4Euvt/gjJS0YipWoMCckwpCccsMrAnSkPmqAGyIHoBJoKnyO3Plc8tZ+3hjdND4/+YZT0F6felU/+ZI4dksknwy5vCQOZITjIISPzbwgvUx49bDo5QqgYEq1SYvzAmIz0QfEN6/4NV5J8c8J67x7+sfGuM6XtyvWizlf+i82kgHZko= X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0393; 6:pobqwbI38SFSnwoVsMjWmRvHFcXlsmLSodiNPjo5ASpGK5IS1KfWyxiYldBBHeB9r8prco304lb2cSI1vOJP0E0+3BkvnjSWjVeCfGHoOmEwV/bxiv/owjTrCLCfuD3VShQ8NbHl2CrzoQAawPxdS6tmpeKDsoNplu6hunOOEcKIDltoiwnGFpdvAQSHQhrZZPWSSDQIRoFW7rV8c7lPd5WACjQiIs6P8MfHGHj/Ws4j0W6BDhQB1JbWj6u87u/g24NOY9MNGlb+DcX0cwvy121Kklw7Xg9WRGdmZSDDVaMwBwyF74rQzTpsxDq4XcxMjDWyN2sKDQFvJOzUoXhmESFNwLEZJxIEctdhB1wI9VldfZeeLuYwA+DdbGb7VTXBEiNGi4/f01MqHg/Qg64Vja7QPqEzO42Z4o/IYA2I6KjnlFBXjla5Dao1t5T7gb3lQjwxwfFo8IH0TipFSpTTOQ==; 5:n8dKqLtvcw1T2X2z9F4ViaK1R/CMXFwILh9+weMrcPTeusn5EeuiYnmE5QHTFwOdBIESF7TgNA5kTW5c9Z2IUL91GoU7D9nZKiiVqcKklOOrQGIxfW24x71CoruQOHEvnIjYScERVrxlRZL2hQeSg4UOLn7pQ9ihKJWgbhSHFxM=; 24:qMBTmwtaIOCej99daAFHgAILOu8Nmt9+7KnQHqK3r6OmR9ueAda3d2xCrt1zb4sEWykVjezq0xxhATZtnou/Lsi6AN5D/9kbV3QMP7ETY3w= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0393; 7:ntxZ49nfI4oUV4njaxyUV81qcAL1y+uZ9R0WXPL74ovtMCeIVc9P+i1Ah2u9mbavFLkKInpEpl16XZajAejowKykbLSqIVqV0GY/k1GfUxWMqtEd2vBF9URdAsToJGE+y+9wtqqdTodPbdaVlvM/yHTLxdBo3VpWTxZnhzUE6sBJgihPO0wsJJ3+zER5WjKLLCE5BNvebWZPVSziSX1gF0NByEo+pmKavpzjnIZNyPr2QTPaEzAnUoTwjplzQZxh; 20:52Hwfk4iNvMieF1tVluHq/BW+j88EJdtdDnmgBIk16P5av09020DwTbQmGIy7yNZwxbVi2lz+9hXsNaiyJb1O5r0JW4tzCE+lQMp/mDSKX4aH9EfKPTiHZDHCxprP/7no6jbAIilHzhkX0LLlo0jLLAQGMRjg1dEq4SS9DkgLpc= X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jul 2018 01:22:30.4817 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4595f173-eb59-42ef-b02a-08d5e2def1b4 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR04MB0393 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 216.71.154.45 Subject: [Qemu-devel] [PULL v4 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 4d3ba4e624..445fe4f7fb 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 Sat May 18 11:46:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 153084053929514.677671241703479; Thu, 5 Jul 2018 18:28:59 -0700 (PDT) Received: from localhost ([::1]:55407 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fbFYQ-00087I-Gm for importer@patchew.org; Thu, 05 Jul 2018 21:28:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36336) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fbFSG-0003CO-CQ for qemu-devel@nongnu.org; Thu, 05 Jul 2018 21:22:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fbFSE-0007eJ-Jz for qemu-devel@nongnu.org; Thu, 05 Jul 2018 21:22:36 -0400 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:40750) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1fbFSE-0007aO-Bh for qemu-devel@nongnu.org; Thu, 05 Jul 2018 21:22:34 -0400 Received: from mail-dm3nam03lp0016.outbound.protection.outlook.com (HELO NAM03-DM3-obe.outbound.protection.outlook.com) ([207.46.163.16]) by ob1.hgst.iphmx.com with ESMTP; 06 Jul 2018 09:22:34 +0800 Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by CY4PR04MB0393.namprd04.prod.outlook.com (2603:10b6:903:b1::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.930.19; Fri, 6 Jul 2018 01:22:31 +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=1530840155; x=1562376155; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=rxUKsg23n6/1KTWC6/h/Nl9Mr5Vw9TDJ4R5XyPMmS9Y=; b=hKwWMW5AAJQqs/6n9Hz/7zWAymYuvMwTfQq1XXJoMjBr1TYPZ/TeO1/h 1RR0FcjKseDWdXyPeL8W20Moo6lwXT8uLwkLaz+ulKezTM+3tovtyvTy9 84NkhafnXS+RwoLkXVLcijhviPVZstiF6U9eXln6rzDGMa3z+vYl3S56L F6r7h2pX3Yy9XCWl+ACwraoqt22w2w+YMNHkXHbNHe0O9d3twCgLdBBKd +18krgW98NZNgD4al5kQBauypGlMEdAvhVOgANUFJdYAl5eV5wadts3Gy Z80gtFgS3uidadQO527viIQKXFcwjcRpZPqMFq2+Y3FmZv+jaR+YCGyC1 g==; X-IronPort-AV: E=Sophos;i="5.51,314,1526313600"; d="scan'208";a="84619630" 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=SO5gRp4xMpUtPO/ctwgf9cFf8jaa8AsrHTGqbJxvLG4=; b=U8Xzi/f7FwaXIfC3tOK67IE32dvP4EUZC3QwmkAMCozUH298Ba79l5cg18SuIpG7scyyoEXTLitRiUG4X0yGZKwtRAEN3BALri+YnSRtDv5xyLWp6Dn/6+XjrbnmEPMRjCj6wk9sLtd+7PYa6EhM2dnAp3QREC4UNId6DneJalw= 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: Thu, 5 Jul 2018 18:22:15 -0700 Message-Id: <20180706012215.21714-8-alistair.francis@wdc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180706012215.21714-1-alistair.francis@wdc.com> References: <20180706012215.21714-1-alistair.francis@wdc.com> MIME-Version: 1.0 X-Originating-IP: [199.255.44.171] X-ClientProxiedBy: CO1PR15CA0105.namprd15.prod.outlook.com (2603:10b6:101:21::25) To CY4PR04MB0393.namprd04.prod.outlook.com (2603:10b6:903:b1::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 85b2a8bb-0e22-4914-2191-08d5e2def21f X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(48565401081)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060)(7193020); SRVR:CY4PR04MB0393; X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0393; 3:z15/6+vQkRKQwzcbam9KK5A14cP8wotRtFSWMj0aZvzY4mDRdrSfSGGAa5snie4nL1wqov9wUVyNuhpcrhVLLT5my4VW7a5LmA2PcC3J78AeRt6HLrvyC1I/Ss8dD73huSBclnpQiYnAI9WG0g1yIPzeDC67FdY+9c6n6t9VIG/bzdvO2eU1uMlAkFWsXXyUyDeAptJjtoAz5cATXXyn0BQHFztCa0AYFtV4jnzLYYRkMu8X30WHDoU0kFCiFdUI; 25:gaeep+JmzN2TAyEOqob7jqFFCPfkOcBFL83V7BOpmRcZD6JWlri21/l/PuHg9ieqIEIz+JyxWpWebfTJpV6O6LNGWgzDKhsONzvGEvU43fF5zSSd6nE6TXucc9yUZOGkl5vQ0UH/OnzCvo4+21vwqsAad5nTgnGTwQ7DwKKNme0D2A7xg0rEa57Xugr5XVta+j8rAb3VtTX56/xs7i6Pjo9o+vUnKv5LE3x3YAKag7LOlE1MO5NI8qgm6P3gfRxMUzxdfXD/xIa+hT6/Avvs3e2c5ZvV76q5nGVeRT72ygOuWPKmHxqWpBXL1suSw22CoaCPbjWwxiwd4UOivHPWJA==; 31:5rKFzkkKe7va3JkGNSpOSOXUkft3y5l2b1gPibVuejWpLPNdJLVq84FGXGdHzw471iH6OAE9agfKr12qb7SirMQp571DQfQipk0k2vE1mgFKvnM8LOehDun8Oy5o4yMpBdOEFk/vXWZ0OC6CDeEqRWIXfCwhmR3itltSQfMCEpfMO7Yf44yBl4IFQIMf8X0JBuHeB3/3Os/xAT1Cdp919QlIrmL9rWdEWy2xKuDylQE= X-MS-TrafficTypeDiagnostic: CY4PR04MB0393: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0393; 20:0Q35uMfVygJco7HUWf3F2kSHmbW5NhyZ+pyp4D/IoNVofUO7WcM0fTS93vNo9/fGBHLrGI/hQklaJni8/9K5RA6gA/fJn58rVclqQPWKuRKrKzGoTB3HnnvID2HVxDJMM1P8zJ/06YFcq9bSUZNV7NuzI1zHJafU39cBv9o8d+UA8cSTaq0Q/VGlYihbB9o/KzM9U14l9r1/MgIrFYtxcOsZbXT2Xu1Irk+wvOhWLlsk4mU+Fw4ZUoA49vHJJ7r2z4OwPQ2Mxz9qoK2fEAof32ieV1x78E6Z4lr2vIDTnDnePZ4eI7YUAjhS5Ua9k8XVkBSDHnUTKQ0EdBulvIKZKxg40FDSY/8/DHp97IKUWhU3gRNGQBw5UtXmtv1A5X5E5FFsQB839xQNHxhE8UbWvqwb+1+6bI/bZD5T1+1pvN9r1iiUP4h3svnW/HvtlXyaJieQrpTzSOD34CcFFcNHiLREapv6F6IMPJ9lfnWYqCegl2Gx3p/U1m5WdVc4xtMi; 4:N9nPG2c3KBk4m5JG23G4Aec06qv5abng+PiJapePAJOpQfZIZPKT+kVM2Nb+VTeF/co0Ed6uZdP/rye1guYyRbVTgvwl+w6brwXxtMXPQAJMdmBzbnDhTOCIFtkDxLET1IXF9b/DWceka20K4FHGk5sRaXKmQjp9NpvYt7FPIucCCApBRnauoz2zifJyLBoEvFTuQ1N+tQiCbcKTKPwrTUeHkqI8OSHYne2Cwwnsmgw8TICJSOR8b7JZ0mrykuUXFjIV8jRPQZKO3m5Z4DkDsjlAPkubSx1wRmntsG7UyeLTGPHRGFbvwpm1LADSRjCS X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(21532816269658); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(3231254)(944501410)(52105095)(93006095)(93001095)(3002001)(10201501046)(6055026)(149027)(150027)(6041310)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:CY4PR04MB0393; BCL:0; PCL:0; RULEID:; SRVR:CY4PR04MB0393; X-Forefront-PRVS: 0725D9E8D0 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(136003)(366004)(39860400002)(346002)(376002)(396003)(189003)(199004)(53936002)(68736007)(50466002)(48376002)(97736004)(81156014)(81166006)(8676002)(8936002)(3846002)(6116002)(44832011)(106356001)(26005)(186003)(76176011)(386003)(16586007)(316002)(16526019)(2906002)(51416003)(2616005)(52116002)(11346002)(476003)(6506007)(956004)(446003)(7736002)(6486002)(1076002)(25786009)(72206003)(50226002)(39060400002)(105586002)(36756003)(6512007)(478600001)(6666003)(47776003)(5660300001)(4326008)(305945005)(486006)(66066001)(86362001); DIR:OUT; SFP:1102; SCL:1; SRVR:CY4PR04MB0393; H:risc6-mainframe.int.fusionio.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR04MB0393; 23:zMyzQAJeAE4O1qmh/z95wCw3cXxTTalqb9KV/Yc5v?= =?us-ascii?Q?zZCLnYN/Eb6Wwh0m51LaESBQPk27OoD/TR1gY/2EZmULHXsUpOdpPvRduNRe?= =?us-ascii?Q?eTo0Nehan0E0k5WNWJ2xQQP6tndSHggW7Raht1SAP8epPiVsuLwjp7Jhsel2?= =?us-ascii?Q?mlJ6D3gqF68KtnZ2rAWFT35gQiBOkuZ7VETseoBuqjC7CLAJGG5pf0kfnaMK?= =?us-ascii?Q?vwJOuU7eT8n+zQmz2iyUg9tsHCOjlIYQ2f+ZobvOLTgB7KJ6T07qfGHyKlN8?= =?us-ascii?Q?toA4GEryD4Ku8ZHUEq7x+alsWC40/gNxLk8ReOz2fEuXyS7UVIDT8aTEgc0l?= =?us-ascii?Q?pP/Gu4pnztsV73WTYRB0SYhUCBIrjte9EOzdnZz3R+bDbgesvm9H1W0eEkt2?= =?us-ascii?Q?E8faJLHquPIaOUFJJsAZklHY32/ssTv0oZcGu3ckFiGArgCO9YZe35FzRo2k?= =?us-ascii?Q?zIt7ZJ5gaw3VnqhU+DUdekOaM9kadK6+QONnfb0D01lKqs1a/bwY/IruMDAm?= =?us-ascii?Q?YZCS8ro++vQEgwOFi71hkmDwhp9OsbElldqKnH2qXmC9r/L6sQFwwZ95HaGi?= =?us-ascii?Q?WAFQ1rtGwLY9ZYsTSIAU46An5ywfhA7Pk70/+B3OIq+2ATifzxVj/9USaVDb?= =?us-ascii?Q?v8O73hhmsWWVS/Z2GnwS7vx2wwn3iDMMv4Bkx0utxgA5tqK5jdJRvPzlto9D?= =?us-ascii?Q?D9wxPQxUcMg0qM/3Xr9YiKbmo8HYmoXiCIwAaq93cyod/ripyVE76HkdouqA?= =?us-ascii?Q?yqUx1A3alOd4ysJkoTmCkFtZb8pcDVBrWgNXbGv60qNsaP+W7XPHqhka/Hd6?= =?us-ascii?Q?wrEyAEJPdpkgNbNJeqocEE7xbFzqyK4afYVjnK6cMBbCSSaIIYL5S5Gq9aoU?= =?us-ascii?Q?QXDFxNOxLZsuvnJIPlF3VN6tIgdiafIQDQLhG9MkckfYIZN5H2TGRyzYtdNm?= =?us-ascii?Q?lrCVpnlqn0J85fGF16hTF4qO0X73aZHiJmHAm+zPiWlmijGxp0OO5VzFGGzO?= =?us-ascii?Q?+KYuGClGXCsKloPTWRyrsqdZxsWKJh/qqhhBtV5MjI7fxyAVHa8KnlKJPojf?= =?us-ascii?Q?dQLyVbjnBACJ/AIGkMUVFC6a/aZ3aPAFjdR656/ePBmHukeV7esXek1a8Ew/?= =?us-ascii?Q?RV3wIHei6zWM8iP1Xtah2KgRxgmCTSz1DHTSWCYhfif2pJibMRJPltZn4YA7?= =?us-ascii?Q?h0HIsSnyHMs6IFAnMkN0vFhcUqOaencFv3zi5k5QJrHPsQpKeyLt/0APw=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Antispam-Message-Info: TaGXMapr/A6uMvTnmluKemJ07xCHgGbFZfu3aeMaoUfBmfppyLsaBzKD5aeq8vyEw/al0IZTF8a/lEjy85Uy8pXd1BJzhRrWjd2mnVv57gR38+rETRZxYJItB+wtd57JdE+ewjhBrr3mKtWmxNWJXrvUybITsFACm4gs7psTD0XeiwuEVa49ZbQ/kwUGGm0bkeTct8nhYRj70iGJgHM3Y2XdJKkglC1iLRJV5qAnB3UFeTs+HHeEHSh5zANbB5t3t2aUiijs2h4RudXzAj+tn07aUbMFLFcJ/A4FkHqKvgxh8Z6MwFqzKqXo7JQVM6wBsFp+unYwwRbjZMSdlH17m6usSbTh4TYqcY8t2EB+n1o= X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0393; 6:+IDxvmewty57QHi1pF17ofk3WiRdHUSDvxvkBYN6uiri+rxleHNMRP5z5b39s5P6/aNwtQJeD6oaiaJpAUvPo/1UAQbG357fgPKrMfRMQLPTJ4/gChNdUCFO/2uUFBHJWohcDA+PKtr5LWXfrqiZazXKH3cGxVeEZ65Mxnm/UX+0W7jO5Fp1W2lKzU1HZ9IVXbUgP8IvrxzJDaL1eh8iQtFNjKuaW9WE+ukSrF5/Ii5fuiAW01rQCwJdeqBiXdLpO9P4lUJ+FlMFwG80apdtK9fR8wHg3amwXq/cy1wOoVw+p2XMTuFEVITm2wWV6CvVSZrtmu6iIgltho+ISLzO0aPzzFuDrl8fcXgDXPGCE6u19zZW/HEI0O5/nJAYrTe65shMXa/alGAWF0ZdSmje1VY4lSQzuRmqTkDYANJ7aEys/DBaM9dnVIR4NxKCfFW+wzmYUSeMBTwizpf14cgXCQ==; 5:NNDCYyeHdAQQfz+JHVRMvy+wRlyy+WFcdSwC3eDO14mCTI4dG+ll2azM2QfnSekycjpR2tNXLNrOQjUeIgFH2UjKZ76+JwMdlHpi8KLamRSD1pzOnkj+nOFCaW61skBgMuznkwhv47mOPoJbXZqHBbam+VVTTmTz2Z7upednN70=; 24:a92gkYfvtCXbJVfayux2phizVH3mkqqIhogtSOaFNe4tlPO/RWGDlq6GhbSLFoiW7ESArs5KyRCLW6GZSDBRehwVBV5O9blKzEqeHVP1pnA= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0393; 7:fv2HK8MPouV+f2kMVeDgApayz4o9ZuJ+Z2yHtfxQCrOrgWcDL1oqg4BoQkxw6LnFXhK1bqUdmB/JVTe5iTUZq8fZf5bV9MW9XqiivEv4dlQFZKQMk5x26huOjq15InUaRGmorcJnd6urhUN6A+iBnC1utiI9/peF+g0vghq84iK+ODnFLYEV0IHZtbgEPKYAG/fgOuD2/x61kM+sQ2k8cDEUUR96fSJpJlxkaV/XNCG2wNQjXSqQpteIN4foZPuU; 20:2rCVcZF8BXeu3tFUsMPvXFMJeopdtnCl81eQaauWr5QlIoov09eJi0CpYtT+Tjv03lPRSOzfR7rmi724bLa77wO5TniWOYyDdLWkeB6SME1ADnzGPgfcOrNi3HIqXWZDtilPX03W2pT/NnlXkFo1eUw7fq0uBvmx7PBlR56hwrI= X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jul 2018 01:22:31.1803 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 85b2a8bb-0e22-4914-2191-08d5e2def21f X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR04MB0393 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 216.71.154.45 Subject: [Qemu-devel] [PULL v4 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 445fe4f7fb..3a6ffeb437 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); @@ -286,6 +310,9 @@ static void riscv_sifive_u_soc_init(Object *obj) &error_abort); object_property_set_int(OBJECT(&s->cpus), smp_cpus, "num-harts", &error_abort); + + 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) @@ -294,6 +321,10 @@ static void riscv_sifive_u_soc_realize(DeviceState *de= v, Error **errp) const struct MemmapEntry *memmap =3D sifive_u_memmap; MemoryRegion *system_memory =3D get_system_memory(); MemoryRegion *mask_rom =3D g_new(MemoryRegion, 1); + 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); @@ -324,6 +355,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