From nobody Fri Dec 19 04:19:54 2025 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; dmarc=pass(p=none dis=none) header.from=yeah.net ARC-Seal: i=1; a=rsa-sha256; t=1754555842; cv=none; d=zohomail.com; s=zohoarc; b=AUYFF+s6z6o/KKTQEkqzl9tIPcwzAFJ0GRyXZFxue1lSAOzPX0/ZQfnanng0TeUNJYipnQdhGC7bQ6ZHNVpp+Pfxs1EMg14AkMQdRv7qLbL54PCuf8NSXuD8JlinwtvzazxQ+DZ4NyC5iN9KGKBnzATRF6YMEu8yzflSMNzd+98= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754555842; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=u0wU2PZMcyzQPCTGLadgEEYeyspIfb3MUYpbGNCZNRA=; b=ZYiwBT/xCqXZnXTaI+skY2D2zDnlHl324nd3Shr69iNf4xz1TLma3mZgVfaJnCkDh/PFB6jnLBR8m2O92Tr2FVGeVNXGQeDkS+7PwhaHVG+s8i3S7OorvGN880+b2WYNLyxXQx80W05XkaZ4rLvp1AX0PoulZI6RivG/wwmXVrE= 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1754555842278721.7946673007004; Thu, 7 Aug 2025 01:37:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ujw7H-0006Dy-8S; Thu, 07 Aug 2025 04:36:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ujw7E-00065k-5M; Thu, 07 Aug 2025 04:36:49 -0400 Received: from mail-m16.yeah.net ([1.95.21.15]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ujw78-0008SU-Lt; Thu, 07 Aug 2025 04:36:46 -0400 Received: from vcore-181.. (unknown []) by gzsmtp1 (Coremail) with SMTP id Mc8vCgCHtrJ_ZZRo1nQxAg--.30694S2; Thu, 07 Aug 2025 16:36:17 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yeah.net; s=s110527; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=u0 wU2PZMcyzQPCTGLadgEEYeyspIfb3MUYpbGNCZNRA=; b=ituoLrQnZxSMb5XfM3 09mrTjaTsmdU9rW7dvKgW1sxOoMS1YyIH5eeD5nYQIz1pirteSuugE7RCpdJUGkT z5I+KKPaP+1NXHAEON59DlJ2yYM+SvyZa+lETaAQ/VUcXkZsOTIZfyOPaTouuTFe BNtKkjmZ5QPmRRfQZvfxfacKg= From: Yang Jialong To: Palmer Dabbelt , Alistair Francis , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei Cc: yangjialong@rvcore.com, Yang Jialong , qemu-riscv@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH] aplic: fix mask for smsiaddrcfgh Date: Thu, 7 Aug 2025 16:23:46 +0800 Message-Id: <20250807082346.3752212-1-z_bajeer@yeah.net> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: Mc8vCgCHtrJ_ZZRo1nQxAg--.30694S2 X-Coremail-Antispam: 1Uf129KBjvJXoW7tw4xZrWfZF48AF1xWr47CFg_yoW8uFykpr 4DK39rCF45Jr1xKa1rta1kGry7trykCr9rur1DW3409F18Ars0934kKws09ryUCFyfGr45 Jw4Fq3WDGF4fA37anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0ziKii3UUUUU= X-Originating-IP: [49.7.252.142] X-CM-SenderInfo: p2betyxhhuq5hhdkh0dhw/1tbiCwWiI2iUX6gQNQAAsh 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=1.95.21.15; envelope-from=z_bajeer@yeah.net; helo=mail-m16.yeah.net 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, UNPARSEABLE_RELAY=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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @yeah.net) X-ZM-MESSAGEID: 1754555844707116600 Content-Type: text/plain; charset="utf-8" 4.5.4. Supervisor MSI address configuration (smsiaddrcfg and smsiaddrcfgh) smsiaddrcfgh: bits 22:20 LHXS(WARL) bits 11:0 High Base PPN(WARL) Signed-off-by: Yang Jialong --- hw/intc/riscv_aplic.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/hw/intc/riscv_aplic.c b/hw/intc/riscv_aplic.c index a1d9fa5085..174ccb3a64 100644 --- a/hw/intc/riscv_aplic.c +++ b/hw/intc/riscv_aplic.c @@ -96,7 +96,7 @@ (APLIC_xMSICFGADDR_PPN_HHX_MASK(__hhxw) << \ APLIC_xMSICFGADDR_PPN_HHX_SHIFT(__hhxs)) =20 -#define APLIC_xMSICFGADDRH_VALID_MASK \ +#define APLIC_MMSICFGADDRH_VALID_MASK \ (APLIC_xMSICFGADDRH_L | \ (APLIC_xMSICFGADDRH_HHXS_MASK << APLIC_xMSICFGADDRH_HHXS_SHIFT) | \ (APLIC_xMSICFGADDRH_LHXS_MASK << APLIC_xMSICFGADDRH_LHXS_SHIFT) | \ @@ -104,6 +104,10 @@ (APLIC_xMSICFGADDRH_LHXW_MASK << APLIC_xMSICFGADDRH_LHXW_SHIFT) | \ APLIC_xMSICFGADDRH_BAPPN_MASK) =20 +#define APLIC_SMSICFGADDRH_VALID_MASK \ + ((APLIC_xMSICFGADDRH_LHXS_MASK << APLIC_xMSICFGADDRH_LHXS_SHIFT) | \ + APLIC_xMSICFGADDRH_BAPPN_MASK) + #define APLIC_SETIP_BASE 0x1c00 #define APLIC_SETIPNUM 0x1cdc =20 @@ -771,7 +775,7 @@ static void riscv_aplic_write(void *opaque, hwaddr addr= , uint64_t value, } else if (aplic->mmode && aplic->msimode && (addr =3D=3D APLIC_MMSICFGADDRH)) { if (!(aplic->mmsicfgaddrH & APLIC_xMSICFGADDRH_L)) { - aplic->mmsicfgaddrH =3D value & APLIC_xMSICFGADDRH_VALID_MASK; + aplic->mmsicfgaddrH =3D value & APLIC_MMSICFGADDRH_VALID_MASK; } } else if (aplic->mmode && aplic->msimode && (addr =3D=3D APLIC_SMSICFGADDR)) { @@ -792,7 +796,7 @@ static void riscv_aplic_write(void *opaque, hwaddr addr= , uint64_t value, (addr =3D=3D APLIC_SMSICFGADDRH)) { if (aplic->num_children && !(aplic->mmsicfgaddrH & APLIC_xMSICFGADDRH_L)) { - aplic->smsicfgaddrH =3D value & APLIC_xMSICFGADDRH_VALID_MASK; + aplic->smsicfgaddrH =3D value & APLIC_SMSICFGADDRH_VALID_MASK; } } else if ((APLIC_SETIP_BASE <=3D addr) && (addr < (APLIC_SETIP_BASE + aplic->bitfield_words * 4))) { --=20 2.34.1