Merge branch 'release/202302' into personal/klautner/fix_testpoint_is…

…sues

.azurepipelines/MuDevOpsWrapper.yml

@@ -17,7 +17,7 @@ resources:
       type: github
       endpoint: microsoft
       name: microsoft/mu_devops
-      ref: refs/tags/v5.0.4
+      ref: refs/tags/v5.0.6
 
 parameters:
 - name: do_ci_build
@@ -71,7 +71,7 @@ parameters:
 jobs:
 - template: Jobs/PrGate.yml@mu_devops
   parameters:
-    linux_container_image: ghcr.io/microsoft/mu_devops/ubuntu-22-build:ea6d2e6
+    linux_container_image: ghcr.io/microsoft/mu_devops/ubuntu-22-build:3bf70b5
     do_ci_build: ${{ parameters.do_ci_build }}
     do_ci_setup: ${{ parameters.do_ci_setup }}
     do_pr_eval: ${{ parameters.do_pr_eval }}

.github/workflows/auto-approve.yml

@@ -25,5 +25,5 @@ jobs:
   approval_check:
     if: |
       github.event.pull_request.user.login == 'dependabot[bot]' || github.event.pull_request.user.login == 'uefibot'
-    uses: microsoft/mu_devops/.github/workflows/[email protected].4
+    uses: microsoft/mu_devops/.github/workflows/[email protected].6
     secrets: inherit

.github/workflows/auto-merge.yml

@@ -26,5 +26,5 @@ jobs:
   merge_check:
     if: |
       github.event.pull_request.user.login == 'dependabot[bot]' || github.event.pull_request.user.login == 'uefibot'
-    uses: microsoft/mu_devops/.github/workflows/[email protected].4
+    uses: microsoft/mu_devops/.github/workflows/[email protected].6
     secrets: inherit

.github/workflows/issue-assignment.yml

@@ -18,4 +18,4 @@ on:
 
 jobs:
   apply:
-    uses: microsoft/mu_devops/.github/workflows/[email protected].4
+    uses: microsoft/mu_devops/.github/workflows/[email protected].6

.github/workflows/label-issues.yml

@@ -31,4 +31,4 @@ on:
 
 jobs:
   apply:
-    uses: microsoft/mu_devops/.github/workflows/[email protected].4
+    uses: microsoft/mu_devops/.github/workflows/[email protected].6

.github/workflows/label-sync.yml

@@ -24,4 +24,4 @@ on:
 
 jobs:
   sync:
-    uses: microsoft/mu_devops/.github/workflows/[email protected].4
+    uses: microsoft/mu_devops/.github/workflows/[email protected].6

.github/workflows/release-draft.yml

@@ -27,5 +27,5 @@ on:
 
 jobs:
   draft:
-    uses: microsoft/mu_devops/.github/workflows/[email protected].4
+    uses: microsoft/mu_devops/.github/workflows/[email protected].6
     secrets: inherit

.github/workflows/stale.yml

@@ -24,4 +24,4 @@ on:
 
 jobs:
   check:
-    uses: microsoft/mu_devops/.github/workflows/[email protected].4
+    uses: microsoft/mu_devops/.github/workflows/[email protected].6

.github/workflows/triage-issues.yml

@@ -19,4 +19,4 @@ on:
 
 jobs:
   triage:
-    uses: microsoft/mu_devops/.github/workflows/[email protected].4
+    uses: microsoft/mu_devops/.github/workflows/[email protected].6

MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c

@@ -70,7 +70,7 @@ DebugDisplayReOrderTable (
   IN EFI_CPU_ID_ORDER_MAP *CpuApicIdOrderTable
   )
 {
-  UINT32 Index;
+  UINTN Index; // MU_CHANGE - Codeql
 
   DEBUG ((DEBUG_INFO, "Index  AcpiProcId  ApicId   Thread  Flags   Skt\n"));
   for (Index = 0; Index < mNumberOfCpus; Index++) {
@@ -144,9 +144,9 @@ CreateCpuLocalApicInTable (
   EFI_STATUS                                Status;
   EFI_PROCESSOR_INFORMATION                 ProcessorInfoBuffer;
   UINT32                                    Index;
-  UINT32                                    CurrProcessor;
+  UINTN                                     CurrProcessor; // MU_CHANGE - Codeql
   EFI_CPU_ID_ORDER_MAP                      *CpuIdMapPtr;
-  UINT32                                    Socket;
+  UINTN                                     Socket;        // MU_CHANGE - Codeql
 
   Status     = EFI_SUCCESS;
 
@@ -1141,6 +1141,9 @@ PlatformUpdateTables (
     FadtHeader->XGpe0Blk.AccessSize               = PcdGet8 (PcdAcpiXGpe0BlkAccessSize);
     FadtHeader->XGpe1Blk.AccessSize               = PcdGet8 (PcdAcpiXGpe1BlkAccessSize);
     FadtHeader->XGpe1Blk.RegisterBitWidth         = PcdGet8 (PcdAcpiXGpe1BlkRegisterBitWidth);
+    //MU_CHANGE [BEGIN] - Update X_GPE1_BLK AddressSpaceId with PCD value
+    FadtHeader->XGpe1Blk.AddressSpaceId           = PcdGet8 (PcdAcpiXGpe1BlkAddressSpaceId);
+    //MU_CHANGE [END] - Update X_GPE1_BLK AddressSpaceId with PCD value
 
     FadtHeader->SleepControlReg.AddressSpaceId    = PcdGet8 (PcdAcpiSleepControlRegisterAddressSpaceId);
     FadtHeader->SleepControlReg.RegisterBitWidth  = PcdGet8 (PcdAcpiSleepControlRegisterBitWidth);

MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.inf

@@ -95,6 +95,9 @@
   gMinPlatformPkgTokenSpaceGuid.PcdAcpiXGpe0BlkAccessSize
   gMinPlatformPkgTokenSpaceGuid.PcdAcpiXGpe1BlkAccessSize
   gMinPlatformPkgTokenSpaceGuid.PcdAcpiXGpe1BlkRegisterBitWidth
+  # MU_CHANGE [BEGIN] - Update X_GPE1_BLK AddressSpaceId with PCD value
+  gMinPlatformPkgTokenSpaceGuid.PcdAcpiXGpe1BlkAddressSpaceId
+  # MU_CHANGE [END] - Update X_GPE1_BLK AddressSpaceId with PCD value
   gMinPlatformPkgTokenSpaceGuid.PcdAcpiSleepControlRegisterAddressSpaceId
   gMinPlatformPkgTokenSpaceGuid.PcdAcpiSleepControlRegisterBitWidth
   gMinPlatformPkgTokenSpaceGuid.PcdAcpiSleepControlRegisterBitOffset

MinPlatformPkg/MinPlatformPkg.dec

@@ -141,6 +141,9 @@
   gMinPlatformPkgTokenSpaceGuid.PcdAcpiXGpe0BlkAccessSize|0x00|UINT8|0x00010049
   gMinPlatformPkgTokenSpaceGuid.PcdAcpiXGpe1BlkAccessSize|0x00|UINT8|0x0001004A
   gMinPlatformPkgTokenSpaceGuid.PcdAcpiXGpe1BlkRegisterBitWidth|0x00|UINT8|0x00010056
+  # MU_CHANGE [BEGIN] - Update X_GPE1_BLK AddressSpaceId with PCD value
+  gMinPlatformPkgTokenSpaceGuid.PcdAcpiXGpe1BlkAddressSpaceId|0x00|UINT8|0x00010057
+  # MU_CHANGE [END] - Update X_GPE1_BLK AddressSpaceId with PCD value
   gMinPlatformPkgTokenSpaceGuid.PcdAcpiS4BiosReq|0x0000|UINT8|0x00010055
 
   #

pip-requirements.txt

@@ -12,8 +12,8 @@
 # https://www.python.org/dev/peps/pep-0440/#version-specifiers
 ##
 
-edk2-pytool-library==0.15.3
-edk2-pytool-extensions==0.23.8
+edk2-pytool-library==0.17.0
+edk2-pytool-extensions==0.24.0
 edk2-basetools==0.1.49
 antlr4-python3-runtime==4.13.0
 regex