Merge branch 'next' into for-linus

		/sys/devices/system/cpu/vulnerabilities/meltdown

		/sys/devices/system/cpu/vulnerabilities/spectre_v1

		/sys/devices/system/cpu/vulnerabilities/spectre_v2

		/sys/devices/system/cpu/vulnerabilities/spec_store_bypass

Date:		January 2018

Contact:	Linux kernel mailing list <linux-kernel@vger.kernel.org>

Description:	Information about CPU vulnerabilities

			allow data leaks with this option, which is equivalent

			to spectre_v2=off.

	nospec_store_bypass_disable

			[HW] Disable all mitigations for the Speculative Store Bypass vulnerability

	noxsave		[BUGS=X86] Disables x86 extended register state save

			and restore using xsave. The kernel will fallback to

			enabling legacy floating-point and sse state.

			Not specifying this option is equivalent to

			spectre_v2=auto.

	spec_store_bypass_disable=

			[HW] Control Speculative Store Bypass (SSB) Disable mitigation

			(Speculative Store Bypass vulnerability)

			Certain CPUs are vulnerable to an exploit against a

			a common industry wide performance optimization known

			as "Speculative Store Bypass" in which recent stores

			to the same memory location may not be observed by

			later loads during speculative execution. The idea

			is that such stores are unlikely and that they can

			be detected prior to instruction retirement at the

			end of a particular speculation execution window.

			In vulnerable processors, the speculatively forwarded

			store can be used in a cache side channel attack, for

			example to read memory to which the attacker does not

			directly have access (e.g. inside sandboxed code).

			This parameter controls whether the Speculative Store

			Bypass optimization is used.

			on      - Unconditionally disable Speculative Store Bypass

			off     - Unconditionally enable Speculative Store Bypass

			auto    - Kernel detects whether the CPU model contains an

				  implementation of Speculative Store Bypass and

				  picks the most appropriate mitigation. If the

				  CPU is not vulnerable, "off" is selected. If the

				  CPU is vulnerable the default mitigation is

				  architecture and Kconfig dependent. See below.

			prctl   - Control Speculative Store Bypass per thread

				  via prctl. Speculative Store Bypass is enabled

				  for a process by default. The state of the control

				  is inherited on fork.

			seccomp - Same as "prctl" above, but all seccomp threads

				  will disable SSB unless they explicitly opt out.

			Not specifying this option is equivalent to

			spec_store_bypass_disable=auto.

			Default mitigations:

			X86:	If CONFIG_SECCOMP=y "seccomp", otherwise "prctl"

	spia_io_base=	[HW,MTD]

	spia_fio_base=

	spia_pedr=

General Keys Properties:

Optional properties for Keys:

- power-off-time-sec: Duration in seconds which the key should be kept

	pressed for device to power off automatically. Device with key pressed

	shutdown feature can specify this property.

- linux,keycodes: Specifies the numeric keycode values to be used for

	reporting key presses.

	Value type: <string>

	Definition: must be one of:

		    "qcom,pm8941-pwrkey"

		    "qcom,pm8941-resin"

- reg:

	Usage: required

	Definition: presence of this property indicates that the KPDPWR_N pin

		    should be configured for pull up.

- linux,code:

	Usage: optional

	Value type: <u32>

	Definition: The input key-code associated with the power key.

		    Use the linux event codes defined in

		    include/dt-bindings/input/linux-event-codes.h

		    When property is omitted KEY_POWER is assumed.

EXAMPLE

	pwrkey@800 {

		interrupts = <0x0 0x8 0 IRQ_TYPE_EDGE_BOTH>;

		debounce = <15625>;

		bias-pull-up;

		linux,code = <KEY_POWER>;

	};

* Rohm BU21029 Touch Screen Controller

Required properties:

 - compatible              : must be "rohm,bu21029"

 - reg                     : i2c device address of the chip (0x40 or 0x41)

 - interrupt-parent        : the phandle for the gpio controller

 - interrupts              : (gpio) interrupt to which the chip is connected

 - rohm,x-plate-ohms       : x-plate resistance in Ohm

Optional properties:

 - reset-gpios             : gpio pin to reset the chip (active low)

 - touchscreen-size-x      : horizontal resolution of touchscreen (in pixels)

 - touchscreen-size-y      : vertical resolution of touchscreen (in pixels)

 - touchscreen-max-pressure: maximum pressure value

 - vdd-supply              : power supply for the controller

Example:

	&i2c1 {

		/* ... */

		bu21029: bu21029@40 {

			compatible = "rohm,bu21029";

			reg = <0x40>;

			interrupt-parent = <&gpio1>;

			interrupts = <4 IRQ_TYPE_EDGE_FALLING>;

			reset-gpios = <&gpio6 16 GPIO_ACTIVE_LOW>;

			rohm,x-plate-ohms = <600>;

			touchscreen-size-x = <800>;

			touchscreen-size-y = <480>;

			touchscreen-max-pressure = <4095>;

		};

		/* ... */

	};