Onboard SBSA based ARM platform to MU

.azurepipelines/Ubuntu-GCC5.yml

@@ -15,7 +15,7 @@ resources:
       ref: main
 
 variables:
-- group: architectures-x86-64
+- group: architectures-arm64-x86-64
 - group: tool-chain-ubuntu-gcc
 
 jobs:
@@ -27,7 +27,7 @@ jobs:
     do_non_ci_build: false
     do_non_ci_setup: true
     do_pr_eval: true
-    packages: QemuQ35Pkg
+    packages: QemuQ35Pkg,QemuSbsaPkg
     target_list: NO-TARGET
     tool_chain_tag: $(tool_chain_tag)
     vm_image: ubuntu-latest

.gitmodules

@@ -14,3 +14,11 @@
 	path = Common/MU_OEM_SAMPLE
 	url = https://github.com/microsoft/mu_oem_sample.git
 	branch = release/202208
+[submodule "Silicon/Arm/MU_TIANO"]
+	path = Silicon/Arm/MU_TIANO
+	url = https://github.com/microsoft/mu_silicon_arm_tiano.git
+	branch = release/202208
+[submodule "Silicon/Arm/TFA"]
+	path = Silicon/Arm/TFA
+	url = https://github.com/ARM-software/arm-trusted-firmware.git
+	branch = v2.7

.pytool/CISettings.py

@@ -41,12 +41,13 @@ def GetPackagesSupported(self):
         ''' return iterable of edk2 packages supported by this build.
         These should be edk2 workspace relative paths '''
 
-        return ("QemuQ35Pkg",)
+        return ("QemuQ35Pkg","QemuSbsaPkg")
 
     def GetArchitecturesSupported(self):
         ''' return iterable of edk2 architectures supported by this build '''
         return ("IA32",
-                "X64")
+                "X64",
+                "AARCH64")
 
     def GetTargetsSupported(self):
         ''' return iterable of edk2 target tags supported by this build '''

Features/mu_config_ext_dep.yaml

@@ -9,6 +9,6 @@
   "name": "FEATURE_CONFIG",
   "var_name": "FEATURE_CONFIG_PATH",
   "source": "https://github.com/microsoft/mu_feature_config.git",
-  "version": "a94415b80bbd559de4678ecf012b75163ebd5275",
+  "version": "aedb83bef7882353b3ee36958f23df65468db3eb",
   "flags": ["set_build_var"]
 }

Platforms/QemuQ35Pkg/QemuQ35Pkg.dec

@@ -296,6 +296,13 @@
   #  instance in PiSmmCpuDxeSmm, and CpuHotplugSmm.
   gUefiQemuQ35PkgTokenSpaceGuid.PcdCpuHotEjectDataAddress|0|UINT64|0x46
 
+  ## This PCD tracks where PcdVideo{Horizontal,Vertical}Resolution
+  #  values are coming from.
+  #    0 - unset (defaults from platform dsc)
+  #    1 - set from PlatformConfig
+  #    2 - set by GOP Driver.
+  gUefiQemuQ35PkgTokenSpaceGuid.PcdVideoResolutionSource|0|UINT8|0x64
+
 [PcdsFeatureFlag]
   gUefiQemuQ35PkgTokenSpaceGuid.PcdQemuBootOrderPciTranslation|TRUE|BOOLEAN|0x1c
   gUefiQemuQ35PkgTokenSpaceGuid.PcdQemuBootOrderMmioTranslation|FALSE|BOOLEAN|0x1d

Platforms/QemuQ35Pkg/QemuQ35Pkg.dsc

@@ -975,6 +975,8 @@ PlatformSmmProtectionsTestLib|UefiTestingPkg/Library/PlatformSmmProtectionsTestL
   # Set video resolution for text setup.
   gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoHorizontalResolution|1024
   gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoVerticalResolution|768
+  # Set video resolution source to be controlled by video driver
+  gUefiQemuQ35PkgTokenSpaceGuid.PcdVideoResolutionSource|2
 
   gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosVersion|0x0208
   gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosDocRev|0x0

Platforms/QemuQ35Pkg/QemuVideoDxe/Driver.c

@@ -45,6 +45,36 @@ QEMU_VIDEO_CARD  gQemuVideoCardList[] = {
     CIRRUS_LOGIC_5446_DEVICE_ID,
     QEMU_VIDEO_CIRRUS_5446,
     L"Cirrus 5446"
+  },{
+    PCI_CLASS_DISPLAY_VGA,
+    0x1234,
+    0x1111,
+    QEMU_VIDEO_BOCHS_MMIO,
+    L"QEMU Standard VGA"
+  },{
+    PCI_CLASS_DISPLAY_OTHER,
+    0x1234,
+    0x1111,
+    QEMU_VIDEO_BOCHS_MMIO,
+    L"QEMU Standard VGA (secondary)"
+  },{
+    PCI_CLASS_DISPLAY_VGA,
+    0x1b36,
+    0x0100,
+    QEMU_VIDEO_BOCHS,
+    L"QEMU QXL VGA"
+  },{
+    PCI_CLASS_DISPLAY_VGA,
+    0x1af4,
+    0x1050,
+    QEMU_VIDEO_BOCHS_MMIO,
+    L"QEMU VirtIO VGA"
+  },{
+    PCI_CLASS_DISPLAY_VGA,
+    0x15ad,
+    0x0405,
+    QEMU_VIDEO_VMWARE_SVGA,
+    L"QEMU VMWare SVGA"
   },{
     0     /* end of list */
   }
@@ -175,6 +205,7 @@ QemuVideoControllerDriverStart (
   EFI_TPL                   OldTpl;
   EFI_STATUS                Status;
   QEMU_VIDEO_PRIVATE_DATA   *Private;
+  BOOLEAN                   IsQxl;
   EFI_DEVICE_PATH_PROTOCOL  *ParentDevicePath;
   ACPI_ADR_DEVICE_PATH      AcpiDeviceNode;
   PCI_TYPE00                Pci;
@@ -238,6 +269,12 @@ QemuVideoControllerDriverStart (
 
   Private->Variant = Card->Variant;
 
+  //
+  // IsQxl is based on the detected Card->Variant, which at a later point might
+  // not match Private->Variant.
+  //
+  IsQxl = (BOOLEAN)(Card->Variant == QEMU_VIDEO_BOCHS);
+
   //
   // Save original PCI attributes
   //
@@ -300,6 +337,59 @@ QemuVideoControllerDriverStart (
     goto ClosePciIo;
   }
 
+  //
+  // Check whenever the qemu stdvga mmio bar is present (qemu 1.3+).
+  //
+  if (Private->Variant == QEMU_VIDEO_BOCHS_MMIO) {
+    EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR  *MmioDesc;
+
+    Status = Private->PciIo->GetBarAttributes (
+                               Private->PciIo,
+                               PCI_BAR_IDX2,
+                               NULL,
+                               (VOID **)&MmioDesc
+                               );
+    if (EFI_ERROR (Status) ||
+        (MmioDesc->ResType != ACPI_ADDRESS_SPACE_TYPE_MEM))
+    {
+      DEBUG ((DEBUG_INFO, "QemuVideo: No mmio bar, fallback to port io\n"));
+      Private->Variant = QEMU_VIDEO_BOCHS;
+    } else {
+      DEBUG ((
+        DEBUG_INFO,
+        "QemuVideo: Using mmio bar @ 0x%lx\n",
+        MmioDesc->AddrRangeMin
+        ));
+    }
+
+    if (!EFI_ERROR (Status)) {
+      FreePool (MmioDesc);
+    }
+  }
+
+  //
+  // VMWare SVGA is handled like Bochs (with port IO only).
+  //
+  if (Private->Variant == QEMU_VIDEO_VMWARE_SVGA) {
+    Private->Variant                 = QEMU_VIDEO_BOCHS;
+    Private->FrameBufferVramBarIndex = PCI_BAR_IDX1;
+  }
+
+  //
+  // Check if accessing the bochs interface works.
+  //
+  if ((Private->Variant == QEMU_VIDEO_BOCHS_MMIO) ||
+      (Private->Variant == QEMU_VIDEO_BOCHS))
+  {
+    UINT16  BochsId;
+    BochsId = BochsRead (Private, VBE_DISPI_INDEX_ID);
+    if ((BochsId & 0xFFF0) != VBE_DISPI_ID0) {
+      DEBUG ((DEBUG_INFO, "QemuVideo: BochsID mismatch (got 0x%x)\n", BochsId));
+      Status = EFI_DEVICE_ERROR;
+      goto RestoreAttributes;
+    }
+  }
+
   //
   // Get ParentDevicePath
   //
@@ -351,6 +441,10 @@ QemuVideoControllerDriverStart (
     case QEMU_VIDEO_CIRRUS_5446:
       Status = QemuVideoCirrusModeSetup (Private);
       break;
+    case QEMU_VIDEO_BOCHS_MMIO:
+    case QEMU_VIDEO_BOCHS:
+      Status = QemuVideoBochsModeSetup (Private, IsQxl);
+      break;
     default:
       ASSERT (FALSE);
       Status = EFI_DEVICE_ERROR;
@@ -827,14 +921,118 @@ InitializeCirrusGraphicsMode (
   ClearScreen (Private);
 }
 
+VOID
+BochsWrite (
+  QEMU_VIDEO_PRIVATE_DATA  *Private,
+  UINT16                   Reg,
+  UINT16                   Data
+  )
+{
+  EFI_STATUS  Status;
+
+  if (Private->Variant == QEMU_VIDEO_BOCHS_MMIO) {
+    Status = Private->PciIo->Mem.Write (
+                                   Private->PciIo,
+                                   EfiPciIoWidthUint16,
+                                   PCI_BAR_IDX2,
+                                   0x500 + (Reg << 1),
+                                   1,
+                                   &Data
+                                   );
+    ASSERT_EFI_ERROR (Status);
+  } else {
+    outw (Private, VBE_DISPI_IOPORT_INDEX, Reg);
+    outw (Private, VBE_DISPI_IOPORT_DATA, Data);
+  }
+}
+
+UINT16
+BochsRead (
+  QEMU_VIDEO_PRIVATE_DATA  *Private,
+  UINT16                   Reg
+  )
+{
+  EFI_STATUS  Status;
+  UINT16      Data;
+
+  if (Private->Variant == QEMU_VIDEO_BOCHS_MMIO) {
+    Status = Private->PciIo->Mem.Read (
+                                   Private->PciIo,
+                                   EfiPciIoWidthUint16,
+                                   PCI_BAR_IDX2,
+                                   0x500 + (Reg << 1),
+                                   1,
+                                   &Data
+                                   );
+    ASSERT_EFI_ERROR (Status);
+  } else {
+    outw (Private, VBE_DISPI_IOPORT_INDEX, Reg);
+    Data = inw (Private, VBE_DISPI_IOPORT_DATA);
+  }
+
+  return Data;
+}
+
 VOID
 VgaOutb (
   QEMU_VIDEO_PRIVATE_DATA  *Private,
   UINTN                    Reg,
   UINT8                    Data
   )
 {
-  outb (Private, Reg, Data);
+  EFI_STATUS  Status;
+
+  if (Private->Variant == QEMU_VIDEO_BOCHS_MMIO) {
+    Status = Private->PciIo->Mem.Write (
+                                   Private->PciIo,
+                                   EfiPciIoWidthUint8,
+                                   PCI_BAR_IDX2,
+                                   0x400 - 0x3c0 + Reg,
+                                   1,
+                                   &Data
+                                   );
+    ASSERT_EFI_ERROR (Status);
+  } else {
+    outb (Private, Reg, Data);
+  }
+}
+
+VOID
+InitializeBochsGraphicsMode (
+  QEMU_VIDEO_PRIVATE_DATA  *Private,
+  QEMU_VIDEO_MODE_DATA     *ModeData
+  )
+{
+  DEBUG ((
+    DEBUG_INFO,
+    "InitializeBochsGraphicsMode: %dx%d @ %d\n",
+    ModeData->HorizontalResolution,
+    ModeData->VerticalResolution,
+    ModeData->ColorDepth
+    ));
+
+  /* unblank */
+  VgaOutb (Private, ATT_ADDRESS_REGISTER, 0x20);
+
+  BochsWrite (Private, VBE_DISPI_INDEX_ENABLE, 0);
+  BochsWrite (Private, VBE_DISPI_INDEX_BANK, 0);
+  BochsWrite (Private, VBE_DISPI_INDEX_X_OFFSET, 0);
+  BochsWrite (Private, VBE_DISPI_INDEX_Y_OFFSET, 0);
+
+  BochsWrite (Private, VBE_DISPI_INDEX_BPP, (UINT16)ModeData->ColorDepth);
+  BochsWrite (Private, VBE_DISPI_INDEX_XRES, (UINT16)ModeData->HorizontalResolution);
+  BochsWrite (Private, VBE_DISPI_INDEX_VIRT_WIDTH, (UINT16)ModeData->HorizontalResolution);
+  BochsWrite (Private, VBE_DISPI_INDEX_YRES, (UINT16)ModeData->VerticalResolution);
+  BochsWrite (Private, VBE_DISPI_INDEX_VIRT_HEIGHT, (UINT16)ModeData->VerticalResolution);
+
+  BochsWrite (
+    Private,
+    VBE_DISPI_INDEX_ENABLE,
+    VBE_DISPI_ENABLED | VBE_DISPI_LFB_ENABLED
+    );
+
+  SetDefaultPalette (Private);
+  ClearScreen (Private);
 }
 
 EFI_STATUS

Platforms/QemuQ35Pkg/QemuVideoDxe/Gop.c

@@ -30,8 +30,15 @@ QemuVideoCompleteModeInfo (
     Info->PixelInformation.BlueMask     = PIXEL24_BLUE_MASK;
     Info->PixelInformation.ReservedMask = 0;
   } else if (ModeData->ColorDepth == 32) {
-    DEBUG ((DEBUG_INFO, "PixelBlueGreenRedReserved8BitPerColor\n"));
-    Info->PixelFormat = PixelBlueGreenRedReserved8BitPerColor;
+    DEBUG ((DEBUG_VERBOSE, "PixelBlueGreenRedReserved8BitPerColor\n"));
+    Info->PixelFormat                   = PixelBlueGreenRedReserved8BitPerColor;
+    Info->PixelInformation.RedMask      = 0;
+    Info->PixelInformation.GreenMask    = 0;
+    Info->PixelInformation.BlueMask     = 0;
+    Info->PixelInformation.ReservedMask = 0;
+  } else {
+    DEBUG ((DEBUG_ERROR, "%a: Invalid ColorDepth %u", __FUNCTION__, ModeData->ColorDepth));
+    ASSERT (FALSE);
   }
 
   Info->PixelsPerScanLine = Info->HorizontalResolution;
@@ -175,6 +182,10 @@ Routine Description:
     case QEMU_VIDEO_CIRRUS_5446:
       InitializeCirrusGraphicsMode (Private, &QemuVideoCirrusModes[ModeData->InternalModeIndex]);
       break;
+    case QEMU_VIDEO_BOCHS_MMIO:
+    case QEMU_VIDEO_BOCHS:
+      InitializeBochsGraphicsMode (Private, ModeData);
+      break;
     default:
       ASSERT (FALSE);
       return EFI_DEVICE_ERROR;
@@ -245,16 +256,16 @@ Routine Description:
 EFI_STATUS
 EFIAPI
 QemuVideoGraphicsOutputBlt (
-  IN  EFI_GRAPHICS_OUTPUT_PROTOCOL *This,
-  IN  EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BltBuffer, OPTIONAL
-  IN  EFI_GRAPHICS_OUTPUT_BLT_OPERATION     BltOperation,
-  IN  UINTN                                 SourceX,
-  IN  UINTN                                 SourceY,
-  IN  UINTN                                 DestinationX,
-  IN  UINTN                                 DestinationY,
-  IN  UINTN                                 Width,
-  IN  UINTN                                 Height,
-  IN  UINTN                                 Delta
+  IN  EFI_GRAPHICS_OUTPUT_PROTOCOL       *This,
+  IN  EFI_GRAPHICS_OUTPUT_BLT_PIXEL      *BltBuffer  OPTIONAL,
+  IN  EFI_GRAPHICS_OUTPUT_BLT_OPERATION  BltOperation,
+  IN  UINTN                              SourceX,
+  IN  UINTN                              SourceY,
+  IN  UINTN                              DestinationX,
+  IN  UINTN                              DestinationY,
+  IN  UINTN                              Width,
+  IN  UINTN                              Height,
+  IN  UINTN                              Delta
   )
 
 /*++
@@ -435,6 +446,12 @@ QemuVideoGraphicsOutputConstructor (
     goto FreeInfo;
   }
 
+  DrawLogo (
+    Private,
+    Private->ModeData[Private->GraphicsOutput.Mode->Mode].HorizontalResolution,
+    Private->ModeData[Private->GraphicsOutput.Mode->Mode].VerticalResolution
+    );
+
   return EFI_SUCCESS;
 
 FreeInfo: