Revision: 18544
http://sourceforge.net/p/edk2/code/18544
Author: lersek
Date: 2015-09-24 21:40:36 +0000 (Thu, 24 Sep 2015)
Log Message:
-----------
ArmVirtPkg: VirtFdtDxe: detect fw-cfg DMA interface from the DTB
A DMA-like transfer interface has recently been implemented in QEMU for
fw-cfg. For ARM and AARCH64 virtual machines, the binding prescribes a new
8-byte wide register at offset 0x10 in the register block. Make VirtFdtDxe
expose this register if it is present.
Please see "docs/specs/fw_cfg.txt" in the QEMU tree for more information.
Cc: Ard Biesheuvel <[email protected]>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <[email protected]>
Reviewed-by: Ard Biesheuvel <[email protected]>
Modified Paths:
--------------
trunk/edk2/ArmVirtPkg/ArmVirtPkg.dec
trunk/edk2/ArmVirtPkg/ArmVirtQemu.dsc
trunk/edk2/ArmVirtPkg/ArmVirtXen.dsc
trunk/edk2/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.c
trunk/edk2/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf
Modified: trunk/edk2/ArmVirtPkg/ArmVirtPkg.dec
===================================================================
--- trunk/edk2/ArmVirtPkg/ArmVirtPkg.dec 2015-09-24 20:44:59 UTC (rev
18543)
+++ trunk/edk2/ArmVirtPkg/ArmVirtPkg.dec 2015-09-24 21:40:36 UTC (rev
18544)
@@ -67,6 +67,7 @@
gArmVirtTokenSpaceGuid.PcdFwCfgSelectorAddress|0x0|UINT64|0x00000004
gArmVirtTokenSpaceGuid.PcdFwCfgDataAddress|0x0|UINT64|0x00000005
+ gArmVirtTokenSpaceGuid.PcdFwCfgDmaAddress|0x0|UINT64|0x00000009
#
# Supported GIC revision (2, 3, ...)
Modified: trunk/edk2/ArmVirtPkg/ArmVirtQemu.dsc
===================================================================
--- trunk/edk2/ArmVirtPkg/ArmVirtQemu.dsc 2015-09-24 20:44:59 UTC (rev
18543)
+++ trunk/edk2/ArmVirtPkg/ArmVirtQemu.dsc 2015-09-24 21:40:36 UTC (rev
18544)
@@ -199,6 +199,7 @@
gArmVirtTokenSpaceGuid.PcdFwCfgSelectorAddress|0x0
gArmVirtTokenSpaceGuid.PcdFwCfgDataAddress|0x0
+ gArmVirtTokenSpaceGuid.PcdFwCfgDmaAddress|0x0
#
# Set video resolution for boot options and for text setup.
Modified: trunk/edk2/ArmVirtPkg/ArmVirtXen.dsc
===================================================================
--- trunk/edk2/ArmVirtPkg/ArmVirtXen.dsc 2015-09-24 20:44:59 UTC (rev
18543)
+++ trunk/edk2/ArmVirtPkg/ArmVirtXen.dsc 2015-09-24 21:40:36 UTC (rev
18544)
@@ -144,6 +144,7 @@
gArmVirtTokenSpaceGuid.PcdFwCfgSelectorAddress|0x0
gArmVirtTokenSpaceGuid.PcdFwCfgDataAddress|0x0
+ gArmVirtTokenSpaceGuid.PcdFwCfgDmaAddress|0x0
gArmVirtTokenSpaceGuid.PcdArmPsciMethod|0
Modified: trunk/edk2/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.c
===================================================================
--- trunk/edk2/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.c 2015-09-24 20:44:59 UTC
(rev 18543)
+++ trunk/edk2/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.c 2015-09-24 21:40:36 UTC
(rev 18544)
@@ -302,6 +302,8 @@
UINT64 FwCfgSelectorSize;
UINT64 FwCfgDataAddress;
UINT64 FwCfgDataSize;
+ UINT64 FwCfgDmaAddress;
+ UINT64 FwCfgDmaSize;
Hob = GetFirstGuidHob(&gFdtHobGuid);
if (Hob == NULL || GET_GUID_HOB_DATA_SIZE (Hob) != sizeof (UINT64)) {
@@ -382,6 +384,19 @@
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:
Modified: trunk/edk2/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf
===================================================================
--- trunk/edk2/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf 2015-09-24 20:44:59 UTC
(rev 18543)
+++ trunk/edk2/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf 2015-09-24 21:40:36 UTC
(rev 18544)
@@ -53,6 +53,7 @@
gArmVirtTokenSpaceGuid.PcdArmPsciMethod
gArmVirtTokenSpaceGuid.PcdFwCfgSelectorAddress
gArmVirtTokenSpaceGuid.PcdFwCfgDataAddress
+ gArmVirtTokenSpaceGuid.PcdFwCfgDmaAddress
gArmVirtTokenSpaceGuid.PcdArmGicRevision
gArmTokenSpaceGuid.PcdGicDistributorBase
gArmTokenSpaceGuid.PcdGicRedistributorsBase
------------------------------------------------------------------------------
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
