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

Commit 6712204d authored by Blagovest Kolenichev's avatar Blagovest Kolenichev
Browse files

Merge android-4.14.130 (fe57a37b) into msm-4.14 



* refs/heads/tmp-fe57a37b:
  Revert "scsi: ufs: Avoid runtime suspend possibly being blocked forever"
  Linux 4.14.130
  mac80211: Do not use stack memory with scatterlist for GMAC
  mac80211: handle deauthentication/disassociation from TDLS peer
  mac80211: drop robust management frames from unknown TA
  cfg80211: fix memory leak of wiphy device name
  SMB3: retry on STATUS_INSUFFICIENT_RESOURCES instead of failing write
  Bluetooth: Fix regression with minimum encryption key size alignment
  Bluetooth: Align minimum encryption key size for LE and BR/EDR connections
  ARM: dts: am57xx-idk: Remove support for voltage switching for SD card
  ARM: imx: cpuidle-imx6sx: Restrict the SW2ISO increase to i.MX6SX
  powerpc/bpf: use unsigned division instruction for 64-bit operations
  can: purge socket error queue on sock destruct
  can: flexcan: fix timeout when set small bitrate
  btrfs: start readahead also in seed devices
  nvme: Fix u32 overflow in the number of namespace list calculation
  hwmon: (pmbus/core) Treat parameters as paged if on multiple pages
  hwmon: (core) add thermal sensors only if dev->of_node is present
  s390/qeth: fix VLAN attribute in bridge_hostnotify udev event
  net: ipvlan: Fix ipvlan device tso disabled while NETIF_F_IP_CSUM is set
  scsi: smartpqi: unlock on error in pqi_submit_raid_request_synchronous()
  scsi: ufs: Check that space was properly alloced in copy_query_response
  scripts/checkstack.pl: Fix arm64 wrong or unknown architecture
  drm/arm/hdlcd: Allow a bit of clock tolerance
  drm/arm/hdlcd: Actually validate CRTC modes
  net: ethernet: mediatek: Use NET_IP_ALIGN to judge if HW RX_2BYTE_OFFSET is enabled
  net: ethernet: mediatek: Use hw_feature to judge if HWLRO is supported
  sparc: perf: fix updated event period in response to PERF_EVENT_IOC_PERIOD
  mdesc: fix a missing-check bug in get_vdev_port_node_info()
  net: hns: Fix loopback test failed at copper ports
  net: dsa: mv88e6xxx: avoid error message on remove from VLAN 0
  xtensa: Fix section mismatch between memblock_reserve and mem_reserve
  MIPS: uprobes: remove set but not used variable 'epc'
  IB/hfi1: Validate page aligned for a given virtual address
  IB/{qib, hfi1, rdmavt}: Correct ibv_devinfo max_mr value
  IB/hfi1: Insure freeze_work work_struct is canceled on shutdown
  IB/rdmavt: Fix alloc_qpn() WARN_ON()
  parisc: Fix compiler warnings in float emulation code
  parport: Fix mem leak in parport_register_dev_model
  ARC: [plat-hsdk]: Add missing FIFO size entry in GMAC node
  ARC: [plat-hsdk]: Add missing multicast filter bins number to GMAC node
  ARC: fix build warnings
  apparmor: enforce nullbyte at end of tag string
  Input: uinput - add compat ioctl number translation for UI_*_FF_UPLOAD
  Input: synaptics - enable SMBus on ThinkPad E480 and E580
  IB/hfi1: Silence txreq allocation warnings
  usb: chipidea: udc: workaround for endpoint conflict issue
  scsi: ufs: Avoid runtime suspend possibly being blocked forever
  mmc: core: Prevent processing SDIO IRQs when the card is suspended
  net: phy: broadcom: Use strlcpy() for ethtool::get_strings
  gcc-9: silence 'address-of-packed-member' warning
  objtool: Support per-function rodata sections
  tracing: Silence GCC 9 array bounds warning

Conflicts:
	drivers/mmc/core/sdio.c

Change-Id: I492acf245c858e5fa16d727813fa9935c7b45c9f
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
parents a1476870 b266bcd6

Makefile

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

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 129

SUBLEVEL = 130

EXTRAVERSION =

NAME = Petit Gorille
@@ -680,6 +680,7 @@ KBUILD_CFLAGS += $(call cc-disable-warning,frame-address,) 
KBUILD_CFLAGS	+= $(call cc-disable-warning, format-truncation)

KBUILD_CFLAGS	+= $(call cc-disable-warning, format-overflow)

KBUILD_CFLAGS	+= $(call cc-disable-warning, int-in-bool-context)

KBUILD_CFLAGS	+= $(call cc-disable-warning, address-of-packed-member)

KBUILD_CFLAGS	+= $(call cc-disable-warning, attribute-alias)



ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
@@ -746,7 +747,6 @@ ifeq ($(cc-name),clang) 
KBUILD_CPPFLAGS += $(call cc-option,-Qunused-arguments,)

KBUILD_CFLAGS += $(call cc-disable-warning, format-invalid-specifier)

KBUILD_CFLAGS += $(call cc-disable-warning, gnu)

KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member)

KBUILD_CFLAGS += $(call cc-disable-warning, duplicate-decl-specifier)

KBUILD_CFLAGS += -fno-builtin

KBUILD_CFLAGS += $(call cc-option, -Wno-undefined-optimized)

arch/arc/boot/dts/hsdk.dts

+4 −0
Original line number Diff line number Diff line
@@ -163,12 +163,16 @@ 
			interrupt-names = "macirq";

			phy-mode = "rgmii";

			snps,pbl = <32>;

			snps,multicast-filter-bins = <256>;

			clocks = <&gmacclk>;

			clock-names = "stmmaceth";

			phy-handle = <&phy0>;

			resets = <&cgu_rst HSDK_ETH_RESET>;

			reset-names = "stmmaceth";



			tx-fifo-depth = <4096>;

			rx-fifo-depth = <4096>;



			mdio {

				#address-cells = <1>;

				#size-cells = <0>;

arch/arc/include/asm/cmpxchg.h

+10 −4
Original line number Diff line number Diff line
@@ -92,8 +92,11 @@ __cmpxchg(volatile void *ptr, unsigned long expected, unsigned long new) 


#endif /* CONFIG_ARC_HAS_LLSC */



#define cmpxchg(ptr, o, n) ((typeof(*(ptr)))__cmpxchg((ptr), \

				(unsigned long)(o), (unsigned long)(n)))

#define cmpxchg(ptr, o, n) ({				\

	(typeof(*(ptr)))__cmpxchg((ptr),		\

				  (unsigned long)(o),	\

				  (unsigned long)(n));	\

})



/*

 * atomic_cmpxchg is same as cmpxchg
@@ -198,8 +201,11 @@ static inline unsigned long __xchg(unsigned long val, volatile void *ptr, 
	return __xchg_bad_pointer();

}



#define xchg(ptr, with) ((typeof(*(ptr)))__xchg((unsigned long)(with), (ptr), \

						 sizeof(*(ptr))))

#define xchg(ptr, with) ({				\

	(typeof(*(ptr)))__xchg((unsigned long)(with),	\

			       (ptr),			\

			       sizeof(*(ptr)));		\

})



#endif /* CONFIG_ARC_PLAT_EZNPS */

arch/arc/mm/tlb.c

+8 −5
Original line number Diff line number Diff line
@@ -902,9 +902,11 @@ void do_tlb_overlap_fault(unsigned long cause, unsigned long address, 
			  struct pt_regs *regs)

{

	struct cpuinfo_arc_mmu *mmu = &cpuinfo_arc700[smp_processor_id()].mmu;

	unsigned int pd0[mmu->ways];

	unsigned long flags;

	int set;

	int set, n_ways = mmu->ways;



	n_ways = min(n_ways, 4);

	BUG_ON(mmu->ways > 4);



	local_irq_save(flags);
@@ -912,9 +914,10 @@ void do_tlb_overlap_fault(unsigned long cause, unsigned long address, 
	for (set = 0; set < mmu->sets; set++) {



		int is_valid, way;

		unsigned int pd0[4];



		/* read out all the ways of current set */

		for (way = 0, is_valid = 0; way < mmu->ways; way++) {

		for (way = 0, is_valid = 0; way < n_ways; way++) {

			write_aux_reg(ARC_REG_TLBINDEX,

					  SET_WAY_TO_IDX(mmu, set, way));

			write_aux_reg(ARC_REG_TLBCOMMAND, TLBRead);
@@ -928,14 +931,14 @@ void do_tlb_overlap_fault(unsigned long cause, unsigned long address, 
			continue;



		/* Scan the set for duplicate ways: needs a nested loop */

		for (way = 0; way < mmu->ways - 1; way++) {

		for (way = 0; way < n_ways - 1; way++) {



			int n;



			if (!pd0[way])

				continue;



			for (n = way + 1; n < mmu->ways; n++) {

			for (n = way + 1; n < n_ways; n++) {

				if (pd0[way] != pd0[n])

					continue;

arch/arm/boot/dts/am57xx-idk-common.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -405,6 +405,7 @@ 
	vqmmc-supply = <&ldo1_reg>;

	bus-width = <4>;

	cd-gpios = <&gpio6 27 GPIO_ACTIVE_LOW>; /* gpio 219 */

	no-1-8-v;

};



&mmc2 {