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

Commit 9842b327 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android-4.19.56 (e5304c69) into msm-4.19"

parents d24d24e7 d355c014

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 55

SUBLEVEL = 56

EXTRAVERSION =

NAME = "People's Front"
@@ -670,6 +670,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)



ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE

KBUILD_CFLAGS	+= -Os $(call cc-disable-warning,maybe-uninitialized,)
@@ -730,7 +731,6 @@ KBUILD_AFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC) 
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 += -Wno-asm-operand-widths

KBUILD_CFLAGS += -Wno-initializer-overrides

arch/arc/boot/dts/hsdk.dts

+4 −0
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ 
			interrupt-names = "macirq";

			phy-mode = "rgmii";

			snps,pbl = <32>;

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

			clocks = <&gmacclk>;

			clock-names = "stmmaceth";

			phy-handle = <&phy0>;
@@ -183,6 +184,9 @@ 
			mac-address = [00 00 00 00 00 00]; /* Filled in by U-Boot */

			dma-coherent;



			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
@@ -911,9 +911,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);
@@ -921,9 +923,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);
@@ -937,14 +940,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
@@ -410,6 +410,7 @@ 
	vqmmc-supply = <&ldo1_reg>;

	bus-width = <4>;

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

	no-1-8-v;

};



&mmc2 {