From nobody Tue May 14 06:38:37 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=1664770778; cv=none; d=zohomail.com; s=zohoarc; b=jiEaZfOPgTHelyiNUH9LRXaWSLeKzLlhnlfpG1s2uH0OCwF9F782/fd8mdug4FjhNXXt4tRqTFfHgAH2WpviyVC0NMdMQbXBr1XoRJaIc7JbBIPUZAVzzevHWnhx11gqErk7Itf4fwNREPgjGFneSbNIU6PcLZG+02Fbma0kZko= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664770778; 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=AVAqL9DO6Ea3bPU26ALVTe/IzugBrn7hGhVezPLUKVdopQ6wBOrCANwL9AlNijbILq6vDJDqvtlOGOS2NtNgkLG+zhvaE5XYeFxjS9NYv+6SqSwcxcm6eUbw9ft8142FIx5bN8m6BD6vxzPOlZ5YZHcY/Jt+bQD4zaEjtB2zf+g= 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 1664770778329651.3926004862286; Sun, 2 Oct 2022 21:19:38 -0700 (PDT) Received: from localhost ([::1]:48744 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ofCvZ-0006LY-Ay for importer@patchew.org; Mon, 03 Oct 2022 00:19:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55178) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ofCr4-0003Xk-4x for qemu-devel@nongnu.org; Mon, 03 Oct 2022 00:15:03 -0400 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]:33466) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ofCr2-0006TP-M2 for qemu-devel@nongnu.org; Mon, 03 Oct 2022 00:14:57 -0400 Received: by mail-pl1-x62f.google.com with SMTP id 10so5045252pli.0 for ; Sun, 02 Oct 2022 21:14:56 -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 d12-20020a170902cecc00b0017732e4003bsm6108596plg.141.2022.10.02.21.14.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Oct 2022 21:14: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=ZHwJ7nmSA/HhiRQZq0meor3/TLygrMmciw6ONBwKishhaJTkeuqYbK2J2lcW2SSPRd JEZl3pnCZJSlnSFqFi2Ga/CrGVZZUE60nalxHOQzlNcLaXny7GMZiFmr9IqRTlM7i5J5 aUkqsLm23rHIQMjzjoxUUDfqQcLZkd1B1g+DcBUH3S50ReHY5NNYnVKYVVaP5Pln27oN zSvMdeHB0Iw5d3p/kDASy3HubSYE/YsqIo5eNeRWD41jtaAdBj3f77OvlwG6bWSP4F9W +HzL+cASZ3fUuiPwaVe5NeBvG13jPbGGJu+Ewa54Mmo7Gk3wjffnn+EEAP/STQMtQ0xB 2XaQ== 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=l1AEAGVasjAm8RFdjaDY4ct0k3DVrSRTgo1AH/H0Q3wuKMNCiEuSkKemFeQ4ll10l2 4M+GlNLJxIzgd0RU2HjOLVj68Eluckae8seEkj8nKOvycVO9vZ78Pl28pvRLBgCTA9gI cGEAEMtdPJMFe/W6EviVDmxxfTWTDBbwa0qMm8XX+qiWLhexOtM3+Tv8KSsCIwliz13n NlehPe0zM/2pI8MznREXAyaPtkob24SDNqGkbXo6EefwAv2Kwpw7DRw5e2+w52KIKkFD /7w9+RS7OSF5EkZDp6dV+0G3813kTxy8g7nY1hkFznBH96D+z4AJAwCqi+/IFyV2458u 22WA== X-Gm-Message-State: ACrzQf1mRNVg30Yo5oXqb/xrqfjJI6jQ8hm3foURkNt+LxZPzkFUoxLI 2rxnTlqPIELOPhgexlI1BpKFbe0C30cbSj51Ug3DMNxroIO9me0GtH6JT0WMOCnY4xATv/zYHB4 umdy2cAqb8SX0Du06ydlXVXcB4fvIJHPAfZGfNDVpUqfb4HT3E0xrmeveqlw66tbIOT8= X-Google-Smtp-Source: AMsMyM5C7v5e7Vq+P9HStNYrUbEzAsgAD/JLSNB+ubeDAn4BIcg5ZlFLau3xkHncfaNlC+cHa+5F4Q== X-Received: by 2002:a17:90b:33c9:b0:200:a0ca:e6c8 with SMTP id lk9-20020a17090b33c900b00200a0cae6c8mr10176264pjb.147.1664770495169; Sun, 02 Oct 2022 21:14:55 -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 v3 1/2] hw/intc: sifive_plic: fix hard-coded max priority level Date: Mon, 3 Oct 2022 04:14:39 +0000 Message-Id: <20221003041440.2320-2-jim.shu@sifive.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221003041440.2320-1-jim.shu@sifive.com> References: <20221003041440.2320-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::62f; envelope-from=jim.shu@sifive.com; helo=mail-pl1-x62f.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: 1664770778918100001 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 Acked-by: Alistair Francis --- 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 Tue May 14 06:38:37 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=1664770763; cv=none; d=zohomail.com; s=zohoarc; b=jP4spTJHn5wU7A7LLwf56DGDK/jXiA0DCscndl4y2R4lTPUerduICdtl0GgOSvHk5FJ8xdtswzcKAW71ZMXeJNKs+J6dUVM1OX+ldmgEokz/htUCuE8NT5Q+EiT+zhUdbph95oViCpRo3+9t2XUGN4ilu76JKZB9kwKzQ5Ekazk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664770763; 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=F+mjQgSIAnozHseNrNKmVtq1cIhjeBBYAbGF2zpCiHk=; b=HgEg4/klSaw3fvjcOsAjui/jjX7N2oAiZ5EAXOw7sttMr6ENe0kqlLNAPN9I8Mtp23brsHKbnQGbfCoobvO0h4VWdc7ACr96oii5/ztKx/FjUy1/eB9ZkmOzHL8OAIIvbVUKE+Vsb2vSHooPr/ULb7XfZMb74KHd6hIeshWSX1k= 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 1664770763121298.83003188107193; Sun, 2 Oct 2022 21:19:23 -0700 (PDT) Received: from localhost ([::1]:43478 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ofCvI-0005vG-Tm for importer@patchew.org; Mon, 03 Oct 2022 00:19:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55184) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ofCr8-0003YW-1w for qemu-devel@nongnu.org; Mon, 03 Oct 2022 00:15:03 -0400 Received: from mail-pg1-x535.google.com ([2607:f8b0:4864:20::535]:39572) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ofCr5-0006Tq-Sk for qemu-devel@nongnu.org; Mon, 03 Oct 2022 00:15:01 -0400 Received: by mail-pg1-x535.google.com with SMTP id b5so8724585pgb.6 for ; Sun, 02 Oct 2022 21:14:59 -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 d12-20020a170902cecc00b0017732e4003bsm6108596plg.141.2022.10.02.21.14.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Oct 2022 21:14: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=F+mjQgSIAnozHseNrNKmVtq1cIhjeBBYAbGF2zpCiHk=; b=casen/B75ua/AN1X/YMfDM+FAcr5wke3RSjmNvTO3zcVlcjuixOQFb/vSQ+q3yU/6L 4/4SR8gFEnnci5HXxPUp1qs0I1iBhZvG0YU/BiCYQbXw9Ks5hUYkyMhR3oQ9jeA9zn9z 5yO0r6WHzd38+IMMr6foYTL1O4tPwZt86AP/bA6Bqm29oBbMsOzk3BZMcboWFTzDBKME CUXFxjiT9SMg+qdE3h+y8ZRXCmQAJzjZMRuDT2ZsWb+JxMjhDkWOn2qjfbZw0yqjRYxH B7HA/qCKFmFGbIYIbOkbX55OIJGlewufIg30yD3iTVHit/0zlr/I7i6U/lkRvzl1RhZ2 zDWw== 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=F+mjQgSIAnozHseNrNKmVtq1cIhjeBBYAbGF2zpCiHk=; b=JSpq6gZO/lhZx0vz5bjzHwpYRAE40Nv6JFtjj4YxVzkzQNuqKMx4lzX5CRN+om0Zy4 VQLv2C/rWEX1A7FpMZOGc2rFeuhGP3/31gF0eliMY1hSo+rU6kH48Nb37HkyERL+bATY 6n6loMYZBPhKgENPkr6W6eswipzk4uNN3ExBJl8iYpdX7NgoBveze3Bkc56vN+XMVpcB LK2h44tuzGvSMnWL6Cx54vwTmcOcgE4lnogqrKJqU/3+5UYuXW6vNjpZl/80EfVBw0Us G80/dpdkNyUjWXTVaWj8qhrmFADJ5ytBN6c1uyplTeaB16nbkdD7FrlNh5W70S5FIV4/ HOEg== X-Gm-Message-State: ACrzQf2E673bBfkGcmrOpAuxaZ714YPI6lVsoKVePbuG7I9XhU9qO7+0 Nbab3Ww1rDlGI1r1FYcItnLLHttAGKFcVcNJ6BFnBHVpaXd0Ojblfg+kUMl78rdficVKFqCMyT3 s+gru3GHCkvVTzPIvAT8fzSTDNc+ILlAjG2zWmgtCi6OL30mSlhFSR3YhPpkyrKq2HJk= X-Google-Smtp-Source: AMsMyM6igbQ0Se816vi8zq5Px9W2pNLp3EF0yiD9tCWpm/16qcmmUvr7272YseSfpbErnWy6qcXo5Q== X-Received: by 2002:a05:6a00:24d2:b0:542:f6e3:e18d with SMTP id d18-20020a056a0024d200b00542f6e3e18dmr20397910pfv.36.1664770498221; Sun, 02 Oct 2022 21:14:58 -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 v3 2/2] hw/intc: sifive_plic: change interrupt priority register to WARL field Date: Mon, 3 Oct 2022 04:14:40 +0000 Message-Id: <20221003041440.2320-3-jim.shu@sifive.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221003041440.2320-1-jim.shu@sifive.com> References: <20221003041440.2320-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::535; envelope-from=jim.shu@sifive.com; helo=mail-pg1-x535.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: 1664770764845100001 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 Acked-by: Alistair Francis Reviewed-by: Cl=C3=A9ment Chigot --- 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..c2dfacf028 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) =3D=3D 0) { + /* + * 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) =3D=3D= 0) { + /* + * 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