From nobody Mon Feb 9 19:43:18 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1767803872; cv=none; d=zohomail.com; s=zohoarc; b=lxXjfbTGyuXHn30dQhyTQaCyVAto1ZqXyCnV79+8wiNlrXlnSBrxcq0RzShH+WLJJx/bP7jyvUO1XeVGluFRG6s9CogM0/DW3fZHs131kf9idvt9afHyNtRsYoE6vri1sPvE4ipAGSZ7ytH18NjFnGwGQF8exR7xJXV1BUWMPwk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767803872; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=j0do4wU9XAoJGGnLPFw9NPAw9NeZhVzIfXdHI5e2mqY=; b=mXm3+Dxey2lDJYoOUEfTZNq489XEG2dZBZc4udOlsV0Ph09YhksEU7V/zaDvUubmzIBvCKXfdE9giKOgnjHrFxWhglzx7e5beNwgCXvge70quIo1z1lQbgGdi+hgrJa24ld4aQjhnPqPcAILeuixNXoINAepsiHtRMvq/aSg2Jw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1767803872676216.11950916507465; Wed, 7 Jan 2026 08:37:52 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1196987.1514677 (Exim 4.92) (envelope-from ) id 1vdWXN-0005Pt-Gk; Wed, 07 Jan 2026 16:37:33 +0000 Received: by outflank-mailman (output) from mailman id 1196987.1514677; Wed, 07 Jan 2026 16:37:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vdWXN-0005Pm-E3; Wed, 07 Jan 2026 16:37:33 +0000 Received: by outflank-mailman (input) for mailman id 1196987; Wed, 07 Jan 2026 16:37:32 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vdWUC-00033L-6o for xen-devel@lists.xenproject.org; Wed, 07 Jan 2026 16:34:16 +0000 Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [2a00:1450:4864:20::62e]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id b4632b82-ebe6-11f0-b15e-2bf370ae4941; Wed, 07 Jan 2026 17:34:15 +0100 (CET) Received: by mail-ej1-x62e.google.com with SMTP id a640c23a62f3a-b7355f6ef12so431929466b.3 for ; Wed, 07 Jan 2026 08:34:15 -0800 (PST) Received: from fedora (user-109-243-67-101.play-internet.pl. [109.243.67.101]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b842a4cfd97sm531309766b.36.2026.01.07.08.34.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Jan 2026 08:34:13 -0800 (PST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: b4632b82-ebe6-11f0-b15e-2bf370ae4941 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1767803654; x=1768408454; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=j0do4wU9XAoJGGnLPFw9NPAw9NeZhVzIfXdHI5e2mqY=; b=XFxE+JWp8F0JxVepRe5zD0WlVuYQYYg8siaFppNMDeMF7IKmBYE3Vw6Ay5KK8MX8bo hJ3Wg4QWFIMi9DKmf7+CH3nBWj22A+Q+CvuDfdx4idaGyc8pUumKA3/3agudJP8c5RWV Bkhzj9QN+4EbGQbhX3tpisrz0Lx18OmVQRtGb8eCgRs3Qb2SMlbMbrbPXi+SaRz90TzF PaRv6tJ7njzNXIYcQPez9Tiw3aipYg8AyFGpbObKIQkO2wmQcJeG6W1ASObTuDzEXFyV gIR8L2/Knn+qogYBm1ViNHDvx0PNZlVxi65M0viAEoEUDvUbx7KXV4hqJlm7dc1TdHCb 9sEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767803654; x=1768408454; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=j0do4wU9XAoJGGnLPFw9NPAw9NeZhVzIfXdHI5e2mqY=; b=N53AJNW0xJ7xUQvFIc3p9j8i+FPqRTEbRqpnnbQPmscB1jGmz8sernu24pYonuWDLl qA4eKOP/ZGuLL/sbjDRIp7T+53lzNwmPQBMrxcYugKs2BPFTF73Pq1AoK2mIAKlUbnE6 4TKkapI/r0o4HkSJv/lI9gzNE8Wb/HEalsDpMkcVAxZOeNYTKm1eJSGGxd8IEMB1OfRi ACFBXTXK2Jbj3FSF6X4Z5eoZaAFYdXctyuI0U1oEKVq6ukl9xLTmXam4i6UQdyX3EROB 0ooYFbv0ZW4tyFgDaw7esBwAN76fSRaBR/gfrfBlF9UBxZTLvqftpidytrugfP8DFWav cOEg== X-Gm-Message-State: AOJu0YxR+5dC1RpE9xMTNcvb6MwoKymAw2irNZ56WeUQ+nipaG6JmbRm nG5i+16CvuQlmZGcveSwYCK6/3UQeV4lwQFxqkqNg/NXJZy1dL/Iwixhu4+tyw== X-Gm-Gg: AY/fxX74eRqTQ5S7QrMFvJ5pVGcIkr5NH5gicXUwWA+xNuJqCLJ0E4nGv78id0qXDm+ Edbkqyd2ANX1BphjMFHWpIi3uDCa1WQYZ2iwvYa5SRKludsE5GU77T7OwZk9GmpLbccHEQYn4XJ RrWhV0ooMiELpHnHQh6luHfiCrt5U75Zw5sCOX+8Oiuf41m6XPvb+zIw8YUm1D7Hg4ZNOOL0vsC LYZPmyZ3xD8QEhAPIbcYLCoPB39LhUIZiJzV3WdU/YntURtrETwpt2xJkUQmHAD+niPYbk12I5O Ld32h2nXlanFaOfuDQXnvIsLA3C0bvHqysSMxcTaVyN8dqT9g5+9xdRJQGQ7gMmCzRyGJFpUNBt YjQBOX48Ha6es6GdUDXhPYzTI98MfnqtbzCadolemvRTLCYHVFErpjRv1MCVrtRMWyZP6NXO5KS OEp798l+X/w542wn+8EnndSZuILErYhkO/EjRc7VIRHnc7ulW7nbhmAuPikRMVwQoh X-Google-Smtp-Source: AGHT+IGTQNpEB2UwZwEuxMVMqHBoasEhnCwPI96dDmnCa/v0k8qb6hQy0agIRqMVqWuLLGrXCJx9dA== X-Received: by 2002:a17:907:7283:b0:b83:1327:5f88 with SMTP id a640c23a62f3a-b84451da312mr317379666b.16.1767803654204; Wed, 07 Jan 2026 08:34:14 -0800 (PST) From: Oleksii Kurochko To: xen-devel@lists.xenproject.org Cc: Oleksii Kurochko , Stefano Stabellini , Julien Grall , Bertrand Marquis , Michal Orzel , Volodymyr Babchuk , Yann Dirson , Yann Sionneau Subject: [PATCH v2] acpi/arm: relax MADT GICC entry length check to support newer ACPI revisions Date: Wed, 7 Jan 2026 17:34:02 +0100 Message-ID: <3850c51d41b1ab67a453ca70c0a44172185274f6.1767694781.git.oleksii.kurochko@gmail.com> X-Mailer: git-send-email 2.52.0 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1767803874446158500 Newer ACPI revisions define the MADT GICC entry with Length =3D 82 bytes [1= ]. The current BAD_MADT_GICC_ENTRY() check rejects entries whose length does n= ot match the known values, which leads to: GICv3: No valid GICC entries exist. as observed on the AmpereOne platform. To fix this, import the logic from Linux commit 9eb1c92b47c7: The BAD_MADT_GICC_ENTRY check is a little too strict because it rejects MADT entries that don't match the currently known lengths. We should remove this restriction to avoid problems if the table length changes. Future code which might depend on additional fields should be written to validate those fields before using them, rather than trying to globally check known MADT version lengths. Link: https://lkml.kernel.org/r/20181012192937.3819951-1-jeremy.linton@ar= m.com Signed-off-by: Jeremy Linton [lorenzo.pieralisi@arm.com: added MADT macro comments] Signed-off-by: Lorenzo Pieralisi Acked-by: Sudeep Holla Cc: Will Deacon Cc: Catalin Marinas Cc: Al Stone Cc: "Rafael J. Wysocki" Signed-off-by: Will Deacon As ACPI_MADT_GICC_LENGTH is dropped, update the functions where it is used. As we rewrite the MADT for hwdom, reuse the host GICC header length instead of ACPI_MADT_GICC_LENGTH. [1] https://uefi.org/specs/ACPI/6.6/05_ACPI_Software_Programming_Model.html= #gic-cpu-interface-gicc-structure Reported-By: Yann Dirson Co-developed-by: Yann Sionneau Signed-off-by: Oleksii Kurochko Reviewed-by: Stefano Stabellini --- I ran CI tests where it made sense for this patch, as I don=E2=80=99t see a= ny CI job that builds Xen with CONFIG_ACPI=3Dy: https://gitlab.com/xen-project/people/olkur/xen/-/pipelines/2229673951 I also built Xen manually with CONFIG_ACPI=3Dy enabled and tested it on the AmpereOne platform. --- Changes in v2: - Update the commit message: - Use more characters for commit ID. - Drop 'import from'. - Add Reviewed-by: Stefano Stabellini . - Make the local variables host_gicc const in gic_get_hwdom_madt_size(). (header variable isn't const as container_of() will discard 'const' qual= ifier and so compilation error will occur). - Return 0 instead of panic() in gic_get_hwdom_madt_size(). --- xen/arch/arm/acpi/domain_build.c | 6 ++++++ xen/arch/arm/gic-v2.c | 3 ++- xen/arch/arm/gic-v3.c | 3 ++- xen/arch/arm/gic.c | 12 +++++++++++- xen/arch/arm/include/asm/acpi.h | 21 +++++++++++++++------ 5 files changed, 36 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/acpi/domain_build.c b/xen/arch/arm/acpi/domain_bu= ild.c index 1c3555d814cc..959698d13ac3 100644 --- a/xen/arch/arm/acpi/domain_build.c +++ b/xen/arch/arm/acpi/domain_build.c @@ -458,6 +458,12 @@ static int __init estimate_acpi_efi_size(struct domain= *d, acpi_size +=3D ROUNDUP(sizeof(struct acpi_table_stao), 8); =20 madt_size =3D gic_get_hwdom_madt_size(d); + if ( !madt_size ) + { + printk("Unable to get hwdom MADT size\n"); + return -EINVAL; + } + acpi_size +=3D ROUNDUP(madt_size, 8); =20 addr =3D acpi_os_get_root_pointer(); diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index b23e72a3d05d..aae6a7bf3076 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -1121,7 +1121,8 @@ static int gicv2_make_hwdom_madt(const struct domain = *d, u32 offset) host_gicc =3D container_of(header, struct acpi_madt_generic_interrupt, header); =20 - size =3D ACPI_MADT_GICC_LENGTH; + size =3D host_gicc->header.length; + /* Add Generic Interrupt */ for ( i =3D 0; i < d->max_vcpus; i++ ) { diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c index bc07f97c16ab..75b89efad462 100644 --- a/xen/arch/arm/gic-v3.c +++ b/xen/arch/arm/gic-v3.c @@ -1672,7 +1672,8 @@ static int gicv3_make_hwdom_madt(const struct domain = *d, u32 offset) =20 host_gicc =3D container_of(header, struct acpi_madt_generic_interrupt, header); - size =3D ACPI_MADT_GICC_LENGTH; + size =3D host_gicc->header.length; + for ( i =3D 0; i < d->max_vcpus; i++ ) { gicc =3D (struct acpi_madt_generic_interrupt *)(base_ptr + table_l= en); diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index ee75258fc3c3..e22feb46f5d4 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -418,8 +418,18 @@ unsigned long gic_get_hwdom_madt_size(const struct dom= ain *d) { unsigned long madt_size; =20 + struct acpi_subtable_header *header; + const struct acpi_madt_generic_interrupt *host_gicc; + + header =3D acpi_table_get_entry_madt(ACPI_MADT_TYPE_GENERIC_INTERRUPT,= 0); + if ( !header ) + return 0; + + host_gicc =3D container_of(header, struct acpi_madt_generic_interrupt, + header); + madt_size =3D sizeof(struct acpi_table_madt) - + ACPI_MADT_GICC_LENGTH * d->max_vcpus + + host_gicc->header.length * d->max_vcpus + sizeof(struct acpi_madt_generic_distributor) + gic_hw_ops->get_hwdom_extra_madt_size(d); =20 diff --git a/xen/arch/arm/include/asm/acpi.h b/xen/arch/arm/include/asm/acp= i.h index 13756dd341b4..30bc446d1f75 100644 --- a/xen/arch/arm/include/asm/acpi.h +++ b/xen/arch/arm/include/asm/acpi.h @@ -53,13 +53,22 @@ void acpi_smp_init_cpus(void); */ paddr_t acpi_get_table_offset(struct membank tbl_add[], EFI_MEM_RES index); =20 -/* Macros for consistency checks of the GICC subtable of MADT */ -#define ACPI_MADT_GICC_LENGTH \ - (acpi_gbl_FADT.header.revision < 6 ? 76 : 80) +/* + * MADT GICC minimum length refers to the MADT GICC structure table length= as + * defined in the earliest ACPI version supported on arm64, ie ACPI 5.1. + * + * The efficiency_class member was added to the + * struct acpi_madt_generic_interrupt to represent the MADT GICC structure + * "Processor Power Efficiency Class" field, added in ACPI 6.0 whose offset + * is therefore used to delimit the MADT GICC structure minimum length + * appropriately. + */ +#define ACPI_MADT_GICC_MIN_LENGTH ACPI_OFFSET( \ + struct acpi_madt_generic_interrupt, efficiency_class) =20 -#define BAD_MADT_GICC_ENTRY(entry, end) \ - (!(entry) || (unsigned long)(entry) + sizeof(*(entry)) > (end) || \ - (entry)->header.length !=3D ACPI_MADT_GICC_LENGTH) +#define BAD_MADT_GICC_ENTRY(entry, end) \ + (!(entry) || (entry)->header.length < ACPI_MADT_GICC_MIN_LENGTH || \ + (unsigned long)(entry) + (entry)->header.length > (end)) =20 #ifdef CONFIG_ACPI extern bool acpi_disabled; --=20 2.52.0