From patchwork Wed Apr 6 16:15:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 65198 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp1147112lbc; Wed, 6 Apr 2016 09:15:59 -0700 (PDT) X-Received: by 10.66.190.40 with SMTP id gn8mr71734235pac.64.1459959356444; Wed, 06 Apr 2016 09:15:56 -0700 (PDT) Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id nw8si5439223pab.215.2016.04.06.09.15.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Apr 2016 09:15:56 -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 0AC081A1FCE; Wed, 6 Apr 2016 09:15:47 -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 24E8D1A1FCE for ; Wed, 6 Apr 2016 09:15:45 -0700 (PDT) Received: by mail-wm0-x22a.google.com with SMTP id l6so72241604wml.1 for ; Wed, 06 Apr 2016 09:15:45 -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=cMWVs7+JTszNpRc/CSgblErXA5QqypO2Rygaz7v0eRQ=; b=cV30URi+N6cJyKj2rg4WrJTYaz1YJf5TB3kyDPtjuyNOCMQBpOUQtq7SkdddBYrK8o qePVPReYLj9QbWLpXXzQKT988t4o7bx7a9NYRa4ta+Gue+h53CzSPhrjMPfxNqJW1jDU jIkHP8ZVH744NjqepVjyas1gYD2e05XmagdWw= 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=cMWVs7+JTszNpRc/CSgblErXA5QqypO2Rygaz7v0eRQ=; b=KRbR4cwnsrWJzl9j3c9yExM5oDlvzutgfvWLL7r3gO4uwYXhIUVVlfLU42AIv/kbnq 3Wj1mePg4Pjm2LZk/EbtPe2WiB8M7s+76S29lHyvc7dgY38EEasqlwYpr9HQeLi/hucX e7euStuxdgNwOiXzOh60ie/CakydOYpByfxWxkLnKuIgn6+8qUrufCjIP0ZcCrCxO3oW bLSZfkc+J0NsWgM4ZXpndqcZadq/O+UJpwHZ6UTVqxfQ/LLrGM1knaqO0ipyk/zCnBLG zj9qWShXEKmiYqT3fhLFsdcHOMImugKBN5X6h6mUjxd4IEKo6e7n0pV/y28j1lGhrjDr XYqg== X-Gm-Message-State: AD7BkJJSctJMyweOde/k6/Dhp3K1Aum5LrIJprSSRPFlsftbp9PI48i0SzTrFYGo1cfh+sSo X-Received: by 10.194.60.235 with SMTP id k11mr13078571wjr.148.1459959343796; Wed, 06 Apr 2016 09:15:43 -0700 (PDT) Received: from localhost.localdomain ([195.55.142.58]) by smtp.gmail.com with ESMTPSA id om6sm3961219wjc.40.2016.04.06.09.15.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 06 Apr 2016 09:15:43 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org, lersek@redhat.com Date: Wed, 6 Apr 2016 18:15:07 +0200 Message-Id: <1459959319-19293-10-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 09/21] ArmVirtPkg/VirtFdtDxe: drop detection of PSCI method 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" The detection of the PSCI method has been moved to the EfiResetSystemLib implementation, so drop the handling from VirtFdtDxe. Since no users remain of gArmVirtTokenSpaceGuid.PcdArmPsciMethod, remove that as well. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- ArmVirtPkg/ArmVirtPkg.dec | 8 -------- ArmVirtPkg/ArmVirtQemu.dsc | 2 -- ArmVirtPkg/ArmVirtQemuKernel.dsc | 2 -- ArmVirtPkg/ArmVirtXen.dsc | 2 -- ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.c | 19 +------------------ ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf | 1 - 6 files changed, 1 insertion(+), 33 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/ArmVirtPkg.dec b/ArmVirtPkg/ArmVirtPkg.dec index adbd5e319a09..73136adf62c6 100644 --- a/ArmVirtPkg/ArmVirtPkg.dec +++ b/ArmVirtPkg/ArmVirtPkg.dec @@ -60,14 +60,6 @@ [PcdsFixedAtBuild, PcdsPatchableInModule] gArmVirtTokenSpaceGuid.PcdTerminalTypeGuidBuffer|{0x65, 0x60, 0xA6, 0xDF, 0x19, 0xB4, 0xD3, 0x11, 0x9A, 0x2D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D}|VOID*|0x00000007 [PcdsDynamic, PcdsFixedAtBuild] - # - # ARM PSCI function invocations can be done either through hypervisor - # calls (HVC) or secure monitor calls (SMC). - # PcdArmPsciMethod == 1 : use HVC - # PcdArmPsciMethod == 2 : use SMC - # - gArmVirtTokenSpaceGuid.PcdArmPsciMethod|0|UINT32|0x00000003 - gArmVirtTokenSpaceGuid.PcdFwCfgSelectorAddress|0x0|UINT64|0x00000004 gArmVirtTokenSpaceGuid.PcdFwCfgDataAddress|0x0|UINT64|0x00000005 gArmVirtTokenSpaceGuid.PcdFwCfgDmaAddress|0x0|UINT64|0x00000009 diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index 6dbd6571fbee..dac37c90f96b 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -221,8 +221,6 @@ [PcdsDynamicDefault.common] gArmPlatformTokenSpaceGuid.PcdPciMmio32Size|0x0 gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0x0 - gArmVirtTokenSpaceGuid.PcdArmPsciMethod|0 - gArmVirtTokenSpaceGuid.PcdFwCfgSelectorAddress|0x0 gArmVirtTokenSpaceGuid.PcdFwCfgDataAddress|0x0 gArmVirtTokenSpaceGuid.PcdFwCfgDmaAddress|0x0 diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc index c36de5cc4294..6d0946776f76 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc @@ -206,8 +206,6 @@ [PcdsDynamicDefault.common] gArmPlatformTokenSpaceGuid.PcdPciMmio32Size|0x0 gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0x0 - gArmVirtTokenSpaceGuid.PcdArmPsciMethod|0 - gArmVirtTokenSpaceGuid.PcdFwCfgSelectorAddress|0x0 gArmVirtTokenSpaceGuid.PcdFwCfgDataAddress|0x0 gArmVirtTokenSpaceGuid.PcdFwCfgDmaAddress|0x0 diff --git a/ArmVirtPkg/ArmVirtXen.dsc b/ArmVirtPkg/ArmVirtXen.dsc index 72bc4745309b..9cf51d5554ea 100644 --- a/ArmVirtPkg/ArmVirtXen.dsc +++ b/ArmVirtPkg/ArmVirtXen.dsc @@ -146,8 +146,6 @@ [PcdsDynamicDefault.common] gArmVirtTokenSpaceGuid.PcdFwCfgDataAddress|0x0 gArmVirtTokenSpaceGuid.PcdFwCfgDmaAddress|0x0 - gArmVirtTokenSpaceGuid.PcdArmPsciMethod|0 - gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|3 ################################################################################ diff --git a/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.c b/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.c index 0e308497e79e..4a4713cf6ad8 100644 --- a/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.c +++ b/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.c @@ -46,7 +46,6 @@ typedef enum { PropertyTypeVirtio, PropertyTypeUart, PropertyTypeTimer, - PropertyTypePsci, PropertyTypeFwCfg, PropertyTypePciHost, PropertyTypeXen, @@ -63,7 +62,6 @@ STATIC CONST PROPERTY CompatibleProperties[] = { { PropertyTypeUart, "arm,pl011" }, { PropertyTypeTimer, "arm,armv7-timer" }, { PropertyTypeTimer, "arm,armv8-timer" }, - { PropertyTypePsci, "arm,psci-0.2" }, { PropertyTypeFwCfg, "qemu,fw-cfg-mmio" }, { PropertyTypePciHost, "pci-host-ecam-generic" }, { PropertyTypeXen, "xen,xen" }, @@ -292,7 +290,6 @@ InitializeVirtFdtDxe ( UINT64 RegBase; CONST INTERRUPT_PROPERTY *InterruptProp; INT32 SecIntrNum, IntrNum, VirtIntrNum, HypIntrNum; - CONST CHAR8 *PsciMethod; UINT64 FwCfgSelectorAddress; UINT64 FwCfgSelectorSize; UINT64 FwCfgDataAddress; @@ -342,8 +339,7 @@ InitializeVirtFdtDxe ( // TODO use #cells root properties instead // RegProp = fdt_getprop (DeviceTreeBase, Node, "reg", &Len); - ASSERT ((RegProp != NULL) || (PropType == PropertyTypeTimer) || - (PropType == PropertyTypePsci)); + ASSERT ((RegProp != NULL) || (PropType == PropertyTypeTimer)); switch (PropType) { case PropertyTypePciHost: @@ -479,19 +475,6 @@ InitializeVirtFdtDxe ( PcdSet32 (PcdArmArchTimerHypIntrNum, HypIntrNum); break; - case PropertyTypePsci: - PsciMethod = fdt_getprop (DeviceTreeBase, Node, "method", &Len); - - if (PsciMethod && AsciiStrnCmp (PsciMethod, "hvc", 3) == 0) { - PcdSet32 (PcdArmPsciMethod, 1); - } else if (PsciMethod && AsciiStrnCmp (PsciMethod, "smc", 3) == 0) { - PcdSet32 (PcdArmPsciMethod, 2); - } else { - DEBUG ((EFI_D_ERROR, "%a: Unknown PSCI method \"%a\"\n", __FUNCTION__, - PsciMethod)); - } - break; - case PropertyTypeXen: ASSERT (Len == 16); diff --git a/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf b/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf index 628b14501f45..5526fd19250e 100644 --- a/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf +++ b/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf @@ -50,7 +50,6 @@ [Guids] gFdtHobGuid [Pcd] - gArmVirtTokenSpaceGuid.PcdArmPsciMethod gArmVirtTokenSpaceGuid.PcdFwCfgSelectorAddress gArmVirtTokenSpaceGuid.PcdFwCfgDataAddress gArmVirtTokenSpaceGuid.PcdFwCfgDmaAddress