From patchwork Wed Apr 6 16:15:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 65196 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp1147045lbc; Wed, 6 Apr 2016 09:15:54 -0700 (PDT) X-Received: by 10.66.63.104 with SMTP id f8mr72188470pas.109.1459959350483; Wed, 06 Apr 2016 09:15:50 -0700 (PDT) Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id b14si5462310pat.152.2016.04.06.09.15.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Apr 2016 09:15:50 -0700 (PDT) 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; 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 dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 88B201A1FC3; Wed, 6 Apr 2016 09:15:43 -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 35C811A1FB2 for ; Wed, 6 Apr 2016 09:15:42 -0700 (PDT) Received: by mail-wm0-x22a.google.com with SMTP id 191so63897133wmq.0 for ; Wed, 06 Apr 2016 09:15:42 -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=X1ZGPyULL7Dq4zKmvjLnTa6DOX9r4EQjs6TlugV442Y=; b=bNnoC0HWh+FiSndlpD4XJgmV/HS7YyTJWFj6YmRRzyFO8vLg7ZIFMiWDSeolstFOqn 5cfCHo2mOLQpdT20ic7uUTuqW2JdRU0gsZLvdXUAf/T/t86ge9SgkOeLxOvKCKdKPsk2 19sY/+99chRaGqgXM5NdMWkNb6d+8m6R99rAw= 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=X1ZGPyULL7Dq4zKmvjLnTa6DOX9r4EQjs6TlugV442Y=; b=cY8kWTIPXsArf/ZWvBO9W5XQAu0n++W42kVYE83dhLETLkCLJqukrVesACI8zVvEy2 joIuhPi1IDXVeFgw958xglQv7Nb9hqrJK5jbvnAPZ33yPSpug9czpvIB9CaoeQCMNksm cIiAmHxyzE5QQ1flqiIFjya+iEKn1lb7q0781y2w+gBC5ICSpxgQ+s26YJpFOwiWcFzC uOu3m38EzwVNlhwKoQB+7djJdhyiHFS7oVrs4eCVfh3SS0vnuiTxuGpAKs+jeS0dMq+k 5IkR54R30WrMda/RQM7wywIsv1ooNVMUu2Vh0boqwKfkEXd5733Bt6A3R8mfj1A9Rb2A PzTA== X-Gm-Message-State: AD7BkJIb061ESC49bQyTLVqpdWiNhQINIuFAZK4OdRPhk5OEpews5RB3uUiilpvLIZTeWlEq X-Received: by 10.28.40.214 with SMTP id o205mr25268857wmo.89.1459959340903; Wed, 06 Apr 2016 09:15:40 -0700 (PDT) Received: from localhost.localdomain ([195.55.142.58]) by smtp.gmail.com with ESMTPSA id om6sm3961219wjc.40.2016.04.06.09.15.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 06 Apr 2016 09:15:40 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org, lersek@redhat.com Date: Wed, 6 Apr 2016 18:15:05 +0200 Message-Id: <1459959319-19293-8-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 07/21] ArmVirtPkg/VirtFdtDxe: remove GIC discovery 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" Now that we moved the GIC discovery to our ArmGicArchLib implementation, we can remove it from VirtFdtDxe, since it is no longer used. Remove the PcdArmGicRevision declaration and definitions as well: VirtFdtDxe no longer sets it, and no other drivers consume its value. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- ArmVirtPkg/ArmVirtPkg.dec | 5 -- ArmVirtPkg/ArmVirtQemu.dsc | 1 - ArmVirtPkg/ArmVirtQemuKernel.dsc | 1 - ArmVirtPkg/ArmVirtXen.dsc | 1 - ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.c | 51 -------------------- ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf | 4 -- 6 files changed, 63 deletions(-) -- 2.5.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Laszlo Ersek diff --git a/ArmVirtPkg/ArmVirtPkg.dec b/ArmVirtPkg/ArmVirtPkg.dec index fa908253b320..adbd5e319a09 100644 --- a/ArmVirtPkg/ArmVirtPkg.dec +++ b/ArmVirtPkg/ArmVirtPkg.dec @@ -72,11 +72,6 @@ [PcdsDynamic, PcdsFixedAtBuild] gArmVirtTokenSpaceGuid.PcdFwCfgDataAddress|0x0|UINT64|0x00000005 gArmVirtTokenSpaceGuid.PcdFwCfgDmaAddress|0x0|UINT64|0x00000009 - # - # Supported GIC revision (2, 3, ...) - # - gArmVirtTokenSpaceGuid.PcdArmGicRevision|0x0|UINT32|0x00000008 - [PcdsFeatureFlag] # # "Map PCI MMIO as Cached" diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index fb42946f4f45..6dbd6571fbee 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -208,7 +208,6 @@ [PcdsDynamicDefault.common] gArmTokenSpaceGuid.PcdGicDistributorBase|0x0 gArmTokenSpaceGuid.PcdGicRedistributorsBase|0x0 gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x0 - gArmVirtTokenSpaceGuid.PcdArmGicRevision|0x0 ## PL031 RealTimeClock gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x0 diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc index cb14972f9bac..c36de5cc4294 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc @@ -193,7 +193,6 @@ [PcdsDynamicDefault.common] gArmTokenSpaceGuid.PcdGicDistributorBase|0x0 gArmTokenSpaceGuid.PcdGicRedistributorsBase|0x0 gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x0 - gArmVirtTokenSpaceGuid.PcdArmGicRevision|0x0 ## PL031 RealTimeClock gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x0 diff --git a/ArmVirtPkg/ArmVirtXen.dsc b/ArmVirtPkg/ArmVirtXen.dsc index f46a79c45e15..72bc4745309b 100644 --- a/ArmVirtPkg/ArmVirtXen.dsc +++ b/ArmVirtPkg/ArmVirtXen.dsc @@ -129,7 +129,6 @@ [PcdsDynamicDefault.common] gArmTokenSpaceGuid.PcdGicDistributorBase|0x0 gArmTokenSpaceGuid.PcdGicRedistributorsBase|0x0 gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x0 - gArmVirtTokenSpaceGuid.PcdArmGicRevision|0x0 ## PL031 RealTimeClock gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x0 diff --git a/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.c b/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.c index d3043fa9b877..0e308497e79e 100644 --- a/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.c +++ b/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.c @@ -42,7 +42,6 @@ typedef struct { typedef enum { PropertyTypeUnknown, - PropertyTypeGic, PropertyTypeRtc, PropertyTypeVirtio, PropertyTypeUart, @@ -50,7 +49,6 @@ typedef enum { PropertyTypePsci, PropertyTypeFwCfg, PropertyTypePciHost, - PropertyTypeGicV3, PropertyTypeXen, } PROPERTY_TYPE; @@ -60,7 +58,6 @@ typedef struct { } PROPERTY; STATIC CONST PROPERTY CompatibleProperties[] = { - { PropertyTypeGic, "arm,cortex-a15-gic" }, { PropertyTypeRtc, "arm,pl031" }, { PropertyTypeVirtio, "virtio,mmio" }, { PropertyTypeUart, "arm,pl011" }, @@ -69,7 +66,6 @@ STATIC CONST PROPERTY CompatibleProperties[] = { { PropertyTypePsci, "arm,psci-0.2" }, { PropertyTypeFwCfg, "qemu,fw-cfg-mmio" }, { PropertyTypePciHost, "pci-host-ecam-generic" }, - { PropertyTypeGicV3, "arm,gic-v3" }, { PropertyTypeXen, "xen,xen" }, { PropertyTypeUnknown, "" } }; @@ -294,7 +290,6 @@ InitializeVirtFdtDxe ( VIRTIO_TRANSPORT_DEVICE_PATH *DevicePath; EFI_HANDLE Handle; UINT64 RegBase; - UINT64 DistBase, CpuBase, RedistBase; CONST INTERRUPT_PROPERTY *InterruptProp; INT32 SecIntrNum, IntrNum, VirtIntrNum, HypIntrNum; CONST CHAR8 *PsciMethod; @@ -446,52 +441,6 @@ InitializeVirtFdtDxe ( } break; - case PropertyTypeGic: - ASSERT (Len == 32); - - DistBase = fdt64_to_cpu (((UINT64 *)RegProp)[0]); - CpuBase = fdt64_to_cpu (((UINT64 *)RegProp)[2]); - ASSERT (DistBase < MAX_UINT32); - ASSERT (CpuBase < MAX_UINT32); - - PcdSet32 (PcdGicDistributorBase, (UINT32)DistBase); - PcdSet32 (PcdGicInterruptInterfaceBase, (UINT32)CpuBase); - PcdSet32 (PcdArmGicRevision, 2); - - DEBUG ((EFI_D_INFO, "Found GIC @ 0x%Lx/0x%Lx\n", DistBase, CpuBase)); - break; - - case PropertyTypeGicV3: - // - // 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 (Len >= 32); - - // RegProp[0..1] == { GICD base, GICD size } - DistBase = fdt64_to_cpu (((UINT64 *)RegProp)[0]); - ASSERT (DistBase < MAX_UINT32); - - // RegProp[2..3] == { GICR base, GICR size } - RedistBase = fdt64_to_cpu (((UINT64 *)RegProp)[2]); - ASSERT (RedistBase < MAX_UINT32); - - PcdSet32 (PcdGicDistributorBase, (UINT32)DistBase); - PcdSet32 (PcdGicRedistributorsBase, (UINT32)RedistBase); - PcdSet32 (PcdArmGicRevision, 3); - - DEBUG ((EFI_D_INFO, "Found GIC v3 (re)distributor @ 0x%Lx (0x%Lx)\n", - DistBase, RedistBase)); - break; - case PropertyTypeRtc: ASSERT (Len == 16); diff --git a/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf b/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf index f807bf76bb4b..628b14501f45 100644 --- a/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf +++ b/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf @@ -54,10 +54,6 @@ [Pcd] gArmVirtTokenSpaceGuid.PcdFwCfgSelectorAddress gArmVirtTokenSpaceGuid.PcdFwCfgDataAddress gArmVirtTokenSpaceGuid.PcdFwCfgDmaAddress - gArmVirtTokenSpaceGuid.PcdArmGicRevision - gArmTokenSpaceGuid.PcdGicDistributorBase - gArmTokenSpaceGuid.PcdGicRedistributorsBase - gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase gArmTokenSpaceGuid.PcdArmArchTimerSecIntrNum gArmTokenSpaceGuid.PcdArmArchTimerIntrNum gArmTokenSpaceGuid.PcdArmArchTimerVirtIntrNum