Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 227aaccc authored by jianzhou's avatar jianzhou
Browse files

Merge android-4.9.189 (2970e785) into msm-4.9 



* refs/heads/tmp-2970e785:
  Linux 4.9.189
  x86/speculation/swapgs: Exclude ATOMs from speculation through SWAPGS
  x86/entry/64: Use JMP instead of JMPQ
  x86/speculation: Enable Spectre v1 swapgs mitigations
  x86/speculation: Prepare entry code for Spectre v1 swapgs mitigations
  x86: cpufeatures: Sort feature word 7
  spi: bcm2835: Fix 3-wire mode if DMA is enabled
  block: blk_init_allocated_queue() set q->fq as NULL in the fail case
  bnx2x: Disable multi-cos feature.
  ife: error out when nla attributes are empty
  ip6_tunnel: fix possible use-after-free on xmit
  compat_ioctl: pppoe: fix PPPOEIOCSFWD handling
  tipc: compat: allow tipc commands without arguments
  net: sched: Fix a possible null-pointer dereference in dequeue_func()
  net/mlx5: Use reversed order when unregister devices
  net: fix ifindex collision during namespace removal
  net: bridge: mcast: don't delete permanent entries when fast leave is enabled
  net: bridge: delete local fdb on device init failure
  atm: iphase: Fix Spectre v1 vulnerability
  libceph: use kbasename() and kill ceph_file_part()
  objtool: Add rewind_stack_do_exit() to the noreturn list
  objtool: Add machine_real_restart() to the noreturn list
  IB: directly cast the sockaddr union to aockaddr
  RDMA: Directly cast the sockaddr union to sockaddr
  HID: Add quirk for HP X1200 PIXART OEM mouse
  HID: wacom: fix bit shift for Cintiq Companion 2
  tcp: be more careful in tcp_fragment()
  arm64: cpufeature: Fix feature comparison for CTR_EL0.{CWG,ERG}
  arm64: cpufeature: Fix CTR_EL0 field definitions
  ARM: dts: logicpd-som-lv: Fix Audio Mute
  ARM: dts: Add pinmuxing for i2c2 and i2c3 for LogicPD torpedo
  ARM: dts: Add pinmuxing for i2c2 and i2c3 for LogicPD SOM-LV
  scsi: fcoe: Embed fc_rport_priv in fcoe_rport structure
  fs/crypto: Fix 4.9.186 missmerge

Change-Id: I1c14f26fa8bcf1851abd64077d6bbd5b058cda4f
Signed-off-by: default avatarjianzhou <jianzhou@codeaurora.org>
parents 466787ae 2970e785

Documentation/kernel-parameters.txt

+5 −4
Original line number Diff line number Diff line
@@ -2506,6 +2506,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
				improves system performance, but it may also

				expose users to several CPU vulnerabilities.

				Equivalent to: nopti [X86]

					       nospectre_v1 [X86]

					       nospectre_v2 [X86]

					       spectre_v2_user=off [X86]

					       spec_store_bypass_disable=off [X86]
@@ -2841,10 +2842,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 


	nohugeiomap	[KNL,x86] Disable kernel huge I/O mappings.



	nospectre_v1	[PPC] Disable mitigations for Spectre Variant 1 (bounds

			check bypass). With this option data leaks are possible

			in the system.



	nosmt		[KNL,S390] Disable symmetric multithreading (SMT).

			Equivalent to smt=1.
@@ -2852,6 +2849,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			nosmt=force: Force disable SMT, cannot be undone

				     via the sysfs control file.



	nospectre_v1	[X86,PPC] Disable mitigations for Spectre Variant 1

			(bounds check bypass). With this option data leaks are

			possible in the system.



	nospectre_v2	[X86,PPC_FSL_BOOK3E] Disable all mitigations for the Spectre variant 2

			(indirect branch prediction) vulnerability. System may

			allow data leaks with this option, which is equivalent

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 188

SUBLEVEL = 189

EXTRAVERSION =

NAME = Roaring Lionus

arch/arm/boot/dts/logicpd-som-lv.dtsi

+18 −0
Original line number Diff line number Diff line
@@ -108,16 +108,21 @@ 
		twl_audio: audio {

			compatible = "ti,twl4030-audio";

			codec {

				ti,hs_extmute_gpio = <&gpio2 25 GPIO_ACTIVE_HIGH>;

			};

		};

	};

};



&i2c2 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c2_pins>;

	clock-frequency = <400000>;

};



&i2c3 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c3_pins>;

	clock-frequency = <400000>;

};
@@ -221,6 +226,7 @@ 
		pinctrl-single,pins = <

			OMAP3_CORE1_IOPAD(0x21ba, PIN_INPUT | MUX_MODE0)        /* i2c1_scl.i2c1_scl */

			OMAP3_CORE1_IOPAD(0x21bc, PIN_INPUT | MUX_MODE0)        /* i2c1_sda.i2c1_sda */

			OMAP3_CORE1_IOPAD(0x20ba, PIN_OUTPUT | MUX_MODE4)        /* gpmc_ncs6.gpio_57 */

		>;

	};

};
@@ -239,6 +245,18 @@ 
			OMAP3_WKUP_IOPAD(0x2a0c, PIN_OUTPUT | MUX_MODE4)	/* sys_boot1.gpio_3 */

		>;

	};

	i2c2_pins: pinmux_i2c2_pins {

		pinctrl-single,pins = <

			OMAP3_CORE1_IOPAD(0x21be, PIN_INPUT | MUX_MODE0)	/* i2c2_scl */

			OMAP3_CORE1_IOPAD(0x21c0, PIN_INPUT | MUX_MODE0)	/* i2c2_sda */

		>;

	};

	i2c3_pins: pinmux_i2c3_pins {

		pinctrl-single,pins = <

			OMAP3_CORE1_IOPAD(0x21c2, PIN_INPUT | MUX_MODE0)	/* i2c3_scl */

			OMAP3_CORE1_IOPAD(0x21c4, PIN_INPUT | MUX_MODE0)	/* i2c3_sda */

		>;

	};

};



&omap3_pmx_core2 {

arch/arm/boot/dts/logicpd-torpedo-som.dtsi

+16 −0
Original line number Diff line number Diff line
@@ -117,10 +117,14 @@ 
};



&i2c2 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c2_pins>;

	clock-frequency = <400000>;

};



&i2c3 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c3_pins>;

	clock-frequency = <400000>;

	at24@50 {

		compatible = "atmel,24c64";
@@ -215,6 +219,18 @@ 
			OMAP3_CORE1_IOPAD(0x21bc, PIN_INPUT | MUX_MODE0)        /* i2c1_sda.i2c1_sda */

		>;

	};

	i2c2_pins: pinmux_i2c2_pins {

		pinctrl-single,pins = <

			OMAP3_CORE1_IOPAD(0x21be, PIN_INPUT | MUX_MODE0)	/* i2c2_scl */

			OMAP3_CORE1_IOPAD(0x21c0, PIN_INPUT | MUX_MODE0)	/* i2c2_sda */

		>;

	};

	i2c3_pins: pinmux_i2c3_pins {

		pinctrl-single,pins = <

			OMAP3_CORE1_IOPAD(0x21c2, PIN_INPUT | MUX_MODE0)	/* i2c3_scl */

			OMAP3_CORE1_IOPAD(0x21c4, PIN_INPUT | MUX_MODE0)	/* i2c3_sda */

		>;

	};

};



&uart2 {

arch/arm64/include/asm/cpufeature.h

+4 −3
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ enum ftr_type { 
	FTR_EXACT,			/* Use a predefined safe value */

	FTR_LOWER_SAFE,			/* Smaller value is safe */

	FTR_HIGHER_SAFE,		/* Bigger value is safe */

	FTR_HIGHER_OR_ZERO_SAFE,	/* Bigger value is safe, but 0 is biggest */

};



#define FTR_STRICT	true	/* SANITY check strict matching required */