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::244; helo=mail-it0-x244.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-it0-x244.google.com (mail-it0-x244.google.com [IPv6:2607:f8b0:4001:c0b::244]) (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 26659210C6425 for ; Mon, 6 Aug 2018 09:09:46 -0700 (PDT) Received: by mail-it0-x244.google.com with SMTP id h23-v6so18879433ita.5 for ; Mon, 06 Aug 2018 09:09:46 -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:content-transfer-encoding; bh=5ch2MocV+1Hgbp+J/pERE29VgHP5TJEV8OoNxolVZkM=; b=EZHYVhYcQIFY9ujiSgo/GPcNpV//+juoHDH2G2xMn4Hlt5JD1jv5knlpeG8B23tafV PLDAK9+Xg9wP3lsyS7fOV69C0mC8iJ2P+nY5DKl6bQpAsstHaPpk6ecvzjJQRSKBBPJG TTW5W+DO/n4/kbrQG25DiqP6p2BTgcK8L0eZ8= 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:content-transfer-encoding; bh=5ch2MocV+1Hgbp+J/pERE29VgHP5TJEV8OoNxolVZkM=; b=WYctS+HfzsALn2cpdgu5ZAz++nOWVt80jI3Fpd0x9QDccXTJbwyDY5Jzpo5D06J2bz TLCXd1tNWZY7KjzvhTHgyL9IM5axO4hVhZuQwyPJAy98MqYkh7XwurcDhib2dKHqv5dx gEVOtkWoqc16uthYG4SYa9w7zK4z5Y71ZQ3pzcMhdfdVfoCzeiMnlkUO2Onvi99K9V1N iy/84ZX76vOFPVj1usstwP1SdwtrdqV2AqCEljGuxyiovtcBmj2aXUFNGy7FRCQSDJBp k4G+cxk43CpsXwIQ5eg+/kU4sfPm6hr/7CpIOygsvC3YeP8Xc03+KVunaWPF99q5nGBr /6HA== X-Gm-Message-State: AOUpUlGu0lmLQyHgBhNhgoBUbg0lVT5FMdsL259VF7WwusGZNjaCfRV+ ikKysndSRPnkINHWCwWu30+Iac28x3EOZ8VYzeyp8A== X-Google-Smtp-Source: AAOMgpdvlxdGOE4LoUzdezDsw/NsHr89UFooZL0jDE+kJbwx9c4Y5wXEfm+6HNYlYIJii5H6hZ0O+n+xgLP0aTTE570= X-Received: by 2002:a24:610d:: with SMTP id s13-v6mr15972673itc.68.1533571785414; Mon, 06 Aug 2018 09:09:45 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a6b:ac05:0:0:0:0:0 with HTTP; Mon, 6 Aug 2018 09:09:44 -0700 (PDT) In-Reply-To: References: <1533511706-9344-1-git-send-email-mw@semihalf.com> <1533511706-9344-8-git-send-email-mw@semihalf.com> From: Ard Biesheuvel Date: Mon, 6 Aug 2018 18:09:44 +0200 Message-ID: To: Marcin Wojtas Cc: edk2-devel-01 , Leif Lindholm , Nadav Haklai , "jsd@semihalf.com" , Grzegorz Jaszczyk Subject: Re: [platforms: PATCH 7/9] Marvell/Armada70x0Db: Enable ACPI support X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Aug 2018 16:09:46 -0000 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On 6 August 2018 at 18:08, Marcin Wojtas wrote: > HI Ard, > > pon., 6 sie 2018 o 13:54 Ard Biesheuvel napis= a=C5=82(a): >> >> On 6 August 2018 at 01:28, Marcin Wojtas wrote: >> > This patch introduces DSDT table and adds necessary >> > wiring in order to enable ACPI support on Armada 7040 DB. >> > >> > Contributed-under: TianoCore Contribution Agreement 1.1 >> > Signed-off-by: Marcin Wojtas >> > --- >> > Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | = 14 ++ >> > Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc | = 3 + >> > Silicon/Marvell/Armada7k8k/Armada7k8k.fdf | = 12 + >> > Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db/AcpiTables.inf | = 61 ++++++ >> > Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf.inc | = 5 + >> > Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db/Dsdt.asl | 2= 29 ++++++++++++++++++++ >> > Silicon/Marvell/Documentation/PortingGuide.txt | = 22 ++ >> > 7 files changed, 346 insertions(+) >> > create mode 100644 Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db= /AcpiTables.inf >> > create mode 100644 Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db= /Dsdt.asl >> > >> > diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc b/Silicon/M= arvell/Armada7k8k/Armada7k8k.dsc.inc >> > index f1ccda0..d4c67a2 100644 >> > --- a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc >> > +++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc >> > @@ -593,6 +593,20 @@ >> > ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf >> > !endif #$(INCLUDE_TFTP_COMMAND) >> > >> > +[Components.AARCH64] >> > + # >> > + # Generic ACPI modules >> > + # >> > + MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf >> > + MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf { >> > + >> > + PlatformHasAcpiLib|EmbeddedPkg/Library/PlatformHasAcpiLib/Platf= ormHasAcpiLib.inf >> > + >> > + >> > + # support ACPI v5.0 or later >> > + gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiExposedTableVersions|0x20 >> > + } >> > + >> > [BuildOptions.common.EDKII.DXE_CORE,BuildOptions.common.EDKII.DXE_DRI= VER,BuildOptions.common.EDKII.UEFI_DRIVER,BuildOptions.common.EDKII.UEFI_AP= PLICATION] >> > GCC:*_*_*_DLINK_FLAGS =3D -z common-page-size=3D0x1000 >> > >> > diff --git a/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc b/Platform= /Marvell/Armada70x0Db/Armada70x0Db.dsc >> > index d3dffb0..f6faff1 100644 >> > --- a/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc >> > +++ b/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc >> > @@ -51,6 +51,9 @@ >> > [Components.common] >> > Silicon/Marvell/Armada7k8k/DeviceTree/Armada70x0Db.inf >> > >> > +[Components.AARCH64] >> > + Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db/AcpiTables.inf >> > + >> > #####################################################################= ########### >> > # >> > # Pcd Section - list of all EDK II PCD Entries defined by this Platfo= rm >> > diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf b/Silicon/Marve= ll/Armada7k8k/Armada7k8k.fdf >> > index 909ad3e..c064a43 100644 >> > --- a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf >> > +++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf >> > @@ -215,6 +215,12 @@ FvNameGuid =3D 5eda4200-2c5f-43cb-9da3-0b= af74b1b30c >> > # DTB >> > INF EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformDxe.inf >> > >> > +!if $(ARCH) =3D=3D AARCH64 >> > + # ACPI support >> > + INF MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf >> > + INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf >> > +!endif >> > + >> > !include $(BOARD_DXE_FV_COMPONENTS) >> > >> > # PEI phase firmware volume >> > @@ -408,3 +414,9 @@ READ_LOCK_STATUS =3D TRUE >> > FILE FREEFORM =3D $(NAMED_GUID) { >> > RAW BIN |.dtb >> > } >> > + >> > +[Rule.Common.USER_DEFINED.ACPITABLE] >> > + FILE FREEFORM =3D $(NAMED_GUID) { >> > + RAW ASL |.aml >> > + RAW ACPI |.acpi >> > + } >> > diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db/AcpiTa= bles.inf b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db/AcpiTables.in= f >> > new file mode 100644 >> > index 0000000..8732e10 >> > --- /dev/null >> > +++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db/AcpiTables.in= f >> > @@ -0,0 +1,61 @@ >> > +## @file >> > +# Component description file for PlatformAcpiTables module. >> > +# >> > +# ACPI table data and ASL sources required to boot the platform. >> > +# >> > +# Copyright (c) 2018, Linaro, Ltd. All rights reserved.
>> > +# Copyright (C) 2018, Marvell International Ltd. and its affiliates.=
>> > +# >> > +# 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" BAS= IS, >> > +# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS = OR IMPLIED. >> > +# >> > +## >> > + >> > +[Defines] >> > + INF_VERSION =3D 0x0001001A >> > + BASE_NAME =3D PlatformAcpiTables >> > + FILE_GUID =3D 7E374E25-8E01-4FEE-87F2-390C23C6= 06CD >> > + MODULE_TYPE =3D USER_DEFINED >> > + VERSION_STRING =3D 1.0 >> > + >> > +[Sources] >> > + Dsdt.asl >> > + ../Fadt.aslc >> > + ../Gtdt.aslc >> > + ../Madt.aslc >> > + ../Pptt.aslc >> > + ../Spcr.aslc >> > + >> >> Could we reshuffle these files so we nog longer rely relative includes? >> Possibly using a Common subdirectory? > > Would below directory tree be acceptable? > > Silicon/Marvell/Armada7k8k/AcpiTables/ > =E2=94=9C=E2=94=80=E2=94=80 AcpiHeader.h > =E2=94=9C=E2=94=80=E2=94=80 Armada70x0Db > =E2=94=82 =E2=94=94=E2=94=80=E2=94=80 Dsdt.asl > =E2=94=9C=E2=94=80=E2=94=80 Armada70x0Db.inf > =E2=94=9C=E2=94=80=E2=94=80 Armada80x0Db > =E2=94=82 =E2=94=94=E2=94=80=E2=94=80 Dsdt.asl > =E2=94=9C=E2=94=80=E2=94=80 Armada80x0Db.inf > =E2=94=9C=E2=94=80=E2=94=80 Armada80x0McBin > =E2=94=82 =E2=94=94=E2=94=80=E2=94=80 Dsdt.asl > =E2=94=9C=E2=94=80=E2=94=80 Armada80x0McBin.inf > =E2=94=9C=E2=94=80=E2=94=80 Fadt.aslc > =E2=94=9C=E2=94=80=E2=94=80 Gtdt.aslc > =E2=94=9C=E2=94=80=E2=94=80 IcuInterrupts.h > =E2=94=9C=E2=94=80=E2=94=80 Madt.aslc > =E2=94=9C=E2=94=80=E2=94=80 Pptt.aslc > =E2=94=94=E2=94=80=E2=94=80 Spcr.aslc > > This way we will have following in the .inf > > Armada80x0McBin/Dsdt.asl > Fadt.aslc > Gtdt.aslc > Madt.aslc > Pptt.aslc > Spcr.aslc > Works for me. Leif?