From nobody Thu Apr 2 19:04:18 2026 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1774610838; cv=none; d=zohomail.com; s=zohoarc; b=afFq/HfAemKTVH1DXko9k9262v+1PP/C22BxxnZNwLRw52ev7slhwYoX1D9zKOCYEAQ2Ew5IWs6UZq/3WKOb6f8Xhj0x25f5WhlHZL6xIbJohJOB9Zh/VDlvnr+NjgXcZ3HTykejogT4D3pzBOyQZepuYXwTle2Fg4VihVT6jK4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774610838; 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=UVAmX36WyzAF1fCLFRuGTaHddS58v5EdzHxjHOa4pQM=; b=QoXTDOa18I+5pMTy/+k5LSmNZHO+1N6ka8nEgJgAHG+xo6jfglAiGovOxRlMRghekVOoWpzPxBJghC1L1hzLnsAuKy8PoLxn2+BLmfpjWAqIje8cUOyEkz/Jm/PqwrgUElRXKF5PVmm91NS58NUzsyt2cdCEdVNVkDfrDKu9F2s= 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 1774610838099179.96366250445885; Fri, 27 Mar 2026 04:27:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w65Bt-0006Yp-TG; Fri, 27 Mar 2026 07:17: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 1w65Bq-0006Ux-EC for qemu-devel@nongnu.org; Fri, 27 Mar 2026 07:17:22 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w65Bo-0007uC-3C for qemu-devel@nongnu.org; Fri, 27 Mar 2026 07:17:22 -0400 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-43b98652f05so862135f8f.1 for ; Fri, 27 Mar 2026 04:17:19 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43b919cf2b2sm15484227f8f.18.2026.03.27.04.17.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Mar 2026 04:17:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1774610238; x=1775215038; 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=UVAmX36WyzAF1fCLFRuGTaHddS58v5EdzHxjHOa4pQM=; b=ZqI88ilJONvoJpyVu1m5IqDy4awVJZ2f5AyRrRtbXUSjw7dJcPOSdCDXn51GjMvG9d XpKY2X4VkMn43+0HKXgURllVwDwTrUWTg1HXLGeDJUUkOISn1TqFFh9idT7WCQIJKJ55 g5eSS3NYcWhNGEtA+7QhxL1LU+3U9esfWvhBaVOyXQfJiI9Goj2m4wO6FzM73ha+gpAE 8XzOIcp3qS7yYihUUQ01JWXQXKGtF3sDTN63k7+U8WnArBX5uPJlYQtiBgiaGyBxGTFD hS5nRxGDtQa9nunhNcfJerMGdsO+ReJBL/a2miP/HMaL0Mp/huw6HssKRgzGndfXkmlR o9Mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774610238; x=1775215038; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=UVAmX36WyzAF1fCLFRuGTaHddS58v5EdzHxjHOa4pQM=; b=b65UnNUcHtoRXx6Aud8F05XySrDad68SgOsWnlJ/S/7xrWEmMLH8C+bmZVLh042x/W TkFzktSlvGePcAKnoobPmK00biWCxf4CW72aQCxm5PIJjFo27ZDuE9HlqFTPOOlzhYB8 8b5NJCgQeThsu0sNAukBxM2jealO08skmtGHW23KvJVAH1Luig3MtMYnVZDOR2HjleD6 w0ovzNTBHM3mYCt53EqVOZZ+mIJXtOag3Zu3Uksl5+TW5DtGPgtKDA3D7vmmxaShY8Se cl0TXR6ANhISQgg90m+szuQg8EZQrnhV567HEg94oL2wJ2AAf3cbBFETYFCcx2NBNfxJ PNNA== X-Forwarded-Encrypted: i=1; AJvYcCV+3Da0AIk4pJ7GfXqz0YtJXyWddUUF/9RTCn2TCEs9FX4MwZZJiqEdW314AHeKUjqySVjWkqBfVSG7@nongnu.org X-Gm-Message-State: AOJu0YyeKm1kZugYlN6JaN1MIfMQ95e5zmeX7tEMk2/Mvg87Kjc/2Zf2 laBgLoNa/mUugf2dtYL/DLBS0FvCycU48OS7y+dusYHhVO15m4F2yNUcwswnqmbogm4= X-Gm-Gg: ATEYQzxco+xX0saIVGh6iZb7mKyhJVbmJLMAd143y5N6sRhughNEyEftHvmDnSuya6i B2XKSGW7hcyjv7E6It9+QddwV0C2BnYAyx3H44LjnloAkfu8vxNk7alySAsHz2z119l4T2ubP83 W1dtPi7zVqaQVCITJbcvBQR+o4Ax5Tjbit3VKcVG4rqa5kUVtZgtmv4Gum42jUwxcP5KGDp9muR jYsb9VfhobQ7u3iZeumVd3Sn0tWGL2pGaNHeD1UN5NROG38UPwvFyPpBLkC6BiiS84QK9oLGzKn SxbKT8BvzxpmtLcCqAB44bTaPWoO8hcpWwil4mScJufYjOsX4kivTLh7L2wHrY7l+hQHNnrb57o TLHCnEKFP57cy2X3Tfrr4PFgS27ZWJSb8raE342/pkY4K4cl1WeHyTKdXQPugDLTnCKA4V53XM0 G4tsXczzISmMYskSnl5F3RdMiXbnZ4lc8whNNdcXIOAlaY9HbTSj8qPo7Xry2p0oWcDxLXwFYoS LoPh/f6/r6vTZr0DGCDi0AWPnZeUp4= X-Received: by 2002:a5d:584b:0:b0:439:c040:cc8a with SMTP id ffacd0b85a97d-43b9ea4660bmr3122838f8f.32.1774610238037; Fri, 27 Mar 2026 04:17:18 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: Jonathan Cameron Subject: [PATCH v2 17/65] hw/intc/arm_gicv5: Cache LPI IST config in a struct Date: Fri, 27 Mar 2026 11:16:12 +0000 Message-ID: <20260327111700.795099-18-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260327111700.795099-1-peter.maydell@linaro.org> References: <20260327111700.795099-1-peter.maydell@linaro.org> 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=2a00:1450:4864:20::434; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x434.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: qemu development 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 @linaro.org) X-ZM-MESSAGEID: 1774610841244154100 Content-Type: text/plain; charset="utf-8" The IRS has multiple ISTs, for different contexts: * physical LPIs (separately for each interrupt domain) * virtual LPIs * virtual SPIs The config information for physical LPIs is in the IRS_IST_BASER and IRS_IST_CFGR registers; for virtual LPIs and virtual SPIs it will be in the L2_VMTE VM table entry. We would like to be able to write generic code that can manipulate any of these ISTs. Define a struct which captures the config information for an IST, and cache the IRS_IST_CFGR/IRS_IST_BASER data into this format when the guest sets the VALID bit. This also allows us to enforce the correct handling of reserved and out-of-range values, and expand the encodings of sizes into a more convenient format for later use. Signed-off-by: Peter Maydell Reviewed-by: Jonathan Cameron --- hw/intc/arm_gicv5.c | 64 +++++++++++++++++++++++++++++++++++++ hw/intc/trace-events | 2 ++ include/hw/intc/arm_gicv5.h | 12 +++++++ 3 files changed, 78 insertions(+) diff --git a/hw/intc/arm_gicv5.c b/hw/intc/arm_gicv5.c index cbb35c0270..172c5be0d4 100644 --- a/hw/intc/arm_gicv5.c +++ b/hw/intc/arm_gicv5.c @@ -278,9 +278,68 @@ static void irs_ist_baser_write(GICv5 *s, GICv5Domain = domain, uint64_t value) } cs->irs_ist_baser[domain] =3D FIELD_DP64(cs->irs_ist_baser[domain], IRS_IST_BASER, VALID, valid= ); + s->phys_lpi_config[domain].valid =3D false; + trace_gicv5_ist_invalid(domain_name[domain]); return; } cs->irs_ist_baser[domain] =3D value; + + if (FIELD_EX64(cs->irs_ist_baser[domain], IRS_IST_BASER, VALID)) { + /* + * If the guest just set VALID then capture data into config struc= t, + * sanitize the reserved values, and expand fields out into byte c= ounts. + */ + GICv5ISTConfig *cfg =3D &s->phys_lpi_config[domain]; + uint8_t istbits, l2bits, l2_idx_bits; + uint8_t id_bits =3D FIELD_EX64(cs->irs_ist_cfgr[domain], + IRS_IST_CFGR, LPI_ID_BITS); + id_bits =3D MIN(MAX(id_bits, QEMU_GICV5_MIN_LPI_ID_BITS), QEMU_GIC= V5_ID_BITS); + + switch (FIELD_EX64(cs->irs_ist_cfgr[domain], IRS_IST_CFGR, ISTSZ))= { + case 0: + case 3: /* reserved: acts like the minimum required size */ + istbits =3D 2; + break; + case 1: + istbits =3D 3; + break; + case 2: + istbits =3D 4; + break; + default: + g_assert_not_reached(); + } + switch (FIELD_EX64(cs->irs_ist_cfgr[domain], IRS_IST_CFGR, L2SZ)) { + case 0: + case 3: /* reserved; CONSTRAINED UNPREDICTABLE */ + l2bits =3D 12; /* 4K: 12 bits */ + break; + case 1: + l2bits =3D 14; /* 16K: 14 bits */ + break; + case 2: + l2bits =3D 16; /* 64K: 16 bits */ + break; + default: + g_assert_not_reached(); + } + /* + * Calculate how many bits of an ID index the L2 table + * (e.g. if we need 14 bits to index each byte in a 16K L2 table, + * but each entry is 4 bytes wide then we need 14 - 2 =3D 12 bits + * to index an entry in the table). + */ + l2_idx_bits =3D l2bits - istbits; + cfg->base =3D cs->irs_ist_baser[domain] & R_IRS_IST_BASER_ADDR_MAS= K; + cfg->id_bits =3D id_bits; + cfg->istsz =3D 1 << istbits; + cfg->l2_idx_bits =3D l2_idx_bits; + cfg->structure =3D FIELD_EX64(cs->irs_ist_cfgr[domain], + IRS_IST_CFGR, STRUCTURE); + cfg->valid =3D true; + trace_gicv5_ist_valid(domain_name[domain], cfg->base, cfg->id_bits, + cfg->l2_idx_bits, cfg->istsz, cfg->structure= ); + } } =20 static bool config_readl(GICv5 *s, GICv5Domain domain, hwaddr offset, @@ -553,6 +612,11 @@ static void gicv5_reset_hold(Object *obj, ResetType ty= pe) if (c->parent_phases.hold) { c->parent_phases.hold(obj, type); } + + /* IRS_IST_BASER and IRS_IST_CFGR reset to 0, clear cached info */ + for (int i =3D 0; i < NUM_GICV5_DOMAINS; i++) { + s->phys_lpi_config[i].valid =3D false; + } } =20 static void gicv5_set_idregs(GICv5Common *cs) diff --git a/hw/intc/trace-events b/hw/intc/trace-events index 0797a23c1a..80fc47794b 100644 --- a/hw/intc/trace-events +++ b/hw/intc/trace-events @@ -233,6 +233,8 @@ gicv5_badread(const char *domain, uint64_t offset, unsi= gned size) "GICv5 IRS %s gicv5_write(const char *domain, uint64_t offset, uint64_t data, unsigned s= ize) "GICv5 IRS %s config frame write: offset 0x%" PRIx64 " data 0x%" PRIx6= 4 " size %u" gicv5_badwrite(const char *domain, uint64_t offset, uint64_t data, unsigne= d size) "GICv5 IRS %s config frame write: offset 0x%" PRIx64 " data 0x%" PR= Ix64 " size %u: error" gicv5_spi(uint32_t id, int level) "GICv5 SPI ID %u asserted at level %d" +gicv5_ist_valid(const char *domain, uint64_t base, uint8_t id_bits, uint8_= t l2_idx_bits, uint8_t istsz, bool structure) "GICv5 IRS %s IST now valid: = base 0x%" PRIx64 " id_bits %u l2_idx_bits %u IST entry size %u 2-level %d" +gicv5_ist_invalid(const char *domain) "GICv5 IRS %s IST no longer valid" =20 # arm_gicv5_common.c gicv5_common_realize(uint32_t irsid, uint32_t num_cpus, uint32_t spi_base,= uint32_t spi_irs_range, uint32_t spi_range) "GICv5 IRS realized: IRS ID %u= , %u CPUs, SPI base %u, SPI IRS range %u, SPI range %u" diff --git a/include/hw/intc/arm_gicv5.h b/include/hw/intc/arm_gicv5.h index 42ccef8474..f6ecd9c323 100644 --- a/include/hw/intc/arm_gicv5.h +++ b/include/hw/intc/arm_gicv5.h @@ -17,11 +17,23 @@ =20 OBJECT_DECLARE_TYPE(GICv5, GICv5Class, ARM_GICV5) =20 +typedef struct GICv5ISTConfig { + hwaddr base; /* Base address */ + uint8_t id_bits; /* number of bits in an ID for this table */ + uint8_t l2_idx_bits; /* number of ID bits that index into L2 table */ + uint8_t istsz; /* L2 ISTE size in bytes */ + bool structure; /* true if using 2-level table */ + bool valid; /* true if this table is valid and usable */ +} GICv5ISTConfig; + /* * This class is for TCG-specific state for the GICv5. */ struct GICv5 { GICv5Common parent_obj; + + /* This is the info from IRS_IST_BASER and IRS_IST_CFGR */ + GICv5ISTConfig phys_lpi_config[NUM_GICV5_DOMAINS]; }; =20 struct GICv5Class { --=20 2.43.0