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

Commit 9df256d5 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.9.161 into android-4.9 



Changes in 4.9.161
	mac80211: Free mpath object when rhashtable insertion fails
	libceph: handle an empty authorize reply
	ceph: avoid repeatedly adding inode to mdsc->snap_flush_list
	numa: change get_mempolicy() to use nr_node_ids instead of MAX_NUMNODES
	proc, oom: do not report alien mms when setting oom_score_adj
	KEYS: allow reaching the keys quotas exactly
	mfd: ti_am335x_tscadc: Use PLATFORM_DEVID_AUTO while registering mfd cells
	mfd: twl-core: Fix section annotations on {,un}protect_pm_master
	mfd: db8500-prcmu: Fix some section annotations
	mfd: mt6397: Do not call irq_domain_remove if PMIC unsupported
	mfd: ab8500-core: Return zero in get_register_interruptible()
	mfd: qcom_rpm: write fw_version to CTRL_REG
	mfd: wm5110: Add missing ASRC rate register
	mfd: mc13xxx: Fix a missing check of a register-read failure
	qed: Fix qed_ll2_post_rx_buffer_notify_fw() by adding a write memory barrier
	net: hns: Fix use after free identified by SLUB debug
	MIPS: ath79: Enable OF serial ports in the default config
	scsi: qla4xxx: check return code of qla4xxx_copy_from_fwddb_param
	scsi: isci: initialize shost fully before calling scsi_add_host()
	MIPS: jazz: fix 64bit build
	net: stmmac: Fix PCI module removal leak
	isdn: i4l: isdn_tty: Fix some concurrency double-free bugs
	atm: he: fix sign-extension overflow on large shift
	leds: lp5523: fix a missing check of return value of lp55xx_read
	mlxsw: spectrum_switchdev: Do not treat static FDB entries as sticky
	net/mlx5e: Fix wrong (zero) TX drop counter indication for representor
	isdn: avm: Fix string plus integer warning from Clang
	net: ethernet: stmmac: change dma descriptors to __le32
	RDMA/srp: Rework SCSI device reset handling
	KEYS: user: Align the payload buffer
	KEYS: always initialize keyring_index_key::desc_len
	batman-adv: fix uninit-value in batadv_interface_tx()
	net/packet: fix 4gb buffer limit due to overflow check
	team: avoid complex list operations in team_nl_cmd_options_set()
	sit: check if IPv6 enabled before calling ip6_err_gen_icmpv6_unreach()
	sctp: call gso_reset_checksum when computing checksum in sctp_gso_segment
	net/mlx4_en: Force CHECKSUM_NONE for short ethernet frames
	parisc: Fix ptrace syscall number modification
	ARCv2: Enable unaligned access in early ASM code
	ARC: U-boot: check arguments paranoidly
	ARC: define ARCH_SLAB_MINALIGN = 8
	hpet: Make cmd parameter of hpet_ioctl_common() unsigned
	clocksource: Use GENMASK_ULL in definition of CLOCKSOURCE_MASK
	netpoll: Fix device name check in netpoll_setup()
	tracing: Use cpumask_available() to check if cpumask variable may be used
	x86/boot: Disable the address-of-packed-member compiler warning
	drm/i915: Consistently use enum pipe for PCH transcoders
	drm/i915: Fix enum pipe vs. enum transcoder for the PCH transcoder
	kbuild: move cc-option and cc-disable-warning after incl. arch Makefile
	kbuild: clang: fix build failures with sparse check
	kbuild: clang: remove crufty HOSTCFLAGS
	kbuild: clang: disable unused variable warnings only when constant
	kbuild: set no-integrated-as before incl. arch Makefile
	kbuild: add -no-integrated-as Clang option unconditionally
	irqchip/gic-v3: Convert arm64 GIC accessors to {read,write}_sysreg_s
	mm/zsmalloc.c: change stat type parameter to int
	mm/zsmalloc.c: fix -Wunneeded-internal-declaration warning
	Revert "bridge: do not add port to router list when receives query with source 0.0.0.0"
	netfilter: nf_tables: fix flush after rule deletion in the same batch
	pinctrl: max77620: Use define directive for max77620_pinconf_param values
	phy: tegra: remove redundant self assignment of 'map'
	sched/sysctl: Fix attributes of some extern declarations
	kbuild: consolidate Clang compiler flags
	Linux 4.9.161

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents c68876db 5507839a

Makefile

+29 −33
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 160

SUBLEVEL = 161

EXTRAVERSION =

NAME = Roaring Lionus
@@ -306,11 +306,6 @@ HOSTCXX = g++ 
HOSTCFLAGS   := -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -std=gnu89

HOSTCXXFLAGS = -O2



ifeq ($(shell $(HOSTCC) -v 2>&1 | grep -c "clang version"), 1)

HOSTCFLAGS  += -Wno-unused-value -Wno-unused-parameter \

		-Wno-missing-field-initializers -fno-delete-null-pointer-checks

endif



# Decide whether to build built-in, modular, or both.

# Normally, just do built-in.
@@ -513,40 +508,20 @@ endif 
ifeq ($(cc-name),clang)

ifneq ($(CROSS_COMPILE),)

CLANG_TRIPLE	?= $(CROSS_COMPILE)

CLANG_TARGET	:= --target=$(notdir $(CLANG_TRIPLE:%-=%))

ifeq ($(shell $(srctree)/scripts/clang-android.sh $(CC) $(CLANG_TARGET)), y)

CLANG_FLAGS	:= --target=$(notdir $(CROSS_TRIPLE:%-=%))

ifeq ($(shell $(srctree)/scripts/clang-android.sh $(CC) $(CLANG_FLAGS)), y)

$(error "Clang with Android --target detected. Did you specify CLANG_TRIPLE?")

endif

GCC_TOOLCHAIN_DIR := $(dir $(shell which $(LD)))

CLANG_PREFIX	:= --prefix=$(GCC_TOOLCHAIN_DIR)

CLANG_FLAGS	+= --prefix=$(GCC_TOOLCHAIN_DIR)

GCC_TOOLCHAIN	:= $(realpath $(GCC_TOOLCHAIN_DIR)/..)

endif

ifneq ($(GCC_TOOLCHAIN),)

CLANG_GCC_TC	:= --gcc-toolchain=$(GCC_TOOLCHAIN)

CLANG_FLAGS	+= --gcc-toolchain=$(GCC_TOOLCHAIN)

endif

KBUILD_CFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC) $(CLANG_PREFIX)

KBUILD_AFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC) $(CLANG_PREFIX)

KBUILD_CPPFLAGS += $(call cc-option,-Qunused-arguments,)

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

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)

# Quiet clang warning: comparison of unsigned expression < 0 is always false

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

# CLANG uses a _MergedGlobals as optimization, but this breaks modpost, as the

# source of a reference will be _MergedGlobals and not on of the whitelisted names.

# See modpost pattern 2

KBUILD_CFLAGS += $(call cc-option, -mno-global-merge,)

KBUILD_CFLAGS += $(call cc-option, -fcatch-undefined-behavior)

KBUILD_CFLAGS += $(call cc-option, -no-integrated-as)

KBUILD_AFLAGS += $(call cc-option, -no-integrated-as)

else



# These warnings generated too much noise in a regular build.

# Use make W=1 to enable them (see scripts/Makefile.build)

KBUILD_CFLAGS += $(call cc-disable-warning, unused-but-set-variable)

KBUILD_CFLAGS += $(call cc-disable-warning, unused-const-variable)

CLANG_FLAGS	+= -no-integrated-as

KBUILD_CFLAGS	+= $(CLANG_FLAGS)

KBUILD_AFLAGS	+= $(CLANG_FLAGS)

endif
@@ -806,6 +781,27 @@ ifdef CONFIG_CC_STACKPROTECTOR 
endif

KBUILD_CFLAGS += $(stackp-flag)



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)

# Quiet clang warning: comparison of unsigned expression < 0 is always false

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

# CLANG uses a _MergedGlobals as optimization, but this breaks modpost, as the

# source of a reference will be _MergedGlobals and not on of the whitelisted names.

# See modpost pattern 2

KBUILD_CFLAGS += $(call cc-option, -mno-global-merge,)

KBUILD_CFLAGS += $(call cc-option, -fcatch-undefined-behavior)

else



# These warnings generated too much noise in a regular build.

# Use make W=1 to enable them (see scripts/Makefile.extrawarn)

KBUILD_CFLAGS += $(call cc-disable-warning, unused-but-set-variable)

endif



KBUILD_CFLAGS += $(call cc-disable-warning, unused-const-variable)

ifdef CONFIG_FRAME_POINTER

KBUILD_CFLAGS	+= -fno-omit-frame-pointer -fno-optimize-sibling-calls

else

arch/arc/include/asm/cache.h

+11 −0
Original line number Diff line number Diff line
@@ -49,6 +49,17 @@ 


#define ARCH_DMA_MINALIGN      L1_CACHE_BYTES



/*

 * Make sure slab-allocated buffers are 64-bit aligned when atomic64_t uses

 * ARCv2 64-bit atomics (LLOCKD/SCONDD). This guarantess runtime 64-bit

 * alignment for any atomic64_t embedded in buffer.

 * Default ARCH_SLAB_MINALIGN is __alignof__(long long) which has a relaxed

 * value of 4 (and not 8) in ARC ABI.

 */

#if defined(CONFIG_ARC_HAS_LL64) && defined(CONFIG_ARC_HAS_LLSC)

#define ARCH_SLAB_MINALIGN	8

#endif



extern void arc_cache_init(void);

extern char *arc_cache_mumbojumbo(int cpu_id, char *buf, int len);

extern void read_decode_cache_bcr(void);

arch/arc/kernel/head.S

+12 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <asm/entry.h>

#include <asm/arcregs.h>

#include <asm/cache.h>

#include <asm/irqflags.h>



.macro CPU_EARLY_SETUP
@@ -47,6 +48,15 @@ 
	sr	r5, [ARC_REG_DC_CTRL]



1:



#ifdef CONFIG_ISA_ARCV2

	; Unaligned access is disabled at reset, so re-enable early as

	; gcc 7.3.1 (ARC GNU 2018.03) onwards generates unaligned access

	; by default

	lr	r5, [status32]

	bset	r5, r5, STATUS_AD_BIT

	kflag	r5

#endif

.endm



	.section .init.text, "ax",@progbits
@@ -93,9 +103,9 @@ ENTRY(stext) 
#ifdef CONFIG_ARC_UBOOT_SUPPORT

	; Uboot - kernel ABI

	;    r0 = [0] No uboot interaction, [1] cmdline in r2, [2] DTB in r2

	;    r1 = magic number (board identity, unused as of now

	;    r1 = magic number (always zero as of now)

	;    r2 = pointer to uboot provided cmdline or external DTB in mem

	; These are handled later in setup_arch()

	; These are handled later in handle_uboot_args()

	st	r0, [@uboot_tag]

	st	r2, [@uboot_arg]

#endif

arch/arc/kernel/setup.c

+62 −25
Original line number Diff line number Diff line
@@ -381,44 +381,81 @@ void setup_processor(void) 
	arc_chk_core_config();

}



static inline int is_kernel(unsigned long addr)

static inline bool uboot_arg_invalid(unsigned long addr)

{

	if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end)

		return 1;

	return 0;

	/*

	 * Check that it is a untranslated address (although MMU is not enabled

	 * yet, it being a high address ensures this is not by fluke)

	 */

	if (addr < PAGE_OFFSET)

		return true;



	/* Check that address doesn't clobber resident kernel image */

	return addr >= (unsigned long)_stext && addr <= (unsigned long)_end;

}



void __init setup_arch(char **cmdline_p)

#define IGNORE_ARGS		"Ignore U-boot args: "



/* uboot_tag values for U-boot - kernel ABI revision 0; see head.S */

#define UBOOT_TAG_NONE		0

#define UBOOT_TAG_CMDLINE	1

#define UBOOT_TAG_DTB		2



void __init handle_uboot_args(void)

{

	bool use_embedded_dtb = true;

	bool append_cmdline = false;



#ifdef CONFIG_ARC_UBOOT_SUPPORT

	/* make sure that uboot passed pointer to cmdline/dtb is valid */

	if (uboot_tag && is_kernel((unsigned long)uboot_arg))

		panic("Invalid uboot arg\n");

	/* check that we know this tag */

	if (uboot_tag != UBOOT_TAG_NONE &&

	    uboot_tag != UBOOT_TAG_CMDLINE &&

	    uboot_tag != UBOOT_TAG_DTB) {

		pr_warn(IGNORE_ARGS "invalid uboot tag: '%08x'\n", uboot_tag);

		goto ignore_uboot_args;

	}



	/* See if u-boot passed an external Device Tree blob */

	machine_desc = setup_machine_fdt(uboot_arg);	/* uboot_tag == 2 */

	if (!machine_desc)

	if (uboot_tag != UBOOT_TAG_NONE &&

            uboot_arg_invalid((unsigned long)uboot_arg)) {

		pr_warn(IGNORE_ARGS "invalid uboot arg: '%px'\n", uboot_arg);

		goto ignore_uboot_args;

	}



	/* see if U-boot passed an external Device Tree blob */

	if (uboot_tag == UBOOT_TAG_DTB) {

		machine_desc = setup_machine_fdt((void *)uboot_arg);



		/* external Device Tree blob is invalid - use embedded one */

		use_embedded_dtb = !machine_desc;

	}



	if (uboot_tag == UBOOT_TAG_CMDLINE)

		append_cmdline = true;



ignore_uboot_args:

#endif

	{

		/* No, so try the embedded one */



	if (use_embedded_dtb) {

		machine_desc = setup_machine_fdt(__dtb_start);

		if (!machine_desc)

			panic("Embedded DT invalid\n");

	}



	/*

		 * If we are here, it is established that @uboot_arg didn't

		 * point to DT blob. Instead if u-boot says it is cmdline,

		 * append to embedded DT cmdline.

		 * setup_machine_fdt() would have populated @boot_command_line

	 * NOTE: @boot_command_line is populated by setup_machine_fdt() so this

	 * append processing can only happen after.

	 */

		if (uboot_tag == 1) {

	if (append_cmdline) {

		/* Ensure a whitespace between the 2 cmdlines */

		strlcat(boot_command_line, " ", COMMAND_LINE_SIZE);

			strlcat(boot_command_line, uboot_arg,

				COMMAND_LINE_SIZE);

		strlcat(boot_command_line, uboot_arg, COMMAND_LINE_SIZE);

	}

}



void __init setup_arch(char **cmdline_p)

{

	handle_uboot_args();



	/* Save unparsed command line copy for /proc/cmdline */

	*cmdline_p = boot_command_line;

arch/arm64/include/asm/arch_gicv3.h

+18 −71
Original line number Diff line number Diff line
@@ -80,24 +80,8 @@ 
#include <linux/stringify.h>

#include <asm/barrier.h>



#define read_gicreg(r)							\

	({								\

		u64 reg;						\

		asm volatile(DEFINE_MRS_S				\

			"mrs_s %0, " __stringify(r) "\n"		\

			UNDEFINE_MRS_S					\

			: "=r" (reg));					\

		reg;							\

	})



#define write_gicreg(v,r)						\

	do {								\

		u64 __val = (v);					\

		asm volatile(DEFINE_MSR_S				\

			"msr_s " __stringify(r) ", %0\n"		\

			UNDEFINE_MSR_S					\

			: : "r" (__val));				\

	} while (0)

#define read_gicreg			read_sysreg_s

#define write_gicreg			write_sysreg_s



/*

 * Low-level accessors
@@ -108,19 +92,13 @@ 


static inline void gic_write_eoir(u32 irq)

{

	asm volatile(DEFINE_MSR_S

		"msr_s " __stringify(ICC_EOIR1_EL1) ", %0\n"

		UNDEFINE_MSR_S

		: : "r" ((u64)irq));

	write_sysreg_s(irq, ICC_EOIR1_EL1);

	isb();

}



static inline void gic_write_dir(u32 irq)

{

	asm volatile(DEFINE_MSR_S

		"msr_s " __stringify(ICC_DIR_EL1) ", %0\n"

		UNDEFINE_MSR_S

		: : "r" ((u64)irq));

	write_sysreg_s(irq, ICC_DIR_EL1);

	isb();

}
@@ -128,10 +106,7 @@ static inline u64 gic_read_iar_common(void) 
{

	u64 irqstat;



	asm volatile(DEFINE_MRS_S

		"mrs_s %0, " __stringify(ICC_IAR1_EL1) "\n"

		UNDEFINE_MRS_S

		: "=r" (irqstat));

	irqstat = read_sysreg_s(ICC_IAR1_EL1);

	dsb(sy);

	return irqstat;

}
@@ -149,12 +124,12 @@ static inline u64 gic_read_iar_cavium_thunderx(void) 


	asm volatile(

		"nop;nop;nop;nop\n\t"

		"nop;nop;nop;nop\n\t"

		DEFINE_MRS_S

		"mrs_s %0, " __stringify(ICC_IAR1_EL1) "\n\t"

		UNDEFINE_MRS_S

		"nop;nop;nop;nop"

		: "=r" (irqstat));

		"nop;nop;nop;nop");



	irqstat = read_sysreg_s(ICC_IAR1_EL1);



	asm volatile(

		"nop;nop;nop;nop");

	mb();



	return irqstat;
@@ -162,68 +137,40 @@ static inline u64 gic_read_iar_cavium_thunderx(void) 


static inline void gic_write_pmr(u32 val)

{

	asm volatile(DEFINE_MSR_S

		"msr_s " __stringify(ICC_PMR_EL1) ", %0\n"

		UNDEFINE_MSR_S

		: : "r" ((u64)val));

	/* As per the architecture specification */

	mb();

	write_sysreg_s(val, ICC_PMR_EL1);

}



static inline void gic_write_ctlr(u32 val)

{

	asm volatile(DEFINE_MSR_S

		"msr_s " __stringify(ICC_CTLR_EL1) ", %0\n"

		UNDEFINE_MSR_S

		: : "r" ((u64)val));

	write_sysreg_s(val, ICC_CTLR_EL1);

	isb();

}



static inline void gic_write_grpen1(u32 val)

{

	asm volatile(DEFINE_MSR_S

		"msr_s " __stringify(ICC_GRPEN1_EL1) ", %0\n"

		UNDEFINE_MSR_S

		: : "r" ((u64)val));

	write_sysreg_s(val, ICC_GRPEN1_EL1);

	isb();

}



static inline void gic_write_sgi1r(u64 val)

{

	asm volatile(DEFINE_MSR_S

		"msr_s " __stringify(ICC_SGI1R_EL1) ", %0\n"

		UNDEFINE_MSR_S

		: : "r" (val));

	/* As per the architecture specification */

	mb();

	write_sysreg_s(val, ICC_SGI1R_EL1);

}



static inline u32 gic_read_sre(void)

{

	u64 val;



	asm volatile(DEFINE_MRS_S

		"mrs_s %0, " __stringify(ICC_SRE_EL1) "\n"

		UNDEFINE_MRS_S

		: "=r" (val));

	return val;

	return read_sysreg_s(ICC_SRE_EL1);

}



static inline void gic_write_sre(u32 val)

{

	asm volatile(DEFINE_MSR_S

		"msr_s " __stringify(ICC_SRE_EL1) ", %0\n"

		UNDEFINE_MSR_S

		: : "r" ((u64)val));

	write_sysreg_s(val, ICC_SRE_EL1);

	isb();

}



static inline void gic_write_bpr1(u32 val)

{

	asm volatile(DEFINE_MSR_S

		"msr_s " __stringify(ICC_BPR1_EL1) ", %x0\n"

		UNDEFINE_MSR_S

		: : "rZ" (val));

	write_sysreg_s(val, ICC_BPR1_EL1);

}



#define gic_read_typer(c)		readq_relaxed(c)