diff options
| author | Laszlo Ersek <lersek@redhat.com> | 2015-09-24 21:40:36 +0000 |
|---|---|---|
| committer | lersek <lersek@Edk2> | 2015-09-24 21:40:36 +0000 |
| commit | 50b91449a3a073af3a7c87af83002016e7e34cc4 (patch) | |
| tree | cd8f396193928b044d9a5d1cd841d0bf5293dcfb | |
| parent | 6add86ab5967931ef9bca871931443e69f9cc09d (diff) | |
| download | edk2-50b91449a3a073af3a7c87af83002016e7e34cc4.tar.gz edk2-50b91449a3a073af3a7c87af83002016e7e34cc4.tar.bz2 edk2-50b91449a3a073af3a7c87af83002016e7e34cc4.zip | |
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 <ard.biesheuvel@linaro.org>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18544 6f19259b-4bc3-4df7-8a09-765794883524
| -rw-r--r-- | ArmVirtPkg/ArmVirtPkg.dec | 1 | ||||
| -rw-r--r-- | ArmVirtPkg/ArmVirtQemu.dsc | 1 | ||||
| -rw-r--r-- | ArmVirtPkg/ArmVirtXen.dsc | 1 | ||||
| -rw-r--r-- | ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.c | 15 | ||||
| -rw-r--r-- | ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf | 1 |
5 files changed, 19 insertions, 0 deletions
diff --git a/ArmVirtPkg/ArmVirtPkg.dec b/ArmVirtPkg/ArmVirtPkg.dec index d987035515..89e8448a84 100644 --- a/ArmVirtPkg/ArmVirtPkg.dec +++ b/ArmVirtPkg/ArmVirtPkg.dec @@ -67,6 +67,7 @@ gArmVirtTokenSpaceGuid.PcdFwCfgSelectorAddress|0x0|UINT64|0x00000004
gArmVirtTokenSpaceGuid.PcdFwCfgDataAddress|0x0|UINT64|0x00000005
+ gArmVirtTokenSpaceGuid.PcdFwCfgDmaAddress|0x0|UINT64|0x00000009
#
# Supported GIC revision (2, 3, ...)
diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index f1af96827f..9e40f39e4b 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -199,6 +199,7 @@ gArmVirtTokenSpaceGuid.PcdFwCfgSelectorAddress|0x0
gArmVirtTokenSpaceGuid.PcdFwCfgDataAddress|0x0
+ gArmVirtTokenSpaceGuid.PcdFwCfgDmaAddress|0x0
#
# Set video resolution for boot options and for text setup.
diff --git a/ArmVirtPkg/ArmVirtXen.dsc b/ArmVirtPkg/ArmVirtXen.dsc index 5c19afca30..ac37cd2a43 100644 --- a/ArmVirtPkg/ArmVirtXen.dsc +++ b/ArmVirtPkg/ArmVirtXen.dsc @@ -144,6 +144,7 @@ gArmVirtTokenSpaceGuid.PcdFwCfgSelectorAddress|0x0
gArmVirtTokenSpaceGuid.PcdFwCfgDataAddress|0x0
+ gArmVirtTokenSpaceGuid.PcdFwCfgDmaAddress|0x0
gArmVirtTokenSpaceGuid.PcdArmPsciMethod|0
diff --git a/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.c b/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.c index 73db63078f..74f80d1d2b 100644 --- a/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.c +++ b/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.c @@ -302,6 +302,8 @@ InitializeVirtFdtDxe ( 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 @@ InitializeVirtFdtDxe ( 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:
diff --git a/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf b/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf index 657b4e8801..ee2503ac4a 100644 --- a/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf +++ b/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf @@ -53,6 +53,7 @@ gArmVirtTokenSpaceGuid.PcdArmPsciMethod
gArmVirtTokenSpaceGuid.PcdFwCfgSelectorAddress
gArmVirtTokenSpaceGuid.PcdFwCfgDataAddress
+ gArmVirtTokenSpaceGuid.PcdFwCfgDmaAddress
gArmVirtTokenSpaceGuid.PcdArmGicRevision
gArmTokenSpaceGuid.PcdGicDistributorBase
gArmTokenSpaceGuid.PcdGicRedistributorsBase
|