Merge branch 'sh/stable-updates' (60e0a4c7) · Commits · e / devices / android_kernel_oneplus_sm7250

Makefile

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 2
		PATCHLEVEL = 6
		SUBLEVEL = 31
		EXTRAVERSION = -rc5
		EXTRAVERSION = -rc6
		NAME = Man-Eating Seals of Antiquity

		# DOCUMENTATION

arch/sh/boards/mach-se/7724/setup.c

+5 −4

Original line number	Diff line number	Diff line
		@@ -246,7 +246,7 @@ static struct platform_device ceu1_device = {
		},
		};

		/* KEYSC */
		/* KEYSC in SoC (Needs SW33-2 set to ON) */
		static struct sh_keysc_info keysc_info = {
		.mode = SH_KEYSC_MODE_1,
		.scan_timing = 10,
		@@ -263,12 +263,13 @@ static struct sh_keysc_info keysc_info = {

		static struct resource keysc_resources[] = {
		[0] = {
		.start = 0x1a204000,
		.end = 0x1a20400f,
		.name = "KEYSC",
		.start = 0x044b0000,
		.end = 0x044b000f,
		.flags = IORESOURCE_MEM,
		},
		[1] = {
		.start = IRQ0_KEY,
		.start = 79,
		.flags = IORESOURCE_IRQ,
		},
		};

arch/sh/kernel/cpu/shmobile/sleep.S

+68 −2

Original line number	Diff line number	Diff line
		@@ -26,8 +26,30 @@ ENTRY(sh_mobile_standby)

		tst #SUSP_SH_SF, r0
		bt skip_set_sf
		#ifdef CONFIG_CPU_SUBTYPE_SH7724
		/* DBSC: put memory in self-refresh mode */

		/* SDRAM: disable power down and put in self-refresh mode */
		mov.l dben_reg, r4
		mov.l dben_data0, r1
		mov.l r1, @r4

		mov.l dbrfpdn0_reg, r4
		mov.l dbrfpdn0_data0, r1
		mov.l r1, @r4

		mov.l dbcmdcnt_reg, r4
		mov.l dbcmdcnt_data0, r1
		mov.l r1, @r4

		mov.l dbcmdcnt_reg, r4
		mov.l dbcmdcnt_data1, r1
		mov.l r1, @r4

		mov.l dbrfpdn0_reg, r4
		mov.l dbrfpdn0_data1, r1
		mov.l r1, @r4
		#else
		/* SBSC: disable power down and put in self-refresh mode */
		mov.l 1f, r4
		mov.l 2f, r1
		mov.l @r4, r2
		@@ -35,6 +57,7 @@ ENTRY(sh_mobile_standby)
		mov.l 3f, r3
		and r3, r2
		mov.l r2, @r4
		#endif

		skip_set_sf:
		tst #SUSP_SH_SLEEP, r0
		@@ -84,7 +107,36 @@ done_sleep:
		tst #SUSP_SH_SF, r0
		bt skip_restore_sf

		/* SDRAM: set auto-refresh mode */
		#ifdef CONFIG_CPU_SUBTYPE_SH7724
		/* DBSC: put memory in auto-refresh mode */

		mov.l dbrfpdn0_reg, r4
		mov.l dbrfpdn0_data0, r1
		mov.l r1, @r4

		/* sleep 140 ns */
		nop
		nop
		nop
		nop

		mov.l dbcmdcnt_reg, r4
		mov.l dbcmdcnt_data0, r1
		mov.l r1, @r4

		mov.l dbcmdcnt_reg, r4
		mov.l dbcmdcnt_data1, r1
		mov.l r1, @r4

		mov.l dben_reg, r4
		mov.l dben_data1, r1
		mov.l r1, @r4

		mov.l dbrfpdn0_reg, r4
		mov.l dbrfpdn0_data2, r1
		mov.l r1, @r4
		#else
		/* SBSC: set auto-refresh mode */
		mov.l 1f, r4
		mov.l @r4, r2
		mov.l 4f, r3
		@@ -98,15 +150,29 @@ done_sleep:
		add r4, r3
		or r2, r3
		mov.l r3, @r1
		#endif
		skip_restore_sf:
		rts
		nop

		.balign 4
		#ifdef CONFIG_CPU_SUBTYPE_SH7724
		dben_reg: .long 0xfd000010 /* DBEN */
		dben_data0: .long 0
		dben_data1: .long 1
		dbrfpdn0_reg: .long 0xfd000040 /* DBRFPDN0 */
		dbrfpdn0_data0: .long 0
		dbrfpdn0_data1: .long 1
		dbrfpdn0_data2: .long 0x00010000
		dbcmdcnt_reg: .long 0xfd000014 /* DBCMDCNT */
		dbcmdcnt_data0: .long 2
		dbcmdcnt_data1: .long 4
		#else
		1: .long 0xfe400008 /* SDCR0 */
		2: .long 0x00000400
		3: .long 0xffff7fff
		4: .long 0xfffffbff
		#endif
		5: .long 0xa4150020 /* STBCR */
		6: .long 0xfe40001c /* RTCOR */
		7: .long 0xfe400018 /* RTCNT */

arch/x86/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ config X86
		select HAVE_UNSTABLE_SCHED_CLOCK
		select HAVE_IDE
		select HAVE_OPROFILE
		select HAVE_PERF_COUNTERS if (!M386 && !M486)
		select HAVE_IOREMAP_PROT
		select HAVE_KPROBES
		select ARCH_WANT_OPTIONAL_GPIOLIB
		@@ -742,7 +743,6 @@ config X86_UP_IOAPIC
		config X86_LOCAL_APIC
		def_bool y
		depends on X86_64 \|\| SMP \|\| X86_32_NON_STANDARD \|\| X86_UP_APIC
		select HAVE_PERF_COUNTERS if (!M386 && !M486)

		config X86_IO_APIC
		def_bool y

arch/x86/kernel/cpu/amd.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -400,6 +400,13 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)
		level = cpuid_eax(1);
		if((level >= 0x0f48 && level < 0x0f50) \|\| level >= 0x0f58)
		set_cpu_cap(c, X86_FEATURE_REP_GOOD);

		/*
		* Some BIOSes incorrectly force this feature, but only K8
		* revision D (model = 0x14) and later actually support it.
		*/
		if (c->x86_model < 0x14)
		clear_cpu_cap(c, X86_FEATURE_LAHF_LM);
		}
		if (c->x86 == 0x10 \|\| c->x86 == 0x11)
		set_cpu_cap(c, X86_FEATURE_REP_GOOD);