From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mx.groups.io with SMTP id smtpd.web11.2932.1672882471768864720 for ; Wed, 04 Jan 2023 17:34:32 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=m7Da3HER; spf=pass (domain: intel.com, ip: 134.134.136.20, mailfrom: isaac.w.oram@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1672882471; x=1704418471; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=v5F+ImKQ/5TWSpeca1S8gwRWEMW5N4QqJwJuglpEvUQ=; b=m7Da3HERrKK3GWx737ErtQTxOLXL+xVWooMikpmpNH3xOpeA3XSPWeTl aoHKTbF6ZVIjOr6LJ4xNfK9DcwJwmcFk7vewXtNoYfsHTsmum5koZVR8c GOy2xNrz/uSJ4Cj4IHPJuj59jm0febYEQhFB90SAQ1KIAteLo2wbGNkNL EJyEPh1bqcwN1Nci+Bmv6Nhlef9WbohFe7nDGkI2YlcHlLVBvPfkpafyg 2SLSeFCbMv/deTHr9gJMJZFOKCCPkxx6eRpB2CX9LDSCmIT7mrm0S6yqr PJjCIFmSbYiPc4x2I2hge2t0u5AmDqQj3vW6m0pLeEsN8pCQFkxvLKZVK w==; X-IronPort-AV: E=McAfee;i="6500,9779,10580"; a="309859224" X-IronPort-AV: E=Sophos;i="5.96,301,1665471600"; d="scan'208";a="309859224" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Jan 2023 17:34:29 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10580"; a="779402973" X-IronPort-AV: E=Sophos;i="5.96,301,1665471600"; d="scan'208";a="779402973" Received: from iworam-desk.amr.corp.intel.com ([10.24.80.243]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Jan 2023 17:34:29 -0800 From: "Isaac Oram" To: devel@edk2.groups.io Cc: Isaac Oram , Nate DeSimone , Chasel Chiu , Ankit Sinha , Suresh Ponnusamy Subject: [edk2-devel][edk2-platforms][PATCH V1 1/1] WhitleyOpenBoardPkg/AcpiTables: Fix EFI_ACPI_GPE0_BLK_LEN calculation Date: Wed, 4 Jan 2023 17:34:15 -0800 Message-Id: <154285e560df24b2cf6a0a7dd9b09577dd10ce37.1672882404.git.isaac.w.oram@intel.com> X-Mailer: git-send-email 2.39.0.windows.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Block length incorrectly calculated off of the block width. Reverted EFI_ACPI_GPE0_BLK_WIDTH change and added #defines for X_GPE0 and X_GPE1 contents. Cc: Nate DeSimone Cc: Chasel Chiu Cc: Ankit Sinha Cc: Suresh Ponnusamy Signed-off-by: Isaac Oram --- .../Features/Acpi/AcpiTables/Fadt/Fadt62.aslc | 16 +++++++------- .../WhitleyOpenBoardPkg/Include/Acpi/Fadt.h | 21 ++++++++++++++++++- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Features/Acpi/AcpiTables/Fadt/Fadt62.aslc b/Platform/Intel/WhitleyOpenBoardPkg/Features/Acpi/AcpiTables/Fadt/Fadt62.aslc index f37cf0a508..b7f15ef716 100644 --- a/Platform/Intel/WhitleyOpenBoardPkg/Features/Acpi/AcpiTables/Fadt/Fadt62.aslc +++ b/Platform/Intel/WhitleyOpenBoardPkg/Features/Acpi/AcpiTables/Fadt/Fadt62.aslc @@ -143,19 +143,19 @@ EFI_ACPI_6_2_FIXED_ACPI_DESCRIPTION_TABLE Fadt = { // // X_General Purpose Event 0 Register Block // - {EFI_ACPI_GPE0_BLK_ADDRESS_SPACE_ID, - EFI_ACPI_GPE0_BLK_BIT_WIDTH, - EFI_ACPI_GPE0_BLK_BIT_OFFSET, + {EFI_ACPI_X_GPE0_BLK_ADDRESS_SPACE_ID, + EFI_ACPI_X_GPE0_BLK_BIT_WIDTH, + EFI_ACPI_X_GPE0_BLK_BIT_OFFSET, EFI_ACPI_6_2_BYTE, - EFI_ACPI_GPE0_BLK_ADDRESS}, + EFI_ACPI_X_GPE0_BLK_ADDRESS}, // // X_General Purpose Event 1 Register Block // - {EFI_ACPI_GPE1_BLK_ADDRESS_SPACE_ID, - EFI_ACPI_GPE1_BLK_BIT_WIDTH, - EFI_ACPI_GPE1_BLK_BIT_OFFSET, + {EFI_ACPI_X_GPE1_BLK_ADDRESS_SPACE_ID, + EFI_ACPI_X_GPE1_BLK_BIT_WIDTH, + EFI_ACPI_X_GPE1_BLK_BIT_OFFSET, EFI_ACPI_6_2_UNDEFINED, - EFI_ACPI_GPE1_BLK_ADDRESS} + EFI_ACPI_X_GPE1_BLK_ADDRESS} }; VOID* diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Include/Acpi/Fadt.h b/Platform/Intel/WhitleyOpenBoardPkg/Include/Acpi/Fadt.h index ebfd21b6cc..8857879370 100644 --- a/Platform/Intel/WhitleyOpenBoardPkg/Include/Acpi/Fadt.h +++ b/Platform/Intel/WhitleyOpenBoardPkg/Include/Acpi/Fadt.h @@ -152,10 +152,19 @@ For Watson Creek we set this to 0 and then dynamically update this to 1 in the D // Information // #define EFI_ACPI_GPE0_BLK_ADDRESS_SPACE_ID EFI_ACPI_6_2_SYSTEM_IO -#define EFI_ACPI_GPE0_BLK_BIT_WIDTH 0 // size of R_PCH_ACPI_GPE0_STS_127_96 + R_PCH_ACPI_GPE0_EN_127_96 +#define EFI_ACPI_GPE0_BLK_BIT_WIDTH 0x100 // size of R_PCH_ACPI_GPE0_STS_127_96 + R_PCH_ACPI_GPE0_EN_127_96 #define EFI_ACPI_GPE0_BLK_BIT_OFFSET 0x00 #define EFI_ACPI_GPE0_BLK_ADDRESS (EFI_ACPI_PM1A_EVT_BLK_ADDRESS + 0x80) +// +// X General Purpose Event 0 Register Block Generic Address +// Information +// +#define EFI_ACPI_X_GPE0_BLK_ADDRESS_SPACE_ID EFI_ACPI_6_2_SYSTEM_IO +#define EFI_ACPI_X_GPE0_BLK_BIT_WIDTH 0x00 +#define EFI_ACPI_X_GPE0_BLK_BIT_OFFSET 0x00 +#define EFI_ACPI_X_GPE0_BLK_ADDRESS EFI_ACPI_GPE0_BLK_ADDRESS + // // General Purpose Event 1 Register Block Generic Address // Information @@ -164,6 +173,16 @@ For Watson Creek we set this to 0 and then dynamically update this to 1 in the D #define EFI_ACPI_GPE1_BLK_BIT_WIDTH 0x0 #define EFI_ACPI_GPE1_BLK_BIT_OFFSET 0x0 #define EFI_ACPI_GPE1_BLK_ADDRESS 0x0 + +// +// X General Purpose Event 1 Register Block Generic Address +// Information +// +#define EFI_ACPI_X_GPE1_BLK_ADDRESS_SPACE_ID EFI_ACPI_6_2_SYSTEM_IO +#define EFI_ACPI_X_GPE1_BLK_BIT_WIDTH 0x00 +#define EFI_ACPI_X_GPE1_BLK_BIT_OFFSET 0x00 +#define EFI_ACPI_X_GPE1_BLK_ADDRESS 0x00 + // // Reset Register Generic Address Information // -- 2.39.0.windows.1