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

Commit 202fde33 authored by Srinivasarao P's avatar Srinivasarao P
Browse files

Merge android-4.4.98 (3d4af8) into msm-4.4 



* refs/heads/tmp-03d4af82
  Linux 4.4.98
  PKCS#7: fix unitialized boolean 'want'
  x86/oprofile/ppro: Do not use __this_cpu*() in preemptible context
  can: c_can: don't indicate triple sampling support for D_CAN
  can: sun4i: handle overrun in RX FIFO
  rbd: use GFP_NOIO for parent stat and data requests
  drm/vmwgfx: Fix Ubuntu 17.10 Wayland black screen issue
  Input: elan_i2c - add ELAN060C to the ACPI table
  MIPS: AR7: Ensure that serial ports are properly set up
  MIPS: AR7: Defer registration of GPIO
  tools: firmware: check for distro fallback udev cancel rule
  selftests: firmware: send expected errors to /dev/null
  selftests: firmware: add empty string and async tests
  test: firmware_class: report errors properly on failure
  MIPS: SMP: Fix deadlock & online race
  MIPS: Fix race on setting and getting cpu_online_mask
  MIPS: SMP: Use a completion event to signal CPU up
  MIPS: Fix CM region target definitions
  MIPS: microMIPS: Fix incorrect mask in insn_table_MM
  ALSA: seq: Avoid invalid lockdep class warning
  ALSA: seq: Fix OSS sysex delivery in OSS emulation
  ARM: 8720/1: ensure dump_instr() checks addr_limit
  KEYS: fix NULL pointer dereference during ASN.1 parsing [ver #2]
  crypto: x86/sha1-mb - fix panic due to unaligned access
  workqueue: Fix NULL pointer dereference
  x86/uaccess, sched/preempt: Verify access_ok() context
  platform/x86: hp-wmi: Do not shadow error values
  platform/x86: hp-wmi: Fix error value for hp_wmi_tablet_state
  KEYS: trusted: fix writing past end of buffer in trusted_read()
  KEYS: trusted: sanitize all key material
  cdc_ncm: Set NTB format again after altsetting switch for Huawei devices
  platform/x86: hp-wmi: Fix detection for dock and tablet mode
  net: dsa: select NET_SWITCHDEV
  s390/qeth: issue STARTLAN as first IPA command
  IB/ipoib: Change list_del to list_del_init in the tx object
  Input: mpr121 - set missing event capability
  Input: mpr121 - handle multiple bits change of status register
  IPsec: do not ignore crypto err in ah4 input
  netfilter: nft_meta: deal with PACKET_LOOPBACK in netdev family
  usb: hcd: initialize hcd->flags to 0 when rm hcd
  serial: sh-sci: Fix register offsets for the IRDA serial port
  phy: increase size of MII_BUS_ID_SIZE and bus_id
  iio: trigger: free trigger resource correctly
  crypto: vmx - disable preemption to enable vsx in aes_ctr.c
  ARM: omap2plus_defconfig: Fix probe errors on UARTs 5 and 6
  powerpc/corenet: explicitly disable the SDHC controller on kmcoge4
  iommu/arm-smmu-v3: Clear prior settings when updating STEs
  KVM: PPC: Book 3S: XICS: correct the real mode ICP rejecting counter
  drm: drm_minor_register(): Clean up debugfs on failure
  xen/netback: set default upper limit of tx/rx queues to 8
  PCI: mvebu: Handle changes to the bridge windows while enabled
  video: fbdev: pmag-ba-fb: Remove bad `__init' annotation
  adv7604: Initialize drive strength to default when using DT
  ANDROID: binder: clarify deferred thread work.
  FROMLIST: arm64: Avoid aligning normal memory pointers in __memcpy_{to,from}io

Conflicts:
	arch/arm64/kernel/io.c

Change-Id: I992fcf368dbc672ad7d6ae31e87f289f4d7df2bf
Signed-off-by: default avatarSrinivasarao P <spathi@codeaurora.org>
parents bb6e8073 03d4af82

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 97

SUBLEVEL = 98

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/arm/configs/omap2plus_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -221,6 +221,7 @@ CONFIG_SERIO=m 
CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_NR_UARTS=32

CONFIG_SERIAL_8250_RUNTIME_UARTS=6

CONFIG_SERIAL_8250_EXTENDED=y

CONFIG_SERIAL_8250_MANY_PORTS=y

CONFIG_SERIAL_8250_SHARE_IRQ=y

arch/arm/kernel/traps.c

+18 −10
Original line number Diff line number Diff line
@@ -133,30 +133,26 @@ static void dump_mem(const char *lvl, const char *str, unsigned long bottom, 
	set_fs(fs);

}



static void dump_instr(const char *lvl, struct pt_regs *regs)

static void __dump_instr(const char *lvl, struct pt_regs *regs)

{

	unsigned long addr = instruction_pointer(regs);

	const int thumb = thumb_mode(regs);

	const int width = thumb ? 4 : 8;

	mm_segment_t fs;

	char str[sizeof("00000000 ") * 5 + 2 + 1], *p = str;

	int i;



	/*

	 * We need to switch to kernel mode so that we can use __get_user

	 * to safely read from kernel space.  Note that we now dump the

	 * code first, just in case the backtrace kills us.

	 * Note that we now dump the code first, just in case the backtrace

	 * kills us.

	 */

	fs = get_fs();

	set_fs(KERNEL_DS);



	for (i = -4; i < 1 + !!thumb; i++) {

		unsigned int val, bad;



		if (thumb)

			bad = __get_user(val, &((u16 *)addr)[i]);

			bad = get_user(val, &((u16 *)addr)[i]);

		else

			bad = __get_user(val, &((u32 *)addr)[i]);

			bad = get_user(val, &((u32 *)addr)[i]);



		if (!bad)

			p += sprintf(p, i == 0 ? "(%0*x) " : "%0*x ",
@@ -167,8 +163,20 @@ static void dump_instr(const char *lvl, struct pt_regs *regs) 
		}

	}

	printk("%sCode: %s\n", lvl, str);

}



static void dump_instr(const char *lvl, struct pt_regs *regs)

{

	mm_segment_t fs;



	if (!user_mode(regs)) {

		fs = get_fs();

		set_fs(KERNEL_DS);

		__dump_instr(lvl, regs);

		set_fs(fs);

	} else {

		__dump_instr(lvl, regs);

	}

}



#ifdef CONFIG_ARM_UNWIND

arch/arm64/kernel/io.c

+5 −7
Original line number Diff line number Diff line
@@ -26,8 +26,7 @@ 
 */

void __memcpy_fromio(void *to, const volatile void __iomem *from, size_t count)

{

	while (count && (!IS_ALIGNED((unsigned long)from, 8) ||

			 !IS_ALIGNED((unsigned long)to, 8))) {

	while (count && !IS_ALIGNED((unsigned long)from, 8)) {

		*(u8 *)to = __raw_readb_no_log(from);

		from++;

		to++;
@@ -55,23 +54,22 @@ EXPORT_SYMBOL(__memcpy_fromio); 
 */

void __memcpy_toio(volatile void __iomem *to, const void *from, size_t count)

{

	while (count && (!IS_ALIGNED((unsigned long)to, 8) ||

			 !IS_ALIGNED((unsigned long)from, 8))) {

		__raw_writeb_no_log(*(volatile u8 *)from, to);

	while (count && !IS_ALIGNED((unsigned long)to, 8)) {

		__raw_writeb_no_log(*(u8 *)from, to);

		from++;

		to++;

		count--;

	}



	while (count >= 8) {

		__raw_writeq_no_log(*(volatile u64 *)from, to);

		__raw_writeq_no_log(*(u64 *)from, to);

		from += 8;

		to += 8;

		count -= 8;

	}



	while (count) {

		__raw_writeb_no_log(*(volatile u8 *)from, to);

		__raw_writeb_no_log(*(u8 *)from, to);

		from++;

		to++;

		count--;

arch/mips/ar7/platform.c

+5 −0
Original line number Diff line number Diff line
@@ -576,6 +576,7 @@ static int __init ar7_register_uarts(void) 
	uart_port.type		= PORT_AR7;

	uart_port.uartclk	= clk_get_rate(bus_clk) / 2;

	uart_port.iotype	= UPIO_MEM32;

	uart_port.flags		= UPF_FIXED_TYPE;

	uart_port.regshift	= 2;



	uart_port.line		= 0;
@@ -654,6 +655,10 @@ static int __init ar7_register_devices(void) 
	u32 val;

	int res;



	res = ar7_gpio_init();

	if (res)

		pr_warn("unable to register gpios: %d\n", res);



	res = ar7_register_uarts();

	if (res)

		pr_err("unable to setup uart(s): %d\n", res);