Commit 18eb3b6d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull xen updates from Juergen Gross:

 - three patches adding missing prototypes

 - a fix for finding the iBFT in a Xen dom0 for supporting diskless
   iSCSI boot

* tag 'for-linus-6.5-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  x86: xen: add missing prototypes
  x86/xen: add prototypes for paravirt mmu functions
  iscsi_ibft: Fix finding the iBFT under Xen Dom 0
  xen: xen_debug_interrupt prototype to global header
parents 6a466769 fb9b7b4b

arch/x86/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -796,7 +796,6 @@ static void __init early_reserve_memory(void) 


	memblock_x86_reserve_range_setup_data();



	reserve_ibft_region();

	reserve_bios_regions();

	trim_snb_memory();

}
@@ -1032,6 +1031,7 @@ void __init setup_arch(char **cmdline_p) 
	if (efi_enabled(EFI_BOOT))

		efi_init();



	reserve_ibft_region();

	dmi_setup();



	/*

arch/x86/xen/efi.c

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
#include <asm/setup.h>

#include <asm/xen/hypercall.h>



#include "xen-ops.h"



static efi_char16_t vendor[100] __initdata;



static efi_system_table_t efi_systab_xen __initdata = {

arch/x86/xen/mmu_pv.c

+16 −0
Original line number Diff line number Diff line
@@ -86,6 +86,22 @@ 
#include "mmu.h"

#include "debugfs.h"



/*

 * Prototypes for functions called via PV_CALLEE_SAVE_REGS_THUNK() in order

 * to avoid warnings with "-Wmissing-prototypes".

 */

pteval_t xen_pte_val(pte_t pte);

pgdval_t xen_pgd_val(pgd_t pgd);

pmdval_t xen_pmd_val(pmd_t pmd);

pudval_t xen_pud_val(pud_t pud);

p4dval_t xen_p4d_val(p4d_t p4d);

pte_t xen_make_pte(pteval_t pte);

pgd_t xen_make_pgd(pgdval_t pgd);

pmd_t xen_make_pmd(pmdval_t pmd);

pud_t xen_make_pud(pudval_t pud);

p4d_t xen_make_p4d(p4dval_t p4d);

pte_t xen_make_pte_init(pteval_t pte);



#ifdef CONFIG_X86_VSYSCALL_EMULATION

/* l3 pud for userspace vsyscall mapping */

static pud_t level3_user_vsyscall[PTRS_PER_PUD] __page_aligned_bss;

arch/x86/xen/setup.c

+19 −9
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
 */



#include <linux/init.h>

#include <linux/iscsi_ibft.h>

#include <linux/sched.h>

#include <linux/kstrtox.h>

#include <linux/mm.h>
@@ -764,6 +765,7 @@ char * __init xen_memory_setup(void) 
	BUG_ON(memmap.nr_entries == 0);

	xen_e820_table.nr_entries = memmap.nr_entries;



	if (xen_initial_domain()) {

		/*

		 * Xen won't allow a 1:1 mapping to be created to UNUSABLE

		 * regions, so if we're using the machine memory map leave the
@@ -772,9 +774,17 @@ char * __init xen_memory_setup(void) 
		 * UNUSABLE regions in domUs are not handled and will need

		 * a patch in the future.

		 */

	if (xen_initial_domain())

		xen_ignore_unusable();



#ifdef CONFIG_ISCSI_IBFT_FIND

		/* Reserve 0.5 MiB to 1 MiB region so iBFT can be found */

		xen_e820_table.entries[xen_e820_table.nr_entries].addr = IBFT_START;

		xen_e820_table.entries[xen_e820_table.nr_entries].size = IBFT_END - IBFT_START;

		xen_e820_table.entries[xen_e820_table.nr_entries].type = E820_TYPE_RESERVED;

		xen_e820_table.nr_entries++;

#endif

	}



	/* Make sure the Xen-supplied memory map is well-ordered. */

	e820__update_table(&xen_e820_table);

arch/x86/xen/smp.h

+4 −0
Original line number Diff line number Diff line
@@ -2,6 +2,10 @@ 
#ifndef _XEN_SMP_H



#ifdef CONFIG_SMP



void asm_cpu_bringup_and_idle(void);

asmlinkage void cpu_bringup_and_idle(void);



extern void xen_send_IPI_mask(const struct cpumask *mask,

			      int vector);

extern void xen_send_IPI_mask_allbutself(const struct cpumask *mask,