From patchwork Thu Dec 16 04:54:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 1568893 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.a=rsa-sha256 header.s=dkim.wdc.com header.b=pbw3Q+SE; dkim=pass (2048-bit key; unprotected) header.d=opensource.wdc.com header.i=@opensource.wdc.com header.a=rsa-sha256 header.s=dkim header.b=OLxBPOcO; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JF0HN6N2Zz9sCD for ; Thu, 16 Dec 2021 15:58:08 +1100 (AEDT) Received: from localhost ([::1]:48478 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mxiqE-0008QA-EM for incoming@patchwork.ozlabs.org; Wed, 15 Dec 2021 23:58:06 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51864) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxin8-0002SS-RR for qemu-devel@nongnu.org; Wed, 15 Dec 2021 23:54:56 -0500 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:6598) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxin6-0003pX-8X for qemu-devel@nongnu.org; Wed, 15 Dec 2021 23:54:54 -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=1639630492; x=1671166492; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=P58rSH9FYVGMWJye9pB0DBdQcbydJZIVFxFrCQLsVdI=; b=pbw3Q+SEvjNOy2mkHqOpF0+eSkoMXM/18ARbxn60i3Bh3QbuFzmJ7yn3 f+4xtf/IfoV0B8WIR4R/iItf6FZNhU6xxgNnAmySjxyXP/N4sYbu62Uky zyyYV4DMcXFHaMZj+lgDBng1oMQpIFYXSM+UuicYUBdPdQEuD8W6/vlio +OwZUk6fbdPeUVtootOzDjraWdPlV4kUZuCj7zEQ7YWX3v32Ldae5PK9W xTZHOXPorK7pTNECm87CCtfmlFCU7hwN0wr/RIYHhc4vHbfsNp9TE7ebD YjBHyd6Duwol9sE7gVTtHqT1enOMioqFeDrcrWB6AmxrFfJeyBY3M9NMW A==; X-IronPort-AV: E=Sophos;i="5.88,210,1635177600"; d="scan'208";a="300226942" Received: from h199-255-45-14.hgst.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 16 Dec 2021 12:54:49 +0800 IronPort-SDR: oqd+GDcDY1345b8z/0HJWGm/KJ8d0BmKviKH8cMVyeFxknWViqRDUz5wPtyA35B/6edD1rfkwC vFFb15Z9UK+ZTuTlk4cVEBt9PU/EQ5x7plBQjlF8/t1Qhwe7x8nkkh+nOaicwsCFcNgaCGCQrf xAkOqD1RclpFzry4K/cK/Lqa+n3Tbdun2KvHXs47lfEnZMbFJwv+4Yy981Ol2Wu2uWMM5U3EQv GdJezuEZq9iKcGSk/C1w8UEDqxPxpfa6OZvRDkKlmQrxBm1GhPjOov5j7LvxLjMfoVUuhiXsjO pfK1O93MnZNXafnA9q/j/QG9 Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Dec 2021 20:29:12 -0800 IronPort-SDR: gcuoD9aMUEpAMR7q4QwrQGENjgn0keduhWDGOoMPm3vDeo4qwUHfj2AdZ8wWy7HYAobmdIbyXP nrB/5TNzYSGOkAw1Esc4XdJjB6ldjtmWKCTRNTcQ28CFvJLpsnuuCcgUGRXIaIIte1y0Tqc7lF dXK+e3sIo/TjPkxfuFpgRU9neonWxv1ueG+tkjyqRhguuuGeut0HhToNdAOWlD3TYy3KMNTwkB 6b6AL30CSSpVIB/sNI7Lhd8RYdq3/L5By9qbpv7gzNW5Nk6DQ6XZidmWWC9EepvcvZHsg6H+9y mns= WDCIronportException: Internal Received: from usg-ed-osssrv.wdc.com ([10.3.10.180]) by uls-op-cesaip02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Dec 2021 20:54:50 -0800 Received: from usg-ed-osssrv.wdc.com (usg-ed-osssrv.wdc.com [127.0.0.1]) by usg-ed-osssrv.wdc.com (Postfix) with ESMTP id 4JF0CY2HpMz1Rwnx for ; Wed, 15 Dec 2021 20:54:49 -0800 (PST) Authentication-Results: usg-ed-osssrv.wdc.com (amavisd-new); dkim=pass reason="pass (just generated, assumed good)" header.d=opensource.wdc.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d= opensource.wdc.com; h=content-transfer-encoding:mime-version :references:in-reply-to:x-mailer:message-id:date:subject:to :from; s=dkim; t=1639630488; x=1642222489; bh=P58rSH9FYVGMWJye9p B0DBdQcbydJZIVFxFrCQLsVdI=; b=OLxBPOcOzjfpSmOwSGOYMq7qeVEzKoGUE0 F8Ha09sZ6GQq+Jj44h1Qc9glQfcDVei8WuW6i6N6otKpGJsMKdRW1IAvTf52yudk lN+yigAIQ09vrzExFrwbE4GISzBePLw0mcBs7S1Et7LRdvLMb39lPQmSCQg5gPKj EealKQp440kn7NeWxhHzwz7kuDtWuOYoF5Job2AZOVf33nbIJucD1CZmoCSYGCOQ CzLN63guoDQ43HfkBYvvo77pPIrCYmiFPBfgI25f1Ix94vlhQ+WcaGXg1/wJOjQg WTat6U7QUGXeqprbD9lbkkj6USHoa8+dFQ2G/WWHSILXQmIZiSEQ== X-Virus-Scanned: amavisd-new at usg-ed-osssrv.wdc.com Received: from usg-ed-osssrv.wdc.com ([127.0.0.1]) by usg-ed-osssrv.wdc.com (usg-ed-osssrv.wdc.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 8MTzOo93mBkp for ; Wed, 15 Dec 2021 20:54:48 -0800 (PST) Received: from toolbox.alistair23.me (unknown [10.225.165.66]) by usg-ed-osssrv.wdc.com (Postfix) with ESMTPSA id 4JF0CS0ntRz1RtVG; Wed, 15 Dec 2021 20:54:43 -0800 (PST) From: Alistair Francis To: qemu-riscv@nongnu.org, qemu-devel@nongnu.org Cc: Bin Meng , alistair23@gmail.com, Alistair Francis , Palmer Dabbelt , Alistair Francis , bmeng.cn@gmail.com Subject: [PATCH v2 2/9] hw/intc: sifive_plic: Cleanup the write function Date: Thu, 16 Dec 2021 14:54:20 +1000 Message-Id: <20211216045427.757779-3-alistair.francis@opensource.wdc.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211216045427.757779-1-alistair.francis@opensource.wdc.com> References: <20211216045427.757779-1-alistair.francis@opensource.wdc.com> MIME-Version: 1.0 Received-SPF: pass client-ip=68.232.141.245; envelope-from=prvs=977d27bfe=alistair.francis@opensource.wdc.com; helo=esa1.hgst.iphmx.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Alistair Francis Signed-off-by: Alistair Francis Reviewed-by: Bin Meng --- hw/intc/sifive_plic.c | 76 +++++++++++++++---------------------------- 1 file changed, 27 insertions(+), 49 deletions(-) diff --git a/hw/intc/sifive_plic.c b/hw/intc/sifive_plic.c index a9f7a1bfb0..698492ce77 100644 --- a/hw/intc/sifive_plic.c +++ b/hw/intc/sifive_plic.c @@ -33,6 +33,11 @@ #define RISCV_DEBUG_PLIC 0 +static bool addr_between(uint32_t addr, uint32_t base, uint32_t num) +{ + return addr >= base && addr - base < num; +} + static PLICMode char_to_mode(char c) { switch (c) { @@ -269,80 +274,53 @@ static void sifive_plic_write(void *opaque, hwaddr addr, uint64_t value, { SiFivePLICState *plic = opaque; - /* writes must be 4 byte words */ - if ((addr & 0x3) != 0) { - goto err; - } - - if (addr >= plic->priority_base && /* 4 bytes per source */ - addr < plic->priority_base + (plic->num_sources << 2)) - { + if (addr_between(addr, plic->priority_base, plic->num_sources << 2)) { uint32_t irq = ((addr - plic->priority_base) >> 2) + 1; + plic->source_priority[irq] = value & 7; - if (RISCV_DEBUG_PLIC) { - qemu_log("plic: write priority: irq=%d priority=%d\n", - irq, plic->source_priority[irq]); - } sifive_plic_update(plic); - return; - } else if (addr >= plic->pending_base && /* 1 bit per source */ - addr < plic->pending_base + (plic->num_sources >> 3)) - { + } else if (addr_between(addr, plic->pending_base, + plic->num_sources >> 3)) { qemu_log_mask(LOG_GUEST_ERROR, "%s: invalid pending write: 0x%" HWADDR_PRIx "", __func__, addr); - return; - } else if (addr >= plic->enable_base && /* 1 bit per source */ - addr < plic->enable_base + plic->num_addrs * plic->enable_stride) - { + } else if (addr_between(addr, plic->enable_base, + plic->num_addrs * plic->enable_stride)) { uint32_t addrid = (addr - plic->enable_base) / plic->enable_stride; uint32_t wordid = (addr & (plic->enable_stride - 1)) >> 2; + if (wordid < plic->bitfield_words) { plic->enable[addrid * plic->bitfield_words + wordid] = value; - if (RISCV_DEBUG_PLIC) { - qemu_log("plic: write enable: hart%d-%c word=%d value=%x\n", - plic->addr_config[addrid].hartid, - mode_to_char(plic->addr_config[addrid].mode), wordid, - plic->enable[addrid * plic->bitfield_words + wordid]); - } - return; + } else { + qemu_log_mask(LOG_GUEST_ERROR, + "%s: Invalid enable write 0x%" HWADDR_PRIx "\n", + __func__, addr); } - } else if (addr >= plic->context_base && /* 4 bytes per reg */ - addr < plic->context_base + plic->num_addrs * plic->context_stride) - { + } else if (addr_between(addr, plic->context_base, + plic->num_addrs * plic->context_stride)) { uint32_t addrid = (addr - plic->context_base) / plic->context_stride; uint32_t contextid = (addr & (plic->context_stride - 1)); + if (contextid == 0) { - if (RISCV_DEBUG_PLIC) { - qemu_log("plic: write priority: hart%d-%c priority=%x\n", - plic->addr_config[addrid].hartid, - mode_to_char(plic->addr_config[addrid].mode), - plic->target_priority[addrid]); - } if (value <= plic->num_priorities) { plic->target_priority[addrid] = value; sifive_plic_update(plic); } - return; } else if (contextid == 4) { - if (RISCV_DEBUG_PLIC) { - qemu_log("plic: write claim: hart%d-%c irq=%x\n", - plic->addr_config[addrid].hartid, - mode_to_char(plic->addr_config[addrid].mode), - (uint32_t)value); - } if (value < plic->num_sources) { sifive_plic_set_claimed(plic, value, false); sifive_plic_update(plic); } - return; + } else { + qemu_log_mask(LOG_GUEST_ERROR, + "%s: Invalid context write 0x%" HWADDR_PRIx "\n", + __func__, addr); } + } else { + qemu_log_mask(LOG_GUEST_ERROR, + "%s: Invalid register write 0x%" HWADDR_PRIx "\n", + __func__, addr); } - -err: - qemu_log_mask(LOG_GUEST_ERROR, - "%s: Invalid register write 0x%" HWADDR_PRIx "\n", - __func__, addr); } static const MemoryRegionOps sifive_plic_ops = {