From nobody Fri Nov 14 21:03:04 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=1761193088; cv=none; d=zohomail.com; s=zohoarc; b=Tlu47zT3d5deIe611ql8FjyJgesXm+28mEWfnclgrnlXEdyl66JvQ1luLRbTaVnRa9cSXSdoL81YHAN7raR2uQvySSHOSl9zT5XA2jH45USfHh5vudDVukxZD+2BE+AT0HFV4CCNedOo58ioLNqy+K+SVznFwE/YNu9YKjMDMzc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761193088; 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=jScFPs1VpY7KperGZSxft8GIBffJ2o1xrGwd6MmeDq8K2KGkP01yYtrJGktfKiKzjgVhgsXV1sjrTE6GezzmzaYgwPDVqt2YYjLpwrjRxyPekbp7vQLWetcd0I3CsljW5n5xisXllMO4ZEfE9UT/P9FTkxeGpOWy0bhH0oqonaE= 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 1761193088499123.36845232531607; Wed, 22 Oct 2025 21:18:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBmjx-00015w-HT; Thu, 23 Oct 2025 00:15:56 -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 1vBmjv-00014N-IR for qemu-devel@nongnu.org; Thu, 23 Oct 2025 00:15:51 -0400 Received: from mail-pf1-x42e.google.com ([2607:f8b0:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vBmjt-0007Nl-Cx for qemu-devel@nongnu.org; Thu, 23 Oct 2025 00:15:51 -0400 Received: by mail-pf1-x42e.google.com with SMTP id d2e1a72fcca58-77f67ba775aso449722b3a.3 for ; Wed, 22 Oct 2025 21:15:49 -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 d2e1a72fcca58-7a274abe5f0sm961640b3a.34.2025.10.22.21.15.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Oct 2025 21:15:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761192947; x=1761797747; 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=SujPqDR4OhCvdIwPF5ajfuKQjq2cNewe/QkZkWdEYol+UFcH+DYkvDpYQSCzVFz1lF WTmnXvoQ2KaAsRxszhfu1VApq/tLTmovp/3VevvtN8isA1Nttgjh+Sr1q32JLkuhpKsG ER4owa329qMPowqGP5Wm99K37dv84EPWL3Sx1MJwhTBVrjDAkgabvs09DzK3kqQ/C4PG UIAV14oxNsqFUd/3Nox8Ht3i9CUFclXKnUT2Sq5ex8H0gVAEFXSgcpT25tP/2SVoRKkb PDFeUc9fuKV68Mx1Lz4YxwC8I930fC8q0j0JFyQp0KPs7+Ceh0Sqhi6dd1URtQbYaYhb px3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761192947; x=1761797747; 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=FKmFv6kL6Km4OaFM5/vISzcwz/R1ZwbqvBI0JJDz9cGwpfT18O3bVHAtIAQj+Zgr26 8k85YjLECCQXln5p/wtHX0DYLxS0iKCgIcD5XgDBiE3hPimMkqXz1loCHNZTRtFt8ItW aV5C7Hbn2jPZFXYPcd1xm0d/iIjlH9khknRQfumS7jWrSosxk3XUENx1ULNAsoIfw6GM Z7XySBATkTfvVY2MsGKAZHn4NMnuPwhjKZyltC5pJjVclK2Ng4eDHu8foNUsbiKV8fLh 1Pv98rDTY1KPIgEWnTG777nVXXa6kdZhQ6OmqbMyIMICrugrN7Slew2cfpeO3ag02ZVv Dy5A== X-Gm-Message-State: AOJu0YzpsET+C0TeoKS0GWOPzoPJqjgd9e8/eNx8MQwJLWk/6tJgCKUf nY/O4AwdbKf9Widt8EEpKdOWwnnqo4ztIlKdpE4EUHWFz7DehgRoEIVBpkrmlw== X-Gm-Gg: ASbGncuCyfg66gxsYZfNECCYT8KSI1PkFxtwKL0yLEfki/b70Z7xJvAnd5QEG3HONni NnGJ+KglwbdSV9CYSZ3s8j9dWu0dB81/OAKkr9PsCBDrF1K9tsDJVhGHpLLrGZ92wM8Z9zubwp+ MYqIDRkoB8hAfwwjmztDh65ncxFLwQn5dU00ZWiWhCaw8MuU2guwCfK3FfAGhvXuf+1FfWFX0lP f549KmNm/nkeNLKUeKijSsIhxeb6SYU2B0RvTrbE9eULRAzk5c2vQbP3oIDMSQWx327cd2WDVSi RZApR995xcgYjI8wvejII131c0oL/D1xVgYsJzr2MJDnM/+ppgNEiydvKkX9o+6iDUK39172JOX sx/rf2mAIXAQAZQbzbQo0Vvgj6cpFCds/cXU/FHHfUqTsuwaVUnh80H8W+76cM+6ybbYkreYIhb uxlcaaDEiljrsUIyzjwDdicKgz+cBa4mAKyDVcfcjJSFdHJSQMGpxsZC9KUt6Dj9Fshep4ECDTo U2M5VZpUA== X-Google-Smtp-Source: AGHT+IHzrdbgICr9bYVV0tVRXfzZGNnOBmoOuY0hEvHgQYs6WmrgWjMypMEuK6d+y7eBVrjhkyGvQQ== X-Received: by 2002:a05:6a20:158a:b0:2e5:655c:7f93 with SMTP id adf61e73a8af0-334a8616c19mr32310941637.33.1761192947438; Wed, 22 Oct 2025 21:15:47 -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 18/37] aplic: fix mask for smsiaddrcfgh Date: Thu, 23 Oct 2025 14:14:16 +1000 Message-ID: <20251023041435.1775208-19-alistair.francis@wdc.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251023041435.1775208-1-alistair.francis@wdc.com> References: <20251023041435.1775208-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::42e; envelope-from=alistair23@gmail.com; helo=mail-pf1-x42e.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=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 @gmail.com) X-ZM-MESSAGEID: 1761193089693154100 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