Commit 7447691e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull xen updates from Juergen Gross:

 - a series fine tuning virtio support for Xen guests, including removal
   the now again unused "platform_has()" feature.

 - a fix for host admin triggered reboot of Xen guests

 - a simple spelling fix

* tag 'for-linus-6.0-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen: don't require virtio with grants for non-PV guests
  kernel: remove platform_has() infrastructure
  virtio: replace restricted mem access flag with callback
  xen: Fix spelling mistake
  xen/manage: Use orderly_reboot() to reboot
parents 7c5c3a61 251e90e7

MAINTAINERS

+0 −8
Original line number Diff line number Diff line
@@ -16121,14 +16121,6 @@ S: Maintained 
F:	Documentation/devicetree/bindings/iio/chemical/plantower,pms7003.yaml

F:	drivers/iio/chemical/pms7003.c









PLATFORM FEATURE INFRASTRUCTURE









M:	Juergen Gross <jgross@suse.com>









S:	Maintained









F:	arch/*/include/asm/platform-feature.h









F:	include/asm-generic/platform-feature.h









F:	include/linux/platform-feature.h









F:	kernel/platform-feature.c

















PLDMFW LIBRARY









M:	Jacob Keller <jacob.e.keller@intel.com>









S:	Maintained
































arch/arm/xen/enlighten.c



+3
−1






























Original line number
Diff line number
Diff line







@@ -34,6 +34,7 @@







#include <linux/timekeeping.h>









#include <linux/timekeeper_internal.h>









#include <linux/acpi.h>









#include <linux/virtio_anchor.h>



















#include <linux/mm.h>


















@@ -443,7 +444,8 @@ static int __init xen_guest_init(void)







	if (!xen_domain())









		return 0;



















	xen_set_restricted_virtio_memory_access();









	if (IS_ENABLED(CONFIG_XEN_VIRTIO))









		virtio_set_mem_acc_cb(xen_virtio_mem_acc);



















	if (!acpi_disabled)









		xen_acpi_guest_init();
































arch/s390/mm/init.c



+2
−2






























Original line number
Diff line number
Diff line







@@ -31,7 +31,6 @@







#include <linux/cma.h>









#include <linux/gfp.h>









#include <linux/dma-direct.h>









#include <linux/platform-feature.h>









#include <asm/processor.h>









#include <linux/uaccess.h>









#include <asm/pgalloc.h>








@@ -48,6 +47,7 @@







#include <asm/kasan.h>









#include <asm/dma-mapping.h>









#include <asm/uv.h>









#include <linux/virtio_anchor.h>









#include <linux/virtio_config.h>



















pgd_t swapper_pg_dir[PTRS_PER_PGD] __section(".bss..swapper_pg_dir");








@@ -175,7 +175,7 @@ static void pv_init(void)







	if (!is_prot_virt_guest())









		return;



















	platform_set(PLATFORM_VIRTIO_RESTRICTED_MEM_ACCESS);









	virtio_set_mem_acc_cb(virtio_require_restricted_mem_acc);



















	/* make sure bounce buffers are shared */









	swiotlb_init(true, SWIOTLB_FORCE | SWIOTLB_VERBOSE);
































arch/x86/mm/mem_encrypt_amd.c



+2
−2






























Original line number
Diff line number
Diff line







@@ -20,8 +20,8 @@







#include <linux/bitops.h>









#include <linux/dma-mapping.h>









#include <linux/virtio_config.h>









#include <linux/virtio_anchor.h>









#include <linux/cc_platform.h>









#include <linux/platform-feature.h>



















#include <asm/tlbflush.h>









#include <asm/fixmap.h>








@@ -245,7 +245,7 @@ void __init sev_setup_arch(void)







	swiotlb_adjust_size(size);



















	/* Set restricted memory access for virtio. */









	platform_set(PLATFORM_VIRTIO_RESTRICTED_MEM_ACCESS);









	virtio_set_mem_acc_cb(virtio_require_restricted_mem_acc);









}



















static unsigned long pg_level_to_pfn(int level, pte_t *kpte, pgprot_t *ret_prot)
































arch/x86/xen/enlighten_hvm.c



+3
−1






























Original line number
Diff line number
Diff line







@@ -4,6 +4,7 @@







#include <linux/cpu.h>









#include <linux/kexec.h>









#include <linux/memblock.h>









#include <linux/virtio_anchor.h>



















#include <xen/features.h>









#include <xen/events.h>








@@ -195,7 +196,8 @@ static void __init xen_hvm_guest_init(void)







	if (xen_pv_domain())









		return;



















	xen_set_restricted_virtio_memory_access();









	if (IS_ENABLED(CONFIG_XEN_VIRTIO_FORCE_GRANT))









		virtio_set_mem_acc_cb(virtio_require_restricted_mem_acc);



















	init_hvm_pv_info();