tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ArmVirtPkg/VirtFdtDxe: drop detection of PSCI method 

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 <ard.biesheuvel@linaro.org>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
This commit is contained in:
Ard Biesheuvel 2016-04-08 11:44:54 +02:00
parent 93f9a23f87
commit a372110b9f
6 changed files with 1 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ArmVirtPkg/ArmVirtPkg.dec
View File

@ -60,14 +60,6 @@
gArmVirtTokenSpaceGuid.PcdTerminalTypeGuidBuffer|{0x65, 0x60, 0xA6, 0xDF, 0x19, 0xB4, 0xD3, 0x11, 0x9A, 0x2D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D}|VOID*|0x00000007 gArmVirtTokenSpaceGuid.PcdTerminalTypeGuidBuffer|{0x65, 0x60, 0xA6, 0xDF, 0x19, 0xB4, 0xD3, 0x11, 0x9A, 0x2D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D}|VOID*|0x00000007
[PcdsDynamic, PcdsFixedAtBuild] [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.PcdFwCfgSelectorAddress|0x0|UINT64|0x00000004
gArmVirtTokenSpaceGuid.PcdFwCfgDataAddress|0x0|UINT64|0x00000005 gArmVirtTokenSpaceGuid.PcdFwCfgDataAddress|0x0|UINT64|0x00000005
gArmVirtTokenSpaceGuid.PcdFwCfgDmaAddress|0x0|UINT64|0x00000009 gArmVirtTokenSpaceGuid.PcdFwCfgDmaAddress|0x0|UINT64|0x00000009

2
ArmVirtPkg/ArmVirtQemu.dsc
View File

@ -221,8 +221,6 @@
gArmPlatformTokenSpaceGuid.PcdPciMmio32Size|0x0 gArmPlatformTokenSpaceGuid.PcdPciMmio32Size|0x0
gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0x0 gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0x0
gArmVirtTokenSpaceGuid.PcdArmPsciMethod|0
gArmVirtTokenSpaceGuid.PcdFwCfgSelectorAddress|0x0 gArmVirtTokenSpaceGuid.PcdFwCfgSelectorAddress|0x0
gArmVirtTokenSpaceGuid.PcdFwCfgDataAddress|0x0 gArmVirtTokenSpaceGuid.PcdFwCfgDataAddress|0x0
gArmVirtTokenSpaceGuid.PcdFwCfgDmaAddress|0x0 gArmVirtTokenSpaceGuid.PcdFwCfgDmaAddress|0x0

2
ArmVirtPkg/ArmVirtQemuKernel.dsc
View File

@ -206,8 +206,6 @@
gArmPlatformTokenSpaceGuid.PcdPciMmio32Size|0x0 gArmPlatformTokenSpaceGuid.PcdPciMmio32Size|0x0
gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0x0 gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0x0
gArmVirtTokenSpaceGuid.PcdArmPsciMethod|0
gArmVirtTokenSpaceGuid.PcdFwCfgSelectorAddress|0x0 gArmVirtTokenSpaceGuid.PcdFwCfgSelectorAddress|0x0
gArmVirtTokenSpaceGuid.PcdFwCfgDataAddress|0x0 gArmVirtTokenSpaceGuid.PcdFwCfgDataAddress|0x0
gArmVirtTokenSpaceGuid.PcdFwCfgDmaAddress|0x0 gArmVirtTokenSpaceGuid.PcdFwCfgDmaAddress|0x0

2
ArmVirtPkg/ArmVirtXen.dsc
View File

@ -146,8 +146,6 @@
gArmVirtTokenSpaceGuid.PcdFwCfgDataAddress|0x0 gArmVirtTokenSpaceGuid.PcdFwCfgDataAddress|0x0
gArmVirtTokenSpaceGuid.PcdFwCfgDmaAddress|0x0 gArmVirtTokenSpaceGuid.PcdFwCfgDmaAddress|0x0
gArmVirtTokenSpaceGuid.PcdArmPsciMethod|0
gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|3 gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|3
################################################################################ ################################################################################

19
ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.c
View File

@ -46,7 +46,6 @@ typedef enum {
PropertyTypeVirtio, PropertyTypeVirtio,
PropertyTypeUart, PropertyTypeUart,
PropertyTypeTimer, PropertyTypeTimer,
PropertyTypePsci,
PropertyTypeFwCfg, PropertyTypeFwCfg,
PropertyTypePciHost, PropertyTypePciHost,
PropertyTypeXen, PropertyTypeXen,
@ -63,7 +62,6 @@ STATIC CONST PROPERTY CompatibleProperties[] = {
{ PropertyTypeUart, "arm,pl011" }, { PropertyTypeUart, "arm,pl011" },
{ PropertyTypeTimer, "arm,armv7-timer" }, { PropertyTypeTimer, "arm,armv7-timer" },
{ PropertyTypeTimer, "arm,armv8-timer" }, { PropertyTypeTimer, "arm,armv8-timer" },
{ PropertyTypePsci, "arm,psci-0.2" },
{ PropertyTypeFwCfg, "qemu,fw-cfg-mmio" }, { PropertyTypeFwCfg, "qemu,fw-cfg-mmio" },
{ PropertyTypePciHost, "pci-host-ecam-generic" }, { PropertyTypePciHost, "pci-host-ecam-generic" },
{ PropertyTypeXen, "xen,xen" }, { PropertyTypeXen, "xen,xen" },
@ -292,7 +290,6 @@ InitializeVirtFdtDxe (
UINT64 RegBase; UINT64 RegBase;
CONST INTERRUPT_PROPERTY *InterruptProp; CONST INTERRUPT_PROPERTY *InterruptProp;
INT32 SecIntrNum, IntrNum, VirtIntrNum, HypIntrNum; INT32 SecIntrNum, IntrNum, VirtIntrNum, HypIntrNum;
CONST CHAR8 *PsciMethod;
UINT64 FwCfgSelectorAddress; UINT64 FwCfgSelectorAddress;
UINT64 FwCfgSelectorSize; UINT64 FwCfgSelectorSize;
UINT64 FwCfgDataAddress; UINT64 FwCfgDataAddress;
@ -342,8 +339,7 @@ InitializeVirtFdtDxe (
// TODO use #cells root properties instead // TODO use #cells root properties instead
// //
RegProp = fdt_getprop (DeviceTreeBase, Node, "reg", &Len); RegProp = fdt_getprop (DeviceTreeBase, Node, "reg", &Len);
ASSERT ((RegProp != NULL) || (PropType == PropertyTypeTimer) || ASSERT ((RegProp != NULL) || (PropType == PropertyTypeTimer));
(PropType == PropertyTypePsci));
switch (PropType) { switch (PropType) {
case PropertyTypePciHost: case PropertyTypePciHost:
@ -479,19 +475,6 @@ InitializeVirtFdtDxe (
PcdSet32 (PcdArmArchTimerHypIntrNum, HypIntrNum); PcdSet32 (PcdArmArchTimerHypIntrNum, HypIntrNum);
break; 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: case PropertyTypeXen:
ASSERT (Len == 16); ASSERT (Len == 16);

1
ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf
View File

@ -50,7 +50,6 @@
gFdtHobGuid gFdtHobGuid
[Pcd] [Pcd]
gArmVirtTokenSpaceGuid.PcdArmPsciMethod
gArmVirtTokenSpaceGuid.PcdFwCfgSelectorAddress gArmVirtTokenSpaceGuid.PcdFwCfgSelectorAddress
gArmVirtTokenSpaceGuid.PcdFwCfgDataAddress gArmVirtTokenSpaceGuid.PcdFwCfgDataAddress
gArmVirtTokenSpaceGuid.PcdFwCfgDmaAddress gArmVirtTokenSpaceGuid.PcdFwCfgDmaAddress