Commit 7c9ebad0 authored Oct 22, 2018 by Blagovest Kolenichev

Merge android-4.14-p.77 (c2214bce) into msm-4.14



* refs/heads/tmp-c2214bce:
  Revert "mm: don't show nr_indirectly_reclaimable in /proc/vmstat"
  Linux 4.14.77
  perf tools: Fix snprint warnings for gcc 8
  ARM: spectre-v1: mitigate user accesses
  ARM: spectre-v1: use get_user() for __get_user()
  ARM: use __inttype() in get_user()
  ARM: oabi-compat: copy semops using __copy_from_user()
  ARM: vfp: use __copy_from_user() when restoring VFP state
  ARM: signal: copy registers using __copy_from_user()
  ARM: spectre-v1: fix syscall entry
  ARM: spectre-v1: add array_index_mask_nospec() implementation
  ARM: spectre-v1: add speculation barrier (csdb) macros
  ARM: KVM: report support for SMCCC_ARCH_WORKAROUND_1
  ARM: KVM: Add SMCCC_ARCH_WORKAROUND_1 fast handling
  ARM: spectre-v2: KVM: invalidate icache on guest exit for Brahma B15
  ARM: KVM: invalidate icache on guest exit for Cortex-A15
  ARM: KVM: invalidate BTB on guest exit for Cortex-A12/A17
  ARM: spectre-v2: warn about incorrect context switching functions
  ARM: spectre-v2: add firmware based hardening
  ARM: spectre-v2: harden user aborts in kernel space
  ARM: spectre-v2: add Cortex A8 and A15 validation of the IBE bit
  ARM: spectre-v2: harden branch predictor on context switches
  ARM: spectre: add Kconfig symbol for CPUs vulnerable to Spectre
  ARM: bugs: add support for per-processor bug checking
  ARM: bugs: hook processor bug checking into SMP and suspend paths
  ARM: bugs: prepare processor bug infrastructure
  ARM: add more CPU part numbers for Cortex and Brahma B15 CPUs
  mm: don't show nr_indirectly_reclaimable in /proc/vmstat
  mm: treat indirectly reclaimable memory as free in overcommit logic
  dcache: account external names as indirectly reclaimable memory
  mm: treat indirectly reclaimable memory as available in MemAvailable
  mm: introduce NR_INDIRECTLY_RECLAIMABLE_BYTES
  xhci: Don't print a warning when setting link state for disabled ports
  i2c: i2c-scmi: fix for i2c_smbus_write_block_data
  mm: Preserve _PAGE_DEVMAP across mprotect() calls
  mm/thp: fix call to mmu_notifier in set_pmd_migration_entry() v2
  arm64: perf: Reject stand-alone CHAIN events for PMUv3
  pinctrl: mcp23s08: fix irq and irqchip setup order
  mmc: block: avoid multiblock reads for the last sector in SPI mode
  cgroup: Fix dom_cgrp propagation when enabling threaded mode
  dm linear: fix linear_end_io conditional definition
  dm linear: eliminate linear_end_io call if CONFIG_DM_ZONED disabled
  dm: fix report zone remapping to account for partition offset
  dm cache: destroy migration_cache if cache target registration failed
  s390/cio: Fix how vfio-ccw checks pinned pages
  perf script python: Fix export-to-sqlite.py sample columns
  perf script python: Fix export-to-postgresql.py occasional failure
  percpu: stop leaking bitmap metadata blocks
  mach64: detect the dot clock divider correctly on sparc
  MIPS: VDSO: Always map near top of user memory
  mm/vmstat.c: fix outdated vmstat_text
  drm/amdgpu: Fix SDMA HQD destroy error on gfx_v7
  x86/kvm/lapic: always disable MMIO interface in x2APIC mode
  clk: x86: Stop marking clocks as CLK_IS_CRITICAL
  clk: x86: add "ether_clk" alias for Bay Trail / Cherry Trail
  PCI: hv: support reporting serial number as slot information
  ARM: dts: at91: add new compatibility string for macb on sama5d3
  net: macb: disable scatter-gather for macb on sama5d3
  stmmac: fix valid numbers of unicast filter entries
  hv_netvsc: fix schedule in RCU context
  sound: don't call skl_init_chip() to reset intel skl soc
  sound: enable interrupt after dma buffer initialization
  scsi: qla2xxx: Fix an endian bug in fcpcmd_is_corrupted()
  scsi: iscsi: target: Don't use stack buffer for scatterlist
  mfd: omap-usb-host: Fix dts probe of children
  Bluetooth: hci_ldisc: Free rw_semaphore on close
  ASoC: rsnd: don't fallback to PIO mode when -EPROBE_DEFER
  ASoC: rsnd: adg: care clock-frequency size
  selftests: memory-hotplug: add required configs
  selftests/efivarfs: add required kernel configs
  ASoC: sigmadsp: safeload should not have lower byte limit
  ASoC: wm8804: Add ACPI support
  ASoC: rt5514: Fix the issue of the delay volume applied again
  inet: make sure to grab rcu_read_lock before using ireq->ireq_opt
  tcp/dccp: fix lockdep issue when SYN is backlogged
  net-ethtool: ETHTOOL_GUFO did not and should not require CAP_NET_ADMIN
  bnxt_en: don't try to offload VLAN 'modify' action
  nfp: avoid soft lockups under control message storm
  bonding: fix warning message
  bonding: pass link-local packets to bonding master also.
  net/mlx5: E-Switch, Fix out of bound access when setting vport rate
  net: aquantia: memory corruption on jumbo frames
  net/mlx5e: Set vlan masks for all offloaded TC rules
  net: dsa: bcm_sf2: Fix unbind ordering
  net/packet: fix packet drop as of virtio gso
  net: stmmac: Fixup the tail addr setting in xmit path
  udp: Unbreak modules that rely on external __skb_recv_udp() availability
  tipc: fix flow control accounting for implicit connect
  team: Forbid enslaving team device to itself
  sctp: update dst pmtu with the correct daddr
  rtnl: limit IFLA_NUM_TX_QUEUES and IFLA_NUM_RX_QUEUES to 4096
  rtnetlink: fix rtnl_fdb_dump() for ndmsg header
  qmi_wwan: Added support for Gemalto's Cinterion ALASxx WWAN interface
  qlcnic: fix Tx descriptor corruption on 82xx devices
  net/usb: cancel pending work when unbinding smsc75xx
  net: systemport: Fix wake-up interrupt race during resume
  net: sched: Add policy validation for tc attributes
  net: mvpp2: fix a txq_done race condition
  net: mvpp2: Extract the correct ethtype from the skb for tx csum offload
  netlabel: check for IPV4MASK in addrinfo_get
  net/ipv6: Display all addresses in output of /proc/net/if_inet6
  net: ipv4: update fnhe_pmtu when first hop's MTU changes
  net: hns: fix for unmapping problem when SMMU is on
  net: dsa: bcm_sf2: Call setup during switch resume
  ipv6: take rcu lock in rawv6_send_hdrinc()
  ipv4: fix use-after-free in ip_cmsg_recv_dstaddr()
  ip_tunnel: be careful when accessing the inner header
  ip6_tunnel: be careful when accessing the inner header
  bonding: avoid possible dead-lock
  bnxt_en: free hwrm resources, if driver probe fails.
  bnxt_en: Fix TX timeout during netpoll.

Change-Id: I0cfdfad8dc66b7a0a850b073a893295843537b39
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>

parents 107b1944 d8af15dd

Documentation/devicetree/bindings/net/macb.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@ Required properties:
		Use "cdns,pc302-gem" for Picochip picoXcell pc302 and later devices based on
		the Cadence GEM, or the generic form: "cdns,gem".
		Use "atmel,sama5d2-gem" for the GEM IP (10/100) available on Atmel sama5d2 SoCs.
		Use "atmel,sama5d3-macb" for the 10/100Mbit IP available on Atmel sama5d3 SoCs.
		Use "atmel,sama5d3-gem" for the Gigabit IP available on Atmel sama5d3 SoCs.
		Use "atmel,sama5d4-gem" for the GEM IP (10/100) available on Atmel sama5d4 SoCs.
		Use "cdns,zynq-gem" Xilinx Zynq-7xxx SoC.

Makefile

+1 −1

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		VERSION = 4
		PATCHLEVEL = 14
		SUBLEVEL = 76
		SUBLEVEL = 77
		EXTRAVERSION =
		NAME = Petit Gorille

arch/arm/boot/dts/sama5d3_emac.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -41,7 +41,7 @@
		};

		macb1: ethernet@f802c000 {
		compatible = "cdns,at91sam9260-macb", "cdns,macb";
		compatible = "atmel,sama5d3-macb", "cdns,at91sam9260-macb", "cdns,macb";
		reg = <0xf802c000 0x100>;
		interrupts = <35 IRQ_TYPE_LEVEL_HIGH 3>;
		pinctrl-names = "default";

arch/arm/include/asm/assembler.h

+12 −0

Original line number	Diff line number	Diff line
		@@ -447,11 +447,23 @@ THUMB( orr \reg , \reg , #PSR_T_BIT )
		.size \name , . - \name
		.endm

		.macro csdb
		#ifdef CONFIG_THUMB2_KERNEL
		.inst.w 0xf3af8014
		#else
		.inst 0xe320f014
		#endif
		.endm

		.macro check_uaccess, addr:req, size:req, limit:req, tmp:req, bad:req
		#ifndef CONFIG_CPU_USE_DOMAINS
		adds \tmp, \addr, #\size - 1
		sbcccs \tmp, \tmp, \limit
		bcs \bad
		#ifdef CONFIG_CPU_SPECTRE
		movcs \addr, #0
		csdb
		#endif
		#endif
		.endm

arch/arm/include/asm/barrier.h

+32 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,12 @@
		#define isb(option) __asm__ __volatile__ ("isb " #option : : : "memory")
		#define dsb(option) __asm__ __volatile__ ("dsb " #option : : : "memory")
		#define dmb(option) __asm__ __volatile__ ("dmb " #option : : : "memory")
		#ifdef CONFIG_THUMB2_KERNEL
		#define CSDB ".inst.w 0xf3af8014"
		#else
		#define CSDB ".inst 0xe320f014"
		#endif
		#define csdb() __asm__ __volatile__(CSDB : : : "memory")
		#elif defined(CONFIG_CPU_XSC3) \|\| __LINUX_ARM_ARCH__ == 6
		#define isb(x) __asm__ __volatile__ ("mcr p15, 0, %0, c7, c5, 4" \
		: : "r" (0) : "memory")
		@@ -37,6 +43,13 @@
		#define dmb(x) __asm__ __volatile__ ("" : : : "memory")
		#endif

		#ifndef CSDB
		#define CSDB
		#endif
		#ifndef csdb
		#define csdb()
		#endif

		#ifdef CONFIG_ARM_HEAVY_MB
		extern void (*soc_mb)(void);
		extern void arm_heavy_mb(void);
		@@ -63,6 +76,25 @@ extern void arm_heavy_mb(void);
		#define __smp_rmb() __smp_mb()
		#define __smp_wmb() dmb(ishst)

		#ifdef CONFIG_CPU_SPECTRE
		static inline unsigned long array_index_mask_nospec(unsigned long idx,
		unsigned long sz)
		{
		unsigned long mask;

		asm volatile(
		"cmp %1, %2\n"
		" sbc %0, %1, %1\n"
		CSDB
		: "=r" (mask)
		: "r" (idx), "Ir" (sz)
		: "cc");

		return mask;
		}
		#define array_index_mask_nospec array_index_mask_nospec
		#endif

		#include <asm-generic/barrier.h>

		#endif /* !__ASSEMBLY__ */