From patchwork Wed Apr 6 16:15:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 65195 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp1147007lbc; Wed, 6 Apr 2016 09:15:51 -0700 (PDT) X-Received: by 10.66.174.134 with SMTP id bs6mr35160710pac.53.1459959347814; Wed, 06 Apr 2016 09:15:47 -0700 (PDT) Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id m1si5452148pfi.178.2016.04.06.09.15.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Apr 2016 09:15:47 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 51B701A1FC7; Wed, 6 Apr 2016 09:15:42 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from mail-wm0-x22a.google.com (mail-wm0-x22a.google.com [IPv6:2a00:1450:400c:c09::22a]) (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 994081A1FC2 for ; Wed, 6 Apr 2016 09:15:40 -0700 (PDT) Received: by mail-wm0-x22a.google.com with SMTP id 191so63896305wmq.0 for ; Wed, 06 Apr 2016 09:15:40 -0700 (PDT) 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; bh=qZJFETuoAuwj9fwIrXbU+gRkUoJuLkCamtn+n1rERy0=; b=DOwdbIu4+9ir21yM6cNhEDPKNiYVOCZjkrunveeinX7A1TO2AyekdZx4CU0vUAa3J1 Du2u9vodsEvtqzeWsVcHGa8BRsk9wnY2f/n2vJeGept0LDldkpDIlfhcNIuPTUlie0/a T4u60Y90sksdbY0r96kyQ+LhlM9l1VS89Vgng= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=qZJFETuoAuwj9fwIrXbU+gRkUoJuLkCamtn+n1rERy0=; b=D6IGY9N9GxxGy3zVmZDs21R+QGhWlGkzB3KF7mHQc9wUr7jjC62piwBRClOiAeYnVt 6xQzj0lOLQ5NnU7HDyj8/Aj7NjdHOJmTrQxRZOPBQzXYGPDZ+QVtymysKvXqWwpxLwTQ 49NQbz+tThaODh+SWB01b5dsL7UPBcncVxAdW779eECeGyFsIoMnUAJNOz8cth8hsnEb ubvnoK73MJ1gwDwbJr0qR2ek2KxV0BbuRlsYKeBcQ6dk0rA/7TVePQgzpStAJqiFMgKc r5wSkeZC/UG+rbb4GHEcV1r4AET5wgJwbtA2+wH4WLrTSaLPOlK9crN79UTw9eVeuStI PeVg== X-Gm-Message-State: AD7BkJLCl4lDrvlpr1dz6BitKcdnDUD8GeDZ0/Aa8xy2jc0iiLA3NiFix0vb9+oTBLDG8LA9 X-Received: by 10.28.187.5 with SMTP id l5mr9527464wmf.17.1459959339332; Wed, 06 Apr 2016 09:15:39 -0700 (PDT) Received: from localhost.localdomain ([195.55.142.58]) by smtp.gmail.com with ESMTPSA id om6sm3961219wjc.40.2016.04.06.09.15.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 06 Apr 2016 09:15:38 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org, lersek@redhat.com Date: Wed, 6 Apr 2016 18:15:04 +0200 Message-Id: <1459959319-19293-7-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1459959319-19293-1-git-send-email-ard.biesheuvel@linaro.org> References: <1459959319-19293-1-git-send-email-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH 06/21] ArmVirtPkg/ArmGicArchLib: move to FdtClient protocol X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Instead of relying on VirtFdtDxe to populate the GIC related PCDs, move this handling to our implementation of ArmGicArchLib, and retrieve the required DT info using the new FDT client protocol. This removes one of the reasons we need to load VirtFdtDxe first using an 'A PRIORI' declaration in the platform FDF. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.c | 84 ++++++++++++++++++-- ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.inf | 15 +++- 2 files changed, 92 insertions(+), 7 deletions(-) -- 2.5.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.c b/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.c index 732860cadfe6..686622228831 100644 --- a/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.c +++ b/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.c @@ -1,7 +1,7 @@ /** @file ArmGicArchLib library class implementation for DT based virt platforms - Copyright (c) 2015, Linaro Ltd. All rights reserved.
+ Copyright (c) 2015 - 2016, Linaro Ltd. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License @@ -19,21 +19,83 @@ #include #include #include +#include +#include + +#include STATIC ARM_GIC_ARCH_REVISION mGicArchRevision; -RETURN_STATUS +EFI_STATUS EFIAPI ArmVirtGicArchLibConstructor ( - VOID + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE *SystemTable ) { - UINT32 IccSre; + UINT32 IccSre; + FDT_CLIENT_PROTOCOL *FdtClient; + CONST VOID *Reg; + UINTN RegElemSize, RegSize; + UINTN GicRevision; + EFI_STATUS Status; + UINT64 DistBase, CpuBase, RedistBase; - switch (PcdGet32 (PcdArmGicRevision)) { + Status = gBS->LocateProtocol (&gFdtClientProtocolGuid, NULL, (VOID **)&FdtClient); + if (EFI_ERROR (Status)) { + return Status; + } + + GicRevision = 2; + Status = FdtClient->FindCompatibleNodeReg (FdtClient, + "arm,cortex-a15-gic", + &Reg, + &RegElemSize, + &RegSize); + if (Status == EFI_NOT_FOUND) { + GicRevision = 3; + Status = FdtClient->FindCompatibleNodeReg (FdtClient, + "arm,gic-v3", + &Reg, + &RegElemSize, + &RegSize); + } + if (EFI_ERROR (Status)) { + return Status; + } + + switch (GicRevision) { case 3: // + // The GIC v3 DT binding describes a series of at least 3 physical (base + // addresses, size) pairs: the distributor interface (GICD), at least one + // redistributor region (GICR) containing dedicated redistributor + // interfaces for all individual CPUs, and the CPU interface (GICC). + // Under virtualization, we assume that the first redistributor region + // listed covers the boot CPU. Also, our GICv3 driver only supports the + // system register CPU interface, so we can safely ignore the MMIO version + // which is listed after the sequence of redistributor interfaces. + // This means we are only interested in the first two memory regions + // supplied, and ignore everything else. + // + ASSERT (RegSize >= 32); + + // RegProp[0..1] == { GICD base, GICD size } + DistBase = fdt64_to_cpu (((UINT64 *)Reg)[0]); + ASSERT (DistBase < MAX_UINT32); + + // RegProp[2..3] == { GICR base, GICR size } + RedistBase = fdt64_to_cpu (((UINT64 *)Reg)[2]); + ASSERT (RedistBase < MAX_UINT32); + + PcdSet32 (PcdGicDistributorBase, (UINT32)DistBase); + PcdSet32 (PcdGicRedistributorsBase, (UINT32)RedistBase); + + DEBUG ((EFI_D_INFO, "Found GIC v3 (re)distributor @ 0x%Lx (0x%Lx)\n", + DistBase, RedistBase)); + + // // The default implementation of ArmGicArchLib is responsible for enabling // the system register interface on the GICv3 if one is found. So let's do // the same here. @@ -55,6 +117,18 @@ ArmVirtGicArchLibConstructor ( break; case 2: + ASSERT (RegSize == 32); + + DistBase = fdt64_to_cpu (((UINT64 *)Reg)[0]); + CpuBase = fdt64_to_cpu (((UINT64 *)Reg)[2]); + ASSERT (DistBase < MAX_UINT32); + ASSERT (CpuBase < MAX_UINT32); + + PcdSet32 (PcdGicDistributorBase, (UINT32)DistBase); + PcdSet32 (PcdGicInterruptInterfaceBase, (UINT32)CpuBase); + + DEBUG ((EFI_D_INFO, "Found GIC @ 0x%Lx/0x%Lx\n", DistBase, CpuBase)); + mGicArchRevision = ARM_GIC_ARCH_REVISION_2; break; diff --git a/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.inf b/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.inf index c85b2d44d856..57086242de1f 100644 --- a/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.inf +++ b/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.inf @@ -18,7 +18,7 @@ [Defines] INF_VERSION = 0x00010005 BASE_NAME = ArmVirtGicArchLib FILE_GUID = 87b0dc84-4661-4deb-a789-97977ff636ed - MODULE_TYPE = BASE + MODULE_TYPE = DXE_DRIVER VERSION_STRING = 1.0 LIBRARY_CLASS = ArmGicArchLib|DXE_DRIVER UEFI_DRIVER UEFI_APPLICATION CONSTRUCTOR = ArmVirtGicArchLibConstructor @@ -30,11 +30,22 @@ [LibraryClasses] PcdLib DebugLib ArmGicLib + UefiBootServicesTableLib + FdtLib [Packages] MdePkg/MdePkg.dec ArmPkg/ArmPkg.dec ArmVirtPkg/ArmVirtPkg.dec + EmbeddedPkg/EmbeddedPkg.dec + +[Protocols] + gFdtClientProtocolGuid [Pcd] - gArmVirtTokenSpaceGuid.PcdArmGicRevision + gArmTokenSpaceGuid.PcdGicDistributorBase + gArmTokenSpaceGuid.PcdGicRedistributorsBase + gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase + +[Depex] + gFdtClientProtocolGuid