Commit cea061e4 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 Ingo Molnar:
 "The main changes in this cycle were:

   - Add "Jailhouse" hypervisor support (Jan Kiszka)

   - Update DeviceTree support (Ivan Gorinov)

   - Improve DMI date handling (Andy Shevchenko)"

* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/PCI: Fix a potential regression when using dmi_get_bios_year()
  firmware/dmi_scan: Uninline dmi_get_bios_year() helper
  x86/devicetree: Use CPU description from Device Tree
  of/Documentation: Specify local APIC ID in "reg"
  MAINTAINERS: Add entry for Jailhouse
  x86/jailhouse: Allow to use PCI_MMCONFIG without ACPI
  x86: Consolidate PCI_MMCONFIG configs
  x86: Align x86_64 PCI_MMCONFIG with 32-bit variant
  x86/jailhouse: Enable PCI mmconfig access in inmates
  PCI: Scan all functions when running over Jailhouse
  jailhouse: Provide detection for non-x86 systems
  x86/devicetree: Fix device IRQ settings in DT
  x86/devicetree: Initialize device tree before using it
  pci: Simplify code by using the new dmi_get_bios_year() helper
  ACPI/sleep: Simplify code by using the new dmi_get_bios_year() helper
  x86/pci: Simplify code by using the new dmi_get_bios_year() helper
  dmi: Introduce the dmi_get_bios_year() helper function
  x86/platform/quark: Re-use DEFINE_SHOW_ATTRIBUTE() macro
  x86/platform/atom: Re-use DEFINE_SHOW_ATTRIBUTE() macro
parents d22fff81 47a9973d

Documentation/devicetree/bindings/jailhouse.txt

0 → 100644
+8 −0
Original line number Original line Diff line number Diff line 
Jailhouse non-root cell device tree bindings

--------------------------------------------



When running in a non-root Jailhouse cell (partition), the device tree of this

platform shall have a top-level "hypervisor" node with the following

properties:



- compatible = "jailhouse,cell"

Documentation/devicetree/bindings/x86/ce4100.txt

+28 −9
Original line number Original line Diff line number Diff line
@@ -7,17 +7,36 @@ Many of the "generic" devices like HPET or IO APIC have the ce4100 
name in their compatible property because they first appeared in this

name in their compatible property because they first appeared in this

SoC.

SoC.





The CPU node

The CPU nodes

------------

-------------



	cpus {

		#address-cells = <1>;

		#size-cells = <0>;



		cpu@0 {

		cpu@0 {

			device_type = "cpu";

			device_type = "cpu";

			compatible = "intel,ce4100";

			compatible = "intel,ce4100";

		reg = <0>;

			reg = <0x00>;

		lapic = <&lapic0>;

		};

		};





The reg property describes the CPU number. The lapic property points to

		cpu@2 {

the local APIC timer.

			device_type = "cpu";

			compatible = "intel,ce4100";

			reg = <0x02>;

		};

	};



A "cpu" node describes one logical processor (hardware thread).



Required properties:



- device_type

	Device type, must be "cpu".



- reg

	Local APIC ID, the unique number assigned to each processor by

	system hardware.





The SoC node

The SoC node

------------

------------

MAINTAINERS

+7 −0
Original line number Original line Diff line number Diff line
@@ -7534,6 +7534,13 @@ Q: http://patchwork.linuxtv.org/project/linux-media/list/ 
S:	Maintained

S:	Maintained

F:	drivers/media/dvb-frontends/ix2505v*

F:	drivers/media/dvb-frontends/ix2505v*





JAILHOUSE HYPERVISOR INTERFACE

M:	Jan Kiszka <jan.kiszka@siemens.com>

L:	jailhouse-dev@googlegroups.com

S:	Maintained

F:	arch/x86/kernel/jailhouse.c

F:	arch/x86/include/asm/jailhouse_para.h



JC42.4 TEMPERATURE SENSOR DRIVER

JC42.4 TEMPERATURE SENSOR DRIVER

M:	Guenter Roeck <linux@roeck-us.net>

M:	Guenter Roeck <linux@roeck-us.net>

L:	linux-hwmon@vger.kernel.org

L:	linux-hwmon@vger.kernel.org

arch/x86/Kconfig

+7 −5
Original line number Original line Diff line number Diff line
@@ -2626,8 +2626,10 @@ config PCI_DIRECT 
	depends on PCI && (X86_64 || (PCI_GODIRECT || PCI_GOANY || PCI_GOOLPC || PCI_GOMMCONFIG))

	depends on PCI && (X86_64 || (PCI_GODIRECT || PCI_GOANY || PCI_GOOLPC || PCI_GOMMCONFIG))





config PCI_MMCONFIG

config PCI_MMCONFIG

	def_bool y

	bool "Support mmconfig PCI config space access" if X86_64

	depends on X86_32 && PCI && (ACPI || SFI) && (PCI_GOMMCONFIG || PCI_GOANY)

	default y

	depends on PCI && (ACPI || SFI || JAILHOUSE_GUEST)

	depends on X86_64 || (PCI_GOANY || PCI_GOMMCONFIG)





config PCI_OLPC

config PCI_OLPC

	def_bool y

	def_bool y
@@ -2642,9 +2644,9 @@ config PCI_DOMAINS 
	def_bool y

	def_bool y

	depends on PCI

	depends on PCI





config PCI_MMCONFIG

config MMCONF_FAM10H

	bool "Support mmconfig PCI config space access"

	def_bool y

	depends on X86_64 && PCI && ACPI

	depends on X86_64 && PCI_MMCONFIG && ACPI





config PCI_CNB20LE_QUIRK

config PCI_CNB20LE_QUIRK

	bool "Read CNB20LE Host Bridge Windows" if EXPERT

	bool "Read CNB20LE Host Bridge Windows" if EXPERT

arch/x86/include/asm/jailhouse_para.h

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

/* SPDX-License-Identifier: GPL2.0 */





/*

/*

 * Jailhouse paravirt_ops implementation

 * Jailhouse paravirt detection

 *

 *

 * Copyright (c) Siemens AG, 2015-2017

 * Copyright (c) Siemens AG, 2015-2017

 *

 *

CRA Git | Maintained and supported by SUSTech CRA and CCSE