Separate User Address Spaces for DXE drivers.

.github/workflows/build_arm.yaml

@@ -98,6 +98,38 @@ jobs:
               cp ./Build/ArmVirtQemu-"$arch"/"$target"_"$TOOLCHAIN"/FV/QEMU_EFI.fd ./firmware_artifacts/ArmVirtQemu/"$arch"/"$target"_"$TOOLCHAIN"/FW.fd
               done
           done
+          rm -r ./Build/*
+        env:
+          ARCHS: ARM,AARCH64
+          TARGETS: RELEASE,DEBUG,NOOPT
+          TOOLCHAIN: GCC
+
+      - name: Build ArmVirtQemu for Linux
+        if: always()
+        run: ./efibuild.sh
+        env:
+          SELFPKG: ArmVirtQemu
+          SELFPKG_DIR: ArmVirtPkg
+          TOOLCHAINS: GCC
+          ARCHS: ARM,AARCH64
+          TARGETS: RELEASE,DEBUG,NOOPT
+          SKIP_TESTS: 1
+          SKIP_PACKAGE: 1
+          GCC_ARM_PREFIX: arm-linux-gnueabi-
+          GCC_AARCH64_PREFIX: aarch64-linux-gnu-
+          BUILD_ARGUMENTS: -D USER_SPACE
+
+      - name: Prepare artifacts with firmwares for Linux
+        if: always()
+        run: |
+          IFS=', ' read -r -a TARGETS <<< "$TARGETS"
+          IFS=', ' read -r -a ARCHS <<< "$ARCHS"
+          for target in "${TARGETS[@]}"; do
+            for arch in "${ARCHS[@]}"; do
+              mkdir -p ./firmware_artifacts/ArmVirtQemu/Linux/"$arch"/"$target"_"$TOOLCHAIN"
+              cp ./Build/ArmVirtQemu-"$arch"/"$target"_"$TOOLCHAIN"/FV/QEMU_EFI.fd ./firmware_artifacts/ArmVirtQemu/Linux/"$arch"/"$target"_"$TOOLCHAIN"/FW.fd
+              done
+          done
         env:
           ARCHS: ARM,AARCH64
           TARGETS: RELEASE,DEBUG,NOOPT
@@ -194,6 +226,36 @@ jobs:
               cp ./Build/ArmVirtQemu-"$arch"/"$target"_"$TOOLCHAIN"/FV/QEMU_EFI.fd ./firmware_artifacts/ArmVirtQemu/"$arch"/"$target"_"$TOOLCHAIN"/FW.fd
               done
           done
+          rm -r ./Build/*
+        env:
+          ARCHS: ARM,AARCH64
+          TARGETS: RELEASE,DEBUG,NOOPT
+          TOOLCHAIN: CLANGDWARF
+
+      - name: Build ArmVirtQemu for Linux
+        if: always()
+        run: ./efibuild.sh
+        env:
+          SELFPKG: ArmVirtQemu
+          SELFPKG_DIR: ArmVirtPkg
+          TOOLCHAINS: CLANGDWARF
+          ARCHS: ARM,AARCH64
+          TARGETS: RELEASE,DEBUG,NOOPT
+          SKIP_TESTS: 1
+          SKIP_PACKAGE: 1
+          BUILD_ARGUMENTS: -D USER_SPACE
+
+      - name: Prepare artifacts with firmwares for Linux
+        if: always()
+        run: |
+          IFS=', ' read -r -a TARGETS <<< "$TARGETS"
+          IFS=', ' read -r -a ARCHS <<< "$ARCHS"
+          for target in "${TARGETS[@]}"; do
+            for arch in "${ARCHS[@]}"; do
+              mkdir -p ./firmware_artifacts/ArmVirtQemu/Linux/"$arch"/"$target"_"$TOOLCHAIN"
+              cp ./Build/ArmVirtQemu-"$arch"/"$target"_"$TOOLCHAIN"/FV/QEMU_EFI.fd ./firmware_artifacts/ArmVirtQemu/Linux/"$arch"/"$target"_"$TOOLCHAIN"/FW.fd
+              done
+          done
         env:
           ARCHS: ARM,AARCH64
           TARGETS: RELEASE,DEBUG,NOOPT
@@ -272,6 +334,8 @@ jobs:
             for arch in "${ARCHS[@]}"; do
                 echo Checking "$PACKAGE""$arch" "$target"_"$TOOLCHAIN"
                 python3 test_qemu_fw.py ./firmware_artifacts/"$PACKAGE"/"$arch"/"$target"_"$TOOLCHAIN"/FW.fd --fw-arch "$arch"
+                echo Checking "$PACKAGE""$arch" "$target"_"$TOOLCHAIN" for Linux
+                python3 test_qemu_fw.py ./firmware_artifacts/"$PACKAGE"/Linux/"$arch"/"$target"_"$TOOLCHAIN"/FW.fd --fw-arch "$arch"
             done
           done
         env:
@@ -289,6 +353,8 @@ jobs:
             for arch in "${ARCHS[@]}"; do
               echo Checking "$PACKAGE""$arch" "$target"_"$TOOLCHAIN"
                 python3 test_qemu_fw.py ./firmware_artifacts/"$PACKAGE"/"$arch"/"$target"_"$TOOLCHAIN"/FW.fd --test-linux --fw-arch "$arch"
+              echo Checking "$PACKAGE""$arch" "$target"_"$TOOLCHAIN" for Linux
+                python3 test_qemu_fw.py ./firmware_artifacts/"$PACKAGE"/Linux/"$arch"/"$target"_"$TOOLCHAIN"/FW.fd --test-linux --fw-arch "$arch"
             done
           done
         env:

.github/workflows/build_nolto.yaml

@@ -101,6 +101,38 @@ jobs:
               cp ./Build/ArmVirtQemu-"$arch"/"$target"_"$TOOLCHAIN"/FV/QEMU_EFI.fd ./firmware_artifacts/ArmVirtQemu/"$arch"/"$target"_"$TOOLCHAIN"/FW.fd
               done
           done
+          rm -r ./Build/*
+        env:
+          ARCHS: ARM,AARCH64
+          TARGETS: RELEASE,DEBUG
+          TOOLCHAIN: GCC
+
+      - name: Build ArmVirtQemu for Linux
+        if: always()
+        run: ./efibuild.sh
+        env:
+          SELFPKG: ArmVirtQemu
+          SELFPKG_DIR: ArmVirtPkg
+          TOOLCHAINS: GCC
+          ARCHS: ARM,AARCH64
+          TARGETS: RELEASE,DEBUG
+          SKIP_TESTS: 1
+          SKIP_PACKAGE: 1
+          GCC_ARM_PREFIX: arm-linux-gnueabi-
+          GCC_AARCH64_PREFIX: aarch64-linux-gnu-
+          BUILD_ARGUMENTS: -D EDK2_GCC_NOLTO -D USER_SPACE
+
+      - name: Prepare artifacts with firmwares for Linux
+        if: always()
+        run: |
+          IFS=', ' read -r -a TARGETS <<< "$TARGETS"
+          IFS=', ' read -r -a ARCHS <<< "$ARCHS"
+          for target in "${TARGETS[@]}"; do
+            for arch in "${ARCHS[@]}"; do
+              mkdir -p ./firmware_artifacts/ArmVirtQemu/Linux/"$arch"/"$target"_"$TOOLCHAIN"
+              cp ./Build/ArmVirtQemu-"$arch"/"$target"_"$TOOLCHAIN"/FV/QEMU_EFI.fd ./firmware_artifacts/ArmVirtQemu/Linux/"$arch"/"$target"_"$TOOLCHAIN"/FW.fd
+              done
+          done
         env:
           ARCHS: ARM,AARCH64
           TARGETS: RELEASE,DEBUG
@@ -420,6 +452,8 @@ jobs:
             for arch in "${ARCHS[@]}"; do
                 echo Checking "$PACKAGE""$arch" "$target"_"$TOOLCHAIN"
                 python3 test_qemu_fw.py ./firmware_artifacts/"$PACKAGE"/"$arch"/"$target"_"$TOOLCHAIN"/FW.fd --fw-arch "$arch"
+                echo Checking "$PACKAGE""$arch" "$target"_"$TOOLCHAIN" for Linux
+                python3 test_qemu_fw.py ./firmware_artifacts/"$PACKAGE"/Linux/"$arch"/"$target"_"$TOOLCHAIN"/FW.fd --fw-arch "$arch"
             done
           done
         env:
@@ -437,6 +471,8 @@ jobs:
             for arch in "${ARCHS[@]}"; do
               echo Checking "$PACKAGE""$arch" "$target"_"$TOOLCHAIN"
                 python3 test_qemu_fw.py ./firmware_artifacts/"$PACKAGE"/"$arch"/"$target"_"$TOOLCHAIN"/FW.fd --test-linux --fw-arch "$arch"
+              echo Checking "$PACKAGE""$arch" "$target"_"$TOOLCHAIN" for Linux
+                python3 test_qemu_fw.py ./firmware_artifacts/"$PACKAGE"/Linux/"$arch"/"$target"_"$TOOLCHAIN"/FW.fd --test-linux --fw-arch "$arch"
             done
           done
         env:

ArmPkg/Drivers/ArmCrashDumpDxe/ArmCrashDumpDxe.c

@@ -29,6 +29,6 @@ ArmCrashDumpDxeInitialize (
   return mCpu->RegisterInterruptHandler (
                  mCpu,
                  EXCEPT_AARCH64_SYNCHRONOUS_EXCEPTIONS,
-                 &DefaultExceptionHandler
+                 (EFI_CPU_INTERRUPT_HANDLER)&DefaultExceptionHandler
                  );
 }

ArmPkg/Drivers/CpuPei/CpuPei.c

@@ -95,7 +95,7 @@ SetMemoryPermissions (
     return EFI_INVALID_PARAMETER;
   }
 
-  return ArmSetMemoryAttributes (BaseAddress, Length, Attributes, AttributeMask);
+  return ArmSetMemoryAttributes (BaseAddress, Length, Attributes, AttributeMask, 0);
 }
 
 STATIC CONST EDKII_MEMORY_ATTRIBUTE_PPI  mMemoryAttributePpi = {

ArmPkg/Include/Library/ArmMmuLib.h

@@ -21,6 +21,14 @@ ArmConfigureMmu (
   OUT UINTN                         *TranslationTableSize  OPTIONAL
   );
 
+EFI_STATUS
+EFIAPI
+ArmMakeUserPageTableTemplate (
+  IN  ARM_MEMORY_REGION_DESCRIPTOR  *MemoryTable,
+  OUT UINTN                         *TranslationTableBase,
+  OUT UINTN                         *TranslationTableSize
+  );
+
 VOID
 EFIAPI
 ArmReplaceLiveTranslationEntry (
@@ -54,6 +62,7 @@ ArmReplaceLiveTranslationEntry (
   @param[in]  Length          The size in bytes of the memory region.
   @param[in]  Attributes      Mask of memory attributes to set.
   @param[in]  AttributeMask   Mask of memory attributes to take into account.
+  @param[in]  UserPageTable   The base address of the User page table.
 
   @retval EFI_SUCCESS           The attributes were set for the memory region.
   @retval EFI_INVALID_PARAMETER BaseAddress or Length is not suitably aligned.
@@ -68,7 +77,8 @@ ArmSetMemoryAttributes (
   IN EFI_PHYSICAL_ADDRESS  BaseAddress,
   IN UINT64                Length,
   IN UINT64                Attributes,
-  IN UINT64                AttributeMask
+  IN UINT64                AttributeMask,
+  IN UINTN                 UserPageTable  OPTIONAL
   );
 
 #endif // ARM_MMU_LIB_H_

ArmPkg/Include/Library/DefaultExceptionHandlerLib.h

@@ -9,17 +9,30 @@
 #ifndef DEFAULT_EXCEPTION_HANDLER_LIB_H_
 #define DEFAULT_EXCEPTION_HANDLER_LIB_H_
 
+typedef
+EFI_STATUS
+(EFIAPI *EFI_SYS_CALL_BOOT_SERVICE)(
+  IN EFI_SYSTEM_CONTEXT  Context
+  );
+
 /**
   This is the default action to take on an unexpected exception
 
   @param  ExceptionType    Type of the exception
   @param  SystemContext    Register state at the time of the Exception
 
 **/
-VOID
+EFI_STATUS
+EFIAPI
 DefaultExceptionHandler (
   IN     EFI_EXCEPTION_TYPE  ExceptionType,
   IN OUT EFI_SYSTEM_CONTEXT  SystemContext
   );
 
+VOID
+EFIAPI
+InitializeSysCallHandler (
+  IN EFI_SYS_CALL_BOOT_SERVICE  Handler
+  );
+
 #endif // DEFAULT_EXCEPTION_HANDLER_LIB_H_