OvmfPkg/QemuFwCfgLib: Provide Pei and Dxe specific library

Current QemuFwCfgLib.inf is used in both Pei and Dxe phases. Add Pei
and Dxe inf file to provide a seperate QemuFwCfgLib instances for Pei
and Dxe phases.

Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Brijesh Singh <brijesh.singh@amd.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>

4 files changed, 170 insertions, 4 deletions

diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiDxe.c b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxe.c
index ac05f4c..ac05f4c 100644
--- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiDxe.c
+++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxe.c
diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxeLib.inf
index 6894760..d7e368e 100644
--- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf
+++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxeLib.inf
@@ -18,11 +18,11 @@
 

 [Defines]

   INF_VERSION                    = 0x00010005

-  BASE_NAME                      = QemuFwCfgLib

-  FILE_GUID                      = fdd53716-31e1-4acc-9007-8bd5d877c96f

+  BASE_NAME                      = QemuFwCfgDxeLib

+  FILE_GUID                      = 80474090-55e7-4c28-b25c-9f236ba41f28

   MODULE_TYPE                    = BASE

   VERSION_STRING                 = 1.0

-  LIBRARY_CLASS                  = QemuFwCfgLib|PEIM DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SMM_DRIVER

+  LIBRARY_CLASS                  = QemuFwCfgLib|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SMM_DRIVER

 

   CONSTRUCTOR                    = QemuFwCfgInitialize

 

@@ -35,7 +35,7 @@
 [Sources]

   QemuFwCfgLibInternal.h

   QemuFwCfgLib.c

-  QemuFwCfgPeiDxe.c

+  QemuFwCfgDxe.c

 

 [Packages]

   MdePkg/MdePkg.dec

diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPei.c b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPei.c
new file mode 100644
index 0000000..ac05f4c
--- /dev/null
+++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPei.c
@@ -0,0 +1,116 @@
+/** @file

+

+  Stateful and implicitly initialized fw_cfg library implementation.

+

+  Copyright (C) 2013, Red Hat, Inc.

+  Copyright (c) 2011 - 2013, Intel Corporation. All rights reserved.<BR>

+

+  This program and the accompanying materials are licensed and made available

+  under the terms and conditions of the BSD License which accompanies this

+  distribution.  The full text of the license may be found at

+  http://opensource.org/licenses/bsd-license.php

+

+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT

+  WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

+**/

+

+#include <Library/DebugLib.h>

+#include <Library/QemuFwCfgLib.h>

+

+#include "QemuFwCfgLibInternal.h"

+

+STATIC BOOLEAN mQemuFwCfgSupported = FALSE;

+STATIC BOOLEAN mQemuFwCfgDmaSupported;

+

+

+/**

+  Returns a boolean indicating if the firmware configuration interface

+  is available or not.

+

+  This function may change fw_cfg state.

+

+  @retval    TRUE   The interface is available

+  @retval    FALSE  The interface is not available

+

+**/

+BOOLEAN

+EFIAPI

+QemuFwCfgIsAvailable (

+  VOID

+  )

+{

+  return InternalQemuFwCfgIsAvailable ();

+}

+

+

+RETURN_STATUS

+EFIAPI

+QemuFwCfgInitialize (

+  VOID

+  )

+{

+  UINT32 Signature;

+  UINT32 Revision;

+

+  //

+  // Enable the access routines while probing to see if it is supported.

+  // For probing we always use the IO Port (IoReadFifo8()) access method.

+  //

+  mQemuFwCfgSupported = TRUE;

+  mQemuFwCfgDmaSupported = FALSE;

+

+  QemuFwCfgSelectItem (QemuFwCfgItemSignature);

+  Signature = QemuFwCfgRead32 ();

+  DEBUG ((EFI_D_INFO, "FW CFG Signature: 0x%x\n", Signature));

+  QemuFwCfgSelectItem (QemuFwCfgItemInterfaceVersion);

+  Revision = QemuFwCfgRead32 ();

+  DEBUG ((EFI_D_INFO, "FW CFG Revision: 0x%x\n", Revision));

+  if ((Signature != SIGNATURE_32 ('Q', 'E', 'M', 'U')) ||

+      (Revision < 1)

+     ) {

+    DEBUG ((EFI_D_INFO, "QemuFwCfg interface not supported.\n"));

+    mQemuFwCfgSupported = FALSE;

+    return RETURN_SUCCESS;

+  }

+

+  if ((Revision & FW_CFG_F_DMA) == 0) {

+    DEBUG ((DEBUG_INFO, "QemuFwCfg interface (IO Port) is supported.\n"));

+  } else {

+    mQemuFwCfgDmaSupported = TRUE;

+    DEBUG ((DEBUG_INFO, "QemuFwCfg interface (DMA) is supported.\n"));

+  }

+  return RETURN_SUCCESS;

+}

+

+

+/**

+  Returns a boolean indicating if the firmware configuration interface is

+  available for library-internal purposes.

+

+  This function never changes fw_cfg state.

+

+  @retval    TRUE   The interface is available internally.

+  @retval    FALSE  The interface is not available internally.

+**/

+BOOLEAN

+InternalQemuFwCfgIsAvailable (

+  VOID

+  )

+{

+  return mQemuFwCfgSupported;

+}

+

+/**

+  Returns a boolean indicating whether QEMU provides the DMA-like access method

+  for fw_cfg.

+

+  @retval    TRUE   The DMA-like access method is available.

+  @retval    FALSE  The DMA-like access method is unavailable.

+**/

+BOOLEAN

+InternalQemuFwCfgDmaIsAvailable (

+  VOID

+  )

+{

+  return mQemuFwCfgDmaSupported;

+}

diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf
new file mode 100644
index 0000000..47e23b9
--- /dev/null
+++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf
@@ -0,0 +1,50 @@
+## @file

+#

+#  Stateful, implicitly initialized fw_cfg library.

+#

+#  Copyright (C) 2013, Red Hat, Inc.

+#  Copyright (c) 2008 - 2012, Intel Corporation. All rights reserved.<BR>

+#  Copyright (c) 2017, AMD Incorporated. All rights reserved.<BR>

+#

+#  This program and the accompanying materials

+#  are licensed and made available under the terms and conditions of the BSD License

+#  which accompanies this distribution. The full text of the license may be found at

+#  http://opensource.org/licenses/bsd-license.php

+#

+#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

+#

+##

+

+[Defines]

+  INF_VERSION                    = 0x00010005

+  BASE_NAME                      = QemuFwCfgPeiLib

+  FILE_GUID                      = ddd4f5f0-5304-42a8-9efa-d14bf11a3533

+  MODULE_TYPE                    = BASE

+  VERSION_STRING                 = 1.0

+  LIBRARY_CLASS                  = QemuFwCfgLib|PEIM

+

+  CONSTRUCTOR                    = QemuFwCfgInitialize

+

+#

+# The following information is for reference only and not required by the build tools.

+#

+#  VALID_ARCHITECTURES           = IA32 X64

+#

+

+[Sources]

+  QemuFwCfgLibInternal.h

+  QemuFwCfgLib.c

+  QemuFwCfgPei.c

+

+[Packages]

+  MdePkg/MdePkg.dec

+  OvmfPkg/OvmfPkg.dec

+

+[LibraryClasses]

+  BaseLib

+  BaseMemoryLib

+  DebugLib

+  IoLib

+  MemoryAllocationLib

+