From nobody Tue May 21 08:51:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=wdc.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1553130289478653.638434204476; Wed, 20 Mar 2019 18:04:49 -0700 (PDT) Received: from localhost ([127.0.0.1]:57615 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6m8Q-00087x-4A for importer@patchew.org; Wed, 20 Mar 2019 21:04:42 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56982) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6lyT-0000rQ-O8 for qemu-devel@nongnu.org; Wed, 20 Mar 2019 20:54:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h6lqZ-0003v4-8w for qemu-devel@nongnu.org; Wed, 20 Mar 2019 20:46:17 -0400 Received: from esa3.hgst.iphmx.com ([216.71.153.141]:17510) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h6lqY-0003j6-PC; Wed, 20 Mar 2019 20:46:15 -0400 Received: from mail-bn3nam01lp2050.outbound.protection.outlook.com (HELO NAM01-BN3-obe.outbound.protection.outlook.com) ([104.47.33.50]) by ob1.hgst.iphmx.com with ESMTP; 21 Mar 2019 08:46:11 +0800 Received: from BYAPR04MB4901.namprd04.prod.outlook.com (52.135.232.206) by BYAPR04MB4741.namprd04.prod.outlook.com (52.135.240.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1709.16; Thu, 21 Mar 2019 00:46:09 +0000 Received: from BYAPR04MB4901.namprd04.prod.outlook.com ([fe80::44e8:bd21:17b:348c]) by BYAPR04MB4901.namprd04.prod.outlook.com ([fe80::44e8:bd21:17b:348c%4]) with mapi id 15.20.1730.013; Thu, 21 Mar 2019 00:46:09 +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=1553129175; x=1584665175; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=2Kyl+NJvYnpLetRWzm2H6cAvR05eeL9/X9h9V+FVJ9s=; b=S6yJXBcX8EM6NPadY6XsbOJPix20cjI+5tsu3HyI0BOipj8PEZWIGbq4 kl8IRg28X89mJQl1P1KUI3I9QC5VsJTUMQgzcuZs6Rq3TytPR/i+hE8DH MrJaLYVWMVqYS+vGT+Hi+ir8NWBPRK6QM74rvm+lro5O9sv6TdIRgf9Aj rivlIBt3FGLFhJwM31bcVWo7C0xPliQBkb5ubdKg4PEygWb/4lLC4ORmA k0UO2KY7P0haWVd6+T8lXMzojxbRBID9B5Xhq0ybJpbm3QINFix/DkbG/ ej4NyaceBSvPXVKWXcldWunN4JMfF9NQt3FOPG541kPlbxXCOl+Ft2fvw w==; X-IronPort-AV: E=Sophos;i="5.60,250,1549900800"; d="scan'208";a="108934105" 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=OSOS5zTA13rAKjLi3hbUDeJM0nut8tqX6afoG4WoJCA=; b=EioBBjoJm/rh5fCiRgF/ZvE6x3JZKSxtSGudvaSsLjz6Uwt2B34WGyw5O7AeIFvY+0wKb9hsHwxTb38ggcXXZqnAogMuXPDc+h2DOw0VGdMf3E3GcSFy7TXiL6aMqbI+UIcSTZrl4YJntbaUnAN2OuvXLvhUxSzr36Z5tbUovBA= From: Alistair Francis To: "qemu-devel@nongnu.org" , "qemu-riscv@nongnu.org" Thread-Topic: [PATCH for 4.0 v1 1/5] riscv: plic: Fix incorrect irq calculation Thread-Index: AQHU33952URPaAK0IkCQpT59g5uD1g== Date: Thu, 21 Mar 2019 00:46:09 +0000 Message-ID: <7efcf90aa1cc78d1ce2c5f823a7ff9ac96c379ed.1553129005.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.21.0 x-clientproxiedby: BYAPR06CA0068.namprd06.prod.outlook.com (2603:10b6:a03:14b::45) To BYAPR04MB4901.namprd04.prod.outlook.com (2603:10b6:a03:4f::14) 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-ms-office365-filtering-correlation-id: 18a4ab3a-d3dc-4304-b103-08d6ad969bc3 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600127)(711020)(4605104)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:BYAPR04MB4741; x-ms-traffictypediagnostic: BYAPR04MB4741: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-forefront-prvs: 0983EAD6B2 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(39860400002)(346002)(396003)(136003)(366004)(376002)(199004)(189003)(71190400001)(8676002)(446003)(102836004)(97736004)(186003)(52116002)(118296001)(81166006)(6436002)(3846002)(86362001)(2616005)(81156014)(478600001)(6512007)(68736007)(476003)(11346002)(2906002)(66066001)(4326008)(6116002)(99286004)(106356001)(26005)(50226002)(110136005)(53936002)(71200400001)(7736002)(44832011)(6506007)(54906003)(72206003)(105586002)(76176011)(2501003)(386003)(14454004)(8936002)(25786009)(5660300002)(305945005)(36756003)(6486002)(486006)(316002)(256004); DIR:OUT; SFP:1102; SCL:1; SRVR:BYAPR04MB4741; H:BYAPR04MB4901.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: FupC6X/1387AGo355f1GsnE/QIxsmBBsgWGlGItdgn1yq2dEJsYmRPbv5A90vhHsjjzKMfkFWzXVzxXg/12e6UpnClNqlZAelWe0iWLRLAAd46qoIpZvfNh95F2drx5SMDwiRTVkRa6M1VRhOZDTdpTmXp+0lugGCjpin9s0e03Y86KlG/DWwZjPWRAEb6HbKwGeL8kE8uxmfLQI/TkH39tbXojAQR/Qfb1aDuDrsWJpyLYzkui4jUW5HqDvgP7jqKLfUAZolTnJYTF1Yaq4FbU/8duTUx0oLcc7E+5y8HyzvRBAsUkp8k2PPUfIrqrQjhSM+4svfwhZeYVucsqWpAo8pnw9ONAZCNXv33/xdlFqgBrFq3ggVR7mTx0fYAPFZNoAuybQWqYZwiF7y095ixxGWRRXCRhBEkaHh9JAsDM= Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 18a4ab3a-d3dc-4304-b103-08d6ad969bc3 X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Mar 2019 00:46:09.2979 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR04MB4741 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 for 4.0 v1 1/5] riscv: plic: Fix incorrect irq calculation 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" , "palmer@sifive.com" , Alistair Francis Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (found 2 invalid signatures) Content-Type: text/plain; charset="utf-8" The irq is incorrectly calculated to be off by one. It has worked in the past as the priority_base offset has also been set incorrectly. We are about to fix the priority_base offset so first first the irq calculation. Signed-off-by: Alistair Francis --- hw/riscv/sifive_plic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/riscv/sifive_plic.c b/hw/riscv/sifive_plic.c index 1c703e1a37..70a85cd075 100644 --- a/hw/riscv/sifive_plic.c +++ b/hw/riscv/sifive_plic.c @@ -206,7 +206,7 @@ static uint64_t sifive_plic_read(void *opaque, hwaddr a= ddr, unsigned size) if (addr >=3D plic->priority_base && /* 4 bytes per source */ addr < plic->priority_base + (plic->num_sources << 2)) { - uint32_t irq =3D (addr - plic->priority_base) >> 2; + uint32_t irq =3D ((addr - plic->priority_base) >> 2) + 1; if (RISCV_DEBUG_PLIC) { qemu_log("plic: read priority: irq=3D%d priority=3D%d\n", irq, plic->source_priority[irq]); @@ -279,7 +279,7 @@ static void sifive_plic_write(void *opaque, hwaddr addr= , uint64_t value, if (addr >=3D plic->priority_base && /* 4 bytes per source */ addr < plic->priority_base + (plic->num_sources << 2)) { - uint32_t irq =3D (addr - plic->priority_base) >> 2; + uint32_t irq =3D ((addr - plic->priority_base) >> 2) + 1; plic->source_priority[irq] =3D value & 7; if (RISCV_DEBUG_PLIC) { qemu_log("plic: write priority: irq=3D%d priority=3D%d\n", --=20 2.21.0 From nobody Tue May 21 08:51:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=wdc.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1553130200846826.5011665741941; Wed, 20 Mar 2019 18:03:20 -0700 (PDT) Received: from localhost ([127.0.0.1]:57607 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6m72-0007R6-Sx for importer@patchew.org; Wed, 20 Mar 2019 21:03:16 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56854) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6lyR-0000d0-TC for qemu-devel@nongnu.org; Wed, 20 Mar 2019 20:54:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h6lqk-0004Ub-M5 for qemu-devel@nongnu.org; Wed, 20 Mar 2019 20:46:28 -0400 Received: from esa3.hgst.iphmx.com ([216.71.153.141]:17530) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h6lqh-0004Ew-8b; Wed, 20 Mar 2019 20:46:24 -0400 Received: from mail-bn3nam01lp2054.outbound.protection.outlook.com (HELO NAM01-BN3-obe.outbound.protection.outlook.com) ([104.47.33.54]) by ob1.hgst.iphmx.com with ESMTP; 21 Mar 2019 08:46:20 +0800 Received: from BYAPR04MB4901.namprd04.prod.outlook.com (52.135.232.206) by BYAPR04MB4741.namprd04.prod.outlook.com (52.135.240.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1709.16; Thu, 21 Mar 2019 00:46:18 +0000 Received: from BYAPR04MB4901.namprd04.prod.outlook.com ([fe80::44e8:bd21:17b:348c]) by BYAPR04MB4901.namprd04.prod.outlook.com ([fe80::44e8:bd21:17b:348c%4]) with mapi id 15.20.1730.013; Thu, 21 Mar 2019 00:46:18 +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=1553129184; x=1584665184; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=DY57obcobmknNwo+PK3NIyeylGAoxgVwAxIWm8eDEBk=; b=rCZs66upOILa9lNC0IxIum5t/7hrC+x/kWzyBr8GWIbCeCFl+sRebq7m /EnIqoINTGNODOaIpO1pJWuykX5P27X+z8p+aXGPWK0NBIGYtsAN6Svlt pQu0RIxpfmuovH+9VXzB/50GwCrlDHtD9npApNNXDPHxgszhZTXivS8JZ Qewlchj3LoJb1Ivejt+bkaDh0zS9crWFpgYHVeUa/Eo8N6cRFnXy36b8C fOOJaJL7/FzGzCNPIl0MmpnAAcGq+Isl5p5HmrM9iRLXEfDE3PV2+McEQ JeDCCTh5NktBU0k/qwAnw+MMHircAHdESXSRfQiw10DJd6CHz1/8e9zVs A==; X-IronPort-AV: E=Sophos;i="5.60,250,1549900800"; d="scan'208";a="108934122" 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=+JIOiOk4tZD8OXjGZAbiuBoDFEBAcFbGONhABtBY/ks=; b=QfIbrt2w6WMF0kuJrLsfW8W2zvhzhuzcNDbEvLLOHRHdI5GlCPcw33E6oZ0pkVInlLhwrFsx1ILhv21UvThU1LBgA1Nl3jR3LUxY0URILvDslIM9alvFPXZDVOEbQYG3VAduDDB69m7REsBNMD3O0fUMdwJPHIbhSTrIUZ7N2TA= From: Alistair Francis To: "qemu-devel@nongnu.org" , "qemu-riscv@nongnu.org" Thread-Topic: [PATCH for 4.0 v1 2/5] riscv: sifive_u: Fix PLIC priority base offset and numbering Thread-Index: AQHU339/kgHud9dDwES2CVs/wJK2oA== Date: Thu, 21 Mar 2019 00:46:18 +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.21.0 x-clientproxiedby: BYAPR02CA0004.namprd02.prod.outlook.com (2603:10b6:a02:ee::17) To BYAPR04MB4901.namprd04.prod.outlook.com (2603:10b6:a03:4f::14) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [199.255.45.64] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 406568af-5f65-4ccf-7647-08d6ad96a14d x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600127)(711020)(4605104)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:BYAPR04MB4741; x-ms-traffictypediagnostic: BYAPR04MB4741: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-forefront-prvs: 0983EAD6B2 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(39860400002)(346002)(396003)(136003)(366004)(376002)(199004)(189003)(71190400001)(8676002)(446003)(102836004)(97736004)(186003)(52116002)(118296001)(81166006)(6436002)(3846002)(86362001)(2616005)(81156014)(478600001)(6512007)(68736007)(476003)(11346002)(2906002)(66066001)(4326008)(6116002)(99286004)(14444005)(106356001)(26005)(50226002)(110136005)(53936002)(71200400001)(7736002)(44832011)(6506007)(54906003)(72206003)(105586002)(76176011)(2501003)(386003)(14454004)(8936002)(25786009)(5660300002)(305945005)(36756003)(6486002)(486006)(316002)(256004); DIR:OUT; SFP:1102; SCL:1; SRVR:BYAPR04MB4741; H:BYAPR04MB4901.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: QqjUrvGWAt8T/ZxLWPQZnNZ/UQnwvwi8r4bYDi1f8OUnlRnjJmKiPnNPKLEEDntga4roWDFVNHcf8sLWP9xE2ku6ZB9rFm0BjGyIYI1Foc24DGKwkjuIMkoT0SAye2IalPhxDuDZxDWCx9EDuItnUd4iiNc6YALT2cKxK4Af1weVJHUtb2oxgWslMg+mETKsBOPjXhigzsU/BrGzH+2K1ErbvlvrQtzgJ1eMrWAGhZb26gCI6v8KqUcbA9pj2P+8uC6kdl2NwKyZgiF6U5rO/B8du457YbjL+DAi8+NS+2HLBSv04iGdl13QUdg8RnrbZTlZUOL9ac9Ds/HmNK4RsW+QF7kPyLd2RTcTpYPm+QYNtbYX1hls2l74glfNDYbIN6vIgdhBhw7KIElZ66Ra3H5zTLCLYwJeDN4PG8BFgJY= Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 406568af-5f65-4ccf-7647-08d6ad96a14d X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Mar 2019 00:46:18.7265 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR04MB4741 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 for 4.0 v1 2/5] riscv: sifive_u: Fix PLIC priority base offset and numbering 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" , "palmer@sifive.com" , Alistair Francis Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (found 2 invalid signatures) Content-Type: text/plain; charset="utf-8" According to the FU540 manual the PLIC source priority address starts at an offset of 0x04 and not 0x00. The same manual also specifies that the PLIC only has 53 source priorities. Fix these two incorrect header files. We also need to over extend the plic_gpios[] array as the PLIC sources count from 1 and not 0. Signed-off-by: Alistair Francis --- hw/riscv/sifive_u.c | 2 +- include/hw/riscv/sifive_u.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index 5ecc47cea3..88381a7507 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -340,7 +340,7 @@ static void riscv_sifive_u_soc_realize(DeviceState *dev= , 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]; + qemu_irq plic_gpios[SIFIVE_U_PLIC_NUM_SOURCES + 1]; int i; Error *err =3D NULL; NICInfo *nd =3D &nd_table[0]; diff --git a/include/hw/riscv/sifive_u.h b/include/hw/riscv/sifive_u.h index be13cc1304..d859ea20f6 100644 --- a/include/hw/riscv/sifive_u.h +++ b/include/hw/riscv/sifive_u.h @@ -68,9 +68,9 @@ enum { }; =20 #define SIFIVE_U_PLIC_HART_CONFIG "MS" -#define SIFIVE_U_PLIC_NUM_SOURCES 127 +#define SIFIVE_U_PLIC_NUM_SOURCES 53 #define SIFIVE_U_PLIC_NUM_PRIORITIES 7 -#define SIFIVE_U_PLIC_PRIORITY_BASE 0x0 +#define SIFIVE_U_PLIC_PRIORITY_BASE 0x04 #define SIFIVE_U_PLIC_PENDING_BASE 0x1000 #define SIFIVE_U_PLIC_ENABLE_BASE 0x2000 #define SIFIVE_U_PLIC_ENABLE_STRIDE 0x80 --=20 2.21.0 From nobody Tue May 21 08:51:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=wdc.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1553130028229219.71979440491998; Wed, 20 Mar 2019 18:00:28 -0700 (PDT) Received: from localhost ([127.0.0.1]:57547 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6m4G-0005hM-Ao for importer@patchew.org; Wed, 20 Mar 2019 21:00:24 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56982) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6lyR-0000rQ-0a for qemu-devel@nongnu.org; Wed, 20 Mar 2019 20:54:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h6lqp-0004kx-E4 for qemu-devel@nongnu.org; Wed, 20 Mar 2019 20:46:32 -0400 Received: from esa4.hgst.iphmx.com ([216.71.154.42]:27998) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h6lqo-0004di-V1; Wed, 20 Mar 2019 20:46:31 -0400 Received: from mail-cys01nam02lp2053.outbound.protection.outlook.com (HELO NAM02-CY1-obe.outbound.protection.outlook.com) ([104.47.37.53]) by ob1.hgst.iphmx.com with ESMTP; 21 Mar 2019 08:46:28 +0800 Received: from BYAPR04MB4901.namprd04.prod.outlook.com (52.135.232.206) by BYAPR04MB4741.namprd04.prod.outlook.com (52.135.240.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1709.16; Thu, 21 Mar 2019 00:46:27 +0000 Received: from BYAPR04MB4901.namprd04.prod.outlook.com ([fe80::44e8:bd21:17b:348c]) by BYAPR04MB4901.namprd04.prod.outlook.com ([fe80::44e8:bd21:17b:348c%4]) with mapi id 15.20.1730.013; Thu, 21 Mar 2019 00:46: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=1553129191; x=1584665191; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=DBQAgadpbnj7BnVWfsQO+BQ1ypLp8McTCWspi4g7wjc=; b=Nzxnpi+2z9CujKKA/Ger3TneohiFJaApQpNt2CB4BjKFQv4xZruMSU4O huiduFPn/jBbi1dChVZuxcEPdAxhPQHST20UvoU4AQaE+uCY2Nrnf4/jL HkPp5haueTE/t/5VdzfraUBnICsTekgFuQ45hzzLaXsgny6TKHDnGizHT 2qsjN9gix0cUG22/bcqH9QuW1d5rVkT3u0OBrjmVu/AD3W1P42s6DEi4l Q5CD2EACgVk+v2sAHY5NY5rYgz4je0+e1yBe92VA/QqNhjxabd+13U3Hx zEcq4A6eBjGfs55XUUpIvjJsoNYAaBXmKS3y4KgaZvJvqya7QC+tt5QeX w==; X-IronPort-AV: E=Sophos;i="5.60,250,1549900800"; d="scan'208";a="103877761" 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=DBQAgadpbnj7BnVWfsQO+BQ1ypLp8McTCWspi4g7wjc=; b=AawaJpmKvLeZbDyPhL+EZoC6MXaw/qt1ynv9T1hjuVPDpl4F33z4ed8Xf6ZOqrF68E+PQ+a8Ao7VNlqrwgy/TfV2ZS43yZ6i0Zst3zU68oR8lAQwRJy98PLuWzQ67nUFyFhqZKeMq2YD8Wi3UJlZ9Nr5EtubGZ4xN4LxDBxWpoE= From: Alistair Francis To: "qemu-devel@nongnu.org" , "qemu-riscv@nongnu.org" Thread-Topic: [PATCH for 4.0 v1 3/5] riscv: sifive_e: Fix PLIC priority base offset Thread-Index: AQHU33+EVWX+bZ3NU02KaOug8iu8nQ== Date: Thu, 21 Mar 2019 00:46:27 +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.21.0 x-clientproxiedby: BYAPR06CA0058.namprd06.prod.outlook.com (2603:10b6:a03:14b::35) To BYAPR04MB4901.namprd04.prod.outlook.com (2603:10b6:a03:4f::14) 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-ms-office365-filtering-correlation-id: d050f1b1-3420-4503-4a12-08d6ad96a655 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600127)(711020)(4605104)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:BYAPR04MB4741; x-ms-traffictypediagnostic: BYAPR04MB4741: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-forefront-prvs: 0983EAD6B2 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(39860400002)(346002)(396003)(136003)(366004)(376002)(199004)(189003)(71190400001)(8676002)(446003)(102836004)(97736004)(186003)(52116002)(118296001)(81166006)(6436002)(3846002)(86362001)(2616005)(81156014)(478600001)(6512007)(68736007)(476003)(11346002)(2906002)(66066001)(4326008)(6116002)(99286004)(14444005)(106356001)(26005)(50226002)(110136005)(53936002)(71200400001)(7736002)(44832011)(6506007)(54906003)(4744005)(72206003)(105586002)(76176011)(2501003)(386003)(14454004)(8936002)(25786009)(5660300002)(305945005)(36756003)(6486002)(486006)(316002)(256004); DIR:OUT; SFP:1102; SCL:1; SRVR:BYAPR04MB4741; H:BYAPR04MB4901.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: gsq1e3EVF6WLtj9V08WMNWQpTmX3TwC73Vi69jM8duXZdhzPDotg6Y4+5qf2rjHR2emRV3HZ4jQ05NOHny7pBGvUQeKI/C+SHdHRDYzFup4nRxGbDpW40Gr+2SL1VOV18P0Yney+DIpWBZNn7zu35uWZVzAIJ1qs4XzkRK/8q6E77lzJO4it7k0j8WCsZX8G0KVr3Qg5tz6bWXQ8OqERlXfiPMjquQ1IbmpovntKMT1N1uYx1VqYdKEzNop0PgQRYe0IlFfYDP3MxqALM5QIX/L1bwOszsDdkmu2ZfHrQSRe2Rsu6xoqVNhgvXBFCBjxfSACGUsNvpARWOQs8p2u5nCSBL5nwsOYg2VKRI2Eq0ZtKv7JWNx3o+DEfcimAgYEBlCaCGKKGIGYyT+VTvXgLRRKGPixE2PXQSlzNOQPMX4= Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: d050f1b1-3420-4503-4a12-08d6ad96a655 X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Mar 2019 00:46:27.0293 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR04MB4741 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 216.71.154.42 Subject: [Qemu-devel] [PATCH for 4.0 v1 3/5] riscv: sifive_e: Fix PLIC priority base offset 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" , "palmer@sifive.com" , Alistair Francis Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (found 2 invalid signatures) Content-Type: text/plain; charset="utf-8" According to the FE31 manual the PLIC source priority address starts at an offset of 0x04 and not 0x00. Signed-off-by: Alistair Francis --- include/hw/riscv/sifive_e.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/hw/riscv/sifive_e.h b/include/hw/riscv/sifive_e.h index 7b6d8aed96..f715f8606f 100644 --- a/include/hw/riscv/sifive_e.h +++ b/include/hw/riscv/sifive_e.h @@ -70,7 +70,7 @@ enum { #define SIFIVE_E_PLIC_HART_CONFIG "M" #define SIFIVE_E_PLIC_NUM_SOURCES 127 #define SIFIVE_E_PLIC_NUM_PRIORITIES 7 -#define SIFIVE_E_PLIC_PRIORITY_BASE 0x0 +#define SIFIVE_E_PLIC_PRIORITY_BASE 0x04 #define SIFIVE_E_PLIC_PENDING_BASE 0x1000 #define SIFIVE_E_PLIC_ENABLE_BASE 0x2000 #define SIFIVE_E_PLIC_ENABLE_STRIDE 0x80 --=20 2.21.0 From nobody Tue May 21 08:51:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=wdc.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 15531301204451016.3503451789622; Wed, 20 Mar 2019 18:02:00 -0700 (PDT) Received: from localhost ([127.0.0.1]:57601 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6m5h-0006lH-DB for importer@patchew.org; Wed, 20 Mar 2019 21:01:53 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56841) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6lyQ-0000YW-HR for qemu-devel@nongnu.org; Wed, 20 Mar 2019 20:54:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h6lqw-0005H5-08 for qemu-devel@nongnu.org; Wed, 20 Mar 2019 20:46:38 -0400 Received: from esa4.hgst.iphmx.com ([216.71.154.42]:28017) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h6lqv-0005CB-IG; Wed, 20 Mar 2019 20:46:37 -0400 Received: from mail-cys01nam02lp2057.outbound.protection.outlook.com (HELO NAM02-CY1-obe.outbound.protection.outlook.com) ([104.47.37.57]) by ob1.hgst.iphmx.com with ESMTP; 21 Mar 2019 08:46:36 +0800 Received: from BYAPR04MB4901.namprd04.prod.outlook.com (52.135.232.206) by BYAPR04MB4741.namprd04.prod.outlook.com (52.135.240.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1709.16; Thu, 21 Mar 2019 00:46:35 +0000 Received: from BYAPR04MB4901.namprd04.prod.outlook.com ([fe80::44e8:bd21:17b:348c]) by BYAPR04MB4901.namprd04.prod.outlook.com ([fe80::44e8:bd21:17b:348c%4]) with mapi id 15.20.1730.013; Thu, 21 Mar 2019 00:46:35 +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=1553129197; x=1584665197; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=gPBRQwVjNkDPus3pZoYDL4t7/qa8M4Nn+/kT4rhTTiI=; b=EdDHNmMlMweGVPV8mz+rlUmRWAY/pcoiTlWS8s7Eyez43TCvh8G4Sw+0 mf3Q6hlisFSjAPaKR6ADtnfAbRLEJ3ILPuJSX59zyO9RqTTM13PYZ7EHS QEEL04eHdtpp54QhYZOj/ZoqwgUKO0zQgheuw2zcBssTrAyni+s6qcX4r NSbJfgV1w0isEZRS/XtUv7OrV80QF6STmTRxQ4Z77XYYxZ8+mUxA/Epaz hxat889Gg7mlFcJ6HNjR2OqoyS5YCgTaDbA/SfUru2cATuNp5upVtoYYl sZxYkiusY4dk8YIP1F/pTUjVcsYSSP8HstMnX2UDZNy7wahKd/sPHjIJ6 Q==; X-IronPort-AV: E=Sophos;i="5.60,250,1549900800"; d="scan'208";a="103877779" 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=gPBRQwVjNkDPus3pZoYDL4t7/qa8M4Nn+/kT4rhTTiI=; b=GmR4fPrV4SmiIDEKvsZJbgFsydNKKLG+EkjwAvG5rz0JrdmE01d9pLuYWtDpNTdWpbZAib+LJWMjWD5+4AWaeRMqokJo+j80MA6bKWk+akKliIxHjX4buH5kS6Gfu7RKTozBKecbg/IuuPKn7rc3IgDCZMMERJrjOWHtpCrAxNM= From: Alistair Francis To: "qemu-devel@nongnu.org" , "qemu-riscv@nongnu.org" Thread-Topic: [PATCH for 4.0 v1 4/5] riscv: virt: Fix PLIC priority base offset Thread-Index: AQHU33+IY/7KbTWY7EKvJCKEuWdgPQ== Date: Thu, 21 Mar 2019 00:46:35 +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.21.0 x-clientproxiedby: BYAPR07CA0102.namprd07.prod.outlook.com (2603:10b6:a03:12b::43) To BYAPR04MB4901.namprd04.prod.outlook.com (2603:10b6:a03:4f::14) 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-ms-office365-filtering-correlation-id: 33ef5a66-8281-4ad5-1dd6-08d6ad96ab2a x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600127)(711020)(4605104)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:BYAPR04MB4741; x-ms-traffictypediagnostic: BYAPR04MB4741: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-forefront-prvs: 0983EAD6B2 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(39860400002)(346002)(396003)(136003)(366004)(376002)(199004)(189003)(71190400001)(8676002)(446003)(102836004)(97736004)(186003)(52116002)(118296001)(81166006)(6436002)(3846002)(86362001)(2616005)(81156014)(478600001)(6512007)(68736007)(476003)(11346002)(2906002)(66066001)(4326008)(6116002)(99286004)(14444005)(106356001)(26005)(50226002)(110136005)(53936002)(71200400001)(7736002)(44832011)(6506007)(54906003)(4744005)(72206003)(105586002)(76176011)(2501003)(386003)(14454004)(8936002)(25786009)(5660300002)(305945005)(36756003)(6486002)(486006)(316002)(256004); DIR:OUT; SFP:1102; SCL:1; SRVR:BYAPR04MB4741; H:BYAPR04MB4901.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: ApVpAXj1NgX4Vu2p54UTUij5H0bAgaRlEttzP3Q69HbJ1Ylb7Cu9M+3BRzniJYnFuyXXka2hqb6KN/BVQYdGqm5dEbDHOZfbomXk9qidOJwWpUUVWK3X0vyDiZdi316ZI+wl+U/uiZ8xke0nqfMQSuEhwM+uGglBM46j+xEOi5b1gkXd6bHwTqpfx+Rt6hzsarJhxi68LbRyR3MRQfZMMRTvw2wm+l9BhRFJpPgD3Egs5hQNSvEig0QNUasBdnPKeYMm5feSjeno1LfDbKcxlZJ0sQxe1QYI1GzMKx6+KVdbb67pJuPBJuXicNhb1sGiKlOELkMO+KpPaKN55jPzaTfVjaYrdx2TFRcsmSDsdMrHLadu820093IGuD/hhXuau0edEtC0xXPI3/Ejf+IuNJlQvdNhakPBPJSdIxhJrTo= Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 33ef5a66-8281-4ad5-1dd6-08d6ad96ab2a X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Mar 2019 00:46:35.1079 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR04MB4741 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 216.71.154.42 Subject: [Qemu-devel] [PATCH for 4.0 v1 4/5] riscv: virt: Fix PLIC priority base offset 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" , "palmer@sifive.com" , Alistair Francis Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (found 2 invalid signatures) Content-Type: text/plain; charset="utf-8" Update the virt offsets based on the newly updated SiFive U and SiFive E offsets. Signed-off-by: Alistair Francis --- include/hw/riscv/virt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/hw/riscv/virt.h b/include/hw/riscv/virt.h index f12deaebd6..568764b570 100644 --- a/include/hw/riscv/virt.h +++ b/include/hw/riscv/virt.h @@ -59,7 +59,7 @@ enum { #define VIRT_PLIC_HART_CONFIG "MS" #define VIRT_PLIC_NUM_SOURCES 127 #define VIRT_PLIC_NUM_PRIORITIES 7 -#define VIRT_PLIC_PRIORITY_BASE 0x0 +#define VIRT_PLIC_PRIORITY_BASE 0x04 #define VIRT_PLIC_PENDING_BASE 0x1000 #define VIRT_PLIC_ENABLE_BASE 0x2000 #define VIRT_PLIC_ENABLE_STRIDE 0x80 --=20 2.21.0 From nobody Tue May 21 08:51:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=wdc.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1553130011827912.0351529447295; Wed, 20 Mar 2019 18:00:11 -0700 (PDT) Received: from localhost ([127.0.0.1]:57545 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6m3u-0005P4-7x for importer@patchew.org; Wed, 20 Mar 2019 21:00:02 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56982) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6lyP-0000rQ-Ts for qemu-devel@nongnu.org; Wed, 20 Mar 2019 20:54:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h6lr5-0005iR-NY for qemu-devel@nongnu.org; Wed, 20 Mar 2019 20:46:48 -0400 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:5518) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h6lr5-0005eH-Az; Wed, 20 Mar 2019 20:46:47 -0400 Received: from mail-cys01nam02lp2051.outbound.protection.outlook.com (HELO NAM02-CY1-obe.outbound.protection.outlook.com) ([104.47.37.51]) by ob1.hgst.iphmx.com with ESMTP; 21 Mar 2019 08:46:49 +0800 Received: from BYAPR04MB4901.namprd04.prod.outlook.com (52.135.232.206) by BYAPR04MB4741.namprd04.prod.outlook.com (52.135.240.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1709.16; Thu, 21 Mar 2019 00:46:43 +0000 Received: from BYAPR04MB4901.namprd04.prod.outlook.com ([fe80::44e8:bd21:17b:348c]) by BYAPR04MB4901.namprd04.prod.outlook.com ([fe80::44e8:bd21:17b:348c%4]) with mapi id 15.20.1730.013; Thu, 21 Mar 2019 00:46:43 +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=1553129212; x=1584665212; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=+McbQ3u7pSiVvq1X4UzDG/xhIHOJBUtngx28tuT8kck=; b=LkzIouy1NnUzE6QdrERCOPG6z9skY00/N/4edn6777umcPqSbblJ1evU iKbrsuJwMO3WHhWNY/gwRfRhaLtplDs+TM6T3tgaVTTTTLmE1SJQYXKRT qmNw5JE477zA6hITbAXLEz6LImpBPXoH1KvdeGMhxFErfPFmAA2pveb36 Q/OuwxM5YP2K9RiCi+MyQwZ2i6awi+WXDkX7HHuDg/F6C4894pvYxwnHy ZkxA/cvjwzSzGMocsnESMpqaPy1lH5C+4NtGzdBB9TiE9NrpELkqd8Qja 75BXyujrYJu8PzCXmMt2Awncqbsx69PjfZtAy7mrm/5fyh9evsPS5gNsX w==; X-IronPort-AV: E=Sophos;i="5.60,250,1549900800"; d="scan'208";a="202570803" 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=RZyti4Y/QB3Gi/MVqDSxOapl/D5ax08xUY2Lb+FYTT0=; b=ecFqzks+Y3L36vsejh555M4z17BBs7duyVWRDEiYwLc67TaoHoV2RZFNM5aPtYAm3C+qB1fACy0Y1X/vifgl3rC7Koqe6xgvT6U9koFYuQ4VEKjS92gqWFYV4LryRnz2zWpYTgyVQUh/kTlFNX3EXDtcY0WKvHh6I/VUotTcCI4= From: Alistair Francis To: "qemu-devel@nongnu.org" , "qemu-riscv@nongnu.org" Thread-Topic: [PATCH for 4.0 v1 5/5] riscv: plic: Log guest errors Thread-Index: AQHU33+NDglHEWTVHUSMigfNJNcezA== Date: Thu, 21 Mar 2019 00:46:43 +0000 Message-ID: <5856b388fa5e95444c910e3ae629038ba22dc37d.1553129005.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.21.0 x-clientproxiedby: BYAPR07CA0094.namprd07.prod.outlook.com (2603:10b6:a03:12b::35) To BYAPR04MB4901.namprd04.prod.outlook.com (2603:10b6:a03:4f::14) 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-ms-office365-filtering-correlation-id: 491fce8b-53ad-4aed-a1f0-08d6ad96b03c x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600127)(711020)(4605104)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:BYAPR04MB4741; x-ms-traffictypediagnostic: BYAPR04MB4741: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-forefront-prvs: 0983EAD6B2 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(39860400002)(346002)(396003)(136003)(366004)(376002)(199004)(189003)(71190400001)(8676002)(446003)(102836004)(97736004)(186003)(52116002)(118296001)(81166006)(6436002)(3846002)(86362001)(2616005)(81156014)(478600001)(6512007)(68736007)(476003)(11346002)(2906002)(66066001)(4326008)(6116002)(99286004)(14444005)(106356001)(26005)(50226002)(110136005)(53936002)(71200400001)(7736002)(44832011)(6506007)(54906003)(72206003)(105586002)(76176011)(2501003)(386003)(14454004)(8936002)(25786009)(5660300002)(305945005)(36756003)(6486002)(486006)(316002)(256004); DIR:OUT; SFP:1102; SCL:1; SRVR:BYAPR04MB4741; H:BYAPR04MB4901.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: ZNNdM9uhTHzOw2N4Tety8nJwfshrxHih+6G/1+lxhvdyu6/moN3/sItiIzRwchrknue68usOLheP4EicjA8vVyEQfqz8jgYk4HYuHjdmBusk2aWALfHN6aOZqN9Wn2/kbgSMJ4MAN9D74tm1A0HBA0N3yoyGaUsJs5X88Tx2vUj5tq0yT8NFIxLdzeM9z+86N1MGhGFYe4svzktIUD81vCbGh8xqe/sfgAQ2aWKd+scsh6KX1HVDqpjfn68qtNmnrTDKRhY4ITErLY/EPRjjkLJNcu4VGMl33bsO1CR2ywYoEWc9Yxh0vtLbJUhJyxxJQqD47nRqkYsM6yN7p5mUMdFCWtWI5QiFk43tHMWBr3TA+6SLTsYmzvg4KrwVLrOJPxyMHXURtFJCOpX7+dJHZUvViqomKtWrllJs69XSZag= Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 491fce8b-53ad-4aed-a1f0-08d6ad96b03c X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Mar 2019 00:46:43.6479 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR04MB4741 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 for 4.0 v1 5/5] riscv: plic: Log guest errors 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" , "palmer@sifive.com" , Alistair Francis Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (found 2 invalid signatures) Content-Type: text/plain; charset="utf-8" Instead of using error_report() to print guest errors let's use qemu_log_mask(LOG_GUEST_ERROR,...) to log the error. Signed-off-by: Alistair Francis --- hw/riscv/sifive_plic.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/hw/riscv/sifive_plic.c b/hw/riscv/sifive_plic.c index 70a85cd075..7f373d6c9d 100644 --- a/hw/riscv/sifive_plic.c +++ b/hw/riscv/sifive_plic.c @@ -262,7 +262,9 @@ static uint64_t sifive_plic_read(void *opaque, hwaddr a= ddr, unsigned size) } =20 err: - error_report("plic: invalid register read: %08x", (uint32_t)addr); + qemu_log_mask(LOG_GUEST_ERROR, + "%s: Invalid register read 0x%" HWADDR_PRIx "\n", + __func__, addr); return 0; } =20 @@ -289,7 +291,9 @@ static void sifive_plic_write(void *opaque, hwaddr addr= , uint64_t value, } else if (addr >=3D plic->pending_base && /* 1 bit per source */ addr < plic->pending_base + (plic->num_sources >> 3)) { - error_report("plic: invalid pending write: %08x", (uint32_t)addr); + qemu_log_mask(LOG_GUEST_ERROR, + "%s: invalid pending write: 0x%" HWADDR_PRIx "", + __func__, addr); return; } else if (addr >=3D plic->enable_base && /* 1 bit per source */ addr < plic->enable_base + plic->num_addrs * plic->enable_stride) @@ -339,7 +343,9 @@ static void sifive_plic_write(void *opaque, hwaddr addr= , uint64_t value, } =20 err: - error_report("plic: invalid register write: %08x", (uint32_t)addr); + qemu_log_mask(LOG_GUEST_ERROR, + "%s: Invalid register write 0x%" HWADDR_PRIx "\n", + __func__, addr); } =20 static const MemoryRegionOps sifive_plic_ops =3D { --=20 2.21.0