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

Commit ae471353 authored by Ivaylo Georgiev's avatar Ivaylo Georgiev
Browse files

Merge android-4.19-q.91 (663a25d5) into msm-4.19 



* refs/heads/tmp-663a25d5:
  Linux 4.19.91
  xhci: fix USB3 device initiated resume race with roothub autosuspend
  drm/radeon: fix r1xx/r2xx register checker for POT textures
  scsi: qla2xxx: Change discovery state before PLOGI
  scsi: iscsi: Fix a potential deadlock in the timeout handler
  dm btree: increase rebalance threshold in __rebalance2()
  dm mpath: remove harmful bio-based optimization
  drm: meson: venc: cvbs: fix CVBS mode matching
  dma-buf: Fix memory leak in sync_file_merge()
  vfio/pci: call irq_bypass_unregister_producer() before freeing irq
  ARM: tegra: Fix FLOW_CTLR_HALT register clobbering by tegra_resume()
  ARM: dts: s3c64xx: Fix init order of clock providers
  CIFS: Close open handle after interrupted close
  CIFS: Respect O_SYNC and O_DIRECT flags during reconnect
  cifs: Don't display RDMA transport on reconnect
  cifs: smbd: Return -EINVAL when the number of iovs exceeds SMBDIRECT_MAX_SGE
  cifs: smbd: Add messages on RDMA session destroy and reconnection
  cifs: smbd: Return -EAGAIN when transport is reconnecting
  rpmsg: glink: Free pending deferred work on remove
  rpmsg: glink: Don't send pending rx_done during remove
  rpmsg: glink: Fix rpmsg_register_device err handling
  rpmsg: glink: Put an extra reference during cleanup
  rpmsg: glink: Fix use after free in open_ack TIMEOUT case
  rpmsg: glink: Fix reuse intents memory leak issue
  rpmsg: glink: Set tail pointer to 0 at end of FIFO
  xtensa: fix TLB sanity checker
  PCI: Apply Cavium ACS quirk to ThunderX2 and ThunderX3
  PCI/MSI: Fix incorrect MSI-X masking on resume
  PCI: Fix Intel ACS quirk UPDCR register address
  PCI: pciehp: Avoid returning prematurely from sysfs requests
  PCI/PM: Always return devices to D0 when thawing
  mmc: block: Add CMD13 polling for MMC IOCTLS with R1B response
  mmc: block: Make card_busy_detect() a bit more generic
  Revert "arm64: preempt: Fix big-endian when checking preempt count in assembly"
  tcp: Protect accesses to .ts_recent_stamp with {READ,WRITE}_ONCE()
  tcp: tighten acceptance of ACKs not matching a child socket
  tcp: fix rejected syncookies due to stale timestamps
  net/mlx5e: Query global pause state before setting prio2buffer
  tipc: fix ordering of tipc module init and exit routine
  tcp: md5: fix potential overestimation of TCP option space
  openvswitch: support asymmetric conntrack
  net: thunderx: start phy before starting autonegotiation
  net: sched: fix dump qlen for sch_mq/sch_mqprio with NOLOCK subqueues
  net: ethernet: ti: cpsw: fix extra rx interrupt
  net: dsa: fix flow dissection on Tx path
  net: bridge: deny dev_set_mac_address() when unregistering
  mqprio: Fix out-of-bounds access in mqprio_dump
  inet: protect against too small mtu values.

Conflicts:
	drivers/rpmsg/qcom_glink_native.c
	drivers/rpmsg/qcom_glink_smem.c

Change-Id: I3a55edc48885ed6fc61853c59fcd78a9838a6ad4
Signed-off-by: default avatarIvaylo Georgiev <irgeorgiev@codeaurora.org>
parents dbd1a2d2 663a25d5

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 90

SUBLEVEL = 91

EXTRAVERSION =

NAME = "People's Front"

arch/arm/boot/dts/s3c6410-mini6410.dts

+4 −0
Original line number Diff line number Diff line
@@ -165,6 +165,10 @@ 
	};

};



&clocks {

	clocks = <&fin_pll>;

};



&sdhci0 {

	pinctrl-names = "default";

	pinctrl-0 = <&sd0_clk>, <&sd0_cmd>, <&sd0_cd>, <&sd0_bus4>;

arch/arm/boot/dts/s3c6410-smdk6410.dts

+4 −0
Original line number Diff line number Diff line
@@ -69,6 +69,10 @@ 
	};

};



&clocks {

	clocks = <&fin_pll>;

};



&sdhci0 {

	pinctrl-names = "default";

	pinctrl-0 = <&sd0_clk>, <&sd0_cmd>, <&sd0_cd>, <&sd0_bus4>;

arch/arm/mach-tegra/reset-handler.S

+3 −3
Original line number Diff line number Diff line
@@ -56,16 +56,16 @@ ENTRY(tegra_resume) 
	cmp	r6, #TEGRA20

	beq	1f				@ Yes

	/* Clear the flow controller flags for this CPU. */

	cpu_to_csr_reg r1, r0

	cpu_to_csr_reg r3, r0

	mov32	r2, TEGRA_FLOW_CTRL_BASE

	ldr	r1, [r2, r1]

	ldr	r1, [r2, r3]

	/* Clear event & intr flag */

	orr	r1, r1, \

		#FLOW_CTRL_CSR_INTR_FLAG | FLOW_CTRL_CSR_EVENT_FLAG

	movw	r0, #0x3FFD	@ enable, cluster_switch, immed, bitmaps

				@ & ext flags for CPU power mgnt

	bic	r1, r1, r0

	str	r1, [r2]

	str	r1, [r2, r3]

1:



	mov32	r9, 0xc09

arch/arm64/include/asm/assembler.h

+5 −3
Original line number Diff line number Diff line
@@ -695,9 +695,11 @@ USER(\label, ic ivau, \tmp2) // invalidate I line PoU 
	.macro		if_will_cond_yield_neon

#ifdef CONFIG_PREEMPT

	get_thread_info	x0

	ldr		x0, [x0, #TSK_TI_PREEMPT]

	sub		x0, x0, #PREEMPT_DISABLE_OFFSET

	cbz		x0, .Lyield_\@

	ldr		w1, [x0, #TSK_TI_PREEMPT]

	ldr		x0, [x0, #TSK_TI_FLAGS]

	cmp		w1, #PREEMPT_DISABLE_OFFSET

	csel		x0, x0, xzr, eq

	tbnz		x0, #TIF_NEED_RESCHED, .Lyield_\@	// needs rescheduling?

	/* fall through to endif_yield_neon */

	.subsection	1

.Lyield_\@ :