From patchwork Thu Jul 13 06:30:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ivanhu X-Patchwork-Id: 1807093 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=fwts-devel-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=fNcfrBLf; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4R1l9z4x7Gz20Ph for ; Thu, 13 Jul 2023 16:31:17 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1qJpr2-0006iI-UU; Thu, 13 Jul 2023 06:31:08 +0000 Received: from smtp-relay-canonical-0.internal ([10.131.114.83] helo=smtp-relay-canonical-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1qJpr1-0006iB-0E for fwts-devel@lists.ubuntu.com; Thu, 13 Jul 2023 06:31:07 +0000 Received: from canonical.com (unknown [106.104.136.95]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-0.canonical.com (Postfix) with ESMTPSA id CEE453F292 for ; Thu, 13 Jul 2023 06:31:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1689229866; bh=9HHICL9/hcatYTNwKgNH/UIptArpbLXBmceqbwmMlPU=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=fNcfrBLfwPG8yt+Gy04Y/OjTJm1Ir2N4jTTPS9XNpyjLHgB9vilUmJS+A4kyJZf4e T6tdpGGe8dreeKa4cpbWwFwmh6ap84JXutHHJoGJGUEp6Hp8sYX9E17jnHNror7uOj +dga/EJmeE18dikZSNQv9U+kKGW1FBnpXk2lntLa6bqgr0ij43RlIC+L4aG1kaJH7h B0PXQQsqpVbCG3jxaSYKlN4X7A6Pp8IS49+pNTSq4Bq/JZF2biOpOqYOJIt0JIJti9 5SQTiAI4A9zerr+8EKh4Nk2In3vUivrCrA9Ij3GCboigfDtWWy/CTaZ/2jDLI+ZwV2 P50HuxwdV9Yyw== From: Ivan Hu To: fwts-devel@lists.ubuntu.com Subject: [PATCH] acpi: update fadt and madt revisions to ACPI 6.5 Date: Thu, 13 Jul 2023 14:30:54 +0800 Message-Id: <20230713063054.34674-1-ivan.hu@canonical.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-BeenThere: fwts-devel@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Firmware Test Suite Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: fwts-devel-bounces@lists.ubuntu.com Sender: "fwts-devel" BugLink: https://bugs.launchpad.net/ubuntu/+source/fwts/+bug/2026305 Signed-off-by: Ivan Hu --- src/acpi/madt/madt.c | 16 ++++++++++++++-- src/lib/include/fwts_acpi.h | 12 ++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/src/acpi/madt/madt.c b/src/acpi/madt/madt.c index 973cf6b8..05f93ed8 100644 --- a/src/acpi/madt/madt.c +++ b/src/acpi/madt/madt.c @@ -118,11 +118,11 @@ #define FADT_MAX_MAJOR_REVISION ((uint8_t)((FWTS_ACPI_VERSION_NOW & 0xF00) >> 8)) #define FADT_MAX_MINOR_REVISION ((uint8_t)(FWTS_ACPI_VERSION_NOW & 0xF0) >> 4) -#define MADT_MAX_REVISION ((uint8_t)5) +#define MADT_MAX_REVISION ((uint8_t)6) #define SUBTABLE_UNDEFINED 0x00 #define SUBTABLE_VARIABLE 0xff -#define NUM_SUBTABLE_TYPES 16 +#define NUM_SUBTABLE_TYPES 24 #define MAX_IO_APIC_ID 256 /* IO APIC ID field is 1 byte */ #define SBBR_ACPI_MAJOR_VERSION 6 @@ -238,6 +238,18 @@ static struct acpi_madt_subtable_lengths spec_info[] = { .lengths = { 8, 12, 10, 8, 6, 12, 16, SUBTABLE_VARIABLE, 16, 16, 12, 80, 24, 24, 16, 20 } }, + { /* for ACPI 6.5 */ + .major_version = 6, + .minor_version = 5, + .madt_version = 6, + .num_types = 24, + .lengths = { 8, 12, 10, 8, 6, 12, 16, SUBTABLE_VARIABLE, + 16, 16, 12, 82, 24, 24, 16, 20, 16, + SUBTABLE_VARIABLE, SUBTABLE_VARIABLE, + SUBTABLE_VARIABLE, SUBTABLE_VARIABLE, + SUBTABLE_VARIABLE, SUBTABLE_VARIABLE, + SUBTABLE_VARIABLE } + }, { /* terminator */ .major_version = 0, .minor_version = 0, diff --git a/src/lib/include/fwts_acpi.h b/src/lib/include/fwts_acpi.h index 9c3aa9fd..8b85fac2 100644 --- a/src/lib/include/fwts_acpi.h +++ b/src/lib/include/fwts_acpi.h @@ -87,8 +87,9 @@ #define FWTS_GAS_ADDR_SPACE_ID_PCC (0x0a) #define FWTS_GAS_ADDR_SPACE_ID_FFH (0x7f) -#define FWTS_ACPI_VERSION_NOW (FWTS_ACPI_VERSION_64) -#define FWTS_ACPI_VERSION_NEXT (0x650) +#define FWTS_ACPI_VERSION_NOW (FWTS_ACPI_VERSION_65) +#define FWTS_ACPI_VERSION_NEXT (0x660) +#define FWTS_ACPI_VERSION_65 (0x650) #define FWTS_ACPI_VERSION_64 (0x640) #define FWTS_ACPI_VERSION_63 (0x630) #define FWTS_ACPI_VERSION_62 (0x620) @@ -523,6 +524,13 @@ typedef enum { FWTS_MADT_GIC_R_REDISTRIBUTOR, FWTS_MADT_GIC_ITS, FWTS_MADT_MP_WAKEUP, + FWTS_MADT_CORE_PIC, + FWTS_MADT_LIO_PIC, + FWTS_MADT_HT_PIC, + FWTS_MADT_EIO_PIC, + FWTS_MADT_MSI_PIC, + FWTS_MADT_BIO_PIC, + FWTS_MADT_LPC_PIC, FWTS_MADT_RESERVED, /* does not have defined structure */ FWTS_MADT_OEM /* does not have defined structure */ } fwts_acpi_madt_type;