From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=217.140.101.70; helo=foss.arm.com; envelope-from=vijayenthiran.subramaniam@arm.com; receiver=edk2-devel@lists.01.org Received: from foss.arm.com (usa-sjc-mx-foss1.foss.arm.com [217.140.101.70]) by ml01.01.org (Postfix) with ESMTP id 0448821CAD9B2 for ; Fri, 14 Dec 2018 08:59:21 -0800 (PST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id D3A87EBD; Fri, 14 Dec 2018 08:59:21 -0800 (PST) Received: from usa.arm.com (a074939-lin.blr.arm.com [10.162.0.38]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 53C6E3F59C; Fri, 14 Dec 2018 08:59:20 -0800 (PST) From: Vijayenthiran Subramaniam To: edk2-devel@lists.01.org, ard.biesheuvel@linaro.org, leif.lindholm@linaro.org Date: Fri, 14 Dec 2018 22:28:16 +0530 Message-Id: <1544806699-25401-6-git-send-email-vijayenthiran.subramaniam@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1544806699-25401-1-git-send-email-vijayenthiran.subramaniam@arm.com> References: <1544806699-25401-1-git-send-email-vijayenthiran.subramaniam@arm.com> Subject: [PATCH v2 edk2-platforms 5/8] SgiClark.Ares: AcpiTables: Use PCDs for virtio disk 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: Fri, 14 Dec 2018 16:59:22 -0000 X-List-Received-Date: Fri, 14 Dec 2018 16:59:22 -0000 X-List-Received-Date: Fri, 14 Dec 2018 16:59:22 -0000 X-List-Received-Date: Fri, 14 Dec 2018 16:59:22 -0000 X-List-Received-Date: Fri, 14 Dec 2018 16:59:22 -0000 X-List-Received-Date: Fri, 14 Dec 2018 16:59:22 -0000 X-List-Received-Date: Fri, 14 Dec 2018 16:59:22 -0000 X-List-Received-Date: Fri, 14 Dec 2018 16:59:22 -0000 X-List-Received-Date: Fri, 14 Dec 2018 16:59:22 -0000 X-List-Received-Date: Fri, 14 Dec 2018 16:59:22 -0000 X-List-Received-Date: Fri, 14 Dec 2018 16:59:22 -0000 X-List-Received-Date: Fri, 14 Dec 2018 16:59:22 -0000 X-List-Received-Date: Fri, 14 Dec 2018 16:59:22 -0000 X-List-Received-Date: Fri, 14 Dec 2018 16:59:22 -0000 X-List-Received-Date: Fri, 14 Dec 2018 16:59:22 -0000 X-List-Received-Date: Fri, 14 Dec 2018 16:59:22 -0000 X-List-Received-Date: Fri, 14 Dec 2018 16:59:22 -0000 X-List-Received-Date: Fri, 14 Dec 2018 16:59:22 -0000 X-List-Received-Date: Fri, 14 Dec 2018 16:59:22 -0000 X-List-Received-Date: Fri, 14 Dec 2018 16:59:22 -0000 X-List-Received-Date: Fri, 14 Dec 2018 16:59:22 -0000 X-List-Received-Date: Fri, 14 Dec 2018 16:59:22 -0000 X-List-Received-Date: Fri, 14 Dec 2018 16:59:22 -0000 X-List-Received-Date: Fri, 14 Dec 2018 16:59:22 -0000 X-List-Received-Date: Fri, 14 Dec 2018 16:59:22 -0000 X-List-Received-Date: Fri, 14 Dec 2018 16:59:22 -0000 X-List-Received-Date: Fri, 14 Dec 2018 16:59:22 -0000 X-List-Received-Date: Fri, 14 Dec 2018 16:59:22 -0000 X-List-Received-Date: Fri, 14 Dec 2018 16:59:22 -0000 X-List-Received-Date: Fri, 14 Dec 2018 16:59:22 -0000 X-List-Received-Date: Fri, 14 Dec 2018 16:59:22 -0000 Use PCDs instead of hardcoded values for virtio disk in DSDT. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Vijayenthiran Subramaniam --- Platform/ARM/SgiPkg/AcpiTables/SgiClarkAresAcpiTables.inf | 4 ++++ Platform/ARM/SgiPkg/AcpiTables/SgiClarkAres/Dsdt.asl | 12 +++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Platform/ARM/SgiPkg/AcpiTables/SgiClarkAresAcpiTables.inf b/Platform/ARM/SgiPkg/AcpiTables/SgiClarkAresAcpiTables.inf index dcfe4929bb5a..10a805e07fd1 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/SgiClarkAresAcpiTables.inf +++ b/Platform/ARM/SgiPkg/AcpiTables/SgiClarkAresAcpiTables.inf @@ -55,4 +55,8 @@ [FixedPcd] gArmTokenSpaceGuid.PcdPciBusMin gArmTokenSpaceGuid.PcdPciBusMax + gArmSgiTokenSpaceGuid.PcdVirtioBlkBaseAddress + gArmSgiTokenSpaceGuid.PcdVirtioBlkSize + gArmSgiTokenSpaceGuid.PcdVirtioBlkInterrupt + gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress diff --git a/Platform/ARM/SgiPkg/AcpiTables/SgiClarkAres/Dsdt.asl b/Platform/ARM/SgiPkg/AcpiTables/SgiClarkAres/Dsdt.asl index c94a7c69e33a..af4dc424a77c 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/SgiClarkAres/Dsdt.asl +++ b/Platform/ARM/SgiPkg/AcpiTables/SgiClarkAres/Dsdt.asl @@ -107,9 +107,15 @@ DefinitionBlock ("DsdtTable.aml", "DSDT", 1, "ARMLTD", "ARMSGI", Name (_UID, 0) Name (_CCA, 1) // mark the device coherent - Name (_CRS, ResourceTemplate () { - Memory32Fixed (ReadWrite, 0x1c130000, 0x10000) - Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { 202 } + Name (_CRS, ResourceTemplate() { + Memory32Fixed ( + ReadWrite, + FixedPcdGet32 (PcdVirtioBlkBaseAddress), + FixedPcdGet32 (PcdVirtioBlkSize) + ) + Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { + FixedPcdGet32 (PcdVirtioBlkInterrupt) + } }) } } // Scope(_SB) -- 2.7.4