Merge tag 'char-misc-4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

bafb0762 · Linus Torvalds <[email protected]> · 2017-09-05 11:08:17 -07:00

Pull char/misc driver updates from Greg KH:
 "Here is the big char/misc driver update for 4.14-rc1.

  Lots of different stuff in here, it's been an active development cycle
  for some reason. Highlights are:

   - updated binder driver, this brings binder up to date with what
     shipped in the Android O release, plus some more changes that
     happened since then that are in the Android development trees.

   - coresight updates and fixes

   - mux driver file renames to be a bit "nicer"

   - intel_th driver updates

   - normal set of hyper-v updates and changes

   - small fpga subsystem and driver updates

   - lots of const code changes all over the driver trees

   - extcon driver updates

   - fmc driver subsystem upadates

   - w1 subsystem minor reworks and new features and drivers added

   - spmi driver updates

  Plus a smattering of other minor driver updates and fixes.

  All of these have been in linux-next with no reported issues for a
  while"

* tag 'char-misc-4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (244 commits)
  ANDROID: binder: don't queue async transactions to thread.
  ANDROID: binder: don't enqueue death notifications to thread todo.
  ANDROID: binder: Don't BUG_ON(!spin_is_locked()).
  ANDROID: binder: Add BINDER_GET_NODE_DEBUG_INFO ioctl
  ANDROID: binder: push new transactions to waiting threads.
  ANDROID: binder: remove proc waitqueue
  android: binder: Add page usage in binder stats
  android: binder: fixup crash introduced by moving buffer hdr
  drivers: w1: add hwmon temp support for w1_therm
  drivers: w1: refactor w1_slave_show to make the temp reading functionality separate
  drivers: w1: add hwmon support structures
  eeprom: idt_89hpesx: Support both ACPI and OF probing
  mcb: Fix an error handling path in 'chameleon_parse_cells()'
  MCB: add support for SC31 to mcb-lpc
  mux: make device_type const
  char: virtio: constify attribute_group structures.
  Documentation/ABI: document the nvmem sysfs files
  lkdtm: fix spelling mistake: "incremeted" -> "incremented"
  perf: cs-etm: Fix ETMv4 CONFIGR entry in perf.data file
  nvmem: include linux/err.h from header
  ...

Commit: bafb0762cb6a906eb4105cccfb3bcd90be7f40d2
Parents: 44b1671f · 3a6430ce

Merge commit. Changes below are compared with the first parent: 44b1671f.

Changes

175 files changed · +9572 −3121

File	Status	Add	Del	Content
Documentation/ABI/stable/sysfs-bus-nvmem	added	+19	−0	View file
Documentation/ABI/testing/sysfs-bus-thunderbolt	modified	+2	−0	View file
Documentation/ABI/testing/sysfs-driver-altera-cvp	added	+8	−0	View file
Documentation/admin-guide/devices.txt	modified	+5	−0	View file
Documentation/devicetree/bindings/arm/coresight.txt	modified	+2	−2	View file
Documentation/devicetree/bindings/extcon/extcon-usbc-cros-ec.txt	added	+24	−0	View file
Documentation/devicetree/bindings/fpga/altera-passive-serial.txt	added	+29	−0	View file
Documentation/devicetree/bindings/fpga/xilinx-pr-decoupler.txt	added	+36	−0	View file
Documentation/devicetree/bindings/vendor-prefixes.txt	modified	+1	−0	View file
Documentation/devicetree/bindings/xilinx.txt	modified	+2	−0	View file
Documentation/trace/stm.txt	modified	+12	−1	View file
MAINTAINERS	modified	+3	−1	View file
arch/arm/boot/dts/imx6q-evi.dts	modified	+16	−0	View file
arch/x86/include/asm/mshyperv.h	modified	+2	−0	View file
arch/x86/kernel/cpu/mshyperv.c	modified	+9	−3	View file
block/genhd.c	modified	+13	−5	View file
drivers/android/Kconfig	modified	+12	−2	View file
drivers/android/Makefile	modified	+2	−1	View file
drivers/android/binder.c	modified	+2556	−1312	View file
drivers/android/binder_alloc.c	added	+1009	−0	View file
drivers/android/binder_alloc.h	added	+187	−0	View file
drivers/android/binder_alloc_selftest.c	added	+310	−0	View file
drivers/android/binder_trace.h	modified	+77	−19	View file
drivers/auxdisplay/panel.c	modified	+3	−3	View file
drivers/char/applicom.c	modified	+1	−1	View file
drivers/char/mwave/smapi.c	modified	+25	−23	View file
drivers/char/ppdev.c	modified	+0	−3	View file
drivers/char/tlclk.c	modified	+1	−1	View file
drivers/char/virtio_console.c	modified	+1	−1	View file
drivers/char/xilinx_hwicap/xilinx_hwicap.c	modified	+21	−18	View file
drivers/char/xilinx_hwicap/xilinx_hwicap.h	modified	+9	−4	View file
drivers/extcon/Kconfig	modified	+7	−0	View file
drivers/extcon/Makefile	modified	+1	−0	View file
drivers/extcon/devres.c	modified	+24	−26	View file
drivers/extcon/extcon-intel-int3496.c	modified	+1	−1	View file
drivers/extcon/extcon-max77693.c	modified	+2	−3	View file
drivers/extcon/extcon-usbc-cros-ec.c	added	+417	−0	View file
drivers/extcon/extcon.c	modified	+136	−143	View file
drivers/firmware/google/vpd.c	modified	+5	−5	View file
drivers/fmc/Makefile	modified	+1	−0	View file
drivers/fmc/fmc-chardev.c	modified	+1	−2	View file
drivers/fmc/fmc-core.c	modified	+90	−5	View file
drivers/fmc/fmc-debug.c	added	+173	−0	View file
drivers/fmc/fmc-dump.c	modified	+0	−41	View file
drivers/fmc/fmc-match.c	modified	+1	−1	View file
drivers/fmc/fmc-private.h	added	+9	−0	View file
drivers/fmc/fmc-sdb.c	modified	+25	−94	View file
drivers/fmc/fmc-trivial.c	modified	+8	−12	View file
drivers/fmc/fmc-write-eeprom.c	modified	+4	−4	View file
drivers/fmc/fru-parse.c	modified	+1	−2	View file
drivers/fpga/Kconfig	modified	+15	−5	View file
drivers/fpga/Makefile	modified	+2	−0	View file
drivers/fpga/altera-cvp.c	added	+500	−0	View file
drivers/fpga/altera-hps2fpga.c	modified	+8	−4	View file
drivers/fpga/altera-ps-spi.c	added	+308	−0	View file
drivers/fpga/fpga-region.c	modified	+2	−2	View file
drivers/fsi/fsi-core.c	modified	+2	−2	View file
drivers/fsi/fsi-scom.c	modified	+4	−6	View file
drivers/hv/channel.c	modified	+14	−0	View file
drivers/hv/channel_mgmt.c	modified	+26	−3	View file
drivers/hv/hv_balloon.c	modified	+6	−6	View file
drivers/hv/hv_kvp.c	modified	+1	−1	View file
drivers/hv/ring_buffer.c	modified	+60	−109	View file
drivers/hv/vmbus_drv.c	modified	+3	−0	View file
drivers/hwtracing/coresight/Kconfig	modified	+5	−5	View file
drivers/hwtracing/coresight/Makefile	modified	+1	−1	View file
drivers/hwtracing/coresight/coresight-cpu-debug.c	modified	+1	−1	View file
drivers/hwtracing/coresight/coresight-replicator-qcom.c → drivers/hwtracing/coresight/coresight-dynamic-replicator.c	renamed	+30	−4	View file
drivers/hwtracing/coresight/coresight-etb10.c	modified	+43	−25	View file
drivers/hwtracing/coresight/coresight-etm-perf.c	modified	+3	−1	View file
drivers/hwtracing/coresight/coresight-etm.h	modified	+1	−0	View file
drivers/hwtracing/coresight/coresight-etm3x-sysfs.c	modified	+13	−13	View file
drivers/hwtracing/coresight/coresight-etm3x.c	modified	+18	−4	View file
drivers/hwtracing/coresight/coresight-etm4x-sysfs.c	modified	+12	−12	View file
drivers/hwtracing/coresight/coresight-etm4x.c	modified	+5	−1	View file
drivers/hwtracing/coresight/coresight-funnel.c	modified	+6	−1	View file
drivers/hwtracing/coresight/coresight-priv.h	modified	+34	−5	View file
drivers/hwtracing/coresight/coresight-stm.c	modified	+25	−24	View file
drivers/hwtracing/coresight/coresight-tmc-etf.c	modified	+35	−7	View file
drivers/hwtracing/coresight/coresight-tmc-etr.c	modified	+37	−12	View file
drivers/hwtracing/coresight/coresight-tmc.c	modified	+85	−23	View file
drivers/hwtracing/coresight/coresight-tmc.h	modified	+84	−1	View file
drivers/hwtracing/coresight/coresight-tpiu.c	modified	+6	−1	View file
drivers/hwtracing/coresight/coresight.c	modified	+8	−0	View file
drivers/hwtracing/intel_th/core.c	modified	+252	−107	View file
drivers/hwtracing/intel_th/gth.c	modified	+30	−10	View file
drivers/hwtracing/intel_th/gth.h	modified	+5	−0	View file
drivers/hwtracing/intel_th/intel_th.h	modified	+84	−20	View file
drivers/hwtracing/intel_th/msu.c	modified	+6	−6	View file
drivers/hwtracing/intel_th/pci.c	modified	+65	−2	View file
drivers/hwtracing/intel_th/pti.c	modified	+110	−5	View file
drivers/hwtracing/intel_th/pti.h	modified	+8	−0	View file
drivers/hwtracing/stm/core.c	modified	+1	−1	View file
drivers/mcb/mcb-lpc.c	modified	+15	−0	View file
drivers/mcb/mcb-parse.c	modified	+4	−2	View file
drivers/misc/Makefile	modified	+1	−0	View file
drivers/misc/apds9802als.c	modified	+2	−2	View file
drivers/misc/apds990x.c	modified	+1	−1	View file
drivers/misc/aspeed-lpc-snoop.c	modified	+29	−5	View file
drivers/misc/bh1770glc.c	modified	+1	−1	View file
drivers/misc/ds1682.c	modified	+1	−1	View file
drivers/misc/eeprom/eeprom.c	modified	+1	−1	View file
drivers/misc/eeprom/eeprom_93xx46.c	modified	+7	−17	View file
drivers/misc/eeprom/idt_89hpesx.c	modified	+55	−71	View file
drivers/misc/eeprom/max6875.c	modified	+1	−1	View file
drivers/misc/hmc6352.c	modified	+1	−1	View file
drivers/misc/hpilo.c	modified	+1	−1	View file
drivers/misc/ioc4.c	modified	+1	−1	View file
drivers/misc/isl29020.c	modified	+2	−2	View file
drivers/misc/lis3lv02d/lis3lv02d.c	modified	+1	−1	View file
drivers/misc/lkdtm.h	modified	+24	−6	View file
drivers/misc/lkdtm_bugs.c	modified	+48	−86	View file
drivers/misc/lkdtm_core.c	modified	+22	−6	View file
drivers/misc/lkdtm_refcount.c	added	+400	−0	View file
drivers/misc/mei/bus.c	modified	+1	−1	View file
drivers/misc/mei/hw-me.c	modified	+34	−11	View file
drivers/misc/mei/hw-me.h	modified	+31	−8	View file
drivers/misc/mei/pci-me.c	modified	+57	−52	View file
drivers/misc/pch_phub.c	modified	+2	−2	View file
drivers/misc/sram.c	modified	+6	−6	View file
drivers/misc/ti-st/st_kim.c	modified	+1	−1	View file
drivers/misc/tifm_7xx1.c	modified	+1	−1	View file
drivers/misc/vmw_vmci/vmci_queue_pair.c	modified	+2	−8	View file
drivers/mux/Makefile	modified	+5	−0	View file
drivers/mux/mux-adg792a.c → drivers/mux/adg792a.c	renamed	+0	−0	View file
drivers/mux/mux-core.c → drivers/mux/core.c	renamed	+7	−7	View file
drivers/mux/mux-gpio.c → drivers/mux/gpio.c	renamed	+0	−0	View file
drivers/mux/mux-mmio.c → drivers/mux/mmio.c	renamed	+0	−0	View file
drivers/nvmem/core.c	modified	+40	−3	View file
drivers/nvmem/lpc18xx_eeprom.c	modified	+1	−1	View file
drivers/parport/daisy.c	modified	+1	−1	View file
drivers/parport/parport_atari.c	modified	+1	−1	View file
drivers/parport/parport_ax88796.c	modified	+2	−4	View file
drivers/parport/parport_ip32.c	modified	+1	−1	View file
drivers/parport/parport_mfc3.c	modified	+1	−1	View file
drivers/parport/parport_pc.c	modified	+12	−12	View file
drivers/phy/broadcom/phy-bcm-ns2-usbdrd.c	modified	+4	−4	View file
drivers/phy/qualcomm/phy-qcom-usb-hs.c	modified	+3	−11	View file
drivers/phy/rockchip/phy-rockchip-inno-usb2.c	modified	+5	−5	View file
drivers/spmi/spmi-pmic-arb.c	modified	+493	−344	View file
drivers/spmi/spmi.c	modified	+6	−8	View file
drivers/thunderbolt/ctl.c	modified	+1	−1	View file
drivers/thunderbolt/switch.c	modified	+12	−8	View file
drivers/usb/gadget/udc/snps_udc_plat.c	modified	+3	−3	View file
drivers/w1/masters/ds1wm.c	modified	+101	−7	View file
drivers/w1/masters/ds2482.c	modified	+8	−4	View file
drivers/w1/masters/ds2490.c	modified	+1	−1	View file
drivers/w1/slaves/Kconfig	modified	+8	−0	View file
drivers/w1/slaves/Makefile	modified	+1	−0	View file
drivers/w1/slaves/w1_ds2438.c	modified	+5	−4	View file
drivers/w1/slaves/w1_ds2805.c	added	+313	−0	View file
drivers/w1/slaves/w1_therm.c	modified	+135	−29	View file
drivers/w1/w1.c	modified	+20	−2	View file
fs/char_dev.c	modified	+41	−17	View file
fs/proc/devices.c	modified	+4	−4	View file
include/linux/bitrev.h	modified	+19	−0	View file
include/linux/coresight-pmu.h	modified	+6	−0	View file
include/linux/eeprom_93xx46.h	modified	+1	−2	View file
include/linux/extcon.h	modified	+54	−76	View file
include/linux/fmc.h	modified	+36	−3	View file
include/linux/fpga/fpga-mgr.h	modified	+4	−0	View file
include/linux/fs.h	modified	+7	−3	View file
include/linux/hyperv.h	modified	+2	−65	View file
include/linux/mfd/cros_ec_commands.h	modified	+75	−0	View file
include/linux/mfd/ds1wm.h	modified	+22	−7	View file
include/linux/mux/consumer.h	modified	+2	−0	View file
include/linux/nvmem-consumer.h	modified	+10	−0	View file
include/linux/w1.h	modified	+4	−0	View file
include/uapi/linux/android/binder.h	modified	+16	−0	View file
kernel/configs/android-base.config	modified	+1	−0	View file
tools/hv/hv_fcopy_daemon.c	modified	+17	−15	View file
tools/hv/hv_kvp_daemon.c	modified	+1	−1	View file
tools/hv/hv_vss_daemon.c	modified	+7	−0	View file
tools/include/linux/coresight-pmu.h	modified	+6	−0	View file
tools/perf/arch/arm/util/cs-etm.c	modified	+27	−1	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/ABI/stable/sysfs-bus-nvmem

View file

diff --git a/Documentation/ABI/stable/sysfs-bus-nvmem b/Documentation/ABI/stable/sysfs-bus-nvmem
new file mode 100644
index 0000000..5923ab4
--- /dev/null
+++ b/Documentation/ABI/stable/sysfs-bus-nvmem
@@ -0,0 +1,19 @@
+What:		/sys/bus/nvmem/devices/.../nvmem
+Date:		July 2015
+KernelVersion:  4.2
+Contact:	Srinivas Kandagatla <[email protected]>
+Description:
+		This file allows user to read/write the raw NVMEM contents.
+		Permissions for write to this file depends on the nvmem
+		provider configuration.
+
+		ex:
+		hexdump /sys/bus/nvmem/devices/qfprom0/nvmem
+
+		0000000 0000 0000 0000 0000 0000 0000 0000 0000
+		*
+		00000a0 db10 2240 0000 e000 0c00 0c00 0000 0c00
+		0000000 0000 0000 0000 0000 0000 0000 0000 0000
+		...
+		*
+		0001000

Documentation/ABI/testing/sysfs-bus-thunderbolt

View file

diff --git a/Documentation/ABI/testing/sysfs-bus-thunderbolt b/Documentation/ABI/testing/sysfs-bus-thunderbolt
index 2a98149..392bef5 100644
--- a/Documentation/ABI/testing/sysfs-bus-thunderbolt
+++ b/Documentation/ABI/testing/sysfs-bus-thunderbolt
@@ -45,6 +45,8 @@ Contact:	[email protected]
 Description:	When a devices supports Thunderbolt secure connect it will
 		have this attribute. Writing 32 byte hex string changes
 		authorization to use the secure connection method instead.
+		Writing an empty string clears the key and regular connection
+		method can be used again.
 
 What:		/sys/bus/thunderbolt/devices/.../device
 Date:		Sep 2017

Documentation/ABI/testing/sysfs-driver-altera-cvp

View file

diff --git a/Documentation/ABI/testing/sysfs-driver-altera-cvp b/Documentation/ABI/testing/sysfs-driver-altera-cvp
new file mode 100644
index 0000000..8cde64a
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-driver-altera-cvp
@@ -0,0 +1,8 @@
+What:		/sys/bus/pci/drivers/altera-cvp/chkcfg
+Date:		May 2017
+Kernel Version:	4.13
+Contact:	Anatolij Gustschin <[email protected]>
+Description:
+		Contains either 1 or 0 and controls if configuration
+		error checking in altera-cvp driver is turned on or
+		off.

Documentation/admin-guide/devices.txt

View file

diff --git a/Documentation/admin-guide/devices.txt b/Documentation/admin-guide/devices.txt
index 6b71852..4ec8431 100644
--- a/Documentation/admin-guide/devices.txt
+++ b/Documentation/admin-guide/devices.txt
@@ -3081,3 +3081,8 @@
 		  1 = /dev/osd1		Second OSD Device
 		  ...
 		  255 = /dev/osd255	256th OSD Device
+
+ 384-511 char	RESERVED FOR DYNAMIC ASSIGNMENT
+		Character devices that request a dynamic allocation of major
+		number will take numbers starting from 511 and downward,
+		once the 234-254 range is full.

Documentation/devicetree/bindings/arm/coresight.txt

View file

diff --git a/Documentation/devicetree/bindings/arm/coresight.txt b/Documentation/devicetree/bindings/arm/coresight.txt
index fcbae6a..15ac8e8 100644
--- a/Documentation/devicetree/bindings/arm/coresight.txt
+++ b/Documentation/devicetree/bindings/arm/coresight.txt
@@ -34,8 +34,8 @@ its hardware characteristcs.
 		- Embedded Trace Macrocell (version 4.x):
 			"arm,coresight-etm4x", "arm,primecell";
 
-		- Qualcomm Configurable Replicator (version 1.x):
-			"qcom,coresight-replicator1x", "arm,primecell";
+		- Coresight programmable Replicator :
+			"arm,coresight-dynamic-replicator", "arm,primecell";
 
 		- System Trace Macrocell:
 			"arm,coresight-stm", "arm,primecell"; [1]

Documentation/devicetree/bindings/extcon/extcon-usbc-cros-ec.txt

View file

diff --git a/Documentation/devicetree/bindings/extcon/extcon-usbc-cros-ec.txt b/Documentation/devicetree/bindings/extcon/extcon-usbc-cros-ec.txt
new file mode 100644
index 0000000..8e8625c
--- /dev/null
+++ b/Documentation/devicetree/bindings/extcon/extcon-usbc-cros-ec.txt
@@ -0,0 +1,24 @@
+ChromeOS EC USB Type-C cable and accessories detection
+
+On ChromeOS systems with USB Type C ports, the ChromeOS Embedded Controller is
+able to detect the state of external accessories such as display adapters
+or USB devices when said accessories are attached or detached.
+
+The node for this device must be under a cros-ec node like google,cros-ec-spi
+or google,cros-ec-i2c.
+
+Required properties:
+- compatible:		Should be "google,extcon-usbc-cros-ec".
+- google,usb-port-id:	Specifies the USB port ID to use.
+
+Example:
+	cros-ec@0 {
+		compatible = "google,cros-ec-i2c";
+
+		...
+
+		extcon {
+			compatible = "google,extcon-usbc-cros-ec";
+			google,usb-port-id = <0>;
+		};
+	}

Documentation/devicetree/bindings/fpga/altera-passive-serial.txt

View file

diff --git a/Documentation/devicetree/bindings/fpga/altera-passive-serial.txt b/Documentation/devicetree/bindings/fpga/altera-passive-serial.txt
new file mode 100644
index 0000000..48478bc
--- /dev/null
+++ b/Documentation/devicetree/bindings/fpga/altera-passive-serial.txt
@@ -0,0 +1,29 @@
+Altera Passive Serial SPI FPGA Manager
+
+Altera FPGAs support a method of loading the bitstream over what is
+referred to as "passive serial".
+The passive serial link is not technically SPI, and might require extra
+circuits in order to play nicely with other SPI slaves on the same bus.
+
+See https://www.altera.com/literature/hb/cyc/cyc_c51013.pdf
+
+Required properties:
+- compatible: Must be one of the following:
+	"altr,fpga-passive-serial",
+	"altr,fpga-arria10-passive-serial"
+- reg: SPI chip select of the FPGA
+- nconfig-gpios: config pin (referred to as nCONFIG in the manual)
+- nstat-gpios: status pin (referred to as nSTATUS in the manual)
+
+Optional properties:
+- confd-gpios: confd pin (referred to as CONF_DONE in the manual)
+
+Example:
+	fpga: fpga@0 {
+		compatible = "altr,fpga-passive-serial";
+		spi-max-frequency = <20000000>;
+		reg = <0>;
+		nconfig-gpios = <&gpio4 9 GPIO_ACTIVE_LOW>;
+		nstat-gpios = <&gpio4 11 GPIO_ACTIVE_LOW>;
+		confd-gpios = <&gpio4 12 GPIO_ACTIVE_LOW>;
+	};

Documentation/devicetree/bindings/fpga/xilinx-pr-decoupler.txt

View file

diff --git a/Documentation/devicetree/bindings/fpga/xilinx-pr-decoupler.txt b/Documentation/devicetree/bindings/fpga/xilinx-pr-decoupler.txt
new file mode 100644
index 0000000..8dcfba9
--- /dev/null
+++ b/Documentation/devicetree/bindings/fpga/xilinx-pr-decoupler.txt
@@ -0,0 +1,36 @@
+Xilinx LogiCORE Partial Reconfig Decoupler Softcore
+
+The Xilinx LogiCORE Partial Reconfig Decoupler manages one or more
+decouplers / fpga bridges.
+The controller can decouple/disable the bridges which prevents signal
+changes from passing through the bridge.  The controller can also
+couple / enable the bridges which allows traffic to pass through the
+bridge normally.
+
+The Driver supports only MMIO handling. A PR region can have multiple
+PR Decouplers which can be handled independently or chained via decouple/
+decouple_status signals.
+
+Required properties:
+- compatible		: Should contain "xlnx,pr-decoupler-1.00" followed by
+                          "xlnx,pr-decoupler"
+- regs			: base address and size for decoupler module
+- clocks		: input clock to IP
+- clock-names		: should contain "aclk"
+
+Optional properties:
+- bridge-enable		: 0 if driver should disable bridge at startup
+			  1 if driver should enable bridge at startup
+			  Default is to leave bridge in current state.
+
+See Documentation/devicetree/bindings/fpga/fpga-region.txt for generic bindings.
+
+Example:
+	fpga-bridge@100000450 {
+		compatible = "xlnx,pr-decoupler-1.00",
+			     "xlnx-pr-decoupler";
+		regs = <0x10000045 0x10>;
+		clocks = <&clkc 15>;
+		clock-names = "aclk";
+		bridge-enable = <0>;
+	};

Documentation/devicetree/bindings/vendor-prefixes.txt

View file

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index 36b27b1..4e72012 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -175,6 +175,7 @@ kosagi	Sutajio Ko-Usagi PTE Ltd.
 kyo	Kyocera Corporation
 lacie	LaCie
 lantiq	Lantiq Semiconductor
+lattice	Lattice Semiconductor
 lego	LEGO Systems A/S
 lenovo	Lenovo Group Ltd.
 lg	LG Corporation

Documentation/devicetree/bindings/xilinx.txt

View file

diff --git a/Documentation/devicetree/bindings/xilinx.txt b/Documentation/devicetree/bindings/xilinx.txt
index 299d092..1d11b90 100644
--- a/Documentation/devicetree/bindings/xilinx.txt
+++ b/Documentation/devicetree/bindings/xilinx.txt
@@ -281,6 +281,8 @@
                       capabilities of the underlying ICAP hardware
                       differ between different families.  May be
                       'virtex2p', 'virtex4', or 'virtex5'.
+		- compatible : should contain "xlnx,xps-hwicap-1.00.a" or
+				"xlnx,opb-hwicap-1.00.b".
 
       vi) Xilinx Uart 16550
 

Documentation/trace/stm.txt

View file

diff --git a/Documentation/trace/stm.txt b/Documentation/trace/stm.txt
index 11cff47..0376575 100644
--- a/Documentation/trace/stm.txt
+++ b/Documentation/trace/stm.txt
@@ -83,7 +83,7 @@ by writing the name of the desired stm device there, for example:
 $ echo dummy_stm.0 > /sys/class/stm_source/console/stm_source_link
 
 For examples on how to use stm_source interface in the kernel, refer
-to stm_console or stm_heartbeat drivers.
+to stm_console, stm_heartbeat or stm_ftrace drivers.
 
 Each stm_source device will need to assume a master and a range of
 channels, depending on how many channels it requires. These are
@@ -107,5 +107,16 @@ console in the STP stream, create a "console" policy entry (see the
 beginning of this text on how to do that). When initialized, it will
 consume one channel.
 
+stm_ftrace
+==========
+
+This is another "stm_source" device, once the stm_ftrace has been
+linked with an stm device, and if "function" tracer is enabled,
+function address and parent function address which Ftrace subsystem
+would store into ring buffer will be exported via the stm device at
+the same time.
+
+Currently only Ftrace "function" tracer is supported.
+
 [1] https://software.intel.com/sites/default/files/managed/d3/3c/intel-th-developer-manual.pdf
 [2] http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.ddi0444b/index.html

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index 8a28bad..a90fe13 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5362,10 +5362,11 @@ K:	fmc_d.*register
 
 FPGA MANAGER FRAMEWORK
 M:	Alan Tull <[email protected]>
-R:	Moritz Fischer <[email protected]>
+R:	Moritz Fischer <[email protected]>
 L:	[email protected]
 S:	Maintained
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/atull/linux-fpga.git
+Q:	http://patchwork.kernel.org/project/linux-fpga/list/
 F:	Documentation/fpga/
 F:	Documentation/devicetree/bindings/fpga/
 F:	drivers/fpga/
@@ -9484,6 +9485,7 @@ M:	Srinivas Kandagatla <[email protected]>
 S:	Maintained
 F:	drivers/nvmem/
 F:	Documentation/devicetree/bindings/nvmem/
+F:	Documentation/ABI/stable/sysfs-bus-nvmem
 F:	include/linux/nvmem-consumer.h
 F:	include/linux/nvmem-provider.h
 

arch/arm/boot/dts/imx6q-evi.dts

View file

diff --git a/arch/arm/boot/dts/imx6q-evi.dts b/arch/arm/boot/dts/imx6q-evi.dts
index 1f0f950..e0aea78 100644
--- a/arch/arm/boot/dts/imx6q-evi.dts
+++ b/arch/arm/boot/dts/imx6q-evi.dts
@@ -94,6 +94,15 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_ecspi1 &pinctrl_ecspi1cs>;
 	status = "okay";
+
+	fpga: fpga@0 {
+		compatible = "altr,fpga-passive-serial";
+		spi-max-frequency = <20000000>;
+		reg = <0>;
+		pinctrl-0 = <&pinctrl_fpgaspi>;
+		nconfig-gpios = <&gpio4 9 GPIO_ACTIVE_LOW>;
+		nstat-gpios = <&gpio4 11 GPIO_ACTIVE_LOW>;
+	};
 };
 
 &ecspi3 {
@@ -319,6 +328,13 @@
 		>;
 	};
 
+	pinctrl_fpgaspi: fpgaspigrp {
+		fsl,pins = <
+			MX6QDL_PAD_KEY_ROW1__GPIO4_IO09 0x1b0b0
+			MX6QDL_PAD_KEY_ROW2__GPIO4_IO11 0x1b0b0
+		>;
+	};
+
 	pinctrl_gpminand: gpminandgrp {
 		fsl,pins = <
 			MX6QDL_PAD_NANDF_CLE__NAND_CLE 0xb0b1

arch/x86/include/asm/mshyperv.h

View file

diff --git a/arch/x86/include/asm/mshyperv.h b/arch/x86/include/asm/mshyperv.h
index 2b58c8c..58b9291 100644
--- a/arch/x86/include/asm/mshyperv.h
+++ b/arch/x86/include/asm/mshyperv.h
@@ -28,6 +28,8 @@ struct ms_hyperv_info {
 	u32 features;
 	u32 misc_features;
 	u32 hints;
+	u32 max_vp_index;
+	u32 max_lp_index;
 };
 
 extern struct ms_hyperv_info ms_hyperv;

arch/x86/kernel/cpu/mshyperv.c

View file

diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c
index 9fc3265..fbafd24 100644
--- a/arch/x86/kernel/cpu/mshyperv.c
+++ b/arch/x86/kernel/cpu/mshyperv.c
@@ -179,9 +179,15 @@ static void __init ms_hyperv_init_platform(void)
 	ms_hyperv.misc_features = cpuid_edx(HYPERV_CPUID_FEATURES);
 	ms_hyperv.hints    = cpuid_eax(HYPERV_CPUID_ENLIGHTMENT_INFO);
 
-	pr_info("HyperV: features 0x%x, hints 0x%x\n",
+	pr_info("Hyper-V: features 0x%x, hints 0x%x\n",
 		ms_hyperv.features, ms_hyperv.hints);
 
+	ms_hyperv.max_vp_index = cpuid_eax(HVCPUID_IMPLEMENTATION_LIMITS);
+	ms_hyperv.max_lp_index = cpuid_ebx(HVCPUID_IMPLEMENTATION_LIMITS);
+
+	pr_debug("Hyper-V: max %u virtual processors, %u logical processors\n",
+		 ms_hyperv.max_vp_index, ms_hyperv.max_lp_index);
+
 	/*
 	 * Extract host information.
 	 */
@@ -214,7 +220,7 @@ static void __init ms_hyperv_init_platform(void)
 		rdmsrl(HV_X64_MSR_APIC_FREQUENCY, hv_lapic_frequency);
 		hv_lapic_frequency = div_u64(hv_lapic_frequency, HZ);
 		lapic_timer_frequency = hv_lapic_frequency;
-		pr_info("HyperV: LAPIC Timer Frequency: %#x\n",
+		pr_info("Hyper-V: LAPIC Timer Frequency: %#x\n",
 			lapic_timer_frequency);
 	}
 
@@ -248,7 +254,7 @@ static void __init ms_hyperv_init_platform(void)
 }
 
 const __refconst struct hypervisor_x86 x86_hyper_ms_hyperv = {
-	.name			= "Microsoft HyperV",
+	.name			= "Microsoft Hyper-V",
 	.detect			= ms_hyperv_platform,
 	.init_platform		= ms_hyperv_init_platform,
 };

block/genhd.c

View file

diff --git a/block/genhd.c b/block/genhd.c
index 7f520fa..51c1d40 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -242,6 +242,7 @@ EXPORT_SYMBOL_GPL(disk_map_sector_rcu);
  * Can be deleted altogether. Later.
  *
  */
+#define BLKDEV_MAJOR_HASH_SIZE 255
 static struct blk_major_name {
 	struct blk_major_name *next;
 	int major;
@@ -259,12 +260,11 @@ void blkdev_show(struct seq_file *seqf, off_t offset)
 {
 	struct blk_major_name *dp;
 
-	if (offset < BLKDEV_MAJOR_HASH_SIZE) {
-		mutex_lock(&block_class_lock);
-		for (dp = major_names[offset]; dp; dp = dp->next)
+	mutex_lock(&block_class_lock);
+	for (dp = major_names[major_to_index(offset)]; dp; dp = dp->next)
+		if (dp->major == offset)
 			seq_printf(seqf, "%3d %s\n", dp->major, dp->name);
-		mutex_unlock(&block_class_lock);
-	}
+	mutex_unlock(&block_class_lock);
 }
 #endif /* CONFIG_PROC_FS */
 
@@ -309,6 +309,14 @@ int register_blkdev(unsigned int major, const char *name)
 		ret = major;
 	}
 
+	if (major >= BLKDEV_MAJOR_MAX) {
+		pr_err("register_blkdev: major requested (%d) is greater than the maximum (%d) for %s\n",
+		       major, BLKDEV_MAJOR_MAX, name);
+
+		ret = -EINVAL;
+		goto out;
+	}
+
 	p = kmalloc(sizeof(struct blk_major_name), GFP_KERNEL);
 	if (p == NULL) {
 		ret = -ENOMEM;

drivers/android/Kconfig

View file

diff --git a/drivers/android/Kconfig b/drivers/android/Kconfig
index 832e885..9801d85 100644
--- a/drivers/android/Kconfig
+++ b/drivers/android/Kconfig
@@ -22,7 +22,7 @@ config ANDROID_BINDER_IPC
 config ANDROID_BINDER_DEVICES
 	string "Android Binder devices"
 	depends on ANDROID_BINDER_IPC
-	default "binder,hwbinder"
+	default "binder,hwbinder,vndbinder"
 	---help---
 	  Default value for the binder.devices parameter.
 
@@ -32,7 +32,7 @@ config ANDROID_BINDER_DEVICES
 	  therefore logically separated from the other devices.
 
 config ANDROID_BINDER_IPC_32BIT
-	bool
+	bool "Use old (Android 4.4 and earlier) 32-bit binder API"
 	depends on !64BIT && ANDROID_BINDER_IPC
 	default y
 	---help---
@@ -44,6 +44,16 @@ config ANDROID_BINDER_IPC_32BIT
 
 	  Note that enabling this will break newer Android user-space.
 
+config ANDROID_BINDER_IPC_SELFTEST
+	bool "Android Binder IPC Driver Selftest"
+	depends on ANDROID_BINDER_IPC
+	---help---
+	  This feature allows binder selftest to run.
+
+	  Binder selftest checks the allocation and free of binder buffers
+	  exhaustively with combinations of various buffer sizes and
+	  alignments.
+
 endif # if ANDROID
 
 endmenu

drivers/android/Makefile

View file

diff --git a/drivers/android/Makefile b/drivers/android/Makefile
index 3b7e4b0..a01254c 100644
--- a/drivers/android/Makefile
+++ b/drivers/android/Makefile
@@ -1,3 +1,4 @@
 ccflags-y += -I$(src)			# needed for trace events
 
-obj-$(CONFIG_ANDROID_BINDER_IPC)	+= binder.o
+obj-$(CONFIG_ANDROID_BINDER_IPC)	+= binder.o binder_alloc.o
+obj-$(CONFIG_ANDROID_BINDER_IPC_SELFTEST) += binder_alloc_selftest.o

drivers/android/binder.c

View file

diff --git a/drivers/android/binder.c b/drivers/android/binder.c
index 831cdd7..d055b3f 100644
--- a/drivers/android/binder.c
+++ b/drivers/android/binder.c
@@ -15,6 +15,40 @@
  *
  */
 
+/*
+ * Locking overview
+ *
+ * There are 3 main spinlocks which must be acquired in the
+ * order shown:
+ *
+ * 1) proc->outer_lock : protects binder_ref
+ *    binder_proc_lock() and binder_proc_unlock() are
+ *    used to acq/rel.
+ * 2) node->lock : protects most fields of binder_node.
+ *    binder_node_lock() and binder_node_unlock() are
+ *    used to acq/rel
+ * 3) proc->inner_lock : protects the thread and node lists
+ *    (proc->threads, proc->waiting_threads, proc->nodes)
+ *    and all todo lists associated with the binder_proc
+ *    (proc->todo, thread->todo, proc->delivered_death and
+ *    node->async_todo), as well as thread->transaction_stack
+ *    binder_inner_proc_lock() and binder_inner_proc_unlock()
+ *    are used to acq/rel
+ *
+ * Any lock under procA must never be nested under any lock at the same
+ * level or below on procB.
+ *
+ * Functions that require a lock held on entry indicate which lock
+ * in the suffix of the function name:
+ *
+ * foo_olocked() : requires node->outer_lock
+ * foo_nlocked() : requires node->lock
+ * foo_ilocked() : requires proc->inner_lock
+ * foo_oilocked(): requires proc->outer_lock and proc->inner_lock
+ * foo_nilocked(): requires node->lock and proc->inner_lock
+ * ...
+ */
+
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <asm/cacheflush.h>
@@ -24,7 +58,6 @@
 #include <linux/fs.h>
 #include <linux/list.h>
 #include <linux/miscdevice.h>
-#include <linux/mm.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/nsproxy.h>
@@ -35,30 +68,31 @@
 #include <linux/sched/mm.h>
 #include <linux/seq_file.h>
 #include <linux/uaccess.h>
-#include <linux/vmalloc.h>
-#include <linux/slab.h>
 #include <linux/pid_namespace.h>
 #include <linux/security.h>
+#include <linux/spinlock.h>
 
 #ifdef CONFIG_ANDROID_BINDER_IPC_32BIT
 #define BINDER_IPC_32BIT 1
 #endif
 
 #include <uapi/linux/android/binder.h>
+#include "binder_alloc.h"
 #include "binder_trace.h"
 
-static DEFINE_MUTEX(binder_main_lock);
+static HLIST_HEAD(binder_deferred_list);
 static DEFINE_MUTEX(binder_deferred_lock);
-static DEFINE_MUTEX(binder_mmap_lock);
 
 static HLIST_HEAD(binder_devices);
 static HLIST_HEAD(binder_procs);
-static HLIST_HEAD(binder_deferred_list);
+static DEFINE_MUTEX(binder_procs_lock);
+
 static HLIST_HEAD(binder_dead_nodes);
+static DEFINE_SPINLOCK(binder_dead_nodes_lock);
 
 static struct dentry *binder_debugfs_dir_entry_root;
 static struct dentry *binder_debugfs_dir_entry_proc;
-static int binder_last_id;
+static atomic_t binder_last_id;
 
 #define BINDER_DEBUG_ENTRY(name) \
 static int binder_##name##_open(struct inode *inode, struct file *file) \
@@ -88,8 +122,6 @@ BINDER_DEBUG_ENTRY(proc);
 
 #define FORBIDDEN_MMAP_FLAGS                (VM_WRITE)
 
-#define BINDER_SMALL_BUF_SIZE (PAGE_SIZE * 64)
-
 enum {
 	BINDER_DEBUG_USER_ERROR             = 1U << 0,
 	BINDER_DEBUG_FAILED_TRANSACTION     = 1U << 1,
@@ -104,17 +136,13 @@ enum {
 	BINDER_DEBUG_TRANSACTION_COMPLETE   = 1U << 10,
 	BINDER_DEBUG_FREE_BUFFER            = 1U << 11,
 	BINDER_DEBUG_INTERNAL_REFS          = 1U << 12,
-	BINDER_DEBUG_BUFFER_ALLOC           = 1U << 13,
-	BINDER_DEBUG_PRIORITY_CAP           = 1U << 14,
-	BINDER_DEBUG_BUFFER_ALLOC_ASYNC     = 1U << 15,
+	BINDER_DEBUG_PRIORITY_CAP           = 1U << 13,
+	BINDER_DEBUG_SPINLOCKS              = 1U << 14,
 };
 static uint32_t binder_debug_mask = BINDER_DEBUG_USER_ERROR |
 	BINDER_DEBUG_FAILED_TRANSACTION | BINDER_DEBUG_DEAD_TRANSACTION;
 module_param_named(debug_mask, binder_debug_mask, uint, S_IWUSR | S_IRUGO);
 
-static bool binder_debug_no_lock;
-module_param_named(proc_no_lock, binder_debug_no_lock, bool, S_IWUSR | S_IRUGO);
-
 static char *binder_devices_param = CONFIG_ANDROID_BINDER_DEVICES;
 module_param_named(devices, binder_devices_param, charp, 0444);
 
@@ -171,26 +199,27 @@ enum binder_stat_types {
 };
 
 struct binder_stats {
-	int br[_IOC_NR(BR_FAILED_REPLY) + 1];
-	int bc[_IOC_NR(BC_REPLY_SG) + 1];
-	int obj_created[BINDER_STAT_COUNT];
-	int obj_deleted[BINDER_STAT_COUNT];
+	atomic_t br[_IOC_NR(BR_FAILED_REPLY) + 1];
+	atomic_t bc[_IOC_NR(BC_REPLY_SG) + 1];
+	atomic_t obj_created[BINDER_STAT_COUNT];
+	atomic_t obj_deleted[BINDER_STAT_COUNT];
 };
 
 static struct binder_stats binder_stats;
 
 static inline void binder_stats_deleted(enum binder_stat_types type)
 {
-	binder_stats.obj_deleted[type]++;
+	atomic_inc(&binder_stats.obj_deleted[type]);
 }
 
 static inline void binder_stats_created(enum binder_stat_types type)
 {
-	binder_stats.obj_created[type]++;
+	atomic_inc(&binder_stats.obj_created[type]);
 }
 
 struct binder_transaction_log_entry {
 	int debug_id;
+	int debug_id_done;
 	int call_type;
 	int from_proc;
 	int from_thread;