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>

diff --git a/ArmVirtPkg/ArmVirtPkg.dec b/ArmVirtPkg/ArmVirtPkg.dec
index 73136adf62c6d25cf0649a9eeb626644953085ff..9f98f28f01e10c4c76f7a5bb2a17a4861a7cda71 100644 (file)
--- a/ArmVirtPkg/ArmVirtPkg.dec
+++ b/ArmVirtPkg/ArmVirtPkg.dec
@@ -59,11 +59,6 @@
   #\r
   gArmVirtTokenSpaceGuid.PcdTerminalTypeGuidBuffer|{0x65, 0x60, 0xA6, 0xDF, 0x19, 0xB4, 0xD3, 0x11, 0x9A, 0x2D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D}|VOID*|0x00000007\r
 \r
-[PcdsDynamic, PcdsFixedAtBuild]\r
-  gArmVirtTokenSpaceGuid.PcdFwCfgSelectorAddress|0x0|UINT64|0x00000004\r
-  gArmVirtTokenSpaceGuid.PcdFwCfgDataAddress|0x0|UINT64|0x00000005\r
-  gArmVirtTokenSpaceGuid.PcdFwCfgDmaAddress|0x0|UINT64|0x00000009\r
-\r
 [PcdsFeatureFlag]\r
   #\r
   # "Map PCI MMIO as Cached"\r

diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
index 2d398135ac18821b04bd7e459a271811bccb794d..bb994262268f24b775c26b0677ca71c58c8c0c27 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -221,10 +221,6 @@
   gArmPlatformTokenSpaceGuid.PcdPciMmio32Size|0x0\r
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0x0\r
 \r
-  gArmVirtTokenSpaceGuid.PcdFwCfgSelectorAddress|0x0\r
-  gArmVirtTokenSpaceGuid.PcdFwCfgDataAddress|0x0\r
-  gArmVirtTokenSpaceGuid.PcdFwCfgDmaAddress|0x0\r
-\r
   #\r
   # Set video resolution for boot options and for text setup.\r
   # PlatformDxe can set the former at runtime.\r

diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
index 9bf1b632aa99fc2b6bf0940588c23e5485ce1f0b..d6c73d960805a89fdc24b5de79c45edac4bf14b9 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -206,10 +206,6 @@
   gArmPlatformTokenSpaceGuid.PcdPciMmio32Size|0x0\r
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0x0\r
 \r
-  gArmVirtTokenSpaceGuid.PcdFwCfgSelectorAddress|0x0\r
-  gArmVirtTokenSpaceGuid.PcdFwCfgDataAddress|0x0\r
-  gArmVirtTokenSpaceGuid.PcdFwCfgDmaAddress|0x0\r
-\r
   #\r
   # Set video resolution for boot options and for text setup.\r
   # PlatformDxe can set the former at runtime.\r

diff --git a/ArmVirtPkg/ArmVirtXen.dsc b/ArmVirtPkg/ArmVirtXen.dsc
index 2d52f4b03b87b7c6258171e229977dfde9430abd..d5057bb4632609182a7f36e44d38c6973cd72f4d 100644 (file)
--- a/ArmVirtPkg/ArmVirtXen.dsc
+++ b/ArmVirtPkg/ArmVirtXen.dsc
@@ -142,10 +142,6 @@
   gArmPlatformTokenSpaceGuid.PcdPciMmio32Size|0x0\r
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0x0\r
 \r
-  gArmVirtTokenSpaceGuid.PcdFwCfgSelectorAddress|0x0\r
-  gArmVirtTokenSpaceGuid.PcdFwCfgDataAddress|0x0\r
-  gArmVirtTokenSpaceGuid.PcdFwCfgDmaAddress|0x0\r
-\r
   gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|3\r
 \r
 ################################################################################\r

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

diff --git a/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf b/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf
index c928e826c258261d9fc29724d849c1c59faae262..6c8ba68599ae82986184559f9ae270fd6a59b06b 100644 (file)
--- a/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf
+++ b/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf
@@ -50,9 +50,6 @@
   gFdtHobGuid\r
 \r
 [Pcd]\r
-  gArmVirtTokenSpaceGuid.PcdFwCfgSelectorAddress\r
-  gArmVirtTokenSpaceGuid.PcdFwCfgDataAddress\r
-  gArmVirtTokenSpaceGuid.PcdFwCfgDmaAddress\r
   gArmPlatformTokenSpaceGuid.PcdPL031RtcBase\r
   gArmPlatformTokenSpaceGuid.PcdPciBusMin\r
   gArmPlatformTokenSpaceGuid.PcdPciBusMax\r