Skip to content

Commit

Permalink
Revert "x86/pvh: Set phys_base when calling xen_prepare_pvh()"
Browse files Browse the repository at this point in the history
This reverts commit f662b4a69e1d6c15db3354de6fc9f923417a5a10 which is
commit b464b461d27d564125db760938643374864c1b1f upstream.

It causes boot failures of domU guests, and should be reverted.

Cc: Jason Andryuk <[email protected]>
Cc: Juergen Gross <[email protected]>
Cc: Sasha Levin <[email protected]>
Cc: Ard Biesheuvel <[email protected]>
Reported-by: Marek Marczykowski-Górecki <[email protected]>
Link: https://lore.kernel.org/r/Z1l6XbHP6BTTZSwr@mail-itl
Signed-off-by: Greg Kroah-Hartman <[email protected]>
  • Loading branch information
gregkh authored and Avenger-285714 committed Dec 14, 2024
1 parent fe102bd commit c5ab9e1
Showing 1 changed file with 0 additions and 13 deletions.
13 changes: 0 additions & 13 deletions arch/x86/platform/pvh/head.S
Original file line number Diff line number Diff line change
Expand Up @@ -100,20 +100,7 @@ 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
Expand Down

0 comments on commit c5ab9e1

Please sign in to comment.