From nobody Mon Oct 27 14:08:33 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1761263514; cv=none; d=zohomail.com; s=zohoarc; b=eaGYW14PD64V/DmDsOiaqVC835zFh5QJBdW9+YO2eP5cTSfQbAPuJ6ciC3jmb4GdxFWXJqTh5ziX+05lv1q/TnhzIGvExsEsp53aO9PGoxz6jPMSL9GEP+GoeQtia+PSAP1meQoGOYnxTAUa7zyuI4xN2UHBOcU47yHHsZjAHk8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761263514; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=2Mao6PD8wwENV7peOfswOR2w88gBwEoO4ue8fP0vqGc=; b=Cpl7jnNVrNE8FBTdv5P/EtgILFXMhlZEcSGFpOQEu4U+GRSP5O5xibLwIMXuTZnDa8bGFg7/ddNzuZCk6txEZ21Vbtbzh8GJy7dcn9mt29xusVo9Xfe7Ifp1cadzmaIe+cOwOhCsdYscn/pZWPd50Idq8wEIxPsEdKTILwzB4mM= 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 1761263514579741.3178774743755; Thu, 23 Oct 2025 16:51:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vC55Z-0005uo-Pf; Thu, 23 Oct 2025 19:51:25 -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 1vC54s-000540-GB for qemu-devel@nongnu.org; Thu, 23 Oct 2025 19:50:44 -0400 Received: from mail-pg1-x52d.google.com ([2607:f8b0:4864:20::52d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vC54p-0007T1-Q5 for qemu-devel@nongnu.org; Thu, 23 Oct 2025 19:50:42 -0400 Received: by mail-pg1-x52d.google.com with SMTP id 41be03b00d2f7-b556284db11so1168937a12.0 for ; Thu, 23 Oct 2025 16:50:39 -0700 (PDT) Received: from toolbx.alistair23.me (2403-580b-97e8-0-82ce-f179-8a79-69f4.ip6.aussiebb.net. [2403:580b:97e8:0:82ce:f179:8a79:69f4]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2946de02cb7sm36088525ad.40.2025.10.23.16.50.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Oct 2025 16:50:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761263438; x=1761868238; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2Mao6PD8wwENV7peOfswOR2w88gBwEoO4ue8fP0vqGc=; b=hOllIspj0dmdvptd7CYuQfcXbnuwVhPyPyUNxM6vYnXpaaNZ+gIL6rDadNnk9kNLNN +kgbXMkWVUdy6lOogqXSXW3DkEm1C8+mqfp6AOC3Qd5FwDLXJQ9JIylqU5yt9WddBa9Q IAUxdoQRVMHJ4XvkESr7ZGFnc8utcZNc5S88Hzhq66wd4D2tzblA6N2RrpFS7RFF5ILG OBP5n5KgeoFPM1ejp/uyDyI05pKy36dm5PQc0Ve9mnjOVfRtDC7y7kJfynP7a6vIVWSF /tH1gqzQUsWqMSEHzhczsDzcmV9Ln+lbp2idex3kNjFbirmDA2OqHfsFFX6z6pjyUqTt fHyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761263438; x=1761868238; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2Mao6PD8wwENV7peOfswOR2w88gBwEoO4ue8fP0vqGc=; b=VMQpz8mt3Dwa2JZ4yXHNOn72Me2NssPWdYJucE1XubaHDLGdfZGjWKvWKPsZc7TI8g wh8I8DlebjayGsJJ5hzlgma6XSB9N+fQUJqflilxze0qVwlHQc/yaVdqOTll/Dfz2eKS Gmuu8yPO2n7xXA5xaHfyLG41ApDKo7231zx8C2DNnTz+eUUSNtdqTaChp5p0QKUi0fSB fwL3zmgqAIyEBIiFN0xHVTIRRpx3XLsxvFMHel97hEKjsJolqVvArK6wgMXkJVjCOW6V KR8+xbAvOogFv6PLiernGoJqxKk3T5MVsMDR96tfZGvdGtrKg6mc5X5K3raP2sjySnHl 6DnQ== X-Gm-Message-State: AOJu0YwINuwbdoqWNpEz3goKYNKCwKIaNZx77BbFIpyrC7eLTvdeoswC kOeXmW3hUhc1xqQr5szqL5Lh2scS+R9Gu44QaNHwnyJLlNa16OoStZzlLiI0kA== X-Gm-Gg: ASbGncstWTNIKIR3BvCAHTICjyCg9M/44Bjykl3ik+P0PzQNkCYL9qaWugN5GrQq7yb J3KaxZDu6cOYUWoyF7WY3Wf9i2DMGcSN/2t2vhmegfk8Ak0TI5uYqh4GcrnsgYdz2KaQX874Uvo We6HhSTtU5B7fA/L5nFspfz5lrHnOVKUHAPAYcvaIEoaDwmMw+q2VFldNexUYlli3wFUkxxg6Ao SQ+PBdMk/9c9TbiX1ji923gyg1NtYV9qe93w2/OXDoxdhRq1RhDSgBPrvcrq3ofC+cnQ6HMOBXM jgWT6zhI2OzR4AnqWqwfTA8Q26zbatV3vOmjEb7XeyI6TFXjDeQBVwwvJJZZMQocH804dgiDWgt s5Ddcyf8iKQ//H40VXS03VFdTxt04zUMCOEl9xguMt3/SDpSd+dWCb4H1UR/Afun2BkoR7LyiuE SodrGyUrnv7GB+vD5cliBOMBD76GvZEiJu/w4jaRcMqj2pviCgXX7jQcH/dA0s2jJxHMp/gybSP mXcxCuzgZU6XNk3Izg= X-Google-Smtp-Source: AGHT+IEYEQYnCkd11txQqnaaiLQGwY1KqSQ9hdzV/D9DRL2hXuIm2BbvMdI3RsbJJW48/d9iq5Fj9w== X-Received: by 2002:a17:902:e944:b0:262:9ac8:610f with SMTP id d9443c01a7336-290c9cdee1cmr281683165ad.22.1761263437735; Thu, 23 Oct 2025 16:50:37 -0700 (PDT) From: alistair23@gmail.com X-Google-Original-From: alistair.francis@wdc.com To: qemu-devel@nongnu.org Cc: alistair23@gmail.com, Jialong Yang , Alistair Francis , qemu-stable@nongnu.org Subject: [PULL v2 18/25] aplic: fix mask for smsiaddrcfgh Date: Fri, 24 Oct 2025 09:49:20 +1000 Message-ID: <20251023234927.1864284-19-alistair.francis@wdc.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251023234927.1864284-1-alistair.francis@wdc.com> References: <20251023234927.1864284-1-alistair.francis@wdc.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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::52d; envelope-from=alistair23@gmail.com; helo=mail-pg1-x52d.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1761263520234158500 Content-Type: text/plain; charset="utf-8" From: Jialong Yang 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: Jialong Yang Acked-by: Alistair Francis Message-ID: <44f3e0d1.161.199d0c338b0.Coremail.z_bajeer@yeah.net> Signed-off-by: Alistair Francis Cc: qemu-stable@nongnu.org --- hw/intc/riscv_aplic.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) 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.51.0