Add patches for Intel TXT support

.gitlab-ci.yml

@@ -1,10 +1,4 @@
 include:
-- file: /r4.1/gitlab-base.yml
-  project: QubesOS/qubes-continuous-integration
-- file: /r4.1/gitlab-dom0.yml
-  project: QubesOS/qubes-continuous-integration
-- file: /r4.1/gitlab-vm-archlinux.yml
-  project: QubesOS/qubes-continuous-integration
 - file: /r4.2/gitlab-base.yml
   project: QubesOS/qubes-continuous-integration
 - file: /r4.2/gitlab-host.yml
@@ -13,5 +7,7 @@ include:
   project: QubesOS/qubes-continuous-integration
 - file: /r4.2/gitlab-vm-archlinux.yml
   project: QubesOS/qubes-continuous-integration
+
 variables:
-  TRAVIS_INSTALL_EXCLUDE: xen-qubes-vm xen-qubes-debug xen-qubes-debuginfo xen-hypervisor-common xen-system-amd64
+  CI_INSTALL_EXCLUDE: xen-qubes-vm xen-qubes-debug xen-qubes-debuginfo
+

0201-EFI-early-Add-noexit-to-inhibit-calling-ExitBootServ.patch

@@ -22,8 +22,8 @@ index e82ac9daa7ad..2221cdec681a 100644
 --- a/xen/arch/x86/efi/efi-boot.h
 +++ b/xen/arch/x86/efi/efi-boot.h
 @@ -816,7 +816,7 @@ void __init efi_multiboot2(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable
-     if ( gop )
-         efi_set_gop_mode(gop, gop_mode);
+
+     efi_relocate_esrt(SystemTable);
 
 -    efi_exit_boot(ImageHandle, SystemTable);
 +    efi_exit_boot(ImageHandle, SystemTable, true);
@@ -39,13 +39,13 @@ index db0340c8e262..d78a315e56e0 100644
  static void efi_variables(void);
  static void efi_set_gop_mode(EFI_GRAPHICS_OUTPUT_PROTOCOL *gop, UINTN gop_mode);
 -static void efi_exit_boot(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable);
-+static void efi_exit_boot(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable, bool efit_boot_services);
++static void efi_exit_boot(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable, bool exit_boot_services);
 
  static const EFI_BOOT_SERVICES *__initdata efi_bs;
  static UINT32 __initdata efi_bs_revision;
 @@ -1175,7 +1175,7 @@ static void __init efi_relocate_esrt(EFI_SYSTEM_TABLE *SystemTable)
-     efi_bs->FreePool(memory_map);
- }
+ #define INVALID_VIRTUAL_ADDRESS (0xBAAADUL << \
+                                  (EFI_PAGE_SHIFT + BITS_PER_LONG - 32))
 
 -static void __init efi_exit_boot(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable)
 +static void __init efi_exit_boot(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable, bool exit_boot_services)

0306-x86-Replace-PAT_-with-X86_MT_.patch

@@ -162,7 +162,7 @@ index 4d2aa6def86de45aeeaade7a1a7815c5ef2b3d7a..242623f3c239ee18a44f882ecb3910a0
                      /* fall through */
                  default:
 @@ -638,12 +638,12 @@ int hvm_set_mem_pinned_cacheattr(struct domain *d, uint64_t gfn_start,
-         rcu_read_unlock(&pinned_cacheattr_rcu_lock);
+         domain_unlock(d);
          return -ENOENT;
 
 -    case PAT_TYPE_UC_MINUS:
@@ -181,14 +181,14 @@ index 4d2aa6def86de45aeeaade7a1a7815c5ef2b3d7a..242623f3c239ee18a44f882ecb3910a0
 
      default:
 @@ -681,7 +681,7 @@ int hvm_set_mem_pinned_cacheattr(struct domain *d, uint64_t gfn_start,
+     xfree(newr);
 
-     list_add_rcu(&range->list, &d->arch.hvm.pinned_cacheattr_ranges);
      p2m_memory_type_changed(d);
 -    if ( type != PAT_TYPE_WRBACK )
 +    if ( type != X86_MT_WB )
          flush_all(FLUSH_CACHE);
 
-     return 0;
+     return rc;
 diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c
 index 7c81b80710f99e08fe8291d3e413c449322b777d..b543c3983d77ae807e8bd97330691a79d8d39bae 100644
 --- a/xen/arch/x86/hvm/vmx/vmx.c

0307-x86-Replace-MTRR_-constants-with-X86_MT_-constants.patch

@@ -95,8 +95,8 @@ index 4e01c8d6f9df6562b94438f265d79a0a6fca8de6..2946003b84938f3b83c98b62dfaa3ace
  	}
 
  	/*  If the type is WC, check that this processor supports it  */
--	if ((type == MTRR_TYPE_WRCOMB) && !have_wrcomb()) {
-+	if ((type == X86_MT_WC) && !have_wrcomb()) {
+-	if ((type == MTRR_TYPE_WRCOMB) && mtrr_have_wrcomb()) {
++	if ((type == X86_MT_WC) && !mtrr_have_wrcomb()) {
  		printk(KERN_WARNING
  		       "mtrr: your processor doesn't support write-combining\n");
  		return -EOPNOTSUPP;