From patchwork Wed Dec 5 18:50:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 152928 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp9640955ljp; Wed, 5 Dec 2018 10:50:38 -0800 (PST) X-Google-Smtp-Source: AFSGD/WYYC2L2eorocXBvC3HuTzR34rUxa8nEkiYs/6UbPx+s03Nsc94iR0iqP3KAZYXVmv0hw6B X-Received: by 2002:a17:902:4503:: with SMTP id m3mr25666904pld.23.1544035838666; Wed, 05 Dec 2018 10:50:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544035838; cv=none; d=google.com; s=arc-20160816; b=eIrwvTGF7Yv4Bl/E6Y9MO5yzvpdBLnq7uF/Tx8kWIWlLUCEH5vN3BVRE9j6GNxg68z mrZfN2TX4Ft2pmrL4TQJDXzQzsmqgrWs6UzP89rOWl4kx7/8mJq2IWsnF7ODFfbYB3/U wSKCC0+iExfD1EPBFl20K35ejfs3O62rF0IiLjTsalOmTf6JOMt2eBJcZ//50f194SqA 3+PsEy/AJNvjy50t1OczmbyQ5y5x/E6PcawUehks0xRzpgLYxTImIZhbEgwQFAOGL5Rw 8yv9kpKHp+cXSz2UxWhvvWQrJgWwFPu4RNC1ktI1O4zoeVObVHLDOuBrbPgheQ5/CW7w RdFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=OJlq9mDZQYAaBVKrEz5tv65aOKm+RUKglOi2eiE4L/k=; b=Y/0NVBBzhlIm5yhwSM8ULZDaGu6rcNt7vPPwwe6eeqnr2EQcCFOCx0jP3PtmD09/LR MDoWGMA4231vkfmpsjyrUfJvRNqicIwS3luc78Bnz+QdaP4Qp9M9Gyd9s4M5zC+ykdNA jtJlWKFwtlhCnm0dwJDTB94YjSlXCKZU1bixYJdnwjEWM8nVCk9kPDk7oE7jr118hNcS RGuFFGsxVdi2ldUCNPGmv4iVObdAmUQxW0pXnCAAxRPoJWNvEqvRTa7hju55j3W/Gqv8 kPl7JjZzSy8r5leNWJhJZfbzQkplJ50/NI0J9t4znsHgvMLEuxy9XlB/34o02Z+42Rgx bGwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=fmjnqFZO; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id b36si17280741pla.354.2018.12.05.10.50.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Dec 2018 10:50:38 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=fmjnqFZO; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 9CE802194D3AE; Wed, 5 Dec 2018 10:50:32 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::444; helo=mail-wr1-x444.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) (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 BF67E2194D3AE for ; Wed, 5 Dec 2018 10:50:30 -0800 (PST) Received: by mail-wr1-x444.google.com with SMTP id v13so20779041wrw.5 for ; Wed, 05 Dec 2018 10:50:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3zApOp0YMAYweeZ/GFoj29Zrs04+W65qo3DjEdQNEcc=; b=fmjnqFZOW1yWymMQb1/UtWtv1vM0gvNoGm/vFaVYlefZQJvWp8RgOj0vaXNOSmPwmB q4joGDVhC5FCN0QkFqun5AE3gbSG8ZfHzD3+Pp1txUMxBXZV50BgD9MboGOBL2q6VcGU 2AJZqiQIIxEz3siYiwelrpUA6vAU5ZysITtAo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3zApOp0YMAYweeZ/GFoj29Zrs04+W65qo3DjEdQNEcc=; b=OBCazBGo5XN5PYnDcSSNWhLmSsvaoop+SFmMw7i+n5Sdi4sUAkOaspRtp4MKOzicdL m4MPAPsx5VUi2KHY6fOYtmCxXHw2Iya/XarzpH1bI2xZomsHhHW29TMrMiJOyO7USec5 o1qKY8upvN6gt1+qwZx036A1rEAdQ3YDAeVDkCKm9Bs5otGHMfCP7tu0eRC6d+nSkun2 nRxqH9Ztqt3hwFnQwBgf/Yfx6zWF6uXwdFnQaC+R+FvNaHBOr1OzUvLwPEWpFXEnteA8 1QJG6ns+6sPQqTLzi445+kVFoBXFoD5raS+Lk3PkJ43hFvNV70e/D1w/oVXPiwZX602c XTBg== X-Gm-Message-State: AA+aEWYpfSOM70Ix0rTIZwIKBIE+y/ZCY79DLctKfQ5L32qN+O5tNc8Q ZMxYUh6b3N0d3hxsaZXPnSPJemYOY/4vEg== X-Received: by 2002:a5d:454f:: with SMTP id p15mr24233742wrr.39.1544035828983; Wed, 05 Dec 2018 10:50:28 -0800 (PST) Received: from harold.home ([2a01:cb1d:112:6f00:816d:4a95:a2ca:814d]) by smtp.gmail.com with ESMTPSA id c8sm14825186wrx.42.2018.12.05.10.50.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Dec 2018 10:50:28 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 5 Dec 2018 19:50:18 +0100 Message-Id: <20181205185020.21441-5-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181205185020.21441-1-ard.biesheuvel@linaro.org> References: <20181205185020.21441-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Subject: [edk2] [PATCH edk2-platforms 4/6] Silicon/AMD/Styx: emit DSDT as aml directly 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: , Cc: alan@softiron.co.uk Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Instead of emitting the DSDT by incorporating the intermediate output of [some version of] the iasl compiler, move the DSDT source file to the ACPI platform driver, which will install it directly. This permits us to drop a lot of cruft related to handling of this intermediate output. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Platform/AMD/OverdriveBoard/OverdriveBoard.dsc | 3 -- Platform/LeMaker/CelloBoard/CelloBoard.dsc | 4 --- Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc | 3 -- Platform/AMD/OverdriveBoard/OverdriveBoard.fdf | 1 - Platform/LeMaker/CelloBoard/CelloBoard.fdf | 1 - Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf | 1 - Silicon/AMD/Styx/AcpiTables/AcpiAml.inf | 29 -------------------- Silicon/AMD/Styx/AcpiTables/AcpiTables.inf | 1 - Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf | 1 + Silicon/AMD/Styx/Common/AmdStyxAcpiLib.h | 1 - Silicon/AMD/Styx/AcpiTables/Dsdt.c | 26 ------------------ Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatform.c | 1 - Silicon/AMD/Styx/{AcpiTables => Drivers/AcpiPlatformDxe}/Dsdt.asl | 0 13 files changed, 1 insertion(+), 71 deletions(-) -- 2.19.2 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc index b062f671f57f..7c66af6128c5 100644 --- a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc +++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc @@ -272,8 +272,6 @@ DEFINE DO_CAPSULE = FALSE GCC:*_*_AARCH64_ARCHCC_FLAGS = -DDO_XGBE=$(DO_XGBE) -DDO_KCS=$(DO_KCS) -DNUM_CORES=$(NUM_CORES) -DARM_CPU_AARCH64 GCC:*_*_AARCH64_PP_FLAGS = -DDO_XGBE=$(DO_XGBE) -DDO_KCS=$(DO_KCS) -DNUM_CORES=$(NUM_CORES) -DARM_CPU_AARCH64 - GCC:*_*_AARCH64_PLATFORM_FLAGS = -I$(BIN_DIR)/Silicon/AMD/Styx/AcpiTables/AcpiAml/OUTPUT - [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER] GCC:*_*_AARCH64_DLINK_FLAGS = -z common-page-size=0x10000 @@ -683,7 +681,6 @@ DEFINE DO_CAPSULE = FALSE NULL|EmbeddedPkg/Library/PlatformHasAcpiLib/PlatformHasAcpiLib.inf } - Silicon/AMD/Styx/AcpiTables/AcpiAml.inf Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf diff --git a/Platform/LeMaker/CelloBoard/CelloBoard.dsc b/Platform/LeMaker/CelloBoard/CelloBoard.dsc index 103c2fb74114..7c22bbbfa90f 100644 --- a/Platform/LeMaker/CelloBoard/CelloBoard.dsc +++ b/Platform/LeMaker/CelloBoard/CelloBoard.dsc @@ -264,8 +264,6 @@ DEFINE DO_FLASHER = FALSE GCC:*_*_AARCH64_ARCHCC_FLAGS = -DDO_KCS=$(DO_KCS) -DNUM_CORES=$(NUM_CORES) -DARM_CPU_AARCH64 GCC:*_*_AARCH64_PP_FLAGS = -DDO_KCS=$(DO_KCS) -DNUM_CORES=$(NUM_CORES) -DARM_CPU_AARCH64 - GCC:*_*_AARCH64_PLATFORM_FLAGS = -I$(BIN_DIR)/Silicon/AMD/Styx/AcpiTables/AcpiAml/OUTPUT - [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER] GCC:*_*_AARCH64_DLINK_FLAGS = -z common-page-size=0x10000 @@ -617,8 +615,6 @@ DEFINE DO_FLASHER = FALSE NULL|EmbeddedPkg/Library/PlatformHasAcpiLib/PlatformHasAcpiLib.inf } - - Silicon/AMD/Styx/AcpiTables/AcpiAml.inf Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf # diff --git a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc index 1927ef3ebafb..793bd5359a23 100644 --- a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc +++ b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc @@ -262,8 +262,6 @@ DEFINE DO_FLASHER = FALSE GCC:*_*_AARCH64_ARCHCC_FLAGS = -DDO_KCS=$(DO_KCS) -DNUM_CORES=$(NUM_CORES) -DARM_CPU_AARCH64 GCC:*_*_AARCH64_PP_FLAGS = -DDO_KCS=$(DO_KCS) -DNUM_CORES=$(NUM_CORES) -DARM_CPU_AARCH64 - GCC:*_*_AARCH64_PLATFORM_FLAGS = -I$(BIN_DIR)/Silicon/AMD/Styx/AcpiTables/AcpiAml/OUTPUT - [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER] GCC:*_*_AARCH64_DLINK_FLAGS = -z common-page-size=0x10000 @@ -612,7 +610,6 @@ DEFINE DO_FLASHER = FALSE NULL|EmbeddedPkg/Library/PlatformHasAcpiLib/PlatformHasAcpiLib.inf } - Silicon/AMD/Styx/AcpiTables/AcpiAml.inf Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf # diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf b/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf index cc082031621c..96df83e0da5a 100644 --- a/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf +++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf @@ -219,7 +219,6 @@ READ_LOCK_STATUS = TRUE # ACPI Support # INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf - INF RuleOverride=ACPITABLE Silicon/AMD/Styx/AcpiTables/AcpiAml.inf INF Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf diff --git a/Platform/LeMaker/CelloBoard/CelloBoard.fdf b/Platform/LeMaker/CelloBoard/CelloBoard.fdf index 45fc850c36cb..fc977f14b5a1 100644 --- a/Platform/LeMaker/CelloBoard/CelloBoard.fdf +++ b/Platform/LeMaker/CelloBoard/CelloBoard.fdf @@ -204,7 +204,6 @@ READ_LOCK_STATUS = TRUE # ACPI Support # INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf - INF RuleOverride=ACPITABLE Silicon/AMD/Styx/AcpiTables/AcpiAml.inf INF Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf # diff --git a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf index fec3acdd767c..8fc9a979aebc 100644 --- a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf +++ b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf @@ -217,7 +217,6 @@ READ_LOCK_STATUS = TRUE # ACPI Support # INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf - INF RuleOverride=ACPITABLE Silicon/AMD/Styx/AcpiTables/AcpiAml.inf INF Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf # diff --git a/Silicon/AMD/Styx/AcpiTables/AcpiAml.inf b/Silicon/AMD/Styx/AcpiTables/AcpiAml.inf deleted file mode 100644 index 08a7aabe8256..000000000000 --- a/Silicon/AMD/Styx/AcpiTables/AcpiAml.inf +++ /dev/null @@ -1,29 +0,0 @@ -#/** @file -# -# Copyright (c) 2014 - 2016, AMD Inc. All rights reserved.
-# -# This program and the accompanying materials -# are licensed and made available under the terms and conditions of the BSD License -# which accompanies this distribution. The full text of the license may be found at -# http://opensource.org/licenses/bsd-license.php -# -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -# -#**/ - -[Defines] - INF_VERSION = 0x00010005 - BASE_NAME = AcpiAml - FILE_GUID = 2df2a2ee-5f34-4dea-b4b6-da724e455f33 - MODULE_TYPE = USER_DEFINED - VERSION_STRING = 1.0 - -[Sources] - Dsdt.asl - -[Packages] - MdePkg/MdePkg.dec - MdeModulePkg/MdeModulePkg.dec - Silicon/AMD/Styx/AmdStyx.dec - diff --git a/Silicon/AMD/Styx/AcpiTables/AcpiTables.inf b/Silicon/AMD/Styx/AcpiTables/AcpiTables.inf index 692717950f40..0bc5b1e98964 100644 --- a/Silicon/AMD/Styx/AcpiTables/AcpiTables.inf +++ b/Silicon/AMD/Styx/AcpiTables/AcpiTables.inf @@ -36,7 +36,6 @@ Madt.c Mcfg.c Csrt.c - Dsdt.c Iort.c Pptt.c diff --git a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf index cc2320e4262d..92f185fa4bee 100644 --- a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf +++ b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf @@ -28,6 +28,7 @@ [Sources] AcpiPlatform.c + Dsdt.asl SsdtB1.asl SsdtXgbe.asl diff --git a/Silicon/AMD/Styx/Common/AmdStyxAcpiLib.h b/Silicon/AMD/Styx/Common/AmdStyxAcpiLib.h index 58e160b6d727..0dfd7635e897 100644 --- a/Silicon/AMD/Styx/Common/AmdStyxAcpiLib.h +++ b/Silicon/AMD/Styx/Common/AmdStyxAcpiLib.h @@ -22,7 +22,6 @@ EFI_ACPI_DESCRIPTION_HEADER *FadtTable (void); EFI_ACPI_DESCRIPTION_HEADER *FacsTable (void); EFI_ACPI_DESCRIPTION_HEADER *MadtHeader (void); EFI_ACPI_DESCRIPTION_HEADER *GtdtHeader (void); -EFI_ACPI_DESCRIPTION_HEADER *DsdtHeader (void); EFI_ACPI_DESCRIPTION_HEADER *McfgHeader (void); EFI_ACPI_DESCRIPTION_HEADER *Dbg2Header (void); EFI_ACPI_DESCRIPTION_HEADER *SpcrHeader (void); diff --git a/Silicon/AMD/Styx/AcpiTables/Dsdt.c b/Silicon/AMD/Styx/AcpiTables/Dsdt.c deleted file mode 100644 index 25e654acabbc..000000000000 --- a/Silicon/AMD/Styx/AcpiTables/Dsdt.c +++ /dev/null @@ -1,26 +0,0 @@ -/** @file - - C language wrapper to build DSDT generated data. - - Copyright (c) 2014 - 2016, AMD Inc. All rights reserved.
- - This program and the accompanying materials - are licensed and made available under the terms and conditions of the BSD License - which accompanies this distribution. The full text of the license may be found at - http://opensource.org/licenses/bsd-license.php - - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - -**/ - -#include -#include - -EFI_ACPI_DESCRIPTION_HEADER * -DsdtHeader ( - VOID - ) -{ - return (EFI_ACPI_DESCRIPTION_HEADER *) &AmlCode[0]; -} diff --git a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatform.c b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatform.c index 460fb4c480c3..a00bd3bd2215 100644 --- a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatform.c +++ b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatform.c @@ -176,7 +176,6 @@ AcpiPlatformEntryPoint ( TableIndex = 0; AcpiTableList[TableIndex++] = FadtTable(); - AcpiTableList[TableIndex++] = DsdtHeader(); AcpiTableList[TableIndex++] = MadtHeader(); AcpiTableList[TableIndex++] = GtdtHeader(); AcpiTableList[TableIndex++] = Dbg2Header(); diff --git a/Silicon/AMD/Styx/AcpiTables/Dsdt.asl b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Dsdt.asl similarity index 100% rename from Silicon/AMD/Styx/AcpiTables/Dsdt.asl rename to Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Dsdt.asl