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:c06::242; helo=mail-io0-x242.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-io0-x242.google.com (mail-io0-x242.google.com [IPv6:2607:f8b0:4001:c06::242]) (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 EDCA921BADAB9 for ; Tue, 7 Aug 2018 00:39:45 -0700 (PDT) Received: by mail-io0-x242.google.com with SMTP id y10-v6so13207767ioa.10 for ; Tue, 07 Aug 2018 00:39:45 -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=ebtVkm/XMyvkN+UrawnJRmX2xsHrxZ0fzA4NfZgtm3E=; b=JHVz/CotsjoKcxg2P5lhm2WBmQsNomNBvidIwtr8p4+SF0UU9OnwcEeDPGOf8tr6WF Hspq6rHycap5PkjRz2Jh4/x11M2oWy/NCiJ0bIfotEj+106dONwudtAhn0Tpmv9N7dPo eh8+VP5+olxBqezO9mQfQ2pr+Kek2hl9J/YQg= 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=ebtVkm/XMyvkN+UrawnJRmX2xsHrxZ0fzA4NfZgtm3E=; b=XX/w7rGNHhZVJGHNtWUlMesyulvK+M3pAgwmz1IZlcFnv92WkRdbmKRx7kA+jtYZF0 sIHN2rTSCuXObI8PWPAgZBF4GOSmAInR8m3+LB0Uep8A5nIPJbUfSetare0yv7lHMFhI dJdmD/P0SM3EmQa8eKMXXZ6sBn/MhxyGH1Jeq2NeDZba5mJASq6CLwnDrhexgvBEGZCE AwaBKKbmKmP8QtcRFWVQ5f0eHhXJuxxPfForP2SZeYL9jdHG47LPxovQC51x2TjomNOe 45iSS2c3iFPweAl42MzV6k2ufzoSFl7AH2SHKqBzjp+XUMx6r7/cNPh8/1HH6IglKo9n zLJA== X-Gm-Message-State: AOUpUlGc15DuX7LCV+UJs7ZMdnRW4Kv1YG0q6lBWwlbsGZDWtDxMCV4u DGXvdO6gGzYyTAqYR08JJohL4iac2oO8M29omP0OyQ== X-Google-Smtp-Source: AA+uWPwKipOPn2cTmTp16tDGJTX/nhLdxANQsrAJ8VNlBB+/z7FezVYfVIrgpYkkmr2xmABZBtc/s0SGC8EaIuzG50o= X-Received: by 2002:a6b:5208:: with SMTP id g8-v6mr18527525iob.60.1533627584535; Tue, 07 Aug 2018 00:39:44 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a6b:ac05:0:0:0:0:0 with HTTP; Tue, 7 Aug 2018 00:39:43 -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: Tue, 7 Aug 2018 09:39:43 +0200 Message-ID: To: Marcin Wojtas Cc: Leif Lindholm , edk2-devel-01 , 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: Tue, 07 Aug 2018 07:39:46 -0000 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On 6 August 2018 at 19:55, Marcin Wojtas wrote: > pon., 6 sie 2018 o 19:44 Leif Lindholm napisa= =C5=82(a): >> >> >> >> On Mon, 6 Aug 2018, 17:09 Ard Biesheuvel, wr= ote: >>> >>> On 6 August 2018 at 18:08, Marcin Wojtas wrote: >>> > HI Ard, >>> > >>> > pon., 6 sie 2018 o 13:54 Ard Biesheuvel n= apisa=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 = | 229 ++++++++++++++++++++ >>> >> > Silicon/Marvell/Documentation/PortingGuide.txt = | 22 ++ >>> >> > 7 files changed, 346 insertions(+) >>> >> > create mode 100644 Silicon/Marvell/Armada7k8k/AcpiTables/Armada70= x0Db/AcpiTables.inf >>> >> > create mode 100644 Silicon/Marvell/Armada7k8k/AcpiTables/Armada70= x0Db/Dsdt.asl >>> >> > >>> >> > diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc b/Silic= on/Marvell/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.i= nf >>> >> > !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/P= latformHasAcpiLib.inf >>> >> > + >>> >> > + >>> >> > + # support ACPI v5.0 or later >>> >> > + gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiExposedTableVersions|= 0x20 >>> >> > + } >>> >> > + >>> >> > [BuildOptions.common.EDKII.DXE_CORE,BuildOptions.common.EDKII.DXE= _DRIVER,BuildOptions.common.EDKII.UEFI_DRIVER,BuildOptions.common.EDKII.UEF= I_APPLICATION] >>> >> > GCC:*_*_*_DLINK_FLAGS =3D -z common-page-size=3D0x1000 >>> >> > >>> >> > diff --git a/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc b/Plat= form/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.i= nf >>> >> > + >>> >> > #################################################################= ############### >>> >> > # >>> >> > # Pcd Section - list of all EDK II PCD Entries defined by this Pl= atform >>> >> > diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf b/Silicon/M= arvell/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-9da= 3-0baf74b1b30c >>> >> > # 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/Ac= piTables.inf b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db/AcpiTable= s.inf >>> >> > new file mode 100644 >>> >> > index 0000000..8732e10 >>> >> > --- /dev/null >>> >> > +++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db/AcpiTable= s.inf >>> >> > @@ -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 affilia= tes.
>>> >> > +# >>> >> > +# 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 lic= ense 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 EXPR= ESS OR IMPLIED. >>> >> > +# >>> >> > +## >>> >> > + >>> >> > +[Defines] >>> >> > + INF_VERSION =3D 0x0001001A >>> >> > + BASE_NAME =3D PlatformAcpiTables >>> >> > + FILE_GUID =3D 7E374E25-8E01-4FEE-87F2-390C= 23C606CD >>> >> > + 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 includ= es? >>> >> 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? >> >> >> Sure. >> > > Ok, I will submit this change, once the remaining patches are reviewed. > The other patches look fine to me.