Merge remote-tracking branch 'kernel-lts/linux-4.14.y' into PerfKernel

* kernel-lts/linux-4.14.y:
  LTS: Update to 4.14.353
  net: fix __dst_negative_advice() race
  selftests: make order checking verbose in msg_zerocopy selftest
  selftests: fix OOM in msg_zerocopy selftest
  Revert "selftests/net: reap zerocopy completions passed up as ancillary data."
  Revert "selftests: fix OOM in msg_zerocopy selftest"
  Revert "selftests: make order checking verbose in msg_zerocopy selftest"
  nvme/pci: Add APST quirk for Lenovo N60z laptop
  exec: Fix ToCToU between perm check and set-uid/gid usage
  drm/i915/gem: Fix Virtual Memory mapping boundaries calculation
  drm/i915: Try GGTT mmapping whole object as partial
  netfilter: nf_tables: set element extended ACK reporting support
  kbuild: Fix '-S -c' in x86 stack protector scripts
  drm/mgag200: Set DDC timeout in milliseconds
  drm/bridge: analogix_dp: properly handle zero sized AUX transactions
  drm/bridge: analogix_dp: Properly log AUX CH errors
  drm/bridge: analogix_dp: Reset aux channel if an error occurred
  drm/bridge: analogix_dp: Check AUX_EN status when doing AUX transfer
  x86/mtrr: Check if fixed MTRRs exist before saving them
  tracing: Fix overflow in get_free_elt()
  power: supply: axp288_charger: Round constant_charge_voltage writes down
  power: supply: axp288_charger: Fix constant_charge_voltage writes
  serial: core: check uartclk for zero to avoid divide by zero
  ntp: Safeguard against time_constant overflow
  driver core: Fix uevent_show() vs driver detach race
  ntp: Clamp maxerror and esterror to operating range
  tick/broadcast: Move per CPU pointer access into the atomic section
  scsi: ufs: core: Fix hba->last_dme_cmd_tstamp timestamp updating logic
  usb: gadget: core: Check for unset descriptor
  USB: serial: debug: do not echo input by default
  usb: vhci-hcd: Do not drop references before new references are gained
  ALSA: line6: Fix racy access to midibuf
  spi: spi-fsl-lpspi: Fix scldiv calculation
  spi: fsl-lpspi: remove unneeded array
  spi: lpspi: add the error info of transfer speed setting
  spi: lpspi: Add i.MX8 boards support for lpspi
  spi: lpspi: Let watermark change with send data length
  spi: lpspi: Add slave mode support
  spi: lpspi: Replace all "master" with "controller"
  spi: lpspi: Switch to SPDX identifier
  i2c: smbus: Send alert notifications to all devices if source not found
  i2c: smbus: Improve handling of stuck alerts
  i2c: smbus: Don't filter out duplicate alerts
  ext4: fix wrong unit use in ext4_mb_find_by_goal
  SUNRPC: Fix a race to wake a sync task
  jbd2: avoid memleak in jbd2_journal_write_metadata_buffer
  media: uvcvideo: Fix the bandwdith quirk on USB 3.x
  media: uvcvideo: Ignore empty TS packets
  btrfs: fix bitmap leak when loading free space cache on duplicate entry
  wifi: nl80211: don't give key data to userspace
  udf: prevent integer overflow in udf_bitmap_free_blocks()
  udf: Fix signed/unsigned format specifiers
  PCI: Add Edimax Vendor ID to pci_ids.h
  clocksource/drivers/sh_cmt: Address race condition for clock events
  md/raid5: avoid BUG_ON() while continue reshape after reassembling
  net: fec: Stop PPS on driver remove
  Bluetooth: l2cap: always unlock channel in l2cap_conless_channel()
  net: linkwatch: use system_unbound_wq
  net: usb: qmi_wwan: fix memory leak for not ip packets
  irqchip/mbigen: Fix mbigen node address layout
  net: usb: sr9700: fix uninitialized variable use in sr_mdio_read
  ALSA: usb-audio: Correct surround channels in UAC1 channel map
  protect the fetch of ->fd[fd] in do_dup2() from mispredictions
  ipv6: fix ndisc_is_useropt() handling for PIO
  net/iucv: fix use after free in iucv_sock_close()
  drm/vmwgfx: Fix overlay when using Screen Targets
  remoteproc: imx_rproc: Skip over memory region when node value is NULL
  remoteproc: imx_rproc: Fix ignoring mapping vdev regions
  remoteproc: imx_rproc: ignore mapping vdev regions
  perf/x86/intel/pt: Fix a topa_entry base address calculation
  perf/x86/intel/pt: Split ToPA metadata and page layout
  perf/x86/intel/pt: Use pointer arithmetics instead in ToPA entry calculation
  perf/x86/intel/pt: Use helpers to obtain ToPA entry size
  perf/x86/intel/pt: Export pt_cap_get()
  devres: Fix memory leakage caused by driver API devm_free_percpu()
  driver core: Cast to (void *) with __force for __percpu pointer
  dev/parport: fix the array out-of-bounds risk
  parport: Standardize use of printmode
  parport: Convert printk(KERN_<LEVEL> to pr_<level>(
  parport: parport_pc: Mark expected switch fall-through
  PCI: rockchip: Use GPIOD_OUT_LOW flag while requesting ep_gpio
  PCI: rockchip: Make 'ep-gpios' DT property optional
  mm: avoid overflows in dirty throttling logic
  mISDN: Fix a use after free in hfcmulti_tx()
  tipc: Return non-zero value from tipc_udp_addr2str() on error
  net: bonding: correctly annotate RCU in bond_should_notify_peers()
  ipv4: Fix incorrect source address in Record Route option
  net: ip_rt_get_source() - use new style struct initializer instead of memset
  MIPS: SMP-CPS: Fix address for GCR_ACCESS register for CM3 and later
  dma: fix call order in dmam_free_coherent
  jfs: Fix array-index-out-of-bounds in diFree
  kdb: Use the passed prompt in kdb_position_cursor()
  kdb: address -Wformat-security warnings
  kdb: Fix bound check compiler warning
  nilfs2: handle inconsistent state in nilfs_btnode_create_block()
  selftests/sigaltstack: Fix ppc64 GCC build
  RDMA/iwcm: Fix a use-after-free related to destroying CM IDs
  RDMA/iwcm: Remove a set-but-not-used variable
  platform: mips: cpu_hwmon: Disable driver on unsupported hardware
  watchdog/perf: properly initialize the turbo mode timestamp and rearm counter
  perf/x86/intel/pt: Fix topa_entry base length
  scsi: qla2xxx: During vport delete send async logout explicitly
  decompress_bunzip2: fix rare decompression failure
  ubi: eba: properly rollback inside self_check_eba
  f2fs: fix to don't dirty inode for readonly filesystem
  f2fs: prevent newly created inode from being dirtied incorrectly
  scsi: qla2xxx: Return ENOBUFS if sg_cnt is more than one for ELS cmds
  binder: fix hang of unregistered readers
  PCI: hv: Return zero, not garbage, when reading PCI_INTERRUPT_PIN
  hwrng: amd - Convert PCIBIOS_* return codes to errnos
  leds: ss4200: Convert PCIBIOS_* return codes to errnos
  wifi: mwifiex: Fix interface type change
  ext4: make sure the first directory block is not a hole
  ext4: check dot and dotdot of dx_root before making dir indexed
  m68k: amiga: Turn off Warp1260 interrupts during boot
  drm/gma500: fix null pointer dereference in psb_intel_lvds_get_modes
  drm/gma500: fix null pointer dereference in cdv_intel_lvds_get_modes
  hfs: fix to initialize fields of hfs_inode_info after hfs_alloc_inode()
  media: venus: fix use after free in vdec_close
  ipv6: take care of scope when choosing the src addr
  af_packet: Handle outgoing VLAN packets without hardware offloading
  net: netconsole: Disable target before netpoll cleanup
  tick/broadcast: Make takeover of broadcast hrtimer reliable
  nilfs2: avoid undefined behavior in nilfs_cnt32_ge macro
  fs/nilfs2: remove some unused macros to tame gcc
  pinctrl: freescale: mxs: Fix refcount of child
  pinctrl: ti: ti-iodelay: fix possible memory leak when pinctrl_enable() fails
  pinctrl: ti: ti-iodelay: Drop if block with always false condition
  pinctrl: single: fix possible memory leak when pinctrl_enable() fails
  pinctrl: core: fix possible memory leak when pinctrl_enable() fails
  netfilter: ctnetlink: use helper function to calculate expect ID
  bnxt_re: Fix imm_data endianness
  macintosh/therm_windtunnel: fix module unload.
  powerpc/xmon: Fix disassembly CPU feature checks
  MIPS: Octeron: remove source file executable bit
  Input: elan_i2c - do not leave interrupt disabled on suspend failure
  mtd: make mtd_test.c a separate module
  RDMA/rxe: Don't set BTH_ACK_MASK for UC or UD QPs
  RDMA/mlx4: Fix truncated output warning in alias_GUID.c
  RDMA/mlx4: Fix truncated output warning in mad.c
  PCI: Fix resource double counting on remove & rescan
  PCI: Equalize hotplug memory and io for occupied and empty slots
  sparc64: Fix incorrect function signature and add prototype for prom_cif_init
  ext4: avoid writing unitialized memory to disk in EA inodes
  drm/etnaviv: fix DMA direction handling for cached RW buffers
  perf report: Fix condition in sort__sym_cmp()
  media: renesas: vsp1: Store RPF partition configuration per RPF instance
  media: renesas: vsp1: Fix _irqsave and _irq mix
  media: v4l: vsp1: Store pipeline pointer in vsp1_entity
  saa7134: Unchecked i2c_transfer function result fixed
  media: imon: Fix race getting ictx->lock
  bna: adjust 'name' buf size of bna_tcb and bna_ccb structures
  perf: Prevent passing zero nr_pages to rb_alloc_aux()
  perf: Fix perf_aux_size() for greater-than 32-bit size
  ipvs: Avoid unnecessary calls to skb_is_gso_sctp
  net: fec: Fix FEC_ECR_EN1588 being cleared on link-down
  net: fec: Refactor: #define magic constants
  wifi: brcmsmac: LCN PHY code is used for BCM4313 2G-only device
  m68k: cmpxchg: Fix return value for default case in __arch_xchg()
  x86/xen: Convert comma to semicolon
  m68k: atari: Fix TT bootup freeze / unexpected (SCU) interrupt messages
  arm64: dts: rockchip: Increase VOP clk rate on RK3328
  hwmon: (max6697) Fix swapped temp{1,8} critical alarms
  hwmon: (max6697) Auto-convert to use SENSOR_DEVICE_ATTR_{RO, RW, WO}
  hwmon: Introduce SENSOR_DEVICE_ATTR_{RO, RW, WO} and variants
  hwmon: (max6697) Fix underflow when writing limit attributes
  pwm: stm32: Always do lazy disabling
  hwmon: (adt7475) Fix default duty on fan is disabled
  x86/platform/iosf_mbi: Convert PCIBIOS_* return codes to errnos
  x86/pci/xen: Fix PCIBIOS_* return code handling
  x86/pci/intel_mid_pci: Fix PCIBIOS_* return code handling
  x86/of: Return consistent error type from x86_of_pci_irq_enable()
  platform/chrome: cros_ec_debugfs: fix wrong EC message version

Change-Id: I1c0f149d39e83ed9c022b51c809a663fc7bca6a7

.elts/config.yaml

@@ -1,5 +1,5 @@
 upstream_repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
 upstream_base: 4.19.304
 base: 4.14.336
-upstream_version: 4.19.319
-version: 4.14.352
+upstream_version: 4.19.320
+version: 4.14.353

Documentation/hwmon/hwmon-kernel-api.txt

@@ -298,17 +298,25 @@ functions is used.
 The header file linux/hwmon-sysfs.h provides a number of useful macros to
 declare and use hardware monitoring sysfs attributes.
 
-In many cases, you can use the exsting define DEVICE_ATTR to declare such
-attributes. This is feasible if an attribute has no additional context. However,
-in many cases there will be additional information such as a sensor index which
-will need to be passed to the sysfs attribute handling function.
+In many cases, you can use the exsting define DEVICE_ATTR or its variants
+DEVICE_ATTR_{RW,RO,WO} to declare such attributes. This is feasible if an
+attribute has no additional context. However, in many cases there will be
+additional information such as a sensor index which will need to be passed
+to the sysfs attribute handling function.
 
 SENSOR_DEVICE_ATTR and SENSOR_DEVICE_ATTR_2 can be used to define attributes
 which need such additional context information. SENSOR_DEVICE_ATTR requires
 one additional argument, SENSOR_DEVICE_ATTR_2 requires two.
 
-SENSOR_DEVICE_ATTR defines a struct sensor_device_attribute variable.
-This structure has the following fields.
+Simplified variants of SENSOR_DEVICE_ATTR and SENSOR_DEVICE_ATTR_2 are available
+and should be used if standard attribute permissions and function names are
+feasible. Standard permissions are 0644 for SENSOR_DEVICE_ATTR[_2]_RW,
+0444 for SENSOR_DEVICE_ATTR[_2]_RO, and 0200 for SENSOR_DEVICE_ATTR[_2]_WO.
+Standard functions, similar to DEVICE_ATTR_{RW,RO,WO}, have _show and _store
+appended to the provided function name.
+
+SENSOR_DEVICE_ATTR and its variants define a struct sensor_device_attribute
+variable. This structure has the following fields.
 
 struct sensor_device_attribute {
 	struct device_attribute dev_attr;
@@ -319,8 +327,8 @@ You can use to_sensor_dev_attr to get the pointer to this structure from the
 attribute read or write function. Its parameter is the device to which the
 attribute is attached.
 
-SENSOR_DEVICE_ATTR_2 defines a struct sensor_device_attribute_2 variable,
-which is defined as follows.
+SENSOR_DEVICE_ATTR_2 and its variants define a struct sensor_device_attribute_2
+variable, which is defined as follows.
 
 struct sensor_device_attribute_2 {
 	struct device_attribute dev_attr;

Makefile

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 4
 PATCHLEVEL = 14
-SUBLEVEL = 352
+SUBLEVEL = 353
 EXTRAVERSION = -openela
 NAME = Petit Gorille
 

arch/arm64/boot/dts/rockchip/rk3328.dtsi

@@ -626,8 +626,8 @@
 			<0>, <24000000>,
 			<24000000>, <24000000>,
 			<15000000>, <15000000>,
-			<100000000>, <100000000>,
-			<100000000>, <100000000>,
+			<300000000>, <100000000>,
+			<400000000>, <100000000>,
 			<50000000>, <100000000>,
 			<100000000>, <100000000>,
 			<50000000>, <50000000>,

arch/m68k/amiga/config.c

@@ -181,6 +181,15 @@ int __init amiga_parse_bootinfo(const struct bi_record *record)
 			dev->slotsize = be16_to_cpu(cd->cd_SlotSize);
 			dev->boardaddr = be32_to_cpu(cd->cd_BoardAddr);
 			dev->boardsize = be32_to_cpu(cd->cd_BoardSize);
+
+			/* CS-LAB Warp 1260 workaround */
+			if (be16_to_cpu(dev->rom.er_Manufacturer) == ZORRO_MANUF(ZORRO_PROD_CSLAB_WARP_1260) &&
+			    dev->rom.er_Product == ZORRO_PROD(ZORRO_PROD_CSLAB_WARP_1260)) {
+
+				/* turn off all interrupts */
+				pr_info("Warp 1260 card detected: applying interrupt storm workaround\n");
+				*(uint32_t *)(dev->boardaddr + 0x1000) = 0xfff;
+			}
 		} else
 			pr_warn("amiga_parse_bootinfo: too many AutoConfig devices\n");
 #endif /* CONFIG_ZORRO */

arch/m68k/atari/ataints.c

@@ -302,11 +302,7 @@ void __init atari_init_IRQ(void)
 
 	if (ATARIHW_PRESENT(SCU)) {
 		/* init the SCU if present */
-		tt_scu.sys_mask = 0x10;		/* enable VBL (for the cursor) and
-									 * disable HSYNC interrupts (who
-									 * needs them?)  MFP and SCC are
-									 * enabled in VME mask
-									 */
+		tt_scu.sys_mask = 0x0;		/* disable all interrupts */
 		tt_scu.vme_mask = 0x60;		/* enable MFP and SCC ints */
 	} else {
 		/* If no SCU and no Hades, the HSYNC interrupt needs to be

arch/m68k/include/asm/cmpxchg.h

@@ -33,7 +33,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int siz
 		x = tmp;
 		break;
 	default:
-		tmp = __invalid_xchg_size(x, ptr, size);
+		x = __invalid_xchg_size(x, ptr, size);
 		break;
 	}
 

arch/mips/include/asm/mips-cm.h

@@ -232,6 +232,10 @@ GCR_ACCESSOR_RO(32, 0x0d0, gic_status)
 GCR_ACCESSOR_RO(32, 0x0f0, cpc_status)
 #define CM_GCR_CPC_STATUS_EX			BIT(0)
 
+/* GCR_ACCESS - Controls core/IOCU access to GCRs */
+GCR_ACCESSOR_RW(32, 0x120, access_cm3)
+#define CM_GCR_ACCESS_ACCESSEN			GENMASK(7, 0)
+
 /* GCR_L2_CONFIG - Indicates L2 cache configuration when Config5.L2C=1 */
 GCR_ACCESSOR_RW(32, 0x130, l2_config)
 #define CM_GCR_L2_CONFIG_BYPASS			BIT(20)

arch/mips/kernel/smp-cps.c

@@ -233,7 +233,10 @@ static void boot_core(unsigned int core, unsigned int vpe_id)
 	write_gcr_co_reset_ext_base(CM_GCR_Cx_RESET_EXT_BASE_UEB);
 
 	/* Ensure the core can access the GCRs */
-	set_gcr_access(1 << core);
+	if (mips_cm_revision() < CM_REV_CM3)
+		set_gcr_access(1 << core);
+	else
+		set_gcr_access_cm3(1 << core);
 
 	if (mips_cpc_present()) {
 		/* Reset the core */

arch/powerpc/xmon/ppc-dis.c

@@ -137,32 +137,21 @@ int print_insn_powerpc (unsigned long insn, unsigned long memaddr)
   bool insn_is_short;
   ppc_cpu_t dialect;
 
-  dialect = PPC_OPCODE_PPC | PPC_OPCODE_COMMON
-            | PPC_OPCODE_64 | PPC_OPCODE_POWER4 | PPC_OPCODE_ALTIVEC;
+  dialect = PPC_OPCODE_PPC | PPC_OPCODE_COMMON;
 
-  if (cpu_has_feature(CPU_FTRS_POWER5))
-    dialect |= PPC_OPCODE_POWER5;
+  if (IS_ENABLED(CONFIG_PPC64))
+    dialect |= PPC_OPCODE_64 | PPC_OPCODE_POWER4 | PPC_OPCODE_CELL |
+	PPC_OPCODE_POWER5 | PPC_OPCODE_POWER6 | PPC_OPCODE_POWER7 | PPC_OPCODE_POWER8 |
+	PPC_OPCODE_POWER9;
 
-  if (cpu_has_feature(CPU_FTRS_CELL))
-    dialect |= (PPC_OPCODE_CELL | PPC_OPCODE_ALTIVEC);
+  if (cpu_has_feature(CPU_FTR_TM))
+    dialect |= PPC_OPCODE_HTM;
 
-  if (cpu_has_feature(CPU_FTRS_POWER6))
-    dialect |= (PPC_OPCODE_POWER5 | PPC_OPCODE_POWER6 | PPC_OPCODE_ALTIVEC);
+  if (cpu_has_feature(CPU_FTR_ALTIVEC))
+    dialect |= PPC_OPCODE_ALTIVEC | PPC_OPCODE_ALTIVEC2;
 
-  if (cpu_has_feature(CPU_FTRS_POWER7))
-    dialect |= (PPC_OPCODE_POWER5 | PPC_OPCODE_POWER6 | PPC_OPCODE_POWER7
-                | PPC_OPCODE_ALTIVEC | PPC_OPCODE_VSX);
-
-  if (cpu_has_feature(CPU_FTRS_POWER8))
-    dialect |= (PPC_OPCODE_POWER5 | PPC_OPCODE_POWER6 | PPC_OPCODE_POWER7
-		| PPC_OPCODE_POWER8 | PPC_OPCODE_HTM
-		| PPC_OPCODE_ALTIVEC | PPC_OPCODE_ALTIVEC2 | PPC_OPCODE_VSX);
-
-  if (cpu_has_feature(CPU_FTRS_POWER9))
-    dialect |= (PPC_OPCODE_POWER5 | PPC_OPCODE_POWER6 | PPC_OPCODE_POWER7
-		| PPC_OPCODE_POWER8 | PPC_OPCODE_POWER9 | PPC_OPCODE_HTM
-		| PPC_OPCODE_ALTIVEC | PPC_OPCODE_ALTIVEC2
-		| PPC_OPCODE_VSX | PPC_OPCODE_VSX3);
+  if (cpu_has_feature(CPU_FTR_VSX))
+    dialect |= PPC_OPCODE_VSX | PPC_OPCODE_VSX3;
 
   /* Get the major opcode of the insn.  */
   opcode = NULL;

arch/sparc/include/asm/oplib_64.h

@@ -247,6 +247,7 @@ void prom_sun4v_guest_soft_state(void);
 int prom_ihandle2path(int handle, char *buffer, int bufsize);
 
 /* Client interface level routines. */
+void prom_cif_init(void *cif_handler);
 void p1275_cmd_direct(unsigned long *);
 
 #endif /* !(__SPARC64_OPLIB_H) */

arch/sparc/prom/init_64.c

@@ -26,9 +26,6 @@ phandle prom_chosen_node;
  * routines in the prom library.
  * It gets passed the pointer to the PROM vector.
  */
-
-extern void prom_cif_init(void *);
-
 void __init prom_init(void *cif_handler)
 {
 	phandle node;

arch/sparc/prom/p1275.c

@@ -49,7 +49,7 @@ void p1275_cmd_direct(unsigned long *args)
 	local_irq_restore(flags);
 }
 
-void prom_cif_init(void *cif_handler, void *cif_stack)
+void prom_cif_init(void *cif_handler)
 {
 	p1275buf.prom_cif_handler = (void (*)(long *))cif_handler;
 }