Commit 669c0f76 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 updates from Thomas Gleixner:
 "The platform support for x86 contains the following updates:

   - A set of updates for the UV platform to support new CPUs and to fix
     some of the UV4A BAU MRRs

   - The initial platform support for the jailhouse hypervisor to allow
     native Linux guests (inmates) in non-root cells.

   - A fix for the PCI initialization on Intel MID platforms"

* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (24 commits)
  x86/jailhouse: Respect pci=lastbus command line settings
  x86/jailhouse: Set X86_FEATURE_TSC_KNOWN_FREQ
  x86/platform/intel-mid: Move PCI initialization to arch_init()
  x86/platform/uv/BAU: Replace hard-coded values with MMR definitions
  x86/platform/UV: Fix UV4A BAU MMRs
  x86/platform/UV: Fix GAM MMR references in the UV x2apic code
  x86/platform/UV: Fix GAM MMR changes in UV4A
  x86/platform/UV: Add references to access fixed UV4A HUB MMRs
  x86/platform/UV: Fix UV4A support on new Intel Processors
  x86/platform/UV: Update uv_mmrs.h to prepare for UV4A fixes
  x86/jailhouse: Add PCI dependency
  x86/jailhouse: Hide x2apic code when CONFIG_X86_X2APIC=n
  x86/jailhouse: Initialize PCI support
  x86/jailhouse: Wire up IOAPIC for legacy UART ports
  x86/jailhouse: Halt instead of failing to restart
  x86/jailhouse: Silence ACPI warning
  x86/jailhouse: Avoid access of unsupported platform resources
  x86/jailhouse: Set up timekeeping
  x86/jailhouse: Enable PMTIMER
  x86/jailhouse: Enable APIC and SMP support
  ...
parents f0b13428 3b42349d

arch/x86/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -810,6 +810,15 @@ config PARAVIRT_TIME_ACCOUNTING 
config PARAVIRT_CLOCK

	bool



config JAILHOUSE_GUEST

	bool "Jailhouse non-root cell support"

	depends on X86_64 && PCI

	select X86_PM_TIMER

	---help---

	  This option allows to run Linux as guest in a Jailhouse non-root

	  cell. You can leave this option disabled if you only want to start

	  Jailhouse and run Linux afterwards in the root cell.



endif #HYPERVISOR_GUEST



config NO_BOOTMEM

arch/x86/include/asm/hypervisor.h

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

	X86_HYPER_XEN_HVM,

	X86_HYPER_KVM,

	X86_HYPER_JAILHOUSE,

};



#ifdef CONFIG_HYPERVISOR_GUEST

arch/x86/include/asm/jailhouse_para.h

0 → 100644
+26 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL2.0 */



/*

 * Jailhouse paravirt_ops implementation

 *

 * Copyright (c) Siemens AG, 2015-2017

 *

 * Authors:

 *  Jan Kiszka <jan.kiszka@siemens.com>

 */



#ifndef _ASM_X86_JAILHOUSE_PARA_H

#define _ASM_X86_JAILHOUSE_PARA_H



#include <linux/types.h>



#ifdef CONFIG_JAILHOUSE_GUEST

bool jailhouse_paravirt(void);

#else

static inline bool jailhouse_paravirt(void)

{

	return false;

}

#endif



#endif /* _ASM_X86_JAILHOUSE_PARA_H */

arch/x86/include/asm/mpspec_def.h

+11 −3
Original line number Diff line number Diff line
@@ -128,9 +128,17 @@ enum mp_irq_source_types { 
	mp_ExtINT = 3

};



#define MP_IRQDIR_DEFAULT	0

#define MP_IRQDIR_HIGH		1

#define MP_IRQDIR_LOW		3

#define MP_IRQPOL_DEFAULT	0x0

#define MP_IRQPOL_ACTIVE_HIGH	0x1

#define MP_IRQPOL_RESERVED	0x2

#define MP_IRQPOL_ACTIVE_LOW	0x3

#define MP_IRQPOL_MASK		0x3



#define MP_IRQTRIG_DEFAULT	0x0

#define MP_IRQTRIG_EDGE		0x4

#define MP_IRQTRIG_RESERVED	0x8

#define MP_IRQTRIG_LEVEL	0xc

#define MP_IRQTRIG_MASK		0xc



#define MP_APIC_ALL	0xFF

arch/x86/include/asm/uv/uv_bau.h

+0 −1
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ 
#define UV2_NET_ENDPOINT_INTD		0x28

#define UV_NET_ENDPOINT_INTD		(is_uv1_hub() ?			\

			UV1_NET_ENDPOINT_INTD : UV2_NET_ENDPOINT_INTD)

#define UV_DESC_PSHIFT			49

#define UV_PAYLOADQ_GNODE_SHIFT		49

#define UV_PTC_BASENAME			"sgi_uv/ptc_statistics"

#define UV_BAU_BASENAME			"sgi_uv/bau_tunables"

CRA Git | Maintained and supported by SUSTech CRA and CCSE