From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4001:c0b::243; helo=mail-it0-x243.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-it0-x243.google.com (mail-it0-x243.google.com [IPv6:2607:f8b0:4001:c0b::243]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 5A2CB21107197 for ; Thu, 30 Aug 2018 06:03:17 -0700 (PDT) Received: by mail-it0-x243.google.com with SMTP id h3-v6so2469411ita.2 for ; Thu, 30 Aug 2018 06:03:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=TMcX0DPyCyJ0ce5+ndITs2lzI4LZr3v4QBzr04Mqr1Y=; b=b2u1AgUc8oIKTsPBQ8XfGKNh7u3nYv9rmyJwmEZp2CfqPvi+xKHUktN8lyfod4dMl9 aTYpRcjm7IkXmH5yniUZdCYWJOnyXARtJ0gXgO+Ow6WFl9XsLy9ghz0gDFHDzhqh00ha tyfm04V5K5F7xGNJd7GsheEk2X3JnpYuLuRuE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=TMcX0DPyCyJ0ce5+ndITs2lzI4LZr3v4QBzr04Mqr1Y=; b=dSUFAfqm6jgcso/u46IY/EUbS+vPH5TIjGChSyoB3VCrwGI+H1ONz9SkO02IDhMzVf UV71Zn/2tMfKdpOpAVnqmLfzcrJMVUALChiGdhS4e/6FrbWarkBhqtZedC6JvwMVD8LL m7VRdsAT8Z8hP7CPrTvH2GBhpzK7srwr1JkEAo0JeqJKWuzKUyPXmx3KIeBykcqVK4jc 1a5e3zKFYD4X4ymEH/kRCMSryttMrut9HZf6iyPmHsRMCymJG4qDezqmYoJ80HmvHVRP gJeb637QPiuG/tb+8YOD05IlxFHKYSTHoTRBwEGkKzZfcfpTC9k77vReR6oV16qRaDBz wlfA== X-Gm-Message-State: APzg51DDKF8XBbZescOYjKQ89sUFO+1Q0cqdo6bif6mZLIdMbpGZ9k6T n6LD7d/z/tNbUhN2RYCNU11sK9C+4XzuR8KKltcjWw== X-Google-Smtp-Source: ANB0VdYNNA/+vfUuyuUjd0j24yiIJbsc7Ka24qoN3lY4hIxypzybXXue4NMj5GNHz+7ZsYc3zuSYepQa4Hd1vuAFCh0= X-Received: by 2002:a24:52cd:: with SMTP id d196-v6mr1948735itb.58.1535634196773; Thu, 30 Aug 2018 06:03:16 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a6b:ac05:0:0:0:0:0 with HTTP; Thu, 30 Aug 2018 06:03:16 -0700 (PDT) In-Reply-To: <20180830112315.xem25mevpahywvof@bivouac.eciton.net> References: <1535539456-28745-1-git-send-email-chandni.cherukuri@arm.com> <20180830112315.xem25mevpahywvof@bivouac.eciton.net> From: Ard Biesheuvel Date: Thu, 30 Aug 2018 15:03:16 +0200 Message-ID: To: Leif Lindholm Cc: Chandni Cherukuri , "edk2-devel@lists.01.org" Subject: Re: [PATCH edk2-platforms] sgi575/acpi: Use ACPI 6.2 specification X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Aug 2018 13:03:18 -0000 Content-Type: text/plain; charset="UTF-8" On 30 August 2018 at 13:23, Leif Lindholm wrote: > On Wed, Aug 29, 2018 at 04:14:16PM +0530, Chandni Cherukuri wrote: >> Switched from using ACPI 6.1 to 6.2 specification for >> SGI575 since SBBR 1.1 requires ACPI 6.2 tables or later. > > Just to clarify - this has no impact at all on the actual generated > tables, right? > > We really should have a better way of dealing with this. > (But we don't, at the moment.) > I don't see the point of these changes. The whole point of ACPI's forward compatibility guarantees is that a ACPI 6.1 system automatically complies with ACPI 6.2, and so these changes are not necessary for compliance with SBBR 1.1 either. >> Contributed-under: TianoCore Contribution Agreement 1.1 >> Cc: Ard Biesheuvel >> Cc: Leif Lindholm >> Signed-off-by: Chandni Cherukuri >> --- >> Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dbg2.aslc | 8 ++-- >> Platform/ARM/SgiPkg/AcpiTables/Sgi575/Gtdt.aslc | 48 ++++++++++---------- >> Platform/ARM/SgiPkg/AcpiTables/Sgi575/Mcfg.aslc | 4 +- >> Platform/ARM/SgiPkg/AcpiTables/Sgi575/Spcr.aslc | 6 +-- >> 4 files changed, 33 insertions(+), 33 deletions(-) >> >> diff --git a/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dbg2.aslc b/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dbg2.aslc >> index ed671f3..0183685 100644 >> --- a/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dbg2.aslc >> +++ b/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dbg2.aslc >> @@ -15,7 +15,7 @@ >> >> #include "SgiAcpiHeader.h" >> #include >> -#include >> +#include >> #include >> >> #define SGI_DBG2_NUM_DEBUG_PORTS 1 >> @@ -29,7 +29,7 @@ >> >> typedef struct { >> EFI_ACPI_DBG2_DEBUG_DEVICE_INFORMATION_STRUCT Dbg2Device; >> - EFI_ACPI_6_1_GENERIC_ADDRESS_STRUCTURE BaseAddressRegister; >> + EFI_ACPI_6_2_GENERIC_ADDRESS_STRUCTURE BaseAddressRegister; >> UINT32 AddressSize; >> UINT8 NameSpaceString[SGI_DBG2_NS_STR_LENGTH]; >> } DBG2_DEBUG_DEVICE_INFORMATION; >> @@ -56,7 +56,7 @@ typedef struct { >> OFFSET_OF (DBG2_DEBUG_DEVICE_INFORMATION, BaseAddressRegister), /* UINT16 BaseAddressRegister Offset */ \ >> OFFSET_OF (DBG2_DEBUG_DEVICE_INFORMATION, AddressSize) /* UINT16 AddressSize Offset */ \ >> }, \ >> - ARM_GAS32 (UartBase), /* EFI_ACPI_6_1_GENERIC_ADDRESS_STRUCTURE BaseAddressRegister */ \ >> + ARM_GAS32 (UartBase), /* EFI_ACPI_6_2_GENERIC_ADDRESS_STRUCTURE BaseAddressRegister */ \ >> UartAddrLen, /* UINT32 AddressSize */ \ >> UartNameStr /* UINT8 NameSpaceString[MAX_DBG2_NAME_LEN] */ \ >> } >> @@ -64,7 +64,7 @@ typedef struct { >> STATIC DBG2_TABLE Dbg2 = { >> { >> ARM_ACPI_HEADER ( >> - EFI_ACPI_6_1_DEBUG_PORT_2_TABLE_SIGNATURE, >> + EFI_ACPI_6_2_DEBUG_PORT_2_TABLE_SIGNATURE, >> DBG2_TABLE, >> EFI_ACPI_DBG2_DEBUG_DEVICE_INFORMATION_STRUCT_REVISION >> ), >> diff --git a/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Gtdt.aslc b/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Gtdt.aslc >> index 46d811e..39e3f02 100644 >> --- a/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Gtdt.aslc >> +++ b/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Gtdt.aslc >> @@ -16,7 +16,7 @@ >> #include "SgiAcpiHeader.h" >> #include >> #include >> -#include >> +#include >> >> #define SGI_PLATFORM_WATCHDOG_COUNT 2 >> #define SGI_PLATFORM_TIMER_COUNT (SGI_PLATFORM_WATCHDOG_COUNT + 1) >> @@ -24,7 +24,7 @@ >> >> #define SYSTEM_TIMER_BASE_ADDRESS 0xFFFFFFFFFFFFFFFF >> #define GTDT_GLOBAL_FLAGS 0 >> -#define GTDT_GTIMER_FLAGS EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_POLARITY >> +#define GTDT_GTIMER_FLAGS EFI_ACPI_6_2_GTDT_TIMER_FLAG_TIMER_INTERRUPT_POLARITY >> >> #define SGI_GT_BLOCK_CTL_BASE 0x2A810000 >> #define SGI_GT_BLOCK_FRAME1_CTL_BASE 0x2A820000 >> @@ -36,18 +36,18 @@ >> #define SGI_GT_BLOCK_FRAME0_GSIV 0x5C >> >> #define SGI_GTX_TIMER_FLAGS 0 >> -#define GTX_TIMER_SECURE EFI_ACPI_6_1_GTDT_GT_BLOCK_COMMON_FLAG_SECURE_TIMER >> +#define GTX_TIMER_SECURE EFI_ACPI_6_2_GTDT_GT_BLOCK_COMMON_FLAG_SECURE_TIMER >> #define GTX_TIMER_NON_SECURE 0 >> -#define GTX_TIMER_SAVE_CONTEXT EFI_ACPI_6_1_GTDT_GT_BLOCK_COMMON_FLAG_ALWAYS_ON_CAPABILITY >> +#define GTX_TIMER_SAVE_CONTEXT EFI_ACPI_6_2_GTDT_GT_BLOCK_COMMON_FLAG_ALWAYS_ON_CAPABILITY >> #define SGI_GTX_COMMON_FLAGS_S (GTX_TIMER_SAVE_CONTEXT | GTX_TIMER_SECURE) >> #define SGI_GTX_COMMON_FLAGS_NS (GTX_TIMER_SAVE_CONTEXT | GTX_TIMER_NON_SECURE) >> >> -#define EFI_ACPI_6_1_SBSA_GENERIC_WATCHDOG_STRUCTURE_INIT( \ >> +#define EFI_ACPI_6_2_SBSA_GENERIC_WATCHDOG_STRUCTURE_INIT( \ >> RefreshFramePhysicalAddress, ControlFramePhysicalAddress, \ >> WatchdogTimerGSIV, WatchdogTimerFlags) \ >> { \ >> - EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG, \ >> - sizeof (EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG_STRUCTURE), \ >> + EFI_ACPI_6_2_GTDT_SBSA_GENERIC_WATCHDOG, \ >> + sizeof (EFI_ACPI_6_2_GTDT_SBSA_GENERIC_WATCHDOG_STRUCTURE), \ >> EFI_ACPI_RESERVED_WORD, \ >> RefreshFramePhysicalAddress, \ >> ControlFramePhysicalAddress, \ >> @@ -58,20 +58,20 @@ >> #pragma pack (1) >> >> typedef struct { >> - EFI_ACPI_6_1_GENERIC_TIMER_DESCRIPTION_TABLE Gtdt; >> - EFI_ACPI_6_1_GTDT_GT_BLOCK_STRUCTURE GtBlock; >> - EFI_ACPI_6_1_GTDT_GT_BLOCK_TIMER_STRUCTURE Frames[SGI_TIMER_FRAMES_COUNT]; >> - EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG_STRUCTURE Watchdogs[SGI_PLATFORM_WATCHDOG_COUNT]; >> -} EFI_ACPI_6_1_GENERIC_TIMER_DESCRIPTION_TABLES; >> + EFI_ACPI_6_2_GENERIC_TIMER_DESCRIPTION_TABLE Gtdt; >> + EFI_ACPI_6_2_GTDT_GT_BLOCK_STRUCTURE GtBlock; >> + EFI_ACPI_6_2_GTDT_GT_BLOCK_TIMER_STRUCTURE Frames[SGI_TIMER_FRAMES_COUNT]; >> + EFI_ACPI_6_2_GTDT_SBSA_GENERIC_WATCHDOG_STRUCTURE Watchdogs[SGI_PLATFORM_WATCHDOG_COUNT]; >> +} EFI_ACPI_6_2_GENERIC_TIMER_DESCRIPTION_TABLES; >> >> #pragma pack () >> >> -STATIC EFI_ACPI_6_1_GENERIC_TIMER_DESCRIPTION_TABLES Gtdt = { >> +STATIC EFI_ACPI_6_2_GENERIC_TIMER_DESCRIPTION_TABLES Gtdt = { >> { >> ARM_ACPI_HEADER ( >> - EFI_ACPI_6_1_GENERIC_TIMER_DESCRIPTION_TABLE_SIGNATURE, >> - EFI_ACPI_6_1_GENERIC_TIMER_DESCRIPTION_TABLES, >> - EFI_ACPI_6_1_GENERIC_TIMER_DESCRIPTION_TABLE_REVISION >> + EFI_ACPI_6_2_GENERIC_TIMER_DESCRIPTION_TABLE_SIGNATURE, >> + EFI_ACPI_6_2_GENERIC_TIMER_DESCRIPTION_TABLES, >> + EFI_ACPI_6_2_GENERIC_TIMER_DESCRIPTION_TABLE_REVISION >> ), >> SYSTEM_TIMER_BASE_ADDRESS, // UINT64 PhysicalAddress >> 0, // UINT32 Reserved >> @@ -85,17 +85,17 @@ STATIC EFI_ACPI_6_1_GENERIC_TIMER_DESCRIPTION_TABLES Gtdt = { >> GTDT_GTIMER_FLAGS, // UINT32 NonSecurePL2TimerFlags >> 0xFFFFFFFFFFFFFFFF, // UINT64 CntReadBasePhysicalAddress >> SGI_PLATFORM_TIMER_COUNT, // UINT32 PlatformTimerCount >> - sizeof (EFI_ACPI_6_1_GENERIC_TIMER_DESCRIPTION_TABLE) // UINT32 PlatfromTimerOffset >> + sizeof (EFI_ACPI_6_2_GENERIC_TIMER_DESCRIPTION_TABLE) // UINT32 PlatfromTimerOffset >> }, >> { >> - EFI_ACPI_6_1_GTDT_GT_BLOCK, // UINT8 Type >> - sizeof(EFI_ACPI_6_1_GTDT_GT_BLOCK_STRUCTURE) + // UINT16 Length >> - sizeof(EFI_ACPI_6_1_GTDT_GT_BLOCK_TIMER_STRUCTURE) * >> + EFI_ACPI_6_2_GTDT_GT_BLOCK, // UINT8 Type >> + sizeof(EFI_ACPI_6_2_GTDT_GT_BLOCK_STRUCTURE) + // UINT16 Length >> + sizeof(EFI_ACPI_6_2_GTDT_GT_BLOCK_TIMER_STRUCTURE) * >> SGI_TIMER_FRAMES_COUNT, >> EFI_ACPI_RESERVED_BYTE, // UINT8 Reserved >> SGI_GT_BLOCK_CTL_BASE, // UINT64 CntCtlBase >> SGI_TIMER_FRAMES_COUNT, // UINT32 GTBlockTimerCount >> - sizeof (EFI_ACPI_6_1_GTDT_GT_BLOCK_STRUCTURE) // UINT32 GTBlockTimerOffset >> + sizeof (EFI_ACPI_6_2_GTDT_GT_BLOCK_STRUCTURE) // UINT32 GTBlockTimerOffset >> }, >> { >> { >> @@ -130,17 +130,17 @@ STATIC EFI_ACPI_6_1_GENERIC_TIMER_DESCRIPTION_TABLES Gtdt = { >> } >> }, >> { >> - EFI_ACPI_6_1_SBSA_GENERIC_WATCHDOG_STRUCTURE_INIT ( >> + EFI_ACPI_6_2_SBSA_GENERIC_WATCHDOG_STRUCTURE_INIT ( >> FixedPcdGet32 (PcdGenericWatchdogRefreshBase), >> FixedPcdGet32 (PcdGenericWatchdogControlBase), >> 93, >> 0 >> ), >> - EFI_ACPI_6_1_SBSA_GENERIC_WATCHDOG_STRUCTURE_INIT ( >> + EFI_ACPI_6_2_SBSA_GENERIC_WATCHDOG_STRUCTURE_INIT ( >> FixedPcdGet32 (PcdGenericWatchdogRefreshBase), >> FixedPcdGet32 (PcdGenericWatchdogControlBase), >> 94, >> - EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG_FLAG_SECURE_TIMER >> + EFI_ACPI_6_2_GTDT_SBSA_GENERIC_WATCHDOG_FLAG_SECURE_TIMER >> ) >> } >> }; >> diff --git a/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Mcfg.aslc b/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Mcfg.aslc >> index 4a487a3..03093c0 100644 >> --- a/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Mcfg.aslc >> +++ b/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Mcfg.aslc >> @@ -13,7 +13,7 @@ >> * >> **/ >> >> -#include >> +#include >> #include >> #include >> #include "SgiAcpiHeader.h" >> @@ -34,7 +34,7 @@ typedef struct >> EFI_ACPI_PCI_MEMORY_MAPPED_CONFIGURATION_SPACE_ACCESS_DESCRIPTION_TABLE Mcfg = { >> { >> ARM_ACPI_HEADER ( >> - EFI_ACPI_6_0_PCI_EXPRESS_MEMORY_MAPPED_CONFIGURATION_SPACE_BASE_ADDRESS_DESCRIPTION_TABLE_SIGNATURE, >> + EFI_ACPI_6_2_PCI_EXPRESS_MEMORY_MAPPED_CONFIGURATION_SPACE_BASE_ADDRESS_DESCRIPTION_TABLE_SIGNATURE, >> EFI_ACPI_PCI_MEMORY_MAPPED_CONFIGURATION_SPACE_ACCESS_DESCRIPTION_TABLE, >> EFI_ACPI_MEMORY_MAPPED_CONFIGURATION_SPACE_ACCESS_TABLE_REVISION >> ), >> diff --git a/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Spcr.aslc b/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Spcr.aslc >> index 5265225..36cc5f3 100644 >> --- a/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Spcr.aslc >> +++ b/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Spcr.aslc >> @@ -15,12 +15,12 @@ >> >> #include "SgiAcpiHeader.h" >> #include >> -#include >> +#include >> #include >> >> STATIC EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE Spcr = { >> ARM_ACPI_HEADER ( >> - EFI_ACPI_6_1_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_SIGNATURE, >> + EFI_ACPI_6_2_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_SIGNATURE, >> EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE, >> EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_REVISION >> ), >> @@ -32,7 +32,7 @@ STATIC EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE Spcr = { >> EFI_ACPI_RESERVED_BYTE, >> EFI_ACPI_RESERVED_BYTE >> }, >> - // EFI_ACPI_6_1_GENERIC_ADDRESS_STRUCTURE BaseAddress; >> + // EFI_ACPI_6_2_GENERIC_ADDRESS_STRUCTURE BaseAddress; >> ARM_GAS32 (0x7FF80000), >> // UINT8 InterruptType; >> EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_INTERRUPT_TYPE_GIC, >> -- >> 2.7.4 >>