Commit 19a519ca authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-6.12-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip 

Pull xen updates from Juergen Gross:

 - fix a boot problem as a Xen dom0 on some AMD systems

 - fix Xen PVH boot problems with KASAN enabled

 - fix for a build warning

 - fixes to swiotlb-xen

* tag 'for-linus-6.12-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/swiotlb: fix allocated size
  xen/swiotlb: add alignment check for dma buffers
  xen/pci: Avoid -Wflex-array-member-not-at-end warning
  xen/xenbus: Convert to use ERR_CAST()
  xen, pvh: fix unbootable VMs by inlining memset() in xen_prepare_pvh()
  x86/cpu: fix unbootable VMs by inlining memcmp() in hypervisor_cpuid_base()
  xen, pvh: fix unbootable VMs (PVH + KASAN - AMD_MEM_ENCRYPT)
  xen: tolerate ACPI NVS memory overlapping with Xen allocated memory
  xen: allow mapping ACPI data using a different physical address
  xen: add capability to remap non-RAM pages to different PFNs
  xen: move max_pfn in xen_memory_setup() out of function scope
  xen: move checks for e820 conflicts further up
  xen: introduce generic helper checking for memory map conflicts
  xen: use correct end address of kernel for conflict checking
parents 1d7bb2bf c3dea3d5

arch/x86/include/asm/acpi.h

+8 −0
Original line number Diff line number Diff line
@@ -174,6 +174,14 @@ void acpi_generic_reduced_hw_init(void); 
void x86_default_set_root_pointer(u64 addr);

u64 x86_default_get_root_pointer(void);



#ifdef CONFIG_XEN_PV

/* A Xen PV domain needs a special acpi_os_ioremap() handling. */

extern void __iomem * (*acpi_os_ioremap)(acpi_physical_address phys,

					 acpi_size size);

void __iomem *x86_acpi_os_ioremap(acpi_physical_address phys, acpi_size size);

#define acpi_os_ioremap acpi_os_ioremap

#endif



#else /* !CONFIG_ACPI */



#define acpi_lapic 0

arch/x86/include/asm/cpuid.h

+6 −1
Original line number Diff line number Diff line
@@ -196,7 +196,12 @@ static inline uint32_t hypervisor_cpuid_base(const char *sig, uint32_t leaves) 
	for_each_possible_hypervisor_cpuid_base(base) {

		cpuid(base, &eax, &signature[0], &signature[1], &signature[2]);



		if (!memcmp(sig, signature, 12) &&

		/*

		 * This must not compile to "call memcmp" because it's called

		 * from PVH early boot code before instrumentation is set up

		 * and memcmp() itself may be instrumented.

		 */

		if (!__builtin_memcmp(sig, signature, 12) &&

		    (leaves == 0 || ((eax - base) >= leaves)))

			return base;

	}

arch/x86/kernel/acpi/boot.c

+11 −0
Original line number Diff line number Diff line
@@ -1778,3 +1778,14 @@ u64 x86_default_get_root_pointer(void) 
{

	return boot_params.acpi_rsdp_addr;

}



#ifdef CONFIG_XEN_PV

void __iomem *x86_acpi_os_ioremap(acpi_physical_address phys, acpi_size size)

{

	return ioremap_cache(phys, size);

}



void __iomem * (*acpi_os_ioremap)(acpi_physical_address phys, acpi_size size) =

	x86_acpi_os_ioremap;

EXPORT_SYMBOL_GPL(acpi_os_ioremap);

#endif

arch/x86/kernel/jailhouse.c

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/kernel.h>

#include <linux/reboot.h>

#include <linux/serial_8250.h>

#include <linux/acpi.h>

#include <asm/apic.h>

#include <asm/io_apic.h>

#include <asm/acpi.h>

arch/x86/kernel/mmconf-fam10h_64.c

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <linux/pci.h>

#include <linux/dmi.h>

#include <linux/range.h>

#include <linux/acpi.h>



#include <asm/pci-direct.h>

#include <linux/sort.h>