Commit 8faef712 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 platform updayes from Ingo Molnar:
 "Most of the commits add ACRN hypervisor guest support, plus two
  cleanups"

* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/jailhouse: Mark jailhouse_x2apic_available() as __init
  x86/platform/geode: Drop <linux/gpio.h> includes
  x86/acrn: Use HYPERVISOR_CALLBACK_VECTOR for ACRN guest upcall vector
  x86: Add support for Linux guests on an ACRN hypervisor
  x86/Kconfig: Add new X86_HV_CALLBACK_VECTOR config symbol
parents da177023 d97ee99b

arch/x86/Kconfig

+14 −0
Original line number Diff line number Diff line
@@ -785,6 +785,9 @@ config PARAVIRT_SPINLOCKS 


	  If you are unsure how to answer this question, answer Y.



config X86_HV_CALLBACK_VECTOR

	def_bool n



source "arch/x86/xen/Kconfig"



config KVM_GUEST
@@ -836,6 +839,17 @@ config JAILHOUSE_GUEST 
	  cell. You can leave this option disabled if you only want to start

	  Jailhouse and run Linux afterwards in the root cell.



config ACRN_GUEST

	bool "ACRN Guest support"

	depends on X86_64

	select X86_HV_CALLBACK_VECTOR

	help

	  This option allows to run Linux as guest in the ACRN hypervisor. ACRN is

	  a flexible, lightweight reference open-source hypervisor, built with

	  real-time and safety-criticality in mind. It is built for embedded

	  IOT with small footprint and real-time features. More details can be

	  found in https://projectacrn.org/.



endif #HYPERVISOR_GUEST



source "arch/x86/Kconfig.cpu"

arch/x86/entry/entry_64.S

+5 −0
Original line number Diff line number Diff line
@@ -1164,6 +1164,11 @@ apicinterrupt3 HYPERV_STIMER0_VECTOR \ 
	hv_stimer0_callback_vector hv_stimer0_vector_handler

#endif /* CONFIG_HYPERV */



#if IS_ENABLED(CONFIG_ACRN_GUEST)

apicinterrupt3 HYPERVISOR_CALLBACK_VECTOR \

	acrn_hv_callback_vector acrn_hv_vector_handler

#endif



idtentry debug			do_debug		has_error_code=0	paranoid=1 shift_ist=IST_INDEX_DB ist_offset=DB_STACK_OFFSET

idtentry int3			do_int3			has_error_code=0	create_gap=1

idtentry stack_segment		do_stack_segment	has_error_code=1

arch/x86/include/asm/acrn.h

0 → 100644
+11 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _ASM_X86_ACRN_H

#define _ASM_X86_ACRN_H



extern void acrn_hv_callback_vector(void);

#ifdef CONFIG_TRACING

#define trace_acrn_hv_callback_vector acrn_hv_callback_vector

#endif



extern void acrn_hv_vector_handler(struct pt_regs *regs);

#endif /* _ASM_X86_ACRN_H */

arch/x86/include/asm/hardirq.h

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ typedef struct { 
#ifdef CONFIG_X86_MCE_AMD

	unsigned int irq_deferred_error_count;

#endif

#if IS_ENABLED(CONFIG_HYPERV) || defined(CONFIG_XEN)

#ifdef CONFIG_X86_HV_CALLBACK_VECTOR

	unsigned int irq_hv_callback_count;

#endif

#if IS_ENABLED(CONFIG_HYPERV)

arch/x86/include/asm/hypervisor.h

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ enum x86_hypervisor_type { 
	X86_HYPER_XEN_HVM,

	X86_HYPER_KVM,

	X86_HYPER_JAILHOUSE,

	X86_HYPER_ACRN,

};



#ifdef CONFIG_HYPERVISOR_GUEST

CRA Git | Maintained and supported by SUSTech CRA and CCSE