ArmVirtPkg/FdtClientDxe: report address and size cell count directly

[mirror_edk2.git] / ArmVirtPkg / Library / QemuFwCfgLib / QemuFwCfgLib.c

diff --git a/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c b/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c
index 377262563e3e16a34a7e71e1bd06c8794faf471b..8ecbe3fb5fe6f64d13d3e5e8f9795c31a8adf52b 100644 (file)
--- a/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c
+++ b/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c
@@ -122,7 +122,8 @@ QemuFwCfgInitialize (
   EFI_STATUS                    Status;\r
   FDT_CLIENT_PROTOCOL           *FdtClient;\r
   CONST UINT64                  *Reg;\r
-  UINT32                        RegElemSize, RegSize;\r
+  UINT32                        RegSize;\r
+  UINTN                         AddressCells, SizeCells;\r
   UINT64                        FwCfgSelectorAddress;\r
   UINT64                        FwCfgSelectorSize;\r
   UINT64                        FwCfgDataAddress;\r
@@ -135,7 +136,8 @@ QemuFwCfgInitialize (
   ASSERT_EFI_ERROR (Status);\r
 \r
   Status = FdtClient->FindCompatibleNodeReg (FdtClient, "qemu,fw-cfg-mmio",\r
-                         (CONST VOID **)&Reg, &RegElemSize, &RegSize);\r
+                         (CONST VOID **)&Reg, &AddressCells, &SizeCells,\r
+                         &RegSize);\r
   if (EFI_ERROR (Status)) {\r
     DEBUG ((EFI_D_WARN,\r
       "%a: No 'qemu,fw-cfg-mmio' compatible DT node found (Status == %r)\n",\r
@@ -143,7 +145,8 @@ QemuFwCfgInitialize (
     return EFI_SUCCESS;\r
   }\r
 \r
-  ASSERT (RegElemSize == sizeof (UINT64));\r
+  ASSERT (AddressCells == 2);\r
+  ASSERT (SizeCells == 2);\r
   ASSERT (RegSize == 2 * sizeof (UINT64));\r
 \r
   FwCfgDataAddress     = SwapBytes64 (Reg[0]);\r