From nobody Fri May 3 00:23:13 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1664541548; cv=none; d=zohomail.com; s=zohoarc; b=BL9IxwM3O+OBRvoPST416nNmkNq9aJyA70psGNBF0tvbsRFz8dORKfKq/tPIUFqxEgdpV9+85pJJ7unFDcu8PKtOp85xzU5J3F46W/k7VfaQsbty5unu9xv6B1jAfq44FmkbNgrm8igH6o4vH5GGqRRpn5/Hen7mMCoCcWUu+RE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664541548; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=6zUl2HU3Z5FB+WM/KgUcWz+nUT78Ab2AAKdW88gdUHQ=; b=ewVxi5aPLfADQPDcgSyxbF2SCxykCS3mbAWdsIp4G/Yvp0KcJ8Ral/2tlBDiNruwPWzjLYLNezzukdyEwbYJbYYswK9baYHg18t4BUKqRELn2VOIrJz1iBck5AAui8R6jdl3aKBamOY3p+TjScOhYcEqZnWL2dceJ8va0lB8g2U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1664541548489351.6670701856674; Fri, 30 Sep 2022 05:39:08 -0700 (PDT) Received: from localhost ([::1]:45944 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oeFII-0000lx-Fe for importer@patchew.org; Fri, 30 Sep 2022 08:39:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40332) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oeFCM-0006Ql-3X for qemu-devel@nongnu.org; Fri, 30 Sep 2022 08:32:58 -0400 Received: from mail-pf1-x433.google.com ([2607:f8b0:4864:20::433]:37684) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oeFCK-0003OT-BD for qemu-devel@nongnu.org; Fri, 30 Sep 2022 08:32:57 -0400 Received: by mail-pf1-x433.google.com with SMTP id a80so4127678pfa.4 for ; Fri, 30 Sep 2022 05:32:55 -0700 (PDT) Received: from hsinchu25.internal.sifive.com (59-124-168-89.hinet-ip.hinet.net. [59.124.168.89]) by smtp.gmail.com with ESMTPSA id t20-20020a62d154000000b00537aa0fbb57sm1649880pfl.51.2022.09.30.05.32.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Sep 2022 05:32:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date; bh=6zUl2HU3Z5FB+WM/KgUcWz+nUT78Ab2AAKdW88gdUHQ=; b=HAHKycchr8f3wYESSTfbg/f0BOjWNauf0F6RnWgQpljzi9G6Q7QxuOFiTAaRcbbBX1 pH5ZJxYQc6sDA8DLg3Ae0LaUm1F1+QBUJmwRfWbdncUbZdszkUEpdYM38silS5J4L217 cw7DdNTyO3WkJ5nKxLT928J5jAFWR8Q1Sy66KOpuMN7QrdFEvl0gU4EFwDbbZf92GOgb mb2Exs6NzIA876n5MKAKJSewDFOZQnjZWMFKqsFrzY1MxHVdtegO79BUqR22pEJSh0Mw 758ZfYktVFNP4aa7KTYfY/EiA3jeKh3I69kPEsk3LBVrFEqbIcQOHvlT2UoW4u01kp0H ofdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=references:in-reply-to:message-id:date:subject:cc:to:from :x-gm-message-state:from:to:cc:subject:date; bh=6zUl2HU3Z5FB+WM/KgUcWz+nUT78Ab2AAKdW88gdUHQ=; b=ymA3Ds1QPqU3QXLpxc4c1f8gDMmYwsTWe3xcdKBSj39BcbAGr+kMcs9xVh7pG3ZCKh X+kxs3CmsmeUGBS69uCzyiqAXkK6SfBiAcTBIzUCoQiwMJ3/uv8HltB1bm83rFsmak35 7woE1IJZKilTAqPKEXiZyoMfeDddnjIVueNo3Hig7CFRW2wTCH93uzPAklNY4A9WO3ct TV7wVZyRpGLJNpK5GoZYJJZIb3aMq9ftHhN/7UICYfbmPdH9IiFxPOPdwe46Tx1l6eVZ VMIXZ8dEpiAU4tE+9HRQfUMyDSoLOzwRXLQ5rvlkyt0bs1CKSa+YYLW0J3+zijSJik4/ gzgA== X-Gm-Message-State: ACrzQf0a85aK3wiV398fJ6HTXPASpsBW4IqtTAEFkjL5wIDHPpiDejOU n5F1luPyrjE3VJ1TMK9Kf0fXyh8mSVk4Y8ntHbrYVhsdjm4VzKLwqaAtagyOucdYJeBHICiQvCB 7gFbVub80cG+X2hRJUFIXb0kppMBlDxWltVhuDgIqCKE8x8FrDxRTZwnHzzq94VT1wCw= X-Google-Smtp-Source: AMsMyM4/mKwclipNv+4Lw13Eseku9bmfVDXrao5T1MsmJkhgojIDfk8eoRq+iiazRU3p8ZLfhPcA6g== X-Received: by 2002:a05:6a00:1248:b0:548:2e34:65e1 with SMTP id u8-20020a056a00124800b005482e3465e1mr9088095pfi.82.1664541174846; Fri, 30 Sep 2022 05:32:54 -0700 (PDT) From: Jim Shu To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Cc: Alistair Francis , Bin Meng , Palmer Dabbelt , chigot@adacore.com, Jim Shu , Emmanuel Blot Subject: [PATCH v2 1/2] hw/intc: sifive_plic: fix hard-coded max priority level Date: Fri, 30 Sep 2022 12:32:38 +0000 Message-Id: <20220930123239.15515-2-jim.shu@sifive.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220930123239.15515-1-jim.shu@sifive.com> References: <20220930123239.15515-1-jim.shu@sifive.com> Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2607:f8b0:4864:20::433; envelope-from=jim.shu@sifive.com; helo=mail-pf1-x433.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, SPF_HELO_NONE=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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @sifive.com) X-ZM-MESSAGEID: 1664541549296100001 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The maximum priority level is hard-coded when writing to interrupt priority register. However, when writing to priority threshold register, the maximum priority level is from num_priorities Property which is configured by platform. Also change interrupt priority register to use num_priorities Property in maximum priority level. Signed-off-by: Emmanuel Blot Signed-off-by: Jim Shu Reviewed-by: Frank Chang --- hw/intc/sifive_plic.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/intc/sifive_plic.c b/hw/intc/sifive_plic.c index af4ae3630e..f864efa761 100644 --- a/hw/intc/sifive_plic.c +++ b/hw/intc/sifive_plic.c @@ -180,8 +180,10 @@ static void sifive_plic_write(void *opaque, hwaddr add= r, uint64_t value, if (addr_between(addr, plic->priority_base, plic->num_sources << 2)) { uint32_t irq =3D ((addr - plic->priority_base) >> 2) + 1; =20 - plic->source_priority[irq] =3D value & 7; - sifive_plic_update(plic); + if (value <=3D plic->num_priorities) { + plic->source_priority[irq] =3D value; + sifive_plic_update(plic); + } } else if (addr_between(addr, plic->pending_base, plic->num_sources >> 3)) { qemu_log_mask(LOG_GUEST_ERROR, --=20 2.17.1 From nobody Fri May 3 00:23:13 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1664541860; cv=none; d=zohomail.com; s=zohoarc; b=E3fzdsdxeJbwrGylARpGaBRRnpiSaR31pe8i3ole6QEwz+fruQqJuQE0UFwsYqY2/1NLxZlJYlhA9tSLezQKfJEo2yqOkl6inq1kgc88LKJKgu6t8vzXvPn3zObdFxL5pDtHskwxjP48Ax5N2y1OBa+ockRjEwvtjehGZG3UgJ8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664541860; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=19tiDMrMrp6otC4IABn8GhcIywk+2/OdxCJVUTJlxdE=; b=MLtNBU0e+ZT62sezthsdohHtZHu7otMObM/GDlYWuXfjjknb+yL2I9wVZZQ5A105sLXcZrP02XszcLow8h3njwzzZO7RACbDyDjDjnmHthIRP4OQu0UdLWMP+ULHRkHwEphXqidN+7LT+IWpfrDdLr08N6CJA7Bt8SQsD6PkGso= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1664541860049414.8691379687019; Fri, 30 Sep 2022 05:44:20 -0700 (PDT) Received: from localhost ([::1]:49716 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oeFNK-00058n-T3 for importer@patchew.org; Fri, 30 Sep 2022 08:44:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40338) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oeFCO-0006XH-V0 for qemu-devel@nongnu.org; Fri, 30 Sep 2022 08:33:01 -0400 Received: from mail-pg1-x52c.google.com ([2607:f8b0:4864:20::52c]:40671) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oeFCN-0003Qh-7t for qemu-devel@nongnu.org; Fri, 30 Sep 2022 08:33:00 -0400 Received: by mail-pg1-x52c.google.com with SMTP id s26so4052418pgv.7 for ; Fri, 30 Sep 2022 05:32:58 -0700 (PDT) Received: from hsinchu25.internal.sifive.com (59-124-168-89.hinet-ip.hinet.net. [59.124.168.89]) by smtp.gmail.com with ESMTPSA id t20-20020a62d154000000b00537aa0fbb57sm1649880pfl.51.2022.09.30.05.32.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Sep 2022 05:32:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date; bh=19tiDMrMrp6otC4IABn8GhcIywk+2/OdxCJVUTJlxdE=; b=EMay5euiQ0loR6hJgLVz/1GmAyJibNWCiP8wVpkeIoqvjMX7EN0uHgRQYQU9VT1cGf AyXnht3Uw/dwzDPxY5/1Ds4Cf0ox6L59jSvRSz+BMgKjOAT9DZXoA2KvTKnagpfUp84l 1FlO4oDIK6Ui7WwAORKqUcqkl5q91+oImSCwuEbr9yG47RfVnaNI4TdtIyPcNL4ZRG3f LKURMDUuegWLKqr2bShN9rPTRYZidWm7c4AOCFkw14oBspLI10tEjwhwJSu2RUxczSo3 hr6xKgqBNRATG6JNnMxCNOFF+A4mj5UXlBgHxANO8+hRu3JEXE9c7HDt7bR06Sp2cJzR KZwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=references:in-reply-to:message-id:date:subject:cc:to:from :x-gm-message-state:from:to:cc:subject:date; bh=19tiDMrMrp6otC4IABn8GhcIywk+2/OdxCJVUTJlxdE=; b=GPQTR5Dgy+CCehdAYC7kaqEsfTBou17OBH+k+aV7hAEguVgMYfGjJMtMntIiF5J7Lw imlw+4UDen6Rt1yru9gyKYkEg80Jh4841soq5I90zbOKskm0tv9ALks4MJTqNNHnTVWT IXwAIe4ZnxelGf3Xka5AE5W8Ka4HUmsKUSjyh6ASfRXBOn5K/NPV83RqRpAggh05BbPl fUmMZ1Lbc2o464+tAnnxiULR3wwH8/sTUL8clP37Dc/GkYTzEHl3O4Hf8QZ0eA/aALLE 0A7qpZvTSRN5zGc39J7fWVG2Dsapx7bq8eR9yWmG/zYB726+4Tu5xVBgcwRBdT7X5Vhx nSPQ== X-Gm-Message-State: ACrzQf20jsX5jpJouaU3zd9xOwP3j887LdkwkJeIv/nSmDEV8jH5ud/8 YQTm67iC6uJL91C/jFJAcxNg/XCBzaBF2J7jLpDqYRNn5y4GNVQTjc042LQJ5dwYOOWonrYBExt /7JEAX6hPvMHbqlZSG66KIE+Qya3Nn5z3TQDgmzPzgwthidcAiiLbSR8dCgA6PIN44gw= X-Google-Smtp-Source: AMsMyM4BRq8ejC09Vhxd43OjSjlYK1kFL2deJcVLBG01g+VT9smHtvvID3sv8IspV1WbM3LMggyXCw== X-Received: by 2002:a05:6a00:1253:b0:546:3d50:3284 with SMTP id u19-20020a056a00125300b005463d503284mr8684156pfi.72.1664541177409; Fri, 30 Sep 2022 05:32:57 -0700 (PDT) From: Jim Shu To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Cc: Alistair Francis , Bin Meng , Palmer Dabbelt , chigot@adacore.com, Jim Shu Subject: [PATCH v2 2/2] hw/intc: sifive_plic: change interrupt priority register to WARL field Date: Fri, 30 Sep 2022 12:32:39 +0000 Message-Id: <20220930123239.15515-3-jim.shu@sifive.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220930123239.15515-1-jim.shu@sifive.com> References: <20220930123239.15515-1-jim.shu@sifive.com> Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2607:f8b0:4864:20::52c; envelope-from=jim.shu@sifive.com; helo=mail-pg1-x52c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @sifive.com) X-ZM-MESSAGEID: 1664541861216100001 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" PLIC spec [1] requires interrupt source priority registers are WARL field and the number of supported priority is power-of-2 to simplify SW discovery. Existing QEMU RISC-V machine (e.g. shakti_c) don't strictly follow PLIC spec, whose number of supported priority is not power-of-2. Just change each bit of interrupt priority register to WARL field when the number of supported priority is power-of-2. [1] https://github.com/riscv/riscv-plic-spec/blob/master/riscv-plic.adoc#in= terrupt-priorities Signed-off-by: Jim Shu --- hw/intc/sifive_plic.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/hw/intc/sifive_plic.c b/hw/intc/sifive_plic.c index f864efa761..218ccff8bd 100644 --- a/hw/intc/sifive_plic.c +++ b/hw/intc/sifive_plic.c @@ -180,7 +180,15 @@ static void sifive_plic_write(void *opaque, hwaddr add= r, uint64_t value, if (addr_between(addr, plic->priority_base, plic->num_sources << 2)) { uint32_t irq =3D ((addr - plic->priority_base) >> 2) + 1; =20 - if (value <=3D plic->num_priorities) { + if ((plic->num_priorities + 1) & (plic->num_priorities)) { + /* + * if "num_priorities + 1" is power-of-2, make each register b= it of + * interrupt priority WARL (Write-Any-Read-Legal). Just filter + * out the access to unsupported priority bits. + */ + plic->source_priority[irq] =3D value % (plic->num_priorities += 1); + sifive_plic_update(plic); + } else if (value <=3D plic->num_priorities) { plic->source_priority[irq] =3D value; sifive_plic_update(plic); } @@ -207,7 +215,16 @@ static void sifive_plic_write(void *opaque, hwaddr add= r, uint64_t value, uint32_t contextid =3D (addr & (plic->context_stride - 1)); =20 if (contextid =3D=3D 0) { - if (value <=3D plic->num_priorities) { + if ((plic->num_priorities + 1) & (plic->num_priorities)) { + /* + * if "num_priorities + 1" is power-of-2, each register bi= t of + * interrupt priority is WARL (Write-Any-Read-Legal). Just + * filter out the access to unsupported priority bits. + */ + plic->target_priority[addrid] =3D value % + (plic->num_priorities + 1); + sifive_plic_update(plic); + } else if (value <=3D plic->num_priorities) { plic->target_priority[addrid] =3D value; sifive_plic_update(plic); } --=20 2.17.1