From patchwork Fri Dec 14 00:18:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 1013215 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.b="gpfinAkL"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="VNQPuYji"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43GB4K03y3z9sN6 for ; Fri, 14 Dec 2018 11:19:13 +1100 (AEDT) Received: from localhost ([::1]:57525 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXbCA-0000NN-JB for incoming@patchwork.ozlabs.org; Thu, 13 Dec 2018 19:19:10 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37656) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXbBc-0000MN-Lm for qemu-devel@nongnu.org; Thu, 13 Dec 2018 19:18:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gXbBZ-0002Cc-Gf for qemu-devel@nongnu.org; Thu, 13 Dec 2018 19:18:36 -0500 Received: from esa3.hgst.iphmx.com ([216.71.153.141]:47776) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gXbBZ-00028u-57; Thu, 13 Dec 2018 19:18:33 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1544746712; x=1576282712; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=Yj47o0scm99gzB+xz9x5v2Uk40MeUTyBLuk9laPLBco=; b=gpfinAkLG3AFR4pavzO0yhv2RQP3kV9WqTv22biA8DiaHQxjVq/jRZ6a TAMIr5PDmFWuNRmECKqQ3b286Ht2DGXLMEBciU4xBgjrUGwbwBmqUcimZ Geo6ciI/O7iJrrb+7n9X7xONJRjJ/7NhRaPGgz3Bp2AsshslTLE4a8mDP ASh8yaga95I0wElRAwuHJP0Fszh2HBRj9QK9mP7uZTtm+0aWUxkDkO0H1 h7YTnMNCAtr0ydyfSojCTpj57x7LLq4IcTEMep/86LZKRQNOfInY3qHhZ 8uSJ9rMeQ429Cc/ONI0vLSNPR3/EIdx/jnCpQSdz+XNTJ3ZQxHY1IGakt g==; X-IronPort-AV: E=Sophos;i="5.56,350,1539619200"; d="scan'208";a="101454238" Received: from mail-by2nam05lp2051.outbound.protection.outlook.com (HELO NAM05-BY2-obe.outbound.protection.outlook.com) ([104.47.50.51]) by ob1.hgst.iphmx.com with ESMTP; 14 Dec 2018 08:18:30 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector1-wdc-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mx20Gjmy87dfovxbpEJ2WCRAUCL1EYSydHGqbS7Tjeo=; b=VNQPuYji2oFouOWousmt/Ab++W8NCO0CyVyxdV9qOs7C7hFZUpzl6RMAz4c3nrcUNt94X4060w//875RrMft8GryOJAUvM4N0kc4sNtK/2xN1sMd6KCF6L4Gm//aioYvLVhjcB9/27KOfPTar1VjKp7i+XUcTdRzSBcTfMCqiCk= Received: from MWHPR04MB0401.namprd04.prod.outlook.com (10.173.48.18) by MWHPR04MB0497.namprd04.prod.outlook.com (10.173.49.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1404.27; Fri, 14 Dec 2018 00:18:30 +0000 Received: from MWHPR04MB0401.namprd04.prod.outlook.com ([fe80::9067:fb44:66b2:7604]) by MWHPR04MB0401.namprd04.prod.outlook.com ([fe80::9067:fb44:66b2:7604%3]) with mapi id 15.20.1425.016; Fri, 14 Dec 2018 00:18:30 +0000 From: Alistair Francis To: "qemu-devel@nongnu.org" , "qemu-riscv@nongnu.org" Thread-Topic: [PATCH v1 1/5] RISC-V: Add hartid and \n to interrupt logging Thread-Index: AQHUk0KKnj0PoIBaoU2IBeWChk9aYg== Date: Fri, 14 Dec 2018 00:18:30 +0000 Message-ID: <12779d199ff308501e5cb35b70ee04dc8f5edd22.1544746653.git.alistair.francis@wdc.com> References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.19.1 x-clientproxiedby: BYAPR07CA0106.namprd07.prod.outlook.com (2603:10b6:a03:12b::47) To MWHPR04MB0401.namprd04.prod.outlook.com (2603:10b6:300:70::18) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [199.255.44.250] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; MWHPR04MB0497; 6:4Ni4pRgWEbdQrkrnaQy9Xx6fwpg8UrEvGpWN1NZi5arwzTnHkxlgj03XYWsuUWBc4JS0WwMTTkO9HG0iYfRxCaBePcDMgBAHGQZ8FnR0kzd8qUQugcgygiURv+VPfz6anWSsgVmQbCqSQTIRvk6lSGFfGclB9WM9cjOn1+AZq6RckxIB3ButXMZpmyq9anQbkfoyAlv1+PzsOlAiLrMbH1xsAL//qolu87D+fYgsKRCNWDHSyMnao5VLUDkoH75QKsOe+14vzpqkSioWw/kwQXlhpLRim6GlxgEn17lGvUT8tR410wx14sTYoG2rs22TyjbUb8tkCMhE2/k+RygFdunhoTSGlxcaf05Gzql5zcBJ1hSCfK1nLfMaOhwEiO5xgNUNQF9G6NQNtA0Ix/tEHAD6ksoXbHzPpL6f0vS++1Azn0zaMUZ5gJAsOYhOt331ZaqvuFsxEUO4CkQ6OTY0iQ==; 5:Nh9zCcN+twHRmJaxdPmARqujFminHqVrxRhdCmrzvl8WlxgPM6OSnC44xlL2Ug17uusDAWz8DKSpw5mBjHy6XPXTnf5mQsCmg9niuItsS5k1zpIXYOzsLtCTRlIb9YquGdvvTOw0EJqeIsa5r/8ngRjzrzY89aFztC/W3XpggUM=; 7:j0xbU2ukdhdEA3WthNlq3PlT5zvWWRpSM18oiPO9EqMy7YYNiozzdUjz+kg+zANmfNpWX+Kis1lmrOOh7+RFOT31HGXYpntuLFt8d6TGEuHdjCXc9gnJauh9hLI/QZBnXt5Q1yHT3Ol0ARovJWTTLA== x-ms-office365-filtering-correlation-id: 13b0f60f-6830-4c5c-8e8f-08d66159acec x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:MWHPR04MB0497; x-ms-traffictypediagnostic: MWHPR04MB0497: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(3230021)(999002)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231475)(944501520)(52105112)(93006095)(93001095)(10201501046)(6055026)(148016)(149066)(150057)(6041310)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(20161123560045)(201708071742011)(7699051)(76991095); SRVR:MWHPR04MB0497; BCL:0; PCL:0; RULEID:; SRVR:MWHPR04MB0497; x-forefront-prvs: 08864C38AC x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(136003)(396003)(376002)(346002)(366004)(39850400004)(199004)(189003)(50226002)(106356001)(3846002)(81166006)(11346002)(5660300001)(81156014)(68736007)(8936002)(71190400001)(36756003)(71200400001)(105586002)(8676002)(7736002)(256004)(2906002)(6436002)(72206003)(6486002)(478600001)(102836004)(53936002)(14454004)(305945005)(25786009)(6512007)(4326008)(476003)(52116002)(316002)(118296001)(54906003)(97736004)(66066001)(39060400002)(486006)(2616005)(2501003)(44832011)(6116002)(386003)(76176011)(6506007)(186003)(86362001)(110136005)(26005)(446003)(99286004); DIR:OUT; SFP:1102; SCL:1; SRVR:MWHPR04MB0497; H:MWHPR04MB0401.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; x-microsoft-antispam-message-info: VBXDpYsTVykGiSsMQ9qDGV76Q6Nm3CtTENiFlECNsHwAooyYOmQ+tIwH6tawTislenIZFni+aJyc0T8ZYQJmSMLkunJ67gX5uWSWFTjJaIm4D8t6U9ipk9ShwU6Rgir7RsPLNH05wkYHJKSthDeSU4A99wgSD9cRA/SsrYioI776ydVezrTCuSpB7m+vDFb2tnUvj8un8EOJzlTFOC9WIxGzYHtcsPvVgAkF3cCQR2yNsdpFR9IeYjlKj8ZxisoKFkNXnNRC6hLuKS1I+2lAKtAFZOVukYUc199nJYwKomXOe3Wg9yrYcgxphVm4Q86u spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 13b0f60f-6830-4c5c-8e8f-08d66159acec X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Dec 2018 00:18:30.2702 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR04MB0497 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 216.71.153.141 Subject: [Qemu-devel] [PATCH v1 1/5] RISC-V: Add hartid and \n to interrupt logging 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 Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Michael Clark Add carriage return that was erroneously removed when converting to qemu_log. Change hard coded core number to the actual hartid. Cc: Sagar Karandikar Cc: Bastian Koppelmann Cc: Palmer Dabbelt Cc: Alistair Francis Signed-off-by: Michael Clark Reviewed-by: Alistair Francis Signed-off-by: Alistair Francis --- target/riscv/cpu_helper.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c index 86f9f4730c..0234c2d528 100644 --- a/target/riscv/cpu_helper.c +++ b/target/riscv/cpu_helper.c @@ -445,11 +445,13 @@ void riscv_cpu_do_interrupt(CPUState *cs) if (RISCV_DEBUG_INTERRUPT) { int log_cause = cs->exception_index & RISCV_EXCP_INT_MASK; if (cs->exception_index & RISCV_EXCP_INT_FLAG) { - qemu_log_mask(LOG_TRACE, "core 0: trap %s, epc 0x" TARGET_FMT_lx, - riscv_intr_names[log_cause], env->pc); + qemu_log_mask(LOG_TRACE, "core " + TARGET_FMT_ld ": trap %s, epc 0x" TARGET_FMT_lx "\n", + env->mhartid, riscv_intr_names[log_cause], env->pc); } else { - qemu_log_mask(LOG_TRACE, "core 0: intr %s, epc 0x" TARGET_FMT_lx, - riscv_excp_names[log_cause], env->pc); + qemu_log_mask(LOG_TRACE, "core " + TARGET_FMT_ld ": intr %s, epc 0x" TARGET_FMT_lx "\n", + env->mhartid, riscv_excp_names[log_cause], env->pc); } } @@ -511,8 +513,8 @@ void riscv_cpu_do_interrupt(CPUState *cs) if (hasbadaddr) { if (RISCV_DEBUG_INTERRUPT) { - qemu_log_mask(LOG_TRACE, "core " TARGET_FMT_ld - ": badaddr 0x" TARGET_FMT_lx, env->mhartid, env->badaddr); + qemu_log_mask(LOG_TRACE, "core " TARGET_FMT_ld ": badaddr 0x" + TARGET_FMT_lx "\n", env->mhartid, env->badaddr); } env->sbadaddr = env->badaddr; } else { @@ -536,8 +538,8 @@ void riscv_cpu_do_interrupt(CPUState *cs) if (hasbadaddr) { if (RISCV_DEBUG_INTERRUPT) { - qemu_log_mask(LOG_TRACE, "core " TARGET_FMT_ld - ": badaddr 0x" TARGET_FMT_lx, env->mhartid, env->badaddr); + qemu_log_mask(LOG_TRACE, "core " TARGET_FMT_ld ": badaddr 0x" + TARGET_FMT_lx "\n", env->mhartid, env->badaddr); } env->mbadaddr = env->badaddr; } else { From patchwork Fri Dec 14 00:18:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 1013217 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.b="QG0b3rIb"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="NHFqNq7i"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43GB6m2PKzz9sN4 for ; Fri, 14 Dec 2018 11:21:20 +1100 (AEDT) Received: from localhost ([::1]:57542 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXbED-0001gm-UH for incoming@patchwork.ozlabs.org; Thu, 13 Dec 2018 19:21:17 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37692) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXbBm-0000SI-PA for qemu-devel@nongnu.org; Thu, 13 Dec 2018 19:18:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gXbBj-0002bU-KJ for qemu-devel@nongnu.org; Thu, 13 Dec 2018 19:18:46 -0500 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:28134) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gXbBj-0002YB-Ah; Thu, 13 Dec 2018 19:18:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1544746774; x=1576282774; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=wy1gsWhNMyacTjYO5PUk1751KW5SzxgFqKFa5DzAg3I=; b=QG0b3rIbGciJT73HXf6hacIqR2uUKyRtINIrslw6pqXpxPMTD6Cq+3cB JgMtqW7l2oYjJv6zch1B7ZZgc2bx1UEdHk5DtJYipnyiF/gtZXpy1mUk9 3iPjMb9D+pdLLySWTjaJ3DWbKmDVOibpqDxFO+hC97RoWNyuD7qCRwsbB ACJTmpmEqgwSc2MhdBb+uDoVD31FrvpNFGOaRQ8z6avAio25vc/OGxjal y+y4sew2AJNVUToXeY47NBoCzbnrnmQ/699luo6QMiCwMeGqGod8Hu75S HRTm64sIJUPxhOVsAj2BQKX/ZN1MDtjeza8tjzA2uJE4Du7nGLFRY3D0H w==; X-IronPort-AV: E=Sophos;i="5.56,350,1539619200"; d="scan'208";a="194449099" Received: from mail-bn3nam04lp2059.outbound.protection.outlook.com (HELO NAM04-BN3-obe.outbound.protection.outlook.com) ([104.47.46.59]) by ob1.hgst.iphmx.com with ESMTP; 14 Dec 2018 08:19:30 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector1-wdc-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=dcBICFHbDOZ4O/C91zn+7v0Uw6hhu1/JBCQEFOPEHuI=; b=NHFqNq7ibgF+UYzIK+lePvap+tNgw5k2y1YYxHyvp1NUdoO4gyow9z+ZL+/zq5FSz57oq55AjXcAZ8wZbOZMPtm4awmUO+HBVefMMmOcSr0mJi63xg8EJcYgc68RfBworsaCPbGz6WN+IV77MVj9Gdp4wvdGS4TXLji4OqV1scg= Received: from MWHPR04MB0401.namprd04.prod.outlook.com (10.173.48.18) by MWHPR04MB0497.namprd04.prod.outlook.com (10.173.49.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1404.27; Fri, 14 Dec 2018 00:18:39 +0000 Received: from MWHPR04MB0401.namprd04.prod.outlook.com ([fe80::9067:fb44:66b2:7604]) by MWHPR04MB0401.namprd04.prod.outlook.com ([fe80::9067:fb44:66b2:7604%3]) with mapi id 15.20.1425.016; Fri, 14 Dec 2018 00:18:39 +0000 From: Alistair Francis To: "qemu-devel@nongnu.org" , "qemu-riscv@nongnu.org" Thread-Topic: [PATCH v1 2/5] RISC-V: Fix CLINT timecmp low 32-bit writes Thread-Index: AQHUk0KQ5+1obptxXUeurTd0K+nBXA== Date: Fri, 14 Dec 2018 00:18:39 +0000 Message-ID: <66f87c98f9a2122262d7c3179052df95e42b6917.1544746653.git.alistair.francis@wdc.com> References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.19.1 x-clientproxiedby: BYAPR07CA0098.namprd07.prod.outlook.com (2603:10b6:a03:12b::39) To MWHPR04MB0401.namprd04.prod.outlook.com (2603:10b6:300:70::18) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [199.255.44.250] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; MWHPR04MB0497; 6:DHMzje1i3K7rRNuHiHPLCg9mlPdPcgpD+Y9cDx3awzQELyoOBgwsvzxOUxZI9w1YdDNUeY/KHrX4Y/gNTYxQHkkoovPVuog16TtIpui6eyfaMFrGJnHx2jtjyfD6Lvyt/WtkBk64M0gfyeZs0xJN6etgBsZuIyNoTTddlTHroDRetbXxQTtPTLg2KuCJ8LQ3LULQFCju1yX//YKNLl48UN/T5MrObGxcaeghFNYOturiKTyJn3Cwk1du/4tAkX7VqrmtYXBx7/6SNa5euO06DrLm9bwm4klYcKgF25r42R4eZZ2kaxyYu9URCrEegK32J51P/3UrRRtnDAlUehcKy/hN/A+0TH0BD9P7IUUcD7Wr2b39SqeYrlYfhQ2IqzSZHzgLO2r5BrV04+fG71Z46uYtUFmAA766YdTEk0XRtTevSfiM+UgJfWy7FqyvqYme08bcyTLAbp8lRPb0BLn+1w==; 5:ctgbatV0/665zggN7oyWwH/+WTYslgLUmS5AiPan5roNOXs6SeyLdwSY5ZMCcczNHRlOF7aj53m6ZQ/Pc8YNmBrVkZF3uf0cpksQk3jiv3USap9KevPqO5RhWAdF86HObQsu2OVSpYJDiMjaM8hUjr05E3ZP32vz2/QG3A582ME=; 7:dIgU43v+Q6BmBM37Gstb5lEJNwyKTccyunLskEXQbKSJfw4Q0neffw1aEx5067rn0xYBLkXCOQTN5+D155ioKd4AYxogtnF0eP1WKHa8ASLf9g74zfd8OXEcel3UXNXxPP8RgPz5/Fc+FvnHHjMfGg== x-ms-office365-filtering-correlation-id: 1a146e27-79e0-4d28-429b-08d66159b26b x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:MWHPR04MB0497; x-ms-traffictypediagnostic: MWHPR04MB0497: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(3230021)(999002)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231475)(944501520)(52105112)(93006095)(93001095)(10201501046)(6055026)(148016)(149066)(150057)(6041310)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(20161123560045)(201708071742011)(7699051)(76991095); SRVR:MWHPR04MB0497; BCL:0; PCL:0; RULEID:; SRVR:MWHPR04MB0497; x-forefront-prvs: 08864C38AC x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(136003)(396003)(376002)(346002)(366004)(39850400004)(199004)(189003)(50226002)(106356001)(3846002)(81166006)(11346002)(5660300001)(81156014)(68736007)(8936002)(71190400001)(36756003)(71200400001)(105586002)(8676002)(14444005)(7736002)(256004)(2906002)(6436002)(72206003)(6486002)(478600001)(102836004)(53936002)(14454004)(305945005)(25786009)(6512007)(4326008)(476003)(52116002)(316002)(118296001)(54906003)(97736004)(66066001)(39060400002)(486006)(2616005)(2501003)(44832011)(6116002)(386003)(76176011)(6506007)(186003)(86362001)(110136005)(26005)(446003)(99286004); DIR:OUT; SFP:1102; SCL:1; SRVR:MWHPR04MB0497; H:MWHPR04MB0401.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; x-microsoft-antispam-message-info: +/KBg4jVU9/SpICX8lQllFd5DGV+DHmO96ePkiGb3TTjDQJDrcBGkqKD6GifZEvBn1ynu/Ze2OXcvZ37mKzJesmDlwVliBq4juYGFEPIoM/MCsfN4hi7AU9sr25NwE1C5dgrldhJDLc/3uaYNN7d5sDG0shrUtl/ke7sPustop9Mynahtx3Nhhk7xCGQlwsv9YECVAZapZGYgek+Hn6WVghiE9NjVUPytSAOd+3R2nH296Sa/rY1qk7snRzxPEKhjVzb8V8F5QAztvm3li7bTSHaK+DzNgco2XIxB4riQ9MP/GTbx++nvREThbyq3/Mz spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1a146e27-79e0-4d28-429b-08d66159b26b X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Dec 2018 00:18:39.4891 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR04MB0497 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 68.232.143.124 Subject: [Qemu-devel] [PATCH v1 2/5] RISC-V: Fix CLINT timecmp low 32-bit writes 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 Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Michael Clark A missing shift made updates to the low order bits of timecmp erroneously copy the old low order bits into the high order bits of the 64-bit timecmp register. Add the missing shift and rename timecmp local variables to timecmp_hi and timecmp_lo. This bug didn't show up as the low order bits are usually written first followed by the high order bits meaning the high order bits contained an invalid value between the timecmp_lo and timecmp_hi update. Cc: Palmer Dabbelt Cc: Sagar Karandikar Cc: Bastian Koppelmann Cc: Alistair Francis Co-Authored-by: Johannes Haring Signed-off-by: Michael Clark Reviewed-by: Alistair Francis Signed-off-by: Alistair Francis --- hw/riscv/sifive_clint.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/riscv/sifive_clint.c b/hw/riscv/sifive_clint.c index 0d2fd52487..d4c159e937 100644 --- a/hw/riscv/sifive_clint.c +++ b/hw/riscv/sifive_clint.c @@ -146,15 +146,15 @@ static void sifive_clint_write(void *opaque, hwaddr addr, uint64_t value, error_report("clint: invalid timecmp hartid: %zu", hartid); } else if ((addr & 0x7) == 0) { /* timecmp_lo */ - uint64_t timecmp = env->timecmp; + uint64_t timecmp_hi = env->timecmp >> 32; sifive_clint_write_timecmp(RISCV_CPU(cpu), - timecmp << 32 | (value & 0xFFFFFFFF)); + timecmp_hi << 32 | (value & 0xFFFFFFFF)); return; } else if ((addr & 0x7) == 4) { /* timecmp_hi */ - uint64_t timecmp = env->timecmp; + uint64_t timecmp_lo = env->timecmp; sifive_clint_write_timecmp(RISCV_CPU(cpu), - value << 32 | (timecmp & 0xFFFFFFFF)); + value << 32 | (timecmp_lo & 0xFFFFFFFF)); } else { error_report("clint: invalid timecmp write: %08x", (uint32_t)addr); } From patchwork Fri Dec 14 00:18:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 1013216 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.b="blAWT1YM"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="Z/wJ2NHv"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43GB6g3lLCz9sN4 for ; Fri, 14 Dec 2018 11:21:15 +1100 (AEDT) Received: from localhost ([::1]:57540 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXbE9-0001dM-2C for incoming@patchwork.ozlabs.org; Thu, 13 Dec 2018 19:21:13 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37730) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXbC0-0000bw-Jr for qemu-devel@nongnu.org; Thu, 13 Dec 2018 19:19:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gXbBx-0003AW-Ep for qemu-devel@nongnu.org; Thu, 13 Dec 2018 19:19:00 -0500 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:28157) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gXbBx-00037w-4O; Thu, 13 Dec 2018 19:18:57 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1544746795; x=1576282795; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=ecaL16ZSjyDYZW4/ZM0vvVB08d24Vby3wFqrleDnp/0=; b=blAWT1YMjdyfaF9hCuIz8oF88riNLtpM6lRTvxE/0FR6fhRaFVMtXCkF qUCRVXaIQtSfHGUMpga3OfBSJUeNCtsU4bQ77cc8CATkqTM5yb5AQI/eh hKLl+yOXg2e4859rCwOLXN6Yv6LKvTH3Yv94MLUM4X5k/xyCipH4OvdKm HrGJOLFIqzr4mf0Lbx1U3o7MIL/2KhvF5va2J32lhezMAt90DTtfP9dtc nNvdzg3BzccxwkHS6JES6voa6AAoKFSCcT/swVLrQRLGYKTu2dRTC3P1A Bw7KX4X/4PHCHtEerbc5yID3p59SttPIc/5F0fiStc1fSoYKr1Oi9g4I/ Q==; X-IronPort-AV: E=Sophos;i="5.56,350,1539619200"; d="scan'208";a="194449112" Received: from mail-bn3nam04lp2059.outbound.protection.outlook.com (HELO NAM04-BN3-obe.outbound.protection.outlook.com) ([104.47.46.59]) by ob1.hgst.iphmx.com with ESMTP; 14 Dec 2018 08:19:52 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector1-wdc-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lv+zSQRCU2CLLmiI5UKaafC+2BLy3oEGA8wyRXMFSo0=; b=Z/wJ2NHvMJau7+0hYQljBLLC+kkjL7LsNY+c0+PPxzKRJb9kk9yrg6Nc8c1bj18hny2TsXB1ZUBLFx+upJJn3MAUgfR53Q4hVQDLUrbka8+3o1KMAOAoWqsWXBFYVbkniyD6ARJr9EmlAneqJKWYkJcTZUbbpWvcoURN3HqYn8U= Received: from MWHPR04MB0401.namprd04.prod.outlook.com (10.173.48.18) by MWHPR04MB0497.namprd04.prod.outlook.com (10.173.49.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1404.27; Fri, 14 Dec 2018 00:18:54 +0000 Received: from MWHPR04MB0401.namprd04.prod.outlook.com ([fe80::9067:fb44:66b2:7604]) by MWHPR04MB0401.namprd04.prod.outlook.com ([fe80::9067:fb44:66b2:7604%3]) with mapi id 15.20.1425.016; Fri, 14 Dec 2018 00:18:54 +0000 From: Alistair Francis To: "qemu-devel@nongnu.org" , "qemu-riscv@nongnu.org" Thread-Topic: [PATCH v1 3/5] RISC-V: Fix PLIC pending bitfield reads Thread-Index: AQHUk0KY9m8ivMBIrUS4cbiAMHVWCg== Date: Fri, 14 Dec 2018 00:18:54 +0000 Message-ID: <126c481d658afcc297317b2f6844a48ffe591de2.1544746653.git.alistair.francis@wdc.com> References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.19.1 x-clientproxiedby: BYAPR07CA0082.namprd07.prod.outlook.com (2603:10b6:a03:12b::23) To MWHPR04MB0401.namprd04.prod.outlook.com (2603:10b6:300:70::18) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [199.255.44.250] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; MWHPR04MB0497; 6:r8iM9bePYYHYtpm2vQRU3Dvuo2sgbN22fFdNiXXegiDhUQ1sjxhks/iyJnyrPb512mSuncqeY925P3xXL0f+AWnhNLlharCaeeigvIXjmYiz07SRofWOIR2mOn33aqvZRQ9Cj9Fpjogr3ytHbZmCwrdc0nd/WgfuA/gLMz+S+pQagVmVbYxgBrzRg1BhhZXsttaeQ5q9b89jccDVeal0qpm+3XZ9IVZKfqx+Q2669U/E9BIDCml8VmmZfQ2efQRZzKGHwWGUCJPamyE/d1Tg9RkfyU8uX7mNcCO4i8AeGcc3UAPUfYfLRcIDVuZp0PpnUBf1Fhd3CUmUzUS/oZQPl3XWxamJj+U+1CGMGCs6ncRAanSDimAz/asMp5yHNbkNPy3l2cmiUFFi2QQ7DDKo06WVUViaqyrEp0Lxx+p91CYsfq2dIBN78FPDT6X5g2ZG+WjgbXbT7uQCPo7b3Vl8bA==; 5:Fb5AtLYS26Wu1YQCQCV9CHnkjhp3GbNaCyPZTihoWk4/6M+vSUGPW3tqDhCklzTpdbILwj3MdT/kb4f5YgcAAgb/Bf0RauizSQXznvoct6U4mqys5gDGXjKvGowAw1n+5gx6zVuIw4Yh/4YUUQj6W7gq5zPK4UGLTZb4XPvuICM=; 7:aLGE42Z2Sg7dnks8iIYXfEFYO33LyV3wrymxje5zcoKXHNUTOuGkrQJ6YDrGmLlVr1wgO7IXH0Le2oxbmWdb5iCs3TRoRtuGkY6JZR5yQiIYslXQWhuhXLUsuMx2Qu31Ivt1cVZ26HoexnT54t+EwA== x-ms-office365-filtering-correlation-id: 3b265edd-41ce-4250-92ca-08d66159bb33 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:MWHPR04MB0497; x-ms-traffictypediagnostic: MWHPR04MB0497: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(3230021)(999002)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231475)(944501520)(52105112)(93006095)(93001095)(10201501046)(6055026)(148016)(149066)(150057)(6041310)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(20161123560045)(201708071742011)(7699051)(76991095); SRVR:MWHPR04MB0497; BCL:0; PCL:0; RULEID:; SRVR:MWHPR04MB0497; x-forefront-prvs: 08864C38AC x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(136003)(396003)(376002)(346002)(366004)(39850400004)(199004)(189003)(50226002)(106356001)(3846002)(81166006)(11346002)(5660300001)(81156014)(68736007)(8936002)(71190400001)(36756003)(71200400001)(105586002)(8676002)(14444005)(7736002)(256004)(2906002)(6436002)(72206003)(6486002)(478600001)(102836004)(53936002)(14454004)(305945005)(25786009)(6512007)(4326008)(476003)(52116002)(316002)(118296001)(54906003)(97736004)(66066001)(39060400002)(486006)(2616005)(2501003)(44832011)(6116002)(386003)(76176011)(6506007)(186003)(86362001)(110136005)(26005)(446003)(99286004); DIR:OUT; SFP:1102; SCL:1; SRVR:MWHPR04MB0497; H:MWHPR04MB0401.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; x-microsoft-antispam-message-info: 4YnzrYgHMXqmrLQ8nAjFpyPJZHat25o6UdDL+A9/ogufyfc0EdQ6DnOjJSniBwZUSr0BCptEJiLDKGMv3J6JJ2vVttEKDlwIprfncPUSjXghzWqOB4qgSGPaVkxQcLXum2pwuPjxAkr/L6O9VszQb5GUCRoRHcmmnUokf8ZD55861Oj+6Ofw6UJpmaaH5c3ayAAqyW/DLrBX7HuJn+u/WHm4891L8yaD9nhvHZlcATxil4W8uCji/aVed8ENaEZx61tInkK6LGiybNzfA0vpRXHGir5iYgQzp+0uJYQG5VY28o8hu6Iz+iEC6vsMt6jF spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3b265edd-41ce-4250-92ca-08d66159bb33 X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Dec 2018 00:18:54.2238 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR04MB0497 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 68.232.143.124 Subject: [Qemu-devel] [PATCH v1 3/5] RISC-V: Fix PLIC pending bitfield reads 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 Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Michael Clark The address calculation for the pending bitfield had a copy paste bug. This bug went unnoticed because the Linux PLIC driver does not read the pending bitfield, rather it reads pending interrupt numbers from the claim register and writes acknowledgements back to the claim register. Cc: Palmer Dabbelt Cc: Sagar Karandikar Cc: Bastian Koppelmann Cc: Alistair Francis Reported-by: Vincent Siles Signed-off-by: Michael Clark Reviewed-by: Alistair Francis Signed-off-by: Alistair Francis --- hw/riscv/sifive_plic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/riscv/sifive_plic.c b/hw/riscv/sifive_plic.c index 9cf9a1f986..d12ec3fc9a 100644 --- a/hw/riscv/sifive_plic.c +++ b/hw/riscv/sifive_plic.c @@ -214,7 +214,7 @@ static uint64_t sifive_plic_read(void *opaque, hwaddr addr, unsigned size) } else if (addr >= plic->pending_base && /* 1 bit per source */ addr < plic->pending_base + (plic->num_sources >> 3)) { - uint32_t word = (addr - plic->priority_base) >> 2; + uint32_t word = (addr - plic->pending_base) >> 2; if (RISCV_DEBUG_PLIC) { qemu_log("plic: read pending: word=%d value=%d\n", word, plic->pending[word]); From patchwork Fri Dec 14 00:19:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 1013218 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.b="KIft+qkC"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="Wb38dwKZ"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43GB914v2Jz9sMp for ; Fri, 14 Dec 2018 11:23:17 +1100 (AEDT) Received: from localhost ([::1]:57549 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXbG7-0002qJ-Aa for incoming@patchwork.ozlabs.org; Thu, 13 Dec 2018 19:23:15 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37792) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXbCD-0000kF-80 for qemu-devel@nongnu.org; Thu, 13 Dec 2018 19:19:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gXbC6-0003Vv-E4 for qemu-devel@nongnu.org; Thu, 13 Dec 2018 19:19:10 -0500 Received: from esa3.hgst.iphmx.com ([216.71.153.141]:47815) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gXbC6-0003Sk-2k; Thu, 13 Dec 2018 19:19:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1544746745; x=1576282745; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=l0iDJxT5Nato+uVZXDGQZ6GbczeYSu3+iA97z+C2jQI=; b=KIft+qkCuslyDxyXV5nfAQjp+EId7NXgCPBMbs+XOyduVNsYDoD1iot+ GKnpm/y+RrTUREuD1QmSQYQthWHOVH59gzatGtDMs/PhZ7UHfUheUR1Pw 7/nEtZ18aSaE0PTSieo41ORH/S1cn17sUHausYRpE24wtRgCaGNhvV5AX /K8JeZGJh6brn+BL4ioThKk37FQZENFsw+zen22kzE8ET7+jrYcsAnpnu zp3MCaatOv9u8XaACjZsXPYgAetQokM7stGBsO/W8l4eiwMi8YPMSBvzs P1+hCtkV9yTbEU4YbqxFwI2R5pTX0hj8rD1cTtuus/1Azl+ScO0QxIlw3 A==; X-IronPort-AV: E=Sophos;i="5.56,350,1539619200"; d="scan'208";a="101454305" Received: from mail-by2nam05lp2055.outbound.protection.outlook.com (HELO NAM05-BY2-obe.outbound.protection.outlook.com) ([104.47.50.55]) by ob1.hgst.iphmx.com with ESMTP; 14 Dec 2018 08:19:03 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector1-wdc-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3B/bds40JPjAOBVCxsB3UWIjkgnlSq0suq865xBsL5g=; b=Wb38dwKZHKkbn/Fb3SzeTQD4VSvwKnVpqFDwaN3u1ulDmDIiiZuO1o+VVpbEogNYruwlzFAuah9Y7ff6G4uq46kLxWH59Ol+BVT99a7KyxCuFEpBPyBFrWNPTIFKXVStskxsEjlrOTnLPZmirOLHm6yo6clpx/HJwJp9QeYvi8E= Received: from MWHPR04MB0401.namprd04.prod.outlook.com (10.173.48.18) by MWHPR04MB0497.namprd04.prod.outlook.com (10.173.49.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1404.27; Fri, 14 Dec 2018 00:19:03 +0000 Received: from MWHPR04MB0401.namprd04.prod.outlook.com ([fe80::9067:fb44:66b2:7604]) by MWHPR04MB0401.namprd04.prod.outlook.com ([fe80::9067:fb44:66b2:7604%3]) with mapi id 15.20.1425.016; Fri, 14 Dec 2018 00:19:03 +0000 From: Alistair Francis To: "qemu-devel@nongnu.org" , "qemu-riscv@nongnu.org" Thread-Topic: [PATCH v1 4/5] RISC-V: Enable second UART on sifive_e and sifive_u Thread-Index: AQHUk0KeyqEGU1N5LU6fnoqQAQ+F/Q== Date: Fri, 14 Dec 2018 00:19:03 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.19.1 x-clientproxiedby: BYAPR07CA0090.namprd07.prod.outlook.com (2603:10b6:a03:12b::31) To MWHPR04MB0401.namprd04.prod.outlook.com (2603:10b6:300:70::18) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [199.255.44.250] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; MWHPR04MB0497; 6:eVX2qY4PBN2JA9xWE3XoAugXzIA2p+U3D0a17Z/FBluEpbFyfmnthvCgUdu5xrw37ZOTpO5uyB38BohjK17oyKRVYDVmtFTlrdOf2JAnd0YIZczj6UXWrhZdGWdZ7yalfNlUViUspRXuD7uhENUZWjaHv0ZOjGs+S1cidxk1U0I60yRyZAXjLyYUTaVeMB9Ns6w12VyjJMpYT2u+k1+SCc9JIWL5aqSVKXeEaBXm8D/ErJ/sbx1BkrbJzI6MU8jlkNKDJfMMUhWP1BrUPj5Kqb14YOc4ttsK/FuLcZw3HVJSZ02gydFqjHpizd2yFOFajnq55e8Pu0oOP83WOUjKMnQG9eQ7CZ/9YwQmFxcorG517aCi7iGXtoKQ/xujA/08Jcru3sSIDitJjqzBKdRlZLvaxMLTzsTokTDj5SwhU0jX9BT5yTH4kATtXElpg6Q1wyuCtybvz9UTcK5N9TWz2Q==; 5:R8wY91HKZrU/r2AEoC5oBClJA8f1CYzwKfQhRmK7pOD/Hh972i9p052HJbBonD1pOjFhsmx7Z6n3Kb2QqOSxRw5RdaEwaBg2QBC1u8egN1Y1X4biGREIOAtVwdZopE+a5ltU1S5C3CzxbshIMdfdcnLj6gPQzKjXftDH6ZjAgz4=; 7:C7QhWVytw+qpbycTnIArcDID5f9gPHSoIJb0hkg1f5mPCIbY7IsTwS7Np5MRPoRyGpHhZNozhyE3HBRxNjU63CnbghqN7LXI0k8Ub1n2RQJCV31n5VpOs8T7wsK6MdbNENXx9iqtu6EDLc2O71XQBQ== x-ms-office365-filtering-correlation-id: 2134f62c-7785-463a-7e47-08d66159c0cc x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:MWHPR04MB0497; x-ms-traffictypediagnostic: MWHPR04MB0497: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(3230021)(999002)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231475)(944501520)(52105112)(93006095)(93001095)(10201501046)(6055026)(148016)(149066)(150057)(6041310)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(20161123560045)(201708071742011)(7699051)(76991095); SRVR:MWHPR04MB0497; BCL:0; PCL:0; RULEID:; SRVR:MWHPR04MB0497; x-forefront-prvs: 08864C38AC x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(136003)(396003)(376002)(346002)(366004)(39850400004)(199004)(189003)(50226002)(106356001)(3846002)(81166006)(11346002)(5660300001)(81156014)(68736007)(8936002)(71190400001)(36756003)(71200400001)(105586002)(8676002)(14444005)(7736002)(256004)(2906002)(6436002)(72206003)(6486002)(478600001)(102836004)(53936002)(14454004)(305945005)(25786009)(6512007)(4326008)(476003)(52116002)(316002)(118296001)(54906003)(97736004)(66066001)(39060400002)(486006)(2616005)(2501003)(44832011)(6116002)(386003)(76176011)(6506007)(186003)(86362001)(110136005)(26005)(446003)(99286004); DIR:OUT; SFP:1102; SCL:1; SRVR:MWHPR04MB0497; H:MWHPR04MB0401.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; x-microsoft-antispam-message-info: 9zdMl/oI0GpSSxiTaonxXJxrm4lBk3zf5Qusd4DKkM+4FYp/7mcIFeDenrsxmMyQxBjHZAZ5YqUrDy5upRvD9pAUkVUjLY1ISYUx+otLrYloEGKi7gGQmIUGM3ifYDFueBUqAGVzYWuXiNONlp7RIpTmUkRRWwjvkMDBaVhu6f6Vsttrzk/pbZkSPTjv3YVcdRmsrc0L72uXyswsgiL0Ko934y2HbsOZB71zVXw5EEkZB/8OztoRJV+y0xacYTXePFZpphDs54pr0bZSfUF1YFYVME92BcYWo+o7/yKSQlc8ThKx7AulIpGy8QR2iL6c spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2134f62c-7785-463a-7e47-08d66159c0cc X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Dec 2018 00:19:03.7083 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR04MB0497 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 216.71.153.141 Subject: [Qemu-devel] [PATCH v1 4/5] RISC-V: Enable second UART on sifive_e and sifive_u 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 Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Michael Clark Previously the second UARTs on the sifive_e and sifive_u machines where disabled due to check-qtest-riscv32 and check-qtest-riscv64 failures. Recent changes in the QEMU core serial code have resolved these failures so the second UARTs can be instantiated. Cc: Palmer Dabbelt Cc: Sagar Karandikar Cc: Bastian Koppelmann Cc: Alistair Francis Signed-off-by: Michael Clark Reviewed-by: Alistair Francis Signed-off-by: Alistair Francis --- hw/riscv/sifive_e.c | 5 ++--- hw/riscv/sifive_u.c | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/hw/riscv/sifive_e.c b/hw/riscv/sifive_e.c index cb513cc3bb..5d9d65ff29 100644 --- a/hw/riscv/sifive_e.c +++ b/hw/riscv/sifive_e.c @@ -192,9 +192,8 @@ static void riscv_sifive_e_soc_realize(DeviceState *dev, Error **errp) 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), qdev_get_gpio_in(DEVICE(s->plic), - SIFIVE_E_UART1_IRQ)); */ + sifive_uart_create(sys_mem, memmap[SIFIVE_E_UART1].base, + 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_u.c b/hw/riscv/sifive_u.c index ef07df2442..3591898011 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -350,9 +350,8 @@ static void riscv_sifive_u_soc_realize(DeviceState *dev, Error **errp) memmap[SIFIVE_U_PLIC].size); sifive_uart_create(system_memory, memmap[SIFIVE_U_UART0].base, 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), qdev_get_gpio_in(DEVICE(s->plic), - SIFIVE_U_UART1_IRQ)); */ + sifive_uart_create(system_memory, memmap[SIFIVE_U_UART1].base, + 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); From patchwork Fri Dec 14 00:19:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 1013219 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.b="bz+t0gp1"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="oGPzsABp"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43GB9D27Gzz9sLw for ; Fri, 14 Dec 2018 11:23:28 +1100 (AEDT) Received: from localhost ([::1]:57552 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXbGH-00038M-St for incoming@patchwork.ozlabs.org; Thu, 13 Dec 2018 19:23:25 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37860) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXbCK-0000nz-TD for qemu-devel@nongnu.org; Thu, 13 Dec 2018 19:19:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gXbCH-00043C-6C for qemu-devel@nongnu.org; Thu, 13 Dec 2018 19:19:20 -0500 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:47870) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gXbCG-0003wb-OG; Thu, 13 Dec 2018 19:19:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1544746756; x=1576282756; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=0xfZsehpV0W8v+k7Dpjq3lJP1A/uqDOChsflEOU/mgQ=; b=bz+t0gp1u3m9VPdfc13N+K6N15uQcPmxiHqQKB16Siz37kEDi8qywcRi Ev3Pur1Bz9XylNIHwgMhAHKa2aCQy7DB7IYGjPaj/qur+FnovnHuL3jOE 67NSH0V6sTfikoRRMrJNaA7hlBYdoXgQJAPMIwgON6i2uZbwINeRpdNK6 E7j7OSl93XH0zUabqmH3Jwi+Cy0PHogjxQtvEK+UeVh+fYHjGZmrI3Xoe kU2O3jgOzEGPIzyxY+pTKbTuYCGUTlz+mXnlV0EbbjhCXli1CgKbFLyE4 JMI4LmKw+gnTpOHzSi8RX2m/J52bLMwCEuserVfFa4TYAdEfR97KkRuZc g==; X-IronPort-AV: E=Sophos;i="5.56,350,1539619200"; d="scan'208";a="201220535" Received: from mail-bn3nam04lp2051.outbound.protection.outlook.com (HELO NAM04-BN3-obe.outbound.protection.outlook.com) ([104.47.46.51]) by ob1.hgst.iphmx.com with ESMTP; 14 Dec 2018 08:19:14 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector1-wdc-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Uf6OrYJOILHspQsDeumGcCOef/wZ4fS/HDvJpnxWPuk=; b=oGPzsABpVGDsXe6hwm4x8q0t9ewNpVepJkd/hHk6Prk0xhR6fRS9uWruMuA/xbRiRRXwinhfU6WttAaTWMEHSdU+9GTekkSxXLvDmlm/aoilZHYb/HK9Juo+Q2cveoHCJd53EJMPXXD/I+njmlavny05FhnYE9TIwoQiNMHcugM= Received: from MWHPR04MB0401.namprd04.prod.outlook.com (10.173.48.18) by MWHPR04MB0497.namprd04.prod.outlook.com (10.173.49.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1404.27; Fri, 14 Dec 2018 00:19:12 +0000 Received: from MWHPR04MB0401.namprd04.prod.outlook.com ([fe80::9067:fb44:66b2:7604]) by MWHPR04MB0401.namprd04.prod.outlook.com ([fe80::9067:fb44:66b2:7604%3]) with mapi id 15.20.1425.016; Fri, 14 Dec 2018 00:19:12 +0000 From: Alistair Francis To: "qemu-devel@nongnu.org" , "qemu-riscv@nongnu.org" Thread-Topic: [PATCH v1 5/5] sifive_uart: Implement interrupt pending register Thread-Index: AQHUk0KjB57zG+zv8UmhY5caMT6++Q== Date: Fri, 14 Dec 2018 00:19:12 +0000 Message-ID: <3753d59b3a0f07fb6a678ffacd3d913f5fcb774d.1544746653.git.alistair.francis@wdc.com> References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.19.1 x-clientproxiedby: BYAPR07CA0083.namprd07.prod.outlook.com (2603:10b6:a03:12b::24) To MWHPR04MB0401.namprd04.prod.outlook.com (2603:10b6:300:70::18) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [199.255.44.250] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; MWHPR04MB0497; 6:5CF+Au4/91LqIfn7gUitQsjV3Lw82/rBGZmjkctwdD1td+ofo/mrho91jHsWRXWO85afkk8IWPYVo6bzCSq6VfEbs/HY9SLSnMiNOHRFJFp93sddfayEGplYA6f5vATOHBoMg7ibdYEmSBLE20/CkNnaZ9xcb46meuX5XER/vtEjKMKXz888NbBtorH7OSmknWF4W8P2iVRRKx2/bDhHhFIUPwVzS+2kct8w5yoR8dvJdJPGJf123tSlJ1/gXY55FcaLvnp+vSSUvGLrOyH9y/qup5OOUU6pJiQvp5Yhxdvtt8LTUeoDKyWM7gcH141PaDIbC5+SYVb4RDm7VnblJYKNldpI4FLUiZTGkPfW+ZIb+q+gJqDK5IdGkRWBS3sOskfDRa3nNh9PtnhVUghwiT35wlLycrPaTEFdtYoEiCrUXeSYMmxSZV75FCilXsxm/hLegAPNrJ5kzytG+9ZI6g==; 5:xGSxmXiB15AH0qQqSiJBpP1iAzie6I+CkVS+DCSgYsO0PWrLhKZPZs4kMC3XFjuo7qjVcaM7V4gmNJ5tBr5vauoKZT1yus7flbF0Lu5913wY54aBRVl7g3ROUANtTeQP6sjFZ9J12bBoCQW6/npt3Z66Q2z707lKss67imZXoCI=; 7:sxmhwWD4/tCnCh1NpLMhqcYNecg4JJbB4eKMe5W2pCjcNVYmZyNhZZCSc1dGDRHWyzdWHMDZ69Wdbs25j5WzqyW//32zLzb5iNZHIhgCb5xef7ygRIeSZd0TR/hnhSOiwL25dXo/5fVesu+iAkHy8w== x-ms-office365-filtering-correlation-id: 376bf68f-fc78-41be-91f6-08d66159c64d x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:MWHPR04MB0497; x-ms-traffictypediagnostic: MWHPR04MB0497: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(3230021)(999002)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231475)(944501520)(52105112)(93006095)(93001095)(10201501046)(6055026)(148016)(149066)(150057)(6041310)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(20161123560045)(201708071742011)(7699051)(76991095); SRVR:MWHPR04MB0497; BCL:0; PCL:0; RULEID:; SRVR:MWHPR04MB0497; x-forefront-prvs: 08864C38AC x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(136003)(396003)(376002)(346002)(366004)(39850400004)(199004)(189003)(50226002)(106356001)(3846002)(81166006)(11346002)(5660300001)(81156014)(68736007)(8936002)(71190400001)(36756003)(71200400001)(105586002)(8676002)(14444005)(7736002)(256004)(2906002)(6436002)(72206003)(6486002)(478600001)(102836004)(53936002)(14454004)(305945005)(25786009)(6512007)(4326008)(476003)(52116002)(316002)(118296001)(54906003)(97736004)(66066001)(39060400002)(486006)(2616005)(2501003)(44832011)(6116002)(386003)(575784001)(76176011)(6506007)(186003)(86362001)(110136005)(26005)(446003)(99286004); DIR:OUT; SFP:1102; SCL:1; SRVR:MWHPR04MB0497; H:MWHPR04MB0401.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; x-microsoft-antispam-message-info: +mM4peyw1MWyki1V7kKr0w0OJ4jhP2KAkjWTjIMZxcwO3IR+8T2eP8JJKEsguM6EpEY/Qb6cjTjnCfNwp2Wq3bpA0OJHoXcHpFNESvWW7YQJhAs2bkK/ZC6gUoicl8qO5PuKXRw/pLwNFORSyk0s+hd8mEXaokvlCMBG3dWJoOkCFoVF1PNc+ETYc4awIUsUiA8/vjIdIP1Yrnr3Q44+bTXvi6tFXYlctPcXoTrHXJuG7TBzvzGG2WUsRZMminjkJdpz05O+q7K2KTo3bX3GC3b9/UFGob1O7Ph+KjVuc80KXVVjoktUdMQVkbXb0RUJ spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 376bf68f-fc78-41be-91f6-08d66159c64d X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Dec 2018 00:19:12.8647 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR04MB0497 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 68.232.141.245 Subject: [Qemu-devel] [PATCH v1 5/5] sifive_uart: Implement interrupt pending register 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 Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Nathaniel Graff The watermark bits are set in the interrupt pending register according to the configuration of txcnt and rxcnt in the txctrl and rxctrl registers. Since the UART TX does not implement a FIFO, the txwm bit is set as long as the TX watermark level is greater than zero. Signed-off-by: Nathaniel Graff Reviewed-by: Michael Clark Reviewed-by: Alistair Francis Signed-off-by: Alistair Francis --- hw/riscv/sifive_uart.c | 24 +++++++++++++++++++----- include/hw/riscv/sifive_uart.h | 3 +++ 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/hw/riscv/sifive_uart.c b/hw/riscv/sifive_uart.c index b0c3798cf2..456a3d3697 100644 --- a/hw/riscv/sifive_uart.c +++ b/hw/riscv/sifive_uart.c @@ -28,12 +28,26 @@ * Not yet implemented: * * Transmit FIFO using "qemu/fifo8.h" - * SIFIVE_UART_IE_TXWM interrupts - * SIFIVE_UART_IE_RXWM interrupts must honor fifo watermark - * Rx FIFO watermark interrupt trigger threshold - * Tx FIFO watermark interrupt trigger threshold. */ +/* Returns the state of the IP (interrupt pending) register */ +static uint64_t uart_ip(SiFiveUARTState *s) +{ + uint64_t ret = 0; + + uint64_t txcnt = SIFIVE_UART_GET_TXCNT(s->txctrl); + uint64_t rxcnt = SIFIVE_UART_GET_RXCNT(s->rxctrl); + + if (txcnt != 0) { + ret |= SIFIVE_UART_IP_TXWM; + } + if (s->rx_fifo_len > rxcnt) { + ret |= SIFIVE_UART_IP_RXWM; + } + + return ret; +} + static void update_irq(SiFiveUARTState *s) { int cond = 0; @@ -69,7 +83,7 @@ uart_read(void *opaque, hwaddr addr, unsigned int size) case SIFIVE_UART_IE: return s->ie; case SIFIVE_UART_IP: - return s->rx_fifo_len ? SIFIVE_UART_IP_RXWM : 0; + return uart_ip(s); case SIFIVE_UART_TXCTRL: return s->txctrl; case SIFIVE_UART_RXCTRL: diff --git a/include/hw/riscv/sifive_uart.h b/include/hw/riscv/sifive_uart.h index 504f18a60f..c8dc1c57fd 100644 --- a/include/hw/riscv/sifive_uart.h +++ b/include/hw/riscv/sifive_uart.h @@ -43,6 +43,9 @@ enum { SIFIVE_UART_IP_RXWM = 2 /* Receive watermark interrupt pending */ }; +#define SIFIVE_UART_GET_TXCNT(txctrl) ((txctrl >> 16) & 0x7) +#define SIFIVE_UART_GET_RXCNT(rxctrl) ((rxctrl >> 16) & 0x7) + #define TYPE_SIFIVE_UART "riscv.sifive.uart" #define SIFIVE_UART(obj) \