From nobody Fri Nov 14 19:45:17 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=1760108350; cv=none; d=zohomail.com; s=zohoarc; b=cOQqb1CfnLMX/SAL5jBvj/fIo2YWmMpY7wph7AVHNcxkll+Pi1WURg3fGeDCNA3mIq0d25sWIBbl7pNr+ecYfKNWv9sEBtiaYiTnwwbcmip3A21KvQxtMaKFsV672BXlidOp0ER34D0EnwH7c74oKhtPAnTaCQ/t7oAAfQsMbGM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760108350; 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=BXYGifCienPI1jzoyndm7T5P3SXtXv5rKB4Tlv/TCMs=; b=ce3k7lAdvUtFc047KBr5zKkKh4WW/xZ1FXoXKW9TpySRh1MRCGx8a10dg3un3B2vWMlROvctFXnBTjCnmZ8yAeHLsuA8C8MSmZdRvQoOOI4GJ4uLnudvOLazNlPrq72NOSmW0sqjodLXU8xnooYSIDr9nEVdx2CI2yHzNdo/iHA= 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 1760108350216745.4398286916464; Fri, 10 Oct 2025 07:59:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v7EYp-0001pO-Vy; Fri, 10 Oct 2025 10:57:36 -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 1v7EYY-0001ng-Dw; Fri, 10 Oct 2025 10:57:20 -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 1v7EYL-0007ub-8h; Fri, 10 Oct 2025 10:57:18 -0400 Received: from well.lan (unknown []) by gzsmtp1 (Coremail) with SMTP id Mc8vCgBnbbGWHulo9wpFBg--.17191S2; Fri, 10 Oct 2025 22:56:26 +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=BX YGifCienPI1jzoyndm7T5P3SXtXv5rKB4Tlv/TCMs=; b=ABUX6vsZTJ5gtBOXOl bSB8LPALeJkfYjWH2wvWiRFRPM2Z8sbgGH27VIKzjxQycL4nn0sLlfgRyilpLmfJ Pi4Ty9kTLgFZgioqcLbQT0pixpaAaFPuycxbS3o95KEkujFSNjLXF7EGpcD/NdSE jJFYH+ZMkG7g75+Dwd9HVFOmY= From: Jialong Yang To: Palmer Dabbelt , Alistair Francis , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei Cc: jialong.yang@barrietech.com, Jialong Yang , qemu-riscv@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH v3] aplic: fix mask for smsiaddrcfgh Date: Fri, 10 Oct 2025 22:56:21 +0800 Message-ID: <20251010145621.24961-1-z_bajeer@yeah.net> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 smsiaddrcfgh: bits 22:20 LHXS(WARL) bits 11:0 High Base PPN(WARL) Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: Mc8vCgBnbbGWHulo9wpFBg--.17191S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxZFWDJr1DJryktw43Cry5XFb_yoW5KrWDpF 4kGwsxKF45Jr1xKanay3ZrJry3JrykAr9Fyr1DW3409F1kZr4q934ktayq9r15JryfWr15 Aw4FqF1DWFsxA37anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0ziKLvtUUUUU= X-Originating-IP: [223.160.231.226] X-CM-SenderInfo: p2betyxhhuq5hhdkh0dhw/1tbiCQviI2jo5st87gAAs8 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, 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: 1760108353687154100 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jialong Yang Acked-by: Alistair Francis --- hw/intc/riscv_aplic.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) v1 --> v2: - fix calculation of MSI address. - In Supervisor mode, lhxw/hhxs/hhxw fields are in mmsiaddrcfgh register. - And lhxs field is in smsiaddrcfgh. v2 --> v3: - Fix compile error when enable kvm. diff --git a/hw/intc/riscv_aplic.c b/hw/intc/riscv_aplic.c index a1d9fa5085..6dccca73af 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 @@ -184,7 +188,7 @@ void riscv_aplic_set_kvm_msicfgaddr(RISCVAPLICState *ap= lic, hwaddr addr) addr >>=3D APLIC_xMSICFGADDR_PPN_SHIFT; aplic->kvm_msicfgaddr =3D extract64(addr, 0, 32); aplic->kvm_msicfgaddrH =3D extract64(addr, 32, 32) & - APLIC_xMSICFGADDRH_VALID_MASK; + APLIC_MMSICFGADDRH_VALID_MASK; } #endif } @@ -409,13 +413,8 @@ static void riscv_aplic_msi_send(RISCVAPLICState *apli= c, msicfgaddr =3D aplic->kvm_msicfgaddr; msicfgaddrH =3D ((uint64_t)aplic->kvm_msicfgaddrH << 32); } else { - if (aplic->mmode) { - msicfgaddr =3D aplic_m->mmsicfgaddr; - msicfgaddrH =3D aplic_m->mmsicfgaddrH; - } else { - msicfgaddr =3D aplic_m->smsicfgaddr; - msicfgaddrH =3D aplic_m->smsicfgaddrH; - } + msicfgaddr =3D aplic_m->mmsicfgaddr; + msicfgaddrH =3D aplic_m->mmsicfgaddrH; } =20 lhxs =3D (msicfgaddrH >> APLIC_xMSICFGADDRH_LHXS_SHIFT) & @@ -427,6 +426,14 @@ static void riscv_aplic_msi_send(RISCVAPLICState *apli= c, hhxw =3D (msicfgaddrH >> APLIC_xMSICFGADDRH_HHXW_SHIFT) & APLIC_xMSICFGADDRH_HHXW_MASK; =20 + if (!aplic->kvm_splitmode && !aplic->mmode) { + msicfgaddrH =3D aplic_m->smsicfgaddrH; + msicfgaddr =3D aplic_m->smsicfgaddr; + + lhxs =3D (msicfgaddrH >> APLIC_xMSICFGADDRH_LHXS_SHIFT) & + APLIC_xMSICFGADDRH_LHXS_MASK; + } + group_idx =3D hart_idx >> lhxw; =20 addr =3D msicfgaddr; @@ -771,7 +778,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 +799,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.43.0