Merge remote-tracking branch 'tip/perf/core' into perf/urgent (e3b22a65) · Commits · jan.koester / Linux

Documentation/ABI/testing/sysfs-devices-system-cpu

+23 −0

Original line number	Original line	Diff line number	Diff line
	@@ -538,3 +538,26 @@ Description: Intel Energy and Performance Bias Hint (EPB)

	This attribute is present for all online CPUs supporting the		This attribute is present for all online CPUs supporting the
	Intel EPB feature.		Intel EPB feature.

			What: /sys/devices/system/cpu/umwait_control
			/sys/devices/system/cpu/umwait_control/enable_c02
			/sys/devices/system/cpu/umwait_control/max_time
			Date: May 2019
			Contact: Linux kernel mailing list <linux-kernel@vger.kernel.org>
			Description: Umwait control

			enable_c02: Read/write interface to control umwait C0.2 state
			Read returns C0.2 state status:
			0: C0.2 is disabled
			1: C0.2 is enabled

			Write 'y' or '1' or 'on' to enable C0.2 state.
			Write 'n' or '0' or 'off' to disable C0.2 state.

			The interface is case insensitive.

			max_time: Read/write interface to control umwait maximum time
			in TSC-quanta that the CPU can reside in either C0.1
			or C0.2 state. The time is an unsigned 32-bit number.
			Note that a value of zero means there is no limit.
			Low order two bits must be zero.

Documentation/cputopology.txt

+33 −15

Original line number	Original line	Diff line number	Diff line
	@@ -12,6 +12,12 @@ physical_package_id:
	socket number, but the actual value is architecture and platform		socket number, but the actual value is architecture and platform
	dependent.		dependent.

			die_id:

			the CPU die ID of cpuX. Typically it is the hardware platform's
			identifier (rather than the kernel's). The actual value is
			architecture and platform dependent.

	core_id:		core_id:

	the CPU core ID of cpuX. Typically it is the hardware platform's		the CPU core ID of cpuX. Typically it is the hardware platform's
	@@ -30,25 +36,33 @@ drawer_id:
	identifier (rather than the kernel's). The actual value is		identifier (rather than the kernel's). The actual value is
	architecture and platform dependent.		architecture and platform dependent.

	thread_siblings:		core_cpus:

	internal kernel map of cpuX's hardware threads within the same		internal kernel map of CPUs within the same core.
	core as cpuX.		(deprecated name: "thread_siblings")

	thread_siblings_list:		core_cpus_list:

	human-readable list of cpuX's hardware threads within the same		human-readable list of CPUs within the same core.
	core as cpuX.		(deprecated name: "thread_siblings_list");

	core_siblings:		package_cpus:

	internal kernel map of cpuX's hardware threads within the same		internal kernel map of the CPUs sharing the same physical_package_id.
	physical_package_id.		(deprecated name: "core_siblings")

	core_siblings_list:		package_cpus_list:

	human-readable list of cpuX's hardware threads within the same		human-readable list of CPUs sharing the same physical_package_id.
	physical_package_id.		(deprecated name: "core_siblings_list")

			die_cpus:

			internal kernel map of CPUs within the same die.

			die_cpus_list:

			human-readable list of CPUs within the same die.

	book_siblings:		book_siblings:

	@@ -81,11 +95,13 @@ For an architecture to support this feature, it must define some of
	these macros in include/asm-XXX/topology.h::		these macros in include/asm-XXX/topology.h::

	#define topology_physical_package_id(cpu)		#define topology_physical_package_id(cpu)
			#define topology_die_id(cpu)
	#define topology_core_id(cpu)		#define topology_core_id(cpu)
	#define topology_book_id(cpu)		#define topology_book_id(cpu)
	#define topology_drawer_id(cpu)		#define topology_drawer_id(cpu)
	#define topology_sibling_cpumask(cpu)		#define topology_sibling_cpumask(cpu)
	#define topology_core_cpumask(cpu)		#define topology_core_cpumask(cpu)
			#define topology_die_cpumask(cpu)
	#define topology_book_cpumask(cpu)		#define topology_book_cpumask(cpu)
	#define topology_drawer_cpumask(cpu)		#define topology_drawer_cpumask(cpu)

	@@ -99,9 +115,11 @@ provides default definitions for any of the above macros that are
	not defined by include/asm-XXX/topology.h:		not defined by include/asm-XXX/topology.h:

	1) topology_physical_package_id: -1		1) topology_physical_package_id: -1
	2) topology_core_id: 0		2) topology_die_id: -1
	3) topology_sibling_cpumask: just the given CPU		3) topology_core_id: 0
	4) topology_core_cpumask: just the given CPU		4) topology_sibling_cpumask: just the given CPU
			5) topology_core_cpumask: just the given CPU
			6) topology_die_cpumask: just the given CPU

	For architectures that don't support books (CONFIG_SCHED_BOOK) there are no		For architectures that don't support books (CONFIG_SCHED_BOOK) there are no
	default definitions for topology_book_id() and topology_book_cpumask().		default definitions for topology_book_id() and topology_book_cpumask().

Documentation/process/changes.rst

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -31,7 +31,7 @@ you probably needn't concern yourself with isdn4k-utils.
	====================== =============== ========================================		====================== =============== ========================================
	GNU C 4.6 gcc --version		GNU C 4.6 gcc --version
	GNU make 3.81 make --version		GNU make 3.81 make --version
	binutils 2.20 ld -v		binutils 2.21 ld -v
	flex 2.5.35 flex --version		flex 2.5.35 flex --version
	bison 2.0 bison --version		bison 2.0 bison --version
	util-linux 2.10o fdformat --version		util-linux 2.10o fdformat --version
	@@ -77,9 +77,7 @@ You will need GNU make 3.81 or later to build the kernel.
	Binutils		Binutils
	--------		--------

	The build system has, as of 4.13, switched to using thin archives (`ar T`)		Binutils 2.21 or newer is needed to build the kernel.
	rather than incremental linking (`ld -r`) for built-in.a intermediate steps.
	This requires binutils 2.20 or newer.

	pkg-config		pkg-config
	----------		----------

Documentation/x86/topology.rst

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -49,6 +49,10 @@ Package-related topology information in the kernel:

	The number of cores in a package. This information is retrieved via CPUID.		The number of cores in a package. This information is retrieved via CPUID.

			- cpuinfo_x86.x86_max_dies:

			The number of dies in a package. This information is retrieved via CPUID.

	- cpuinfo_x86.phys_proc_id:		- cpuinfo_x86.phys_proc_id:

	The physical ID of the package. This information is retrieved via CPUID		The physical ID of the package. This information is retrieved via CPUID

MAINTAINERS

+7 −1

Original line number	Original line	Diff line number	Diff line
	@@ -7810,7 +7810,7 @@ INGENIC JZ4780 NAND DRIVER
	M: Harvey Hunt <harveyhuntnexus@gmail.com>		M: Harvey Hunt <harveyhuntnexus@gmail.com>
	L: linux-mtd@lists.infradead.org		L: linux-mtd@lists.infradead.org
	S: Maintained		S: Maintained
	F: drivers/mtd/nand/raw/jz4780_*		F: drivers/mtd/nand/raw/ingenic/

	INOTIFY		INOTIFY
	M: Jan Kara <jack@suse.cz>		M: Jan Kara <jack@suse.cz>
	@@ -17496,6 +17496,12 @@ Q: https://patchwork.linuxtv.org/project/linux-media/list/
	S: Maintained		S: Maintained
	F: drivers/media/dvb-frontends/zd1301_demod*		F: drivers/media/dvb-frontends/zd1301_demod*

			ZHAOXIN PROCESSOR SUPPORT
			M: Tony W Wang-oc <TonyWWang-oc@zhaoxin.com>
			L: linux-kernel@vger.kernel.org
			S: Maintained
			F: arch/x86/kernel/cpu/zhaoxin.c

	ZPOOL COMPRESSED PAGE STORAGE API		ZPOOL COMPRESSED PAGE STORAGE API
	M: Dan Streetman <ddstreet@ieee.org>		M: Dan Streetman <ddstreet@ieee.org>
	L: linux-mm@kvack.org		L: linux-mm@kvack.org