drop broken x86/phv patches

diff --git a/queue-5.10/series b/queue-5.10/series
index bbbd6c1d5b09e4652077ea4404bdb0c77887fd55..c77d8457fdfe9c0f446068c891355374809cff9d 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -54,8 +54,6 @@ nvme-fix-metadata-handling-in-nvme-passthrough.patch
 x86-barrier-do-not-serialize-msr-accesses-on-amd.patch
 kselftest-arm64-mte-fix-printf-type-warnings-about-l.patch
 x86-xen-pvh-annotate-indirect-branch-as-safe.patch
-x86-pvh-set-phys_base-when-calling-xen_prepare_pvh.patch
-x86-pvh-call-c-code-via-the-kernel-virtual-mapping.patch
 mips-asm-fix-warning-when-disabling-mips_fp_support.patch
 initramfs-avoid-filename-buffer-overrun.patch
 nvme-pci-fix-freeing-of-the-hmb-descriptor-table.patch

diff --git a/queue-5.10/x86-pvh-call-c-code-via-the-kernel-virtual-mapping.patch b/queue-5.10/x86-pvh-call-c-code-via-the-kernel-virtual-mapping.patch
deleted file mode 100644 (file)
index 1f9aed3..0000000
--- a/queue-5.10/x86-pvh-call-c-code-via-the-kernel-virtual-mapping.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 981a05a2e3d15cf30f556fa08c217a6c8f0eda22 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 9 Oct 2024 18:04:40 +0200
-Subject: x86/pvh: Call C code via the kernel virtual mapping
-
-From: Ard Biesheuvel <ardb@kernel.org>
-
-[ Upstream commit e8fbc0d9cab6c1ee6403f42c0991b0c1d5dbc092 ]
-
-Calling C code via a different mapping than it was linked at is
-problematic, because the compiler assumes that RIP-relative and absolute
-symbol references are interchangeable. GCC in particular may use
-RIP-relative per-CPU variable references even when not using -fpic.
-
-So call xen_prepare_pvh() via its kernel virtual mapping on x86_64, so
-that those RIP-relative references produce the correct values. This
-matches the pre-existing behavior for i386, which also invokes
-xen_prepare_pvh() via the kernel virtual mapping before invoking
-startup_32 with paging disabled again.
-
-Fixes: 7243b93345f7 ("xen/pvh: Bootstrap PVH guest")
-Tested-by: Jason Andryuk <jason.andryuk@amd.com>
-Reviewed-by: Jason Andryuk <jason.andryuk@amd.com>
-Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
-Message-ID: <20241009160438.3884381-8-ardb+git@google.com>
-Signed-off-by: Juergen Gross <jgross@suse.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/x86/platform/pvh/head.S | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/arch/x86/platform/pvh/head.S b/arch/x86/platform/pvh/head.S
-index cfabc3340362b..eadadd2ecd847 100644
---- a/arch/x86/platform/pvh/head.S
-+++ b/arch/x86/platform/pvh/head.S
-@@ -106,7 +106,14 @@ SYM_CODE_START_LOCAL(pvh_start_xen)
-       movq %rbp, %rbx
-       subq $_pa(pvh_start_xen), %rbx
-       movq %rbx, phys_base(%rip)
--      call xen_prepare_pvh
-+
-+      /* Call xen_prepare_pvh() via the kernel virtual mapping */
-+      leaq xen_prepare_pvh(%rip), %rax
-+      subq phys_base(%rip), %rax
-+      addq $__START_KERNEL_map, %rax
-+      ANNOTATE_RETPOLINE_SAFE
-+      call *%rax
-+
-       /*
-        * Clear phys_base.  __startup_64 will *add* to its value,
-        * so reset to 0.
--- 
-2.43.0
-

diff --git a/queue-5.10/x86-pvh-set-phys_base-when-calling-xen_prepare_pvh.patch b/queue-5.10/x86-pvh-set-phys_base-when-calling-xen_prepare_pvh.patch
deleted file mode 100644 (file)
index e15049b..0000000
--- a/queue-5.10/x86-pvh-set-phys_base-when-calling-xen_prepare_pvh.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From f250731baac8e75ace3cec56e22c979aadb1f1ae Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 23 Aug 2024 15:36:28 -0400
-Subject: x86/pvh: Set phys_base when calling xen_prepare_pvh()
-
-From: Jason Andryuk <jason.andryuk@amd.com>
-
-[ Upstream commit b464b461d27d564125db760938643374864c1b1f ]
-
-phys_base needs to be set for __pa() to work in xen_pvh_init() when
-finding the hypercall page.  Set it before calling into
-xen_prepare_pvh(), which calls xen_pvh_init().  Clear it afterward to
-avoid __startup_64() adding to it and creating an incorrect value.
-
-Signed-off-by: Jason Andryuk <jason.andryuk@amd.com>
-Reviewed-by: Juergen Gross <jgross@suse.com>
-Message-ID: <20240823193630.2583107-4-jason.andryuk@amd.com>
-Signed-off-by: Juergen Gross <jgross@suse.com>
-Stable-dep-of: e8fbc0d9cab6 ("x86/pvh: Call C code via the kernel virtual mapping")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/x86/platform/pvh/head.S | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/arch/x86/platform/pvh/head.S b/arch/x86/platform/pvh/head.S
-index b0490701da2ab..cfabc3340362b 100644
---- a/arch/x86/platform/pvh/head.S
-+++ b/arch/x86/platform/pvh/head.S
-@@ -99,7 +99,20 @@ SYM_CODE_START_LOCAL(pvh_start_xen)
-       xor %edx, %edx
-       wrmsr
- 
-+      /*
-+       * Calculate load offset and store in phys_base.  __pa() needs
-+       * phys_base set to calculate the hypercall page in xen_pvh_init().
-+       */
-+      movq %rbp, %rbx
-+      subq $_pa(pvh_start_xen), %rbx
-+      movq %rbx, phys_base(%rip)
-       call xen_prepare_pvh
-+      /*
-+       * Clear phys_base.  __startup_64 will *add* to its value,
-+       * so reset to 0.
-+       */
-+      xor  %rbx, %rbx
-+      movq %rbx, phys_base(%rip)
- 
-       /* startup_64 expects boot_params in %rsi. */
-       mov $_pa(pvh_bootparams), %rsi
--- 
-2.43.0
-

diff --git a/queue-5.15/series b/queue-5.15/series
index 7d6bacf9d50b6a776e1c90757208007d8f4e6a89..3d11da4fcf8766ecf32b979daed7789fccdb41e3 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -76,8 +76,6 @@ nvme-fix-metadata-handling-in-nvme-passthrough.patch
 x86-barrier-do-not-serialize-msr-accesses-on-amd.patch
 kselftest-arm64-mte-fix-printf-type-warnings-about-l.patch
 s390-cio-do-not-unregister-the-subchannel-based-on-d.patch
-x86-pvh-set-phys_base-when-calling-xen_prepare_pvh.patch
-x86-pvh-call-c-code-via-the-kernel-virtual-mapping.patch
 brd-remove-brd_devices_mutex-mutex.patch
 brd-defer-automatic-disk-creation-until-module-initi.patch
 mips-asm-fix-warning-when-disabling-mips_fp_support.patch

diff --git a/queue-5.15/x86-pvh-call-c-code-via-the-kernel-virtual-mapping.patch b/queue-5.15/x86-pvh-call-c-code-via-the-kernel-virtual-mapping.patch
deleted file mode 100644 (file)
index 73c21ad..0000000
--- a/queue-5.15/x86-pvh-call-c-code-via-the-kernel-virtual-mapping.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 048e3e68cbfcd01e36fe20f3349654dce674823a Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 9 Oct 2024 18:04:40 +0200
-Subject: x86/pvh: Call C code via the kernel virtual mapping
-
-From: Ard Biesheuvel <ardb@kernel.org>
-
-[ Upstream commit e8fbc0d9cab6c1ee6403f42c0991b0c1d5dbc092 ]
-
-Calling C code via a different mapping than it was linked at is
-problematic, because the compiler assumes that RIP-relative and absolute
-symbol references are interchangeable. GCC in particular may use
-RIP-relative per-CPU variable references even when not using -fpic.
-
-So call xen_prepare_pvh() via its kernel virtual mapping on x86_64, so
-that those RIP-relative references produce the correct values. This
-matches the pre-existing behavior for i386, which also invokes
-xen_prepare_pvh() via the kernel virtual mapping before invoking
-startup_32 with paging disabled again.
-
-Fixes: 7243b93345f7 ("xen/pvh: Bootstrap PVH guest")
-Tested-by: Jason Andryuk <jason.andryuk@amd.com>
-Reviewed-by: Jason Andryuk <jason.andryuk@amd.com>
-Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
-Message-ID: <20241009160438.3884381-8-ardb+git@google.com>
-Signed-off-by: Juergen Gross <jgross@suse.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/x86/platform/pvh/head.S | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/arch/x86/platform/pvh/head.S b/arch/x86/platform/pvh/head.S
-index af6195d230b86..c81ca153f73c1 100644
---- a/arch/x86/platform/pvh/head.S
-+++ b/arch/x86/platform/pvh/head.S
-@@ -106,7 +106,14 @@ SYM_CODE_START_LOCAL(pvh_start_xen)
-       movq %rbp, %rbx
-       subq $_pa(pvh_start_xen), %rbx
-       movq %rbx, phys_base(%rip)
--      call xen_prepare_pvh
-+
-+      /* Call xen_prepare_pvh() via the kernel virtual mapping */
-+      leaq xen_prepare_pvh(%rip), %rax
-+      subq phys_base(%rip), %rax
-+      addq $__START_KERNEL_map, %rax
-+      ANNOTATE_RETPOLINE_SAFE
-+      call *%rax
-+
-       /*
-        * Clear phys_base.  __startup_64 will *add* to its value,
-        * so reset to 0.
--- 
-2.43.0
-

diff --git a/queue-5.15/x86-pvh-set-phys_base-when-calling-xen_prepare_pvh.patch b/queue-5.15/x86-pvh-set-phys_base-when-calling-xen_prepare_pvh.patch
deleted file mode 100644 (file)
index f4c5c62..0000000
--- a/queue-5.15/x86-pvh-set-phys_base-when-calling-xen_prepare_pvh.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From b52836e5679e1aa967c015806956b70a9562548d Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 23 Aug 2024 15:36:28 -0400
-Subject: x86/pvh: Set phys_base when calling xen_prepare_pvh()
-
-From: Jason Andryuk <jason.andryuk@amd.com>
-
-[ Upstream commit b464b461d27d564125db760938643374864c1b1f ]
-
-phys_base needs to be set for __pa() to work in xen_pvh_init() when
-finding the hypercall page.  Set it before calling into
-xen_prepare_pvh(), which calls xen_pvh_init().  Clear it afterward to
-avoid __startup_64() adding to it and creating an incorrect value.
-
-Signed-off-by: Jason Andryuk <jason.andryuk@amd.com>
-Reviewed-by: Juergen Gross <jgross@suse.com>
-Message-ID: <20240823193630.2583107-4-jason.andryuk@amd.com>
-Signed-off-by: Juergen Gross <jgross@suse.com>
-Stable-dep-of: e8fbc0d9cab6 ("x86/pvh: Call C code via the kernel virtual mapping")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/x86/platform/pvh/head.S | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/arch/x86/platform/pvh/head.S b/arch/x86/platform/pvh/head.S
-index 72c1e42d121df..af6195d230b86 100644
---- a/arch/x86/platform/pvh/head.S
-+++ b/arch/x86/platform/pvh/head.S
-@@ -99,7 +99,20 @@ SYM_CODE_START_LOCAL(pvh_start_xen)
-       xor %edx, %edx
-       wrmsr
- 
-+      /*
-+       * Calculate load offset and store in phys_base.  __pa() needs
-+       * phys_base set to calculate the hypercall page in xen_pvh_init().
-+       */
-+      movq %rbp, %rbx
-+      subq $_pa(pvh_start_xen), %rbx
-+      movq %rbx, phys_base(%rip)
-       call xen_prepare_pvh
-+      /*
-+       * Clear phys_base.  __startup_64 will *add* to its value,
-+       * so reset to 0.
-+       */
-+      xor  %rbx, %rbx
-+      movq %rbx, phys_base(%rip)
- 
-       /* startup_64 expects boot_params in %rsi. */
-       mov $_pa(pvh_bootparams), %rsi
--- 
-2.43.0
-

diff --git a/queue-5.4/series b/queue-5.4/series
index 18bf699698782eee6cc096b9861d7de83f332169..81ef4e7d694b3a2ee1cec9f3c1c9ea00dde32b87 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -26,8 +26,6 @@ cifs-fix-buffer-overflow-when-parsing-nfs-reparse-po.patch
 nfsd-force-all-nfsv4.2-copy-requests-to-be-synchrono.patch
 nvme-fix-metadata-handling-in-nvme-passthrough.patch
 x86-xen-pvh-annotate-indirect-branch-as-safe.patch
-x86-pvh-set-phys_base-when-calling-xen_prepare_pvh.patch
-x86-pvh-call-c-code-via-the-kernel-virtual-mapping.patch
 mips-asm-fix-warning-when-disabling-mips_fp_support.patch
 initramfs-avoid-filename-buffer-overrun.patch
 nvme-pci-fix-freeing-of-the-hmb-descriptor-table.patch

diff --git a/queue-5.4/x86-pvh-call-c-code-via-the-kernel-virtual-mapping.patch b/queue-5.4/x86-pvh-call-c-code-via-the-kernel-virtual-mapping.patch
deleted file mode 100644 (file)
index c7149c2..0000000
--- a/queue-5.4/x86-pvh-call-c-code-via-the-kernel-virtual-mapping.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 22c3b7c8feb1881a2ec6b5225702c44779877261 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 9 Oct 2024 18:04:40 +0200
-Subject: x86/pvh: Call C code via the kernel virtual mapping
-
-From: Ard Biesheuvel <ardb@kernel.org>
-
-[ Upstream commit e8fbc0d9cab6c1ee6403f42c0991b0c1d5dbc092 ]
-
-Calling C code via a different mapping than it was linked at is
-problematic, because the compiler assumes that RIP-relative and absolute
-symbol references are interchangeable. GCC in particular may use
-RIP-relative per-CPU variable references even when not using -fpic.
-
-So call xen_prepare_pvh() via its kernel virtual mapping on x86_64, so
-that those RIP-relative references produce the correct values. This
-matches the pre-existing behavior for i386, which also invokes
-xen_prepare_pvh() via the kernel virtual mapping before invoking
-startup_32 with paging disabled again.
-
-Fixes: 7243b93345f7 ("xen/pvh: Bootstrap PVH guest")
-Tested-by: Jason Andryuk <jason.andryuk@amd.com>
-Reviewed-by: Jason Andryuk <jason.andryuk@amd.com>
-Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
-Message-ID: <20241009160438.3884381-8-ardb+git@google.com>
-Signed-off-by: Juergen Gross <jgross@suse.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/x86/platform/pvh/head.S | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/arch/x86/platform/pvh/head.S b/arch/x86/platform/pvh/head.S
-index 7616daaae74eb..783b1e0d04a53 100644
---- a/arch/x86/platform/pvh/head.S
-+++ b/arch/x86/platform/pvh/head.S
-@@ -108,7 +108,14 @@ ENTRY(pvh_start_xen)
-       movq %rbp, %rbx
-       subq $_pa(pvh_start_xen), %rbx
-       movq %rbx, phys_base(%rip)
--      call xen_prepare_pvh
-+
-+      /* Call xen_prepare_pvh() via the kernel virtual mapping */
-+      leaq xen_prepare_pvh(%rip), %rax
-+      subq phys_base(%rip), %rax
-+      addq $__START_KERNEL_map, %rax
-+      ANNOTATE_RETPOLINE_SAFE
-+      call *%rax
-+
-       /*
-        * Clear phys_base.  __startup_64 will *add* to its value,
-        * so reset to 0.
--- 
-2.43.0
-

diff --git a/queue-5.4/x86-pvh-set-phys_base-when-calling-xen_prepare_pvh.patch b/queue-5.4/x86-pvh-set-phys_base-when-calling-xen_prepare_pvh.patch
deleted file mode 100644 (file)
index 298d7ab..0000000
--- a/queue-5.4/x86-pvh-set-phys_base-when-calling-xen_prepare_pvh.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 377caab6ef286a859c34411b83abcb48f2236148 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 23 Aug 2024 15:36:28 -0400
-Subject: x86/pvh: Set phys_base when calling xen_prepare_pvh()
-
-From: Jason Andryuk <jason.andryuk@amd.com>
-
-[ Upstream commit b464b461d27d564125db760938643374864c1b1f ]
-
-phys_base needs to be set for __pa() to work in xen_pvh_init() when
-finding the hypercall page.  Set it before calling into
-xen_prepare_pvh(), which calls xen_pvh_init().  Clear it afterward to
-avoid __startup_64() adding to it and creating an incorrect value.
-
-Signed-off-by: Jason Andryuk <jason.andryuk@amd.com>
-Reviewed-by: Juergen Gross <jgross@suse.com>
-Message-ID: <20240823193630.2583107-4-jason.andryuk@amd.com>
-Signed-off-by: Juergen Gross <jgross@suse.com>
-Stable-dep-of: e8fbc0d9cab6 ("x86/pvh: Call C code via the kernel virtual mapping")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/x86/platform/pvh/head.S | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/arch/x86/platform/pvh/head.S b/arch/x86/platform/pvh/head.S
-index efd615d397d22..7616daaae74eb 100644
---- a/arch/x86/platform/pvh/head.S
-+++ b/arch/x86/platform/pvh/head.S
-@@ -101,7 +101,20 @@ ENTRY(pvh_start_xen)
-       xor %edx, %edx
-       wrmsr
- 
-+      /*
-+       * Calculate load offset and store in phys_base.  __pa() needs
-+       * phys_base set to calculate the hypercall page in xen_pvh_init().
-+       */
-+      movq %rbp, %rbx
-+      subq $_pa(pvh_start_xen), %rbx
-+      movq %rbx, phys_base(%rip)
-       call xen_prepare_pvh
-+      /*
-+       * Clear phys_base.  __startup_64 will *add* to its value,
-+       * so reset to 0.
-+       */
-+      xor  %rbx, %rbx
-+      movq %rbx, phys_base(%rip)
- 
-       /* startup_64 expects boot_params in %rsi. */
-       mov $_pa(pvh_bootparams), %rsi
--- 
-2.43.0
-

diff --git a/queue-6.1/series b/queue-6.1/series
index 2d3976e0f8fd15bc76450c95c22e80ced36d10a8..14050aef07c99871d7ec0bbcefb12c98bc52d081 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -46,8 +46,6 @@ x86-barrier-do-not-serialize-msr-accesses-on-amd.patch
 kselftest-arm64-mte-fix-printf-type-warnings-about-_.patch
 kselftest-arm64-mte-fix-printf-type-warnings-about-l.patch
 s390-cio-do-not-unregister-the-subchannel-based-on-d.patch
-x86-pvh-set-phys_base-when-calling-xen_prepare_pvh.patch
-x86-pvh-call-c-code-via-the-kernel-virtual-mapping.patch
 brd-defer-automatic-disk-creation-until-module-initi.patch
 ext4-make-abort-mount-option-handling-standard.patch
 ext4-avoid-remount-errors-with-abort-mount-option.patch

diff --git a/queue-6.1/x86-pvh-call-c-code-via-the-kernel-virtual-mapping.patch b/queue-6.1/x86-pvh-call-c-code-via-the-kernel-virtual-mapping.patch
deleted file mode 100644 (file)
index a24138d..0000000
--- a/queue-6.1/x86-pvh-call-c-code-via-the-kernel-virtual-mapping.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From af77177b5a707a01ecb5db0af3c4d4d28cf1e277 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 9 Oct 2024 18:04:40 +0200
-Subject: x86/pvh: Call C code via the kernel virtual mapping
-
-From: Ard Biesheuvel <ardb@kernel.org>
-
-[ Upstream commit e8fbc0d9cab6c1ee6403f42c0991b0c1d5dbc092 ]
-
-Calling C code via a different mapping than it was linked at is
-problematic, because the compiler assumes that RIP-relative and absolute
-symbol references are interchangeable. GCC in particular may use
-RIP-relative per-CPU variable references even when not using -fpic.
-
-So call xen_prepare_pvh() via its kernel virtual mapping on x86_64, so
-that those RIP-relative references produce the correct values. This
-matches the pre-existing behavior for i386, which also invokes
-xen_prepare_pvh() via the kernel virtual mapping before invoking
-startup_32 with paging disabled again.
-
-Fixes: 7243b93345f7 ("xen/pvh: Bootstrap PVH guest")
-Tested-by: Jason Andryuk <jason.andryuk@amd.com>
-Reviewed-by: Jason Andryuk <jason.andryuk@amd.com>
-Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
-Message-ID: <20241009160438.3884381-8-ardb+git@google.com>
-Signed-off-by: Juergen Gross <jgross@suse.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/x86/platform/pvh/head.S | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/arch/x86/platform/pvh/head.S b/arch/x86/platform/pvh/head.S
-index 82efba4022ac0..7fe6526b30769 100644
---- a/arch/x86/platform/pvh/head.S
-+++ b/arch/x86/platform/pvh/head.S
-@@ -107,7 +107,14 @@ SYM_CODE_START_LOCAL(pvh_start_xen)
-       movq %rbp, %rbx
-       subq $_pa(pvh_start_xen), %rbx
-       movq %rbx, phys_base(%rip)
--      call xen_prepare_pvh
-+
-+      /* Call xen_prepare_pvh() via the kernel virtual mapping */
-+      leaq xen_prepare_pvh(%rip), %rax
-+      subq phys_base(%rip), %rax
-+      addq $__START_KERNEL_map, %rax
-+      ANNOTATE_RETPOLINE_SAFE
-+      call *%rax
-+
-       /*
-        * Clear phys_base.  __startup_64 will *add* to its value,
-        * so reset to 0.
--- 
-2.43.0
-

diff --git a/queue-6.1/x86-pvh-set-phys_base-when-calling-xen_prepare_pvh.patch b/queue-6.1/x86-pvh-set-phys_base-when-calling-xen_prepare_pvh.patch
deleted file mode 100644 (file)
index a3225f9..0000000
--- a/queue-6.1/x86-pvh-set-phys_base-when-calling-xen_prepare_pvh.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From fee61b0f456c6aff64b22290f06d12b78ce420da Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 23 Aug 2024 15:36:28 -0400
-Subject: x86/pvh: Set phys_base when calling xen_prepare_pvh()
-
-From: Jason Andryuk <jason.andryuk@amd.com>
-
-[ Upstream commit b464b461d27d564125db760938643374864c1b1f ]
-
-phys_base needs to be set for __pa() to work in xen_pvh_init() when
-finding the hypercall page.  Set it before calling into
-xen_prepare_pvh(), which calls xen_pvh_init().  Clear it afterward to
-avoid __startup_64() adding to it and creating an incorrect value.
-
-Signed-off-by: Jason Andryuk <jason.andryuk@amd.com>
-Reviewed-by: Juergen Gross <jgross@suse.com>
-Message-ID: <20240823193630.2583107-4-jason.andryuk@amd.com>
-Signed-off-by: Juergen Gross <jgross@suse.com>
-Stable-dep-of: e8fbc0d9cab6 ("x86/pvh: Call C code via the kernel virtual mapping")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/x86/platform/pvh/head.S | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/arch/x86/platform/pvh/head.S b/arch/x86/platform/pvh/head.S
-index 7fe564eaf228a..82efba4022ac0 100644
---- a/arch/x86/platform/pvh/head.S
-+++ b/arch/x86/platform/pvh/head.S
-@@ -100,7 +100,20 @@ SYM_CODE_START_LOCAL(pvh_start_xen)
-       xor %edx, %edx
-       wrmsr
- 
-+      /*
-+       * Calculate load offset and store in phys_base.  __pa() needs
-+       * phys_base set to calculate the hypercall page in xen_pvh_init().
-+       */
-+      movq %rbp, %rbx
-+      subq $_pa(pvh_start_xen), %rbx
-+      movq %rbx, phys_base(%rip)
-       call xen_prepare_pvh
-+      /*
-+       * Clear phys_base.  __startup_64 will *add* to its value,
-+       * so reset to 0.
-+       */
-+      xor  %rbx, %rbx
-+      movq %rbx, phys_base(%rip)
- 
-       /* startup_64 expects boot_params in %rsi. */
-       mov $_pa(pvh_bootparams), %rsi
--- 
-2.43.0
-