Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50dfd03d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull xen fixes and cleanups from Juergen Gross:

 - a fix in the Xen balloon driver avoiding hitting a BUG_ON() in some
   cases, plus a follow-on cleanup series for that driver

 - a patch for introducing non-blocking EFI callbacks in Xen's EFI
   driver, plu a cleanup patch for Xen EFI handling merging the x86 and
   ARM arch specific initialization into the Xen EFI driver

 - a fix of the Xen xenbus driver avoiding a self-deadlock when cleaning
   up after a user process has died

 - a fix for Xen on ARM after removal of ZONE_DMA

 - a cleanup patch for avoiding build warnings for Xen on ARM

* tag 'for-linus-5.4-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/xenbus: fix self-deadlock after killing user process
  xen/efi: have a common runtime setup function
  arm: xen: mm: use __GPF_DMA32 for arm64
  xen/balloon: Clear PG_offline in balloon_retrieve()
  xen/balloon: Mark pages PG_offline in balloon_append()
  xen/balloon: Drop __balloon_append()
  xen/balloon: Set pages PageOffline() in balloon_add_region()
  ARM: xen: unexport HYPERVISOR_platform_op function
  xen/efi: Set nonblocking callbacks
parents e524d16e a8fabb38

arch/arm/include/asm/xen/xen-ops.h

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
#ifndef _ASM_XEN_OPS_H

#define _ASM_XEN_OPS_H



void xen_efi_runtime_setup(void);



#endif /* _ASM_XEN_OPS_H */

arch/arm/xen/Makefile

+0 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

obj-y		:= enlighten.o hypercall.o grant-table.o p2m.o mm.o
 
obj-$(CONFIG_XEN_EFI) += efi.o

arch/arm/xen/efi.c

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later

/*

 * Copyright (c) 2015, Linaro Limited, Shannon Zhao

 */



#include <linux/efi.h>

#include <xen/xen-ops.h>

#include <asm/xen/xen-ops.h>



/* Set XEN EFI runtime services function pointers. Other fields of struct efi,

 * e.g. efi.systab, will be set like normal EFI.

 */

void __init xen_efi_runtime_setup(void)

{

	efi.get_time                 = xen_efi_get_time;

	efi.set_time                 = xen_efi_set_time;

	efi.get_wakeup_time          = xen_efi_get_wakeup_time;

	efi.set_wakeup_time          = xen_efi_set_wakeup_time;

	efi.get_variable             = xen_efi_get_variable;

	efi.get_next_variable        = xen_efi_get_next_variable;

	efi.set_variable             = xen_efi_set_variable;

	efi.query_variable_info      = xen_efi_query_variable_info;

	efi.update_capsule           = xen_efi_update_capsule;

	efi.query_capsule_caps       = xen_efi_query_capsule_caps;

	efi.get_next_high_mono_count = xen_efi_get_next_high_mono_count;

	efi.reset_system             = xen_efi_reset_system;

}

EXPORT_SYMBOL_GPL(xen_efi_runtime_setup);

arch/arm/xen/enlighten.c

+1 −2
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include <xen/xen-ops.h>

#include <asm/xen/hypervisor.h>

#include <asm/xen/hypercall.h>

#include <asm/xen/xen-ops.h>

#include <asm/system_misc.h>

#include <asm/efi.h>

#include <linux/interrupt.h>
@@ -437,7 +436,7 @@ EXPORT_SYMBOL_GPL(HYPERVISOR_memory_op); 
EXPORT_SYMBOL_GPL(HYPERVISOR_physdev_op);

EXPORT_SYMBOL_GPL(HYPERVISOR_vcpu_op);

EXPORT_SYMBOL_GPL(HYPERVISOR_tmem_op);

EXPORT_SYMBOL_GPL(HYPERVISOR_platform_op);

EXPORT_SYMBOL_GPL(HYPERVISOR_platform_op_raw);

EXPORT_SYMBOL_GPL(HYPERVISOR_multicall);

EXPORT_SYMBOL_GPL(HYPERVISOR_vm_assist);

EXPORT_SYMBOL_GPL(HYPERVISOR_dm_op);

arch/arm/xen/mm.c

+4 −1
Original line number Diff line number Diff line
@@ -28,6 +28,9 @@ unsigned long xen_get_swiotlb_free_pages(unsigned int order) 


	for_each_memblock(memory, reg) {

		if (reg->base < (phys_addr_t)0xffffffff) {

			if (IS_ENABLED(CONFIG_ZONE_DMA32))

				flags |= __GFP_DMA32;

			else

				flags |= __GFP_DMA;

			break;

		}