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

ArmVirtPkg/VirtFdtDxe: remove handling of fw_cfg DT node 

Remove the handling of the fw_cfg DT node from VirtFdtDxe now that the
fw_cfg client library has been moved to the FDT client protocol, and no
longer relies on VirtFdtDxe to pass this information via dynamic PCDs.
Since the PCDs in question are now no longer used, remove them from the
various DEC and DSC files 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:59 +02:00
parent 7b6745cc11
commit ba83f7e397
6 changed files with 0 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ArmVirtPkg/ArmVirtPkg.dec
View File

@ -59,11 +59,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]
gArmVirtTokenSpaceGuid.PcdFwCfgSelectorAddress|0x0|UINT64|0x00000004
gArmVirtTokenSpaceGuid.PcdFwCfgDataAddress|0x0|UINT64|0x00000005
gArmVirtTokenSpaceGuid.PcdFwCfgDmaAddress|0x0|UINT64|0x00000009
[PcdsFeatureFlag] [PcdsFeatureFlag]
# #
# "Map PCI MMIO as Cached" # "Map PCI MMIO as Cached"

4
ArmVirtPkg/ArmVirtQemu.dsc
View File

@ -221,10 +221,6 @@
gArmPlatformTokenSpaceGuid.PcdPciMmio32Size|0x0 gArmPlatformTokenSpaceGuid.PcdPciMmio32Size|0x0
gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0x0 gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0x0
gArmVirtTokenSpaceGuid.PcdFwCfgSelectorAddress|0x0
gArmVirtTokenSpaceGuid.PcdFwCfgDataAddress|0x0
gArmVirtTokenSpaceGuid.PcdFwCfgDmaAddress|0x0
# #
# Set video resolution for boot options and for text setup. # Set video resolution for boot options and for text setup.
# PlatformDxe can set the former at runtime. # PlatformDxe can set the former at runtime.

4
ArmVirtPkg/ArmVirtQemuKernel.dsc
View File

@ -206,10 +206,6 @@
gArmPlatformTokenSpaceGuid.PcdPciMmio32Size|0x0 gArmPlatformTokenSpaceGuid.PcdPciMmio32Size|0x0
gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0x0 gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0x0
gArmVirtTokenSpaceGuid.PcdFwCfgSelectorAddress|0x0
gArmVirtTokenSpaceGuid.PcdFwCfgDataAddress|0x0
gArmVirtTokenSpaceGuid.PcdFwCfgDmaAddress|0x0
# #
# Set video resolution for boot options and for text setup. # Set video resolution for boot options and for text setup.
# PlatformDxe can set the former at runtime. # PlatformDxe can set the former at runtime.

4
ArmVirtPkg/ArmVirtXen.dsc
View File

@ -142,10 +142,6 @@
gArmPlatformTokenSpaceGuid.PcdPciMmio32Size|0x0 gArmPlatformTokenSpaceGuid.PcdPciMmio32Size|0x0
gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0x0 gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0x0
gArmVirtTokenSpaceGuid.PcdFwCfgSelectorAddress|0x0
gArmVirtTokenSpaceGuid.PcdFwCfgDataAddress|0x0
gArmVirtTokenSpaceGuid.PcdFwCfgDmaAddress|0x0
gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|3 gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|3
################################################################################ ################################################################################

49
ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.c
View File

@ -45,7 +45,6 @@ typedef enum {
PropertyTypeRtc, PropertyTypeRtc,
PropertyTypeVirtio, PropertyTypeVirtio,
PropertyTypeUart, PropertyTypeUart,
PropertyTypeFwCfg,
PropertyTypePciHost, PropertyTypePciHost,
PropertyTypeXen, PropertyTypeXen,
} PROPERTY_TYPE; } PROPERTY_TYPE;
@ -59,7 +58,6 @@ STATIC CONST PROPERTY CompatibleProperties[] = {
{ PropertyTypeRtc, "arm,pl031" }, { PropertyTypeRtc, "arm,pl031" },
{ PropertyTypeVirtio, "virtio,mmio" }, { PropertyTypeVirtio, "virtio,mmio" },
{ PropertyTypeUart, "arm,pl011" }, { PropertyTypeUart, "arm,pl011" },
{ PropertyTypeFwCfg, "qemu,fw-cfg-mmio" },
{ PropertyTypePciHost, "pci-host-ecam-generic" }, { PropertyTypePciHost, "pci-host-ecam-generic" },
{ PropertyTypeXen, "xen,xen" }, { PropertyTypeXen, "xen,xen" },
{ PropertyTypeUnknown, "" } { PropertyTypeUnknown, "" }
@ -279,12 +277,6 @@ InitializeVirtFdtDxe (
VIRTIO_TRANSPORT_DEVICE_PATH *DevicePath; VIRTIO_TRANSPORT_DEVICE_PATH *DevicePath;
EFI_HANDLE Handle; EFI_HANDLE Handle;
UINT64 RegBase; UINT64 RegBase;
UINT64 FwCfgSelectorAddress;
UINT64 FwCfgSelectorSize;
UINT64 FwCfgDataAddress;
UINT64 FwCfgDataSize;
UINT64 FwCfgDmaAddress;
UINT64 FwCfgDmaSize;
BOOLEAN HavePci; BOOLEAN HavePci;
Hob = GetFirstGuidHob(&gFdtHobGuid); Hob = GetFirstGuidHob(&gFdtHobGuid);
@ -338,47 +330,6 @@ InitializeVirtFdtDxe (
HavePci = TRUE; HavePci = TRUE;
break; break;
case PropertyTypeFwCfg:
ASSERT (Len == 2 * sizeof (UINT64));
FwCfgDataAddress = fdt64_to_cpu (((UINT64 *)RegProp)[0]);
FwCfgDataSize = 8;
FwCfgSelectorAddress = FwCfgDataAddress + FwCfgDataSize;
FwCfgSelectorSize = 2;
//
// The following ASSERT()s express
//
// Address + Size - 1 <= MAX_UINTN
//
// for both registers, that is, that the last byte in each MMIO range is
// expressible as a MAX_UINTN. The form below is mathematically
// equivalent, and it also prevents any unsigned overflow before the
// comparison.
//
ASSERT (FwCfgSelectorAddress <= MAX_UINTN - FwCfgSelectorSize + 1);
ASSERT (FwCfgDataAddress <= MAX_UINTN - FwCfgDataSize + 1);
PcdSet64 (PcdFwCfgSelectorAddress, FwCfgSelectorAddress);
PcdSet64 (PcdFwCfgDataAddress, FwCfgDataAddress);
DEBUG ((EFI_D_INFO, "Found FwCfg @ 0x%Lx/0x%Lx\n", FwCfgSelectorAddress,
FwCfgDataAddress));
if (fdt64_to_cpu (((UINT64 *)RegProp)[1]) >= 0x18) {
FwCfgDmaAddress = FwCfgDataAddress + 0x10;
FwCfgDmaSize = 0x08;
//
// See explanation above.
//
ASSERT (FwCfgDmaAddress <= MAX_UINTN - FwCfgDmaSize + 1);
PcdSet64 (PcdFwCfgDmaAddress, FwCfgDmaAddress);
DEBUG ((EFI_D_INFO, "Found FwCfg DMA @ 0x%Lx\n", FwCfgDmaAddress));
}
break;
case PropertyTypeVirtio: case PropertyTypeVirtio:
ASSERT (Len == 16); ASSERT (Len == 16);
// //

3
ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf
View File

@ -50,9 +50,6 @@
gFdtHobGuid gFdtHobGuid
[Pcd] [Pcd]
gArmVirtTokenSpaceGuid.PcdFwCfgSelectorAddress
gArmVirtTokenSpaceGuid.PcdFwCfgDataAddress
gArmVirtTokenSpaceGuid.PcdFwCfgDmaAddress
gArmPlatformTokenSpaceGuid.PcdPL031RtcBase gArmPlatformTokenSpaceGuid.PcdPL031RtcBase
gArmPlatformTokenSpaceGuid.PcdPciBusMin gArmPlatformTokenSpaceGuid.PcdPciBusMin
gArmPlatformTokenSpaceGuid.PcdPciBusMax gArmPlatformTokenSpaceGuid.PcdPciBusMax