From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 36B63CDD541 for ; Wed, 18 Sep 2024 15:23:43 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3666C88ECD; Wed, 18 Sep 2024 17:22:19 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=9elements.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; secure) header.d=9elements.com header.i=@9elements.com header.b="JtzDr3yc"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9F5C388F30; Wed, 18 Sep 2024 17:22:17 +0200 (CEST) Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id AC7A388ECD for ; Wed, 18 Sep 2024 17:22:15 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=9elements.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=patrick.rudolph@9elements.com Received: by mail-ej1-x62e.google.com with SMTP id a640c23a62f3a-a8d6ac24a3bso182523666b.1 for ; Wed, 18 Sep 2024 08:22:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; t=1726672935; x=1727277735; darn=lists.denx.de; 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=NVS/TQvaGEbeIBlKGP3PnXHKxQyaGbllvziHc8nYQ/M=; b=JtzDr3yc2ZYAn//rnBd1S/HXf4EmuUjM5bgwg7gkrmCBtfs7qUPv56Wkwsyzo1MhlS Cb9KrFPWeRVmcB06S2fvptk7ig6RFpyD1HV/fe7QqaG4qgvWVV40W7jz1NdfSz9Gbla1 ZsZ4ZsvaXYEmjb0Jy4I9tysX2qOp0vmodubKnYQmxvozQBgBwcl1b4mXu7MlnmOT4+vW gCXtdZBVrqHUM2vdKsxn7SXi0yi44RMKsxr9novRz50QDIlqETV+HJaUnrmyUC0ncVtP TmR8b21pkWlFnYPeI+eh4UYbqTbTuIeE8am2lNbcgkXy9LfhzFqByq0zCEr94DM2VM3X 1POQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726672935; x=1727277735; 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=NVS/TQvaGEbeIBlKGP3PnXHKxQyaGbllvziHc8nYQ/M=; b=Nv/yHP8aHQ8MnpTLJPehGG5R1scSWB3lhr+7fkEKwLSj8a5NKdcNIuU3ngyYu1Ap2i SnNv8tfy8Fcv2BRMRm4sgJHG3GoMH/7/mtztWN6FOomhi9T5tc4vh2t+2nApPNXLmKg1 aOMymmjF5E5mQ+vYogu54WRRnZCfbnvECEaly6mvxI5Gt5VAgZtHChGLSl8eQd/TA5qT 8DlGrlfSBoBAF0B9P5kzNwpq3wNtacMaHjS21GKdRBkem8rC6GpjR9jcmo6EMgZQj7qS 0SeV4O0o/8jHop5y78pmTYALLABmv3DEPMdbLhLBHd3cgXP67oj9AXLvATVsafAVydeR Zb1g== X-Gm-Message-State: AOJu0YwLFFtS2Tx5FnLlXhY591Jxpng5HZnktfe/MSYigWgMYuYivvO5 r4xbOguE+H8hJzCukUMgtbeis2nczygfGI91mneifbCqXZ/3WGzT/ig0z1/lgxPY5cks8hR9Lcr t X-Google-Smtp-Source: AGHT+IEcGBof8cQLXPJqVUXGCkS0qalX/qSYd9DIX70hxCYT6rdlmcwz9lXib7ZlkeJ9Z/b5dnsE8g== X-Received: by 2002:a17:907:1b05:b0:a7a:afe8:1013 with SMTP id a640c23a62f3a-a902a3d188dmr2468633966b.1.1726672935142; Wed, 18 Sep 2024 08:22:15 -0700 (PDT) Received: from fedora.sec.9e.network (ip-037-049-067-221.um09.pools.vodafone-ip.de. [37.49.67.221]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a90610967b0sm599791266b.42.2024.09.18.08.22.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Sep 2024 08:22:14 -0700 (PDT) From: Patrick Rudolph To: u-boot@lists.denx.de, Simon Glass Cc: Patrick Rudolph , Bin Meng , Tom Rini Subject: [PATCH v4 09/35] acpi: acpi_table: Bump revisions Date: Wed, 18 Sep 2024 17:20:13 +0200 Message-ID: <20240918152136.3395170-10-patrick.rudolph@9elements.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240918152136.3395170-1-patrick.rudolph@9elements.com> References: <20240918152136.3395170-1-patrick.rudolph@9elements.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean The FADT structure found in U-Boot represents FADT revision 6 and the GICC and GICD structures defined in U-Boot are based on ACPI revision 6.3. Bump the table revision to fix FWTS failures seen on aarch64. Signed-off-by: Patrick Rudolph Reviewed-by: Simon Glass Cc: Simon Glass Cc: Bin Meng --- arch/x86/cpu/tangier/acpi.c | 2 -- include/acpi/acpi_table.h | 3 ++- lib/acpi/acpi_table.c | 7 ++++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/x86/cpu/tangier/acpi.c b/arch/x86/cpu/tangier/acpi.c index 3d11787861..8ea764f7cc 100644 --- a/arch/x86/cpu/tangier/acpi.c +++ b/arch/x86/cpu/tangier/acpi.c @@ -28,8 +28,6 @@ void acpi_fill_fadt(struct acpi_fadt *fadt) ACPI_FADT_POWER_BUTTON | ACPI_FADT_SLEEP_BUTTON | ACPI_FADT_SEALED_CASE | ACPI_FADT_HEADLESS | ACPI_FADT_HW_REDUCED_ACPI; - fadt->header.revision = 6; - fadt->minor_revision = 2; } void *acpi_fill_madt(struct acpi_madt *madt, struct acpi_ctx *ctx) diff --git a/include/acpi/acpi_table.h b/include/acpi/acpi_table.h index 7d994a985f..48f8ce248f 100644 --- a/include/acpi/acpi_table.h +++ b/include/acpi/acpi_table.h @@ -290,7 +290,8 @@ struct __packed acpi_fadt { #define ACPI_MADT_REV_ACPI_3_0 2 #define ACPI_MADT_REV_ACPI_4_0 3 #define ACPI_MADT_REV_ACPI_5_0 3 -#define ACPI_MADT_REV_ACPI_6_0 5 +#define ACPI_MADT_REV_ACPI_6_2 4 +#define ACPI_MADT_REV_ACPI_6_3 5 #define ACPI_MCFG_REV_ACPI_3_0 1 diff --git a/lib/acpi/acpi_table.c b/lib/acpi/acpi_table.c index 5b9b4d2f29..959cac9e2e 100644 --- a/lib/acpi/acpi_table.c +++ b/lib/acpi/acpi_table.c @@ -63,9 +63,9 @@ int acpi_get_table_revision(enum acpi_tables table) { switch (table) { case ACPITAB_FADT: - return ACPI_FADT_REV_ACPI_3_0; + return ACPI_FADT_REV_ACPI_6_0; case ACPITAB_MADT: - return ACPI_MADT_REV_ACPI_3_0; + return ACPI_MADT_REV_ACPI_6_2; case ACPITAB_MCFG: return ACPI_MCFG_REV_ACPI_3_0; case ACPITAB_TCPA: @@ -219,6 +219,7 @@ int acpi_write_fadt(struct acpi_ctx *ctx, const struct acpi_writer *entry) memcpy(header->oem_table_id, OEM_TABLE_ID, 8); memcpy(header->creator_id, ASLC_ID, 4); header->creator_revision = 1; + fadt->minor_revision = 2; fadt->x_firmware_ctrl = map_to_sysmem(ctx->facs); fadt->x_dsdt = map_to_sysmem(ctx->dsdt); @@ -254,7 +255,7 @@ int acpi_write_madt(struct acpi_ctx *ctx, const struct acpi_writer *entry) /* Fill out header fields */ acpi_fill_header(header, "APIC"); header->length = sizeof(struct acpi_madt); - header->revision = ACPI_MADT_REV_ACPI_3_0; + header->revision = acpi_get_table_revision(ACPITAB_MADT); acpi_inc(ctx, sizeof(struct acpi_madt)); /* TODO: Get rid of acpi_fill_madt and use driver model */ -- 2.46.0