[PATCH 0/2] Add Ramdisk support to ArmVirtPkg platforms

[PATCH 0/2] Add Ramdisk support to ArmVirtPkg platforms

[Vikas C Sajjan]

This series adds ramdisk driver support to ArmVirtPkg platforms.
It actually ports OvmfPkg commit 259d87146b07 to ArmVirtPkg.

changes since v1:
   - Made changes as suggested by Laszlo Ersek <lersek@redhat.com>
      a] clarified in the commit message (including the subject line)
         that this patch is actually about adding the RAM Disk driver to the
         ArmVirtPkg platforms, not just the NFIT reporting feature of the driver
      b] enabled feature for all of ArmVirtQemu, ArmVirtQemuKernel, and ArmVirtXen.
      c] prepended a patch to the series that extracts
         "MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf"
         from all of the DSC files, into "ArmVirt.dsc.inc"

Vikas C Sajjan (2):
  ArmVirtPkg: Move inclusion of AcpiTableDxe.inf to ArmVirt.dsc.inc
  ArmVirtPkg: Add Ramdisk support to ArmVirtPkg platforms

 ArmVirtPkg/ArmVirt.dsc.inc           | 13 +++++++++++++
 ArmVirtPkg/ArmVirtQemu.dsc           |  1 -
 ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc |  3 +++
 ArmVirtPkg/ArmVirtQemuKernel.dsc     |  1 -
 ArmVirtPkg/ArmVirtRules.fdf.inc      |  2 ++
 ArmVirtPkg/ArmVirtXen.dsc            |  1 -
 ArmVirtPkg/ArmVirtXen.fdf            |  3 +++
 7 files changed, 21 insertions(+), 3 deletions(-)

-- 
1.9.1

[PATCH 1/2] ArmVirtPkg: Move inclusion of AcpiTableDxe.inf to ArmVirt.dsc.inc

[Vikas C Sajjan]

Since ArmVirt.dsc.inc is included in all the ArmVirt dsc files,
move inclusion of AcpiTableDxe.inf to ArmVirt.dsc.inc.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Vikas C Sajjan <vikas.cha.sajjan@hpe.com>
---
 ArmVirtPkg/ArmVirt.dsc.inc       | 6 ++++++
 ArmVirtPkg/ArmVirtQemu.dsc       | 1 -
 ArmVirtPkg/ArmVirtQemuKernel.dsc | 1 -
 ArmVirtPkg/ArmVirtXen.dsc        | 1 -
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc
index ed18428..9e215c2 100644
--- a/ArmVirtPkg/ArmVirt.dsc.inc
+++ b/ArmVirtPkg/ArmVirt.dsc.inc
@@ -382,6 +382,12 @@
   MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
   MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
 
+[Components.AARCH64]
+  #
+  # ACPI Support
+  #
+  MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
+
   #
   # UEFI application (Shell Embedded Boot Loader)
   #
diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
index 9f88786..fa7dad5 100644
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -396,7 +396,6 @@
   #
   # ACPI Support
   #
-  MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
   OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf {
     <LibraryClasses>
       NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
index 6c536d9..fb7b1c3 100644
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -382,7 +382,6 @@
   #
   # ACPI Support
   #
-  MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
   OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf {
     <LibraryClasses>
       NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
diff --git a/ArmVirtPkg/ArmVirtXen.dsc b/ArmVirtPkg/ArmVirtXen.dsc
index 4ebead5..191b615 100644
--- a/ArmVirtPkg/ArmVirtXen.dsc
+++ b/ArmVirtPkg/ArmVirtXen.dsc
@@ -232,6 +232,5 @@
   # ACPI support
   #
 !if $(ARCH) == AARCH64
-  MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
   ArmVirtPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.inf
 !endif
-- 
1.9.1

[PATCH 2/2] ArmVirtPkg: Add Ramdisk support to ArmVirtPkg platforms

[Vikas C Sajjan]

Adds the RAMDisk support to ArmVirtPkg platforms.
This patch actually ports OvmfPkg commit 259d87146b07 to
ArmVirtPkg.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Vikas C Sajjan <vikas.cha.sajjan@hpe.com>
---
 ArmVirtPkg/ArmVirt.dsc.inc           | 7 +++++++
 ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 3 +++
 ArmVirtPkg/ArmVirtRules.fdf.inc      | 2 ++
 ArmVirtPkg/ArmVirtXen.fdf            | 3 +++
 4 files changed, 15 insertions(+)

diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc
index 9e215c2..66068f7 100644
--- a/ArmVirtPkg/ArmVirt.dsc.inc
+++ b/ArmVirtPkg/ArmVirt.dsc.inc
@@ -253,6 +253,10 @@
   gEfiMdePkgTokenSpaceGuid.PcdComponentName2Disable|TRUE
   gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnostics2Disable|TRUE
 
+[PcdsFeatureFlag.AARCH64]
+  # Activate AcpiSdtProtocol
+  gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE
+
   #
   # Control what commands are supported from the UI
   # Turn these on and off to add features or save size
@@ -382,6 +386,9 @@
   MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
   MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
 
+  # Ramdisk support
+  MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
+
 [Components.AARCH64]
   #
   # ACPI Support
diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
index ad7037f..14d06bb 100644
--- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
+++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
@@ -177,3 +177,6 @@ READ_LOCK_STATUS   = TRUE
   FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
     SECTION RAW = MdeModulePkg/Logo/Logo.bmp
   }
+
+  # Ramdisk support
+  INF MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
diff --git a/ArmVirtPkg/ArmVirtRules.fdf.inc b/ArmVirtPkg/ArmVirtRules.fdf.inc
index 8952c67..5ff3004 100644
--- a/ArmVirtPkg/ArmVirtRules.fdf.inc
+++ b/ArmVirtPkg/ArmVirtRules.fdf.inc
@@ -85,6 +85,8 @@
     DXE_DEPEX    DXE_DEPEX              Optional $(INF_OUTPUT)/$(MODULE_NAME).depex
     PE32         PE32                   $(INF_OUTPUT)/$(MODULE_NAME).efi
     UI           STRING="$(MODULE_NAME)" Optional
+    RAW          ACPI  Optional               |.acpi
+    RAW          ASL   Optional               |.aml
   }
 
 [Rule.Common.DXE_RUNTIME_DRIVER]
diff --git a/ArmVirtPkg/ArmVirtXen.fdf b/ArmVirtPkg/ArmVirtXen.fdf
index 0a97bd8..36671a8 100644
--- a/ArmVirtPkg/ArmVirtXen.fdf
+++ b/ArmVirtPkg/ArmVirtXen.fdf
@@ -188,6 +188,9 @@ READ_LOCK_STATUS   = TRUE
   INF ArmVirtPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.inf
 !endif
 
+ # Ramdisk support
+ INF MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
+
 [FV.FVMAIN_COMPACT]
 FvAlignment        = 16
 ERASE_POLARITY     = 1
-- 
1.9.1

Re: [PATCH 1/2] ArmVirtPkg: Move inclusion of AcpiTableDxe.inf to ArmVirt.dsc.inc

[Laszlo Ersek]

On 08/18/16 07:17, Vikas C Sajjan wrote:
> Since ArmVirt.dsc.inc is included in all the ArmVirt dsc files,
> move inclusion of AcpiTableDxe.inf to ArmVirt.dsc.inc.
> 
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Vikas C Sajjan <vikas.cha.sajjan@hpe.com>
> ---
>  ArmVirtPkg/ArmVirt.dsc.inc       | 6 ++++++
>  ArmVirtPkg/ArmVirtQemu.dsc       | 1 -
>  ArmVirtPkg/ArmVirtQemuKernel.dsc | 1 -
>  ArmVirtPkg/ArmVirtXen.dsc        | 1 -
>  4 files changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc
> index ed18428..9e215c2 100644
> --- a/ArmVirtPkg/ArmVirt.dsc.inc
> +++ b/ArmVirtPkg/ArmVirt.dsc.inc
> @@ -382,6 +382,12 @@
>    MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
>    MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
>  
> +[Components.AARCH64]
> +  #
> +  # ACPI Support
> +  #
> +  MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
> +
>    #
>    # UEFI application (Shell Embedded Boot Loader)
>    #

I don't think this is right; this way, Shell.inf gets restricted to
[Components.AARCH64] as well, and I think it will break the ARM build. I
think [Components.AARCH64] (with AcpiTableDxe.inf) should be added at
the very end of the file.

Thanks
Laszlo

> diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
> index 9f88786..fa7dad5 100644
> --- a/ArmVirtPkg/ArmVirtQemu.dsc
> +++ b/ArmVirtPkg/ArmVirtQemu.dsc
> @@ -396,7 +396,6 @@
>    #
>    # ACPI Support
>    #
> -  MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
>    OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf {
>      <LibraryClasses>
>        NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
> diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
> index 6c536d9..fb7b1c3 100644
> --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
> +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
> @@ -382,7 +382,6 @@
>    #
>    # ACPI Support
>    #
> -  MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
>    OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf {
>      <LibraryClasses>
>        NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
> diff --git a/ArmVirtPkg/ArmVirtXen.dsc b/ArmVirtPkg/ArmVirtXen.dsc
> index 4ebead5..191b615 100644
> --- a/ArmVirtPkg/ArmVirtXen.dsc
> +++ b/ArmVirtPkg/ArmVirtXen.dsc
> @@ -232,6 +232,5 @@
>    # ACPI support
>    #
>  !if $(ARCH) == AARCH64
> -  MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
>    ArmVirtPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.inf
>  !endif
> 

Re: [PATCH 2/2] ArmVirtPkg: Add Ramdisk support to ArmVirtPkg platforms

[Laszlo Ersek]

On 08/18/16 07:17, Vikas C Sajjan wrote:
> Adds the RAMDisk support to ArmVirtPkg platforms.
> This patch actually ports OvmfPkg commit 259d87146b07 to
> ArmVirtPkg.
> 
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Vikas C Sajjan <vikas.cha.sajjan@hpe.com>
> ---
>  ArmVirtPkg/ArmVirt.dsc.inc           | 7 +++++++
>  ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 3 +++
>  ArmVirtPkg/ArmVirtRules.fdf.inc      | 2 ++
>  ArmVirtPkg/ArmVirtXen.fdf            | 3 +++
>  4 files changed, 15 insertions(+)
> 
> diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc
> index 9e215c2..66068f7 100644
> --- a/ArmVirtPkg/ArmVirt.dsc.inc
> +++ b/ArmVirtPkg/ArmVirt.dsc.inc
> @@ -253,6 +253,10 @@
>    gEfiMdePkgTokenSpaceGuid.PcdComponentName2Disable|TRUE
>    gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnostics2Disable|TRUE
>  
> +[PcdsFeatureFlag.AARCH64]
> +  # Activate AcpiSdtProtocol
> +  gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE
> +
>    #
>    # Control what commands are supported from the UI
>    # Turn these on and off to add features or save size

Similar problem to the one with the previous patch: this change
restricts PcdEmbeddedMacBoot etc to AARCH64. They used to be under
[PcdsFeatureFlag.common]'s scope.

> @@ -382,6 +386,9 @@
>    MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
>    MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
>  
> +  # Ramdisk support
> +  MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
> +

Looks good, this is under [Components.common].

>  [Components.AARCH64]
>    #
>    # ACPI Support
> diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
> index ad7037f..14d06bb 100644
> --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
> +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
> @@ -177,3 +177,6 @@ READ_LOCK_STATUS   = TRUE
>    FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
>      SECTION RAW = MdeModulePkg/Logo/Logo.bmp
>    }
> +
> +  # Ramdisk support
> +  INF MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf

The rest of the file uses a commenting style like

  #
  # Ramdisk support
  #

Not very important, but preferable.

> diff --git a/ArmVirtPkg/ArmVirtRules.fdf.inc b/ArmVirtPkg/ArmVirtRules.fdf.inc
> index 8952c67..5ff3004 100644
> --- a/ArmVirtPkg/ArmVirtRules.fdf.inc
> +++ b/ArmVirtPkg/ArmVirtRules.fdf.inc
> @@ -85,6 +85,8 @@
>      DXE_DEPEX    DXE_DEPEX              Optional $(INF_OUTPUT)/$(MODULE_NAME).depex
>      PE32         PE32                   $(INF_OUTPUT)/$(MODULE_NAME).efi
>      UI           STRING="$(MODULE_NAME)" Optional
> +    RAW          ACPI  Optional               |.acpi
> +    RAW          ASL   Optional               |.aml
>    }
>  
>  [Rule.Common.DXE_RUNTIME_DRIVER]

Looks okay (modifies [Rule.Common.DXE_DRIVER])

> diff --git a/ArmVirtPkg/ArmVirtXen.fdf b/ArmVirtPkg/ArmVirtXen.fdf
> index 0a97bd8..36671a8 100644
> --- a/ArmVirtPkg/ArmVirtXen.fdf
> +++ b/ArmVirtPkg/ArmVirtXen.fdf
> @@ -188,6 +188,9 @@ READ_LOCK_STATUS   = TRUE
>    INF ArmVirtPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.inf
>  !endif
>  
> + # Ramdisk support
> + INF MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
> +
>  [FV.FVMAIN_COMPACT]
>  FvAlignment        = 16
>  ERASE_POLARITY     = 1
> 

This hunk looks good too.

Thanks
Laszlo