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

2521129a · Linus Torvalds <[email protected]> · 2014-08-04 17:32:24 -07:00

Pull char / misc driver patches from Greg KH:
 "Here's the big driver misc / char pull request for 3.17-rc1.

  Lots of things in here, the thunderbolt support for Apple laptops,
  some other new drivers, testing fixes, and other good things.  All
  have been in linux-next for a long time"

* tag 'char-misc-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (119 commits)
  misc: bh1780: Introduce the use of devm_kzalloc
  Lattice ECP3 FPGA: Correct endianness
  drivers/misc/ti-st: Load firmware from ti-connectivity directory.
  dt-bindings: extcon: Add support for SM5502 MUIC device
  extcon: sm5502: Change internal hardware switch according to cable type
  extcon: sm5502: Detect cable state after completing platform booting
  extcon: sm5502: Add support new SM5502 extcon device driver
  extcon: arizona: Get MICVDD against extcon device
  extcon: Remove unnecessary OOM messages
  misc: vexpress: Fix sparse non static symbol warnings
  mei: drop unused hw dependent fw status functions
  misc: bh1770glc: Use managed functions
  pcmcia: remove DEFINE_PCI_DEVICE_TABLE usage
  misc: remove DEFINE_PCI_DEVICE_TABLE usage
  ipack: Replace DEFINE_PCI_DEVICE_TABLE macro use
  drivers/char/dsp56k.c: drop check for negativity of unsigned parameter
  mei: fix return value on disconnect timeout
  mei: don't schedule suspend in pm idle
  mei: start disconnect request timer consistently
  mei: reset client connection state on timeout
  ...

Commit: 2521129a6d2fd8a81f99cf95055eddea3df914ff
Parents: 98a96f20 · 16eb2bfc

Merge commit. Changes below are compared with the first parent: 98a96f20.

Changes

140 files changed · +8646 −1083

File	Status	Add	Del	Content
Documentation/ABI/testing/sysfs-class-mei	added	+16	−0	View file
Documentation/ABI/testing/sysfs-driver-genwqe	modified	+9	−0	View file
Documentation/devicetree/bindings/extcon/extcon-sm5502.txt	added	+23	−0	View file
Documentation/mic/mic_overview.txt	modified	+41	−26	View file
Documentation/mic/mpssd/mpss	modified	+7	−7	View file
Documentation/w1/slaves/w1_ds2406	added	+25	−0	View file
MAINTAINERS	modified	+5	−0	View file
drivers/Kconfig	modified	+2	−0	View file
drivers/Makefile	modified	+1	−0	View file
drivers/char/bsr.c	modified	+1	−1	View file
drivers/char/dsp56k.c	modified	+1	−1	View file
drivers/char/i8k.c	modified	+82	−41	View file
drivers/char/xilinx_hwicap/xilinx_hwicap.c	modified	+1	−0	View file
drivers/dma/Kconfig	modified	+18	−0	View file
drivers/dma/Makefile	modified	+1	−0	View file
drivers/dma/mic_x100_dma.c	added	+774	−0	View file
drivers/dma/mic_x100_dma.h	added	+286	−0	View file
drivers/extcon/Kconfig	modified	+24	−14	View file
drivers/extcon/Makefile	modified	+4	−3	View file
drivers/extcon/extcon-adc-jack.c	modified	+0	−1	View file
drivers/extcon/extcon-arizona.c	modified	+45	−29	View file
drivers/extcon/extcon-class.c	modified	+2	−0	View file
drivers/extcon/extcon-gpio.c	modified	+0	−1	View file
drivers/extcon/extcon-max14577.c	modified	+2	−3	View file
drivers/extcon/extcon-max77693.c	modified	+20	−21	View file
drivers/extcon/extcon-max8997.c	modified	+1	−4	View file
drivers/extcon/extcon-palmas.c	modified	+1	−2	View file
drivers/extcon/extcon-sm5502.c	added	+724	−0	View file
drivers/hv/channel.c	modified	+1	−5	View file
drivers/ipack/carriers/tpci200.c	modified	+1	−1	View file
drivers/ipack/devices/ipoctal.c	modified	+10	−10	View file
drivers/mfd/Kconfig	modified	+1	−0	View file
drivers/mfd/Makefile	modified	+1	−1	View file
drivers/mfd/max77693-irq.c	deleted	+0	−336	View before deletion
drivers/mfd/max77693.c	modified	+147	−63	View file
drivers/misc/bh1770glc.c	modified	+14	−21	View file
drivers/misc/bh1780gli.c	modified	+9	−24	View file
drivers/misc/carma/carma-fpga.c	modified	+1	−4	View file
drivers/misc/dummy-irq.c	modified	+1	−0	View file
drivers/misc/genwqe/Kconfig	modified	+6	−0	View file
drivers/misc/genwqe/card_base.c	modified	+202	−15	View file
drivers/misc/genwqe/card_base.h	modified	+2	−0	View file
drivers/misc/genwqe/card_ddcb.c	modified	+20	−8	View file
drivers/misc/genwqe/card_debugfs.c	modified	+7	−0	View file
drivers/misc/genwqe/card_dev.c	modified	+5	−0	View file
drivers/misc/genwqe/card_sysfs.c	modified	+25	−0	View file
drivers/misc/genwqe/card_utils.c	modified	+16	−4	View file
drivers/misc/genwqe/genwqe_driver.h	modified	+1	−1	View file
drivers/misc/lattice-ecp3-config.c	modified	+9	−7	View file
drivers/misc/lkdtm.c	modified	+1	−0	View file
drivers/misc/mei/client.c	modified	+7	−10	View file
drivers/misc/mei/hw-me-regs.h	modified	+1	−0	View file
drivers/misc/mei/hw-me.c	modified	+0	−54	View file
drivers/misc/mei/hw-txe.c	modified	+0	−32	View file
drivers/misc/mei/main.c	modified	+121	−27	View file
drivers/misc/mei/mei_dev.h	modified	+8	−4	View file
drivers/misc/mei/pci-me.c	modified	+3	−3	View file
drivers/misc/mei/pci-txe.c	modified	+2	−2	View file
drivers/misc/mic/Kconfig	modified	+19	−2	View file
drivers/misc/mic/Makefile	modified	+1	−0	View file
drivers/misc/mic/bus/Makefile	added	+5	−0	View file
drivers/misc/mic/bus/mic_bus.c	added	+218	−0	View file
drivers/misc/mic/card/mic_device.c	modified	+13	−10	View file
drivers/misc/mic/card/mic_device.h	modified	+7	−2	View file
drivers/misc/mic/card/mic_virtio.c	modified	+4	−3	View file
drivers/misc/mic/card/mic_x100.c	modified	+56	−6	View file
drivers/misc/mic/host/mic_boot.c	modified	+82	−1	View file
drivers/misc/mic/host/mic_device.h	modified	+24	−0	View file
drivers/misc/mic/host/mic_intr.c	modified	+72	−49	View file
drivers/misc/mic/host/mic_intr.h	modified	+19	−8	View file
drivers/misc/mic/host/mic_main.c	modified	+4	−3	View file
drivers/misc/mic/host/mic_virtio.c	modified	+149	−38	View file
drivers/misc/mic/host/mic_virtio.h	modified	+19	−2	View file
drivers/misc/mic/host/mic_x100.c	modified	+8	−0	View file
drivers/misc/ti-st/st_kim.c	modified	+4	−4	View file
drivers/misc/vexpress-syscfg.c	modified	+2	−2	View file
drivers/misc/vmw_vmci/vmci_guest.c	modified	+1	−1	View file
drivers/pci/pci-driver.c	modified	+14	−4	View file
drivers/pci/quirks.c	modified	+104	−0	View file
drivers/pcmcia/Kconfig	modified	+1	−1	View file
drivers/pcmcia/Makefile	modified	+1	−0	View file
drivers/pcmcia/bcm63xx_pcmcia.c	modified	+1	−1	View file
drivers/pcmcia/i82092.c	modified	+1	−1	View file
drivers/pcmcia/pd6729.c	modified	+1	−1	View file
drivers/pcmcia/sa1111_jornada720.c	modified	+6	−4	View file
drivers/pcmcia/vrc4173_cardu.c	modified	+1	−1	View file
drivers/pcmcia/yenta_socket.c	modified	+1	−1	View file
drivers/regulator/max77693.c	modified	+6	−6	View file
drivers/spmi/spmi.c	modified	+0	−1	View file
drivers/thunderbolt/Kconfig	added	+13	−0	View file
drivers/thunderbolt/Makefile	added	+3	−0	View file
drivers/thunderbolt/cap.c	added	+116	−0	View file
drivers/thunderbolt/ctl.c	added	+731	−0	View file
drivers/thunderbolt/ctl.h	added	+75	−0	View file
drivers/thunderbolt/eeprom.c	added	+449	−0	View file
drivers/thunderbolt/nhi.c	added	+675	−0	View file
drivers/thunderbolt/nhi.h	added	+114	−0	View file
drivers/thunderbolt/nhi_regs.h	added	+101	−0	View file
drivers/thunderbolt/path.c	added	+215	−0	View file
drivers/thunderbolt/switch.c	added	+507	−0	View file
drivers/thunderbolt/tb.c	added	+436	−0	View file
drivers/thunderbolt/tb.h	added	+271	−0	View file
drivers/thunderbolt/tb_regs.h	added	+213	−0	View file
drivers/thunderbolt/tunnel_pci.c	added	+232	−0	View file
drivers/thunderbolt/tunnel_pci.h	added	+30	−0	View file
drivers/uio/uio_pruss.c	modified	+19	−18	View file
drivers/vme/bridges/vme_ca91cx42.h	modified	+0	−1	View file
drivers/w1/masters/ds1wm.c	modified	+1	−1	View file
drivers/w1/masters/ds2482.c	modified	+1	−1	View file
drivers/w1/masters/ds2490.c	modified	+25	−25	View file
drivers/w1/masters/mxc_w1.c	modified	+35	−29	View file
drivers/w1/slaves/Kconfig	modified	+8	−0	View file
drivers/w1/slaves/Makefile	modified	+1	−0	View file
drivers/w1/slaves/w1_ds2406.c	added	+168	−0	View file
drivers/w1/slaves/w1_ds2760.c	modified	+1	−2	View file
drivers/w1/w1.c	modified	+4	−6	View file
drivers/w1/w1_family.c	modified	+1	−1	View file
drivers/w1/w1_family.h	modified	+1	−0	View file
drivers/w1/w1_int.c	modified	+9	−10	View file
drivers/w1/w1_log.h	modified	+2	−2	View file
drivers/w1/w1_netlink.c	modified	+1	−2	View file
include/asm-generic/vmlinux.lds.h	modified	+3	−0	View file
include/linux/extcon/sm5502.h	added	+287	−0	View file
include/linux/mfd/arizona/pdata.h	modified	+3	−0	View file
include/linux/mfd/max77693-private.h	modified	+44	−10	View file
include/linux/mic_bus.h	added	+110	−0	View file
include/linux/pci.h	modified	+11	−1	View file
include/uapi/linux/genwqe/genwqe_card.h	modified	+1	−0	View file
include/uapi/linux/i8k.h	modified	+2	−1	View file
tools/hv/hv_fcopy_daemon.c	modified	+2	−1	View file
tools/testing/selftests/Makefile	modified	+18	−0	View file
tools/testing/selftests/README.txt	modified	+23	−4	View file
tools/testing/selftests/cpu-hotplug/Makefile	modified	+3	−0	View file
tools/testing/selftests/cpu-hotplug/on-off-test.sh	modified	+50	−2	View file
tools/testing/selftests/kcmp/kcmp_test.c	modified	+1	−1	View file
tools/testing/selftests/memory-hotplug/Makefile	modified	+3	−0	View file
tools/testing/selftests/memory-hotplug/on-off-test.sh	modified	+8	−0	View file
tools/testing/selftests/mqueue/Makefile	modified	+2	−2	View file
tools/testing/selftests/mqueue/mq_open_tests.c	modified	+14	−6	View file
tools/testing/selftests/mqueue/mq_perf_tests.c	modified	+21	−19	View file

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

Documentation/ABI/testing/sysfs-class-mei

View file

diff --git a/Documentation/ABI/testing/sysfs-class-mei b/Documentation/ABI/testing/sysfs-class-mei
new file mode 100644
index 0000000..0ec8b81
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-class-mei
@@ -0,0 +1,16 @@
+What:		/sys/class/mei/
+Date:		May 2014
+KernelVersion:	3.17
+Contact:	Tomas Winkler <[email protected]>
+Description:
+		The mei/ class sub-directory belongs to mei device class
+
+
+What:		/sys/class/mei/meiN/
+Date:		May 2014
+KernelVersion:	3.17
+Contact:	Tomas Winkler <[email protected]>
+Description:
+		The /sys/class/mei/meiN directory is created for
+		each probed mei device
+

Documentation/ABI/testing/sysfs-driver-genwqe

View file

diff --git a/Documentation/ABI/testing/sysfs-driver-genwqe b/Documentation/ABI/testing/sysfs-driver-genwqe
index 1870737..64ac6d5 100644
--- a/Documentation/ABI/testing/sysfs-driver-genwqe
+++ b/Documentation/ABI/testing/sysfs-driver-genwqe
@@ -25,6 +25,15 @@ Date:           Oct 2013
 Contact:        [email protected]
 Description:    Interface to set the next bitstream to be used.
 
+What:           /sys/class/genwqe/genwqe<n>_card/reload_bitstream
+Date:           May 2014
+Contact:        [email protected]
+Description:    Interface to trigger a PCIe card reset to reload the bitstream.
+                  sudo sh -c 'echo 1 > \
+                    /sys/class/genwqe/genwqe0_card/reload_bitstream'
+                If successfully, the card will come back with the bitstream set
+                on 'next_bitstream'.
+
 What:           /sys/class/genwqe/genwqe<n>_card/tempsens
 Date:           Oct 2013
 Contact:        [email protected]

Documentation/devicetree/bindings/extcon/extcon-sm5502.txt

View file

diff --git a/Documentation/devicetree/bindings/extcon/extcon-sm5502.txt b/Documentation/devicetree/bindings/extcon/extcon-sm5502.txt
new file mode 100644
index 0000000..4ecda22
--- /dev/null
+++ b/Documentation/devicetree/bindings/extcon/extcon-sm5502.txt
@@ -0,0 +1,23 @@
+
+* SM5502 MUIC (Micro-USB Interface Controller) device
+
+The Silicon Mitus SM5502 is a MUIC (Micro-USB Interface Controller) device
+which can detect the state of external accessory when external accessory is
+attached or detached and button is pressed or released. It is interfaced to
+the host controller using an I2C interface.
+
+Required properties:
+- compatible: Should be "siliconmitus,sm5502-muic"
+- reg: Specifies the I2C slave address of the MUIC block. It should be 0x25
+- interrupt-parent: Specifies the phandle of the interrupt controller to which
+  the interrupts from sm5502 are delivered to.
+- interrupts: Interrupt specifiers for detection interrupt sources.
+
+Example:
+
+	sm5502@25 {
+		compatible = "siliconmitus,sm5502-muic";
+		interrupt-parent = <&gpx1>;
+		interrupts = <5 0>;
+		reg = <0x25>;
+	};

Documentation/mic/mic_overview.txt

View file

diff --git a/Documentation/mic/mic_overview.txt b/Documentation/mic/mic_overview.txt
index b419292..77c5418 100644
--- a/Documentation/mic/mic_overview.txt
+++ b/Documentation/mic/mic_overview.txt
@@ -17,35 +17,50 @@ for applications. A key benefit of our solution is that it leverages
 the standard virtio framework for network, disk and console devices,
 though in our case the virtio framework is used across a PCIe bus.
 
+MIC PCIe card has a dma controller with 8 channels. These channels are
+shared between the host s/w and the card s/w. 0 to 3 are used by host
+and 4 to 7 by card. As the dma device doesn't show up as PCIe device,
+a virtual bus called mic bus is created and virtual dma devices are
+created on it by the host/card drivers. On host the channels are private
+and used only by the host driver to transfer data for the virtio devices.
+
 Here is a block diagram of the various components described above. The
 virtio backends are situated on the host rather than the card given better
 single threaded performance for the host compared to MIC, the ability of
 the host to initiate DMA's to/from the card using the MIC DMA engine and
 the fact that the virtio block storage backend can only be on the host.
 
-                              |
-       +----------+           |             +----------+
-       | Card OS  |           |             | Host OS  |
-       +----------+           |             +----------+
-                              |
-+-------+ +--------+ +------+ | +---------+  +--------+ +--------+
-| Virtio| |Virtio  | |Virtio| | |Virtio   |  |Virtio  | |Virtio  |
-| Net   | |Console | |Block | | |Net      |  |Console | |Block   |
-| Driver| |Driver  | |Driver| | |backend  |  |backend | |backend |
-+-------+ +--------+ +------+ | +---------+  +--------+ +--------+
-    |         |         |     |      |            |         |
-    |         |         |     |User  |            |         |
-    |         |         |     |------|------------|---------|-------
-    +-------------------+     |Kernel +--------------------------+
-              |               |       | Virtio over PCIe IOCTLs  |
-              |               |       +--------------------------+
-      +--------------+        |                   |
-      |Intel MIC     |        |            +---------------+
-      |Card Driver   |        |            |Intel MIC      |
-      +--------------+        |            |Host Driver    |
-              |               |            +---------------+
-              |               |                   |
-     +-------------------------------------------------------------+
-     |                                                             |
-     |                    PCIe Bus                                 |
-     +-------------------------------------------------------------+
+                                      |
+               +----------+           |             +----------+
+               | Card OS  |           |             | Host OS  |
+               +----------+           |             +----------+
+                                      |
+        +-------+ +--------+ +------+ | +---------+  +--------+ +--------+
+        | Virtio| |Virtio  | |Virtio| | |Virtio   |  |Virtio  | |Virtio  |
+        | Net   | |Console | |Block | | |Net      |  |Console | |Block   |
+        | Driver| |Driver  | |Driver| | |backend  |  |backend | |backend |
+        +-------+ +--------+ +------+ | +---------+  +--------+ +--------+
+            |         |         |     |      |            |         |
+            |         |         |     |User  |            |         |
+            |         |         |     |------|------------|---------|-------
+            +-------------------+     |Kernel +--------------------------+
+                      |               |       | Virtio over PCIe IOCTLs  |
+                      |               |       +--------------------------+
++-----------+         |               |                   |  +-----------+
+| MIC DMA   |         |               |                   |  | MIC DMA   |
+| Driver    |         |               |                   |  | Driver    |
++-----------+         |               |                   |  +-----------+
+      |               |               |                   |        |
++---------------+     |               |                   |  +----------------+
+|MIC virtual Bus|     |               |                   |  |MIC virtual Bus |
++---------------+     |               |                   |  +----------------+
+      |               |               |                   |              |
+      |   +--------------+            |            +---------------+     |
+      |   |Intel MIC     |            |            |Intel MIC      |     |
+      +---|Card Driver   |            |            |Host Driver    |     |
+          +--------------+            |            +---------------+-----+
+                      |               |                   |
+             +-------------------------------------------------------------+
+             |                                                             |
+             |                    PCIe Bus                                 |
+             +-------------------------------------------------------------+

Documentation/mic/mpssd/mpss

View file

diff --git a/Documentation/mic/mpssd/mpss b/Documentation/mic/mpssd/mpss
index 3136c68..cacbdb0 100755
--- a/Documentation/mic/mpssd/mpss
+++ b/Documentation/mic/mpssd/mpss
@@ -48,18 +48,18 @@ start()
 	fi
 
 	echo -e $"Starting MPSS Stack"
-	echo -e $"Loading MIC_HOST Module"
+	echo -e $"Loading MIC_X100_DMA & MIC_HOST Modules"
 
-	# Ensure the driver is loaded
-	if [ ! -d "$sysfs" ]; then
-		modprobe mic_host
+	for f in "mic_host" "mic_x100_dma"
+	do
+		modprobe $f
 		RETVAL=$?
 		if [ $RETVAL -ne 0 ]; then
 			failure
 			echo
 			return $RETVAL
 		fi
-	fi
+	done
 
 	# Start the daemon
 	echo -n $"Starting MPSSD "
@@ -170,8 +170,8 @@ unload()
 	stop
 
 	sleep 5
-	echo -n $"Removing MIC_HOST Module: "
-	modprobe -r mic_host
+	echo -n $"Removing MIC_HOST & MIC_X100_DMA Modules: "
+	modprobe -r mic_host mic_x100_dma
 	RETVAL=$?
 	[ $RETVAL -ne 0 ] && failure || success
 	echo

Documentation/w1/slaves/w1_ds2406

View file

diff --git a/Documentation/w1/slaves/w1_ds2406 b/Documentation/w1/slaves/w1_ds2406
new file mode 100644
index 0000000..8137fe6
--- /dev/null
+++ b/Documentation/w1/slaves/w1_ds2406
@@ -0,0 +1,25 @@
+w1_ds2406 kernel driver
+=======================
+
+Supported chips:
+  * Maxim DS2406 (and other family 0x12) addressable switches
+
+Author: Scott Alfter <[email protected]>
+
+Description
+-----------
+
+The w1_ds2406 driver allows connected devices to be switched on and off. 
+These chips also provide 128 bytes of OTP EPROM, but reading/writing it is
+not supported.  In TSOC-6 form, the DS2406 provides two switch outputs and
+can be provided with power on a dedicated input.  In TO-92 form, it provides
+one output and uses parasitic power only.
+
+The driver provides two sysfs files.  state is readable; it gives the
+current state of each switch, with PIO A in bit 0 and PIO B in bit 1.  The
+driver ORs this state with 0x30, so shell scripts get an ASCII 0/1/2/3 to
+work with.  output is writable; bits 0 and 1 control PIO A and B,
+respectively.  Bits 2-7 are ignored, so it's safe to write ASCII data.
+
+CRCs are checked on read and write.  Failed checks cause an I/O error to be
+returned.  On a failed write, the switch status is not changed.

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index 1acc624..211389b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7844,6 +7844,11 @@ S:	Maintained
 F:	include/linux/mmc/dw_mmc.h
 F:	drivers/mmc/host/dw_mmc*
 
+THUNDERBOLT DRIVER
+M:	Andreas Noever <[email protected]>
+S:	Maintained
+F:	drivers/thunderbolt/
+
 TIMEKEEPING, CLOCKSOURCE CORE, NTP
 M:	John Stultz <[email protected]>
 M:	Thomas Gleixner <[email protected]>

drivers/Kconfig

View file

diff --git a/drivers/Kconfig b/drivers/Kconfig
index 4e6e66c..622fa26 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -178,4 +178,6 @@ source "drivers/mcb/Kconfig"
 
 source "drivers/ras/Kconfig"
 
+source "drivers/thunderbolt/Kconfig"
+
 endmenu

drivers/Makefile

View file

diff --git a/drivers/Makefile b/drivers/Makefile
index 65c32b1..54bfae1 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -159,3 +159,4 @@ obj-$(CONFIG_FMC)		+= fmc/
 obj-$(CONFIG_POWERCAP)		+= powercap/
 obj-$(CONFIG_MCB)		+= mcb/
 obj-$(CONFIG_RAS)		+= ras/
+obj-$(CONFIG_THUNDERBOLT)	+= thunderbolt/

drivers/char/bsr.c

View file

diff --git a/drivers/char/bsr.c b/drivers/char/bsr.c
index 8fedbc2..a6cef54 100644
--- a/drivers/char/bsr.c
+++ b/drivers/char/bsr.c
@@ -259,7 +259,7 @@ static int bsr_add_node(struct device_node *bn)
 		}
 
 		cur->bsr_device = device_create(bsr_class, NULL, cur->bsr_dev,
-						cur, cur->bsr_name);
+						cur, "%s", cur->bsr_name);
 		if (IS_ERR(cur->bsr_device)) {
 			printk(KERN_ERR "device_create failed for %s\n",
 			       cur->bsr_name);

drivers/char/dsp56k.c

View file

diff --git a/drivers/char/dsp56k.c b/drivers/char/dsp56k.c
index 01a5ca7..8bf70e8 100644
--- a/drivers/char/dsp56k.c
+++ b/drivers/char/dsp56k.c
@@ -383,7 +383,7 @@ static long dsp56k_ioctl(struct file *file, unsigned int cmd,
 			return put_user(status, &hf->status);
 		}
 		case DSP56K_HOST_CMD:
-			if (arg > 31 || arg < 0)
+			if (arg > 31)
 				return -EINVAL;
 			mutex_lock(&dsp56k_mutex);
 			dsp56k_host_interface.cvr = (u_char)((arg & DSP56K_CVR_HV_MASK) |

drivers/char/i8k.c

View file

diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c
index 93dcad0..65525c7 100644
--- a/drivers/char/i8k.c
+++ b/drivers/char/i8k.c
@@ -65,6 +65,8 @@ static char bios_version[4];
 static struct device *i8k_hwmon_dev;
 static u32 i8k_hwmon_flags;
 static int i8k_fan_mult;
+static int i8k_pwm_mult;
+static int i8k_fan_max = I8K_FAN_HIGH;
 
 #define I8K_HWMON_HAVE_TEMP1	(1 << 0)
 #define I8K_HWMON_HAVE_TEMP2	(1 << 1)
@@ -97,6 +99,10 @@ static int fan_mult = I8K_FAN_MULT;
 module_param(fan_mult, int, 0);
 MODULE_PARM_DESC(fan_mult, "Factor to multiply fan speed with");
 
+static int fan_max = I8K_FAN_HIGH;
+module_param(fan_max, int, 0);
+MODULE_PARM_DESC(fan_max, "Maximum configurable fan speed");
+
 static int i8k_open_fs(struct inode *inode, struct file *file);
 static long i8k_ioctl(struct file *, unsigned int, unsigned long);
 
@@ -276,7 +282,7 @@ static int i8k_set_fan(int fan, int speed)
 {
 	struct smm_regs regs = { .eax = I8K_SMM_SET_FAN, };
 
-	speed = (speed < 0) ? 0 : ((speed > I8K_FAN_MAX) ? I8K_FAN_MAX : speed);
+	speed = (speed < 0) ? 0 : ((speed > i8k_fan_max) ? i8k_fan_max : speed);
 	regs.ebx = (fan & 0xff) | (speed << 8);
 
 	return i8k_smm(&regs) ? : i8k_get_fan_status(fan);
@@ -521,7 +527,7 @@ static ssize_t i8k_hwmon_show_pwm(struct device *dev,
 	status = i8k_get_fan_status(index);
 	if (status < 0)
 		return -EIO;
-	return sprintf(buf, "%d\n", clamp_val(status * 128, 0, 255));
+	return sprintf(buf, "%d\n", clamp_val(status * i8k_pwm_mult, 0, 255));
 }
 
 static ssize_t i8k_hwmon_set_pwm(struct device *dev,
@@ -535,7 +541,7 @@ static ssize_t i8k_hwmon_set_pwm(struct device *dev,
 	err = kstrtoul(buf, 10, &val);
 	if (err)
 		return err;
-	val = clamp_val(DIV_ROUND_CLOSEST(val, 128), 0, 2);
+	val = clamp_val(DIV_ROUND_CLOSEST(val, i8k_pwm_mult), 0, i8k_fan_max);
 
 	mutex_lock(&i8k_mutex);
 	err = i8k_set_fan(index, val);
@@ -544,20 +550,6 @@ static ssize_t i8k_hwmon_set_pwm(struct device *dev,
 	return err < 0 ? -EIO : count;
 }
 
-static ssize_t i8k_hwmon_show_label(struct device *dev,
-				    struct device_attribute *devattr,
-				    char *buf)
-{
-	static const char *labels[3] = {
-		"CPU",
-		"Left Fan",
-		"Right Fan",
-	};
-	int index = to_sensor_dev_attr(devattr)->index;
-
-	return sprintf(buf, "%s\n", labels[index]);
-}
-
 static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, i8k_hwmon_show_temp, NULL, 0);
 static SENSOR_DEVICE_ATTR(temp2_input, S_IRUGO, i8k_hwmon_show_temp, NULL, 1);
 static SENSOR_DEVICE_ATTR(temp3_input, S_IRUGO, i8k_hwmon_show_temp, NULL, 2);
@@ -570,41 +562,34 @@ static SENSOR_DEVICE_ATTR(fan2_input, S_IRUGO, i8k_hwmon_show_fan, NULL,
 			  I8K_FAN_RIGHT);
 static SENSOR_DEVICE_ATTR(pwm2, S_IRUGO | S_IWUSR, i8k_hwmon_show_pwm,
 			  i8k_hwmon_set_pwm, I8K_FAN_RIGHT);
-static SENSOR_DEVICE_ATTR(temp1_label, S_IRUGO, i8k_hwmon_show_label, NULL, 0);
-static SENSOR_DEVICE_ATTR(fan1_label, S_IRUGO, i8k_hwmon_show_label, NULL, 1);
-static SENSOR_DEVICE_ATTR(fan2_label, S_IRUGO, i8k_hwmon_show_label, NULL, 2);
 
 static struct attribute *i8k_attrs[] = {
 	&sensor_dev_attr_temp1_input.dev_attr.attr,	/* 0 */
-	&sensor_dev_attr_temp1_label.dev_attr.attr,	/* 1 */
-	&sensor_dev_attr_temp2_input.dev_attr.attr,	/* 2 */
-	&sensor_dev_attr_temp3_input.dev_attr.attr,	/* 3 */
-	&sensor_dev_attr_temp4_input.dev_attr.attr,	/* 4 */
-	&sensor_dev_attr_fan1_input.dev_attr.attr,	/* 5 */
-	&sensor_dev_attr_pwm1.dev_attr.attr,		/* 6 */
-	&sensor_dev_attr_fan1_label.dev_attr.attr,	/* 7 */
-	&sensor_dev_attr_fan2_input.dev_attr.attr,	/* 8 */
-	&sensor_dev_attr_pwm2.dev_attr.attr,		/* 9 */
-	&sensor_dev_attr_fan2_label.dev_attr.attr,	/* 10 */
+	&sensor_dev_attr_temp2_input.dev_attr.attr,	/* 1 */
+	&sensor_dev_attr_temp3_input.dev_attr.attr,	/* 2 */
+	&sensor_dev_attr_temp4_input.dev_attr.attr,	/* 3 */
+	&sensor_dev_attr_fan1_input.dev_attr.attr,	/* 4 */
+	&sensor_dev_attr_pwm1.dev_attr.attr,		/* 5 */
+	&sensor_dev_attr_fan2_input.dev_attr.attr,	/* 6 */
+	&sensor_dev_attr_pwm2.dev_attr.attr,		/* 7 */
 	NULL
 };
 
 static umode_t i8k_is_visible(struct kobject *kobj, struct attribute *attr,
 			      int index)
 {
-	if ((index == 0 || index == 1) &&
-	    !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP1))
+	if (index == 0 && !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP1))
 		return 0;
-	if (index == 2 && !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP2))
+	if (index == 1 && !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP2))
 		return 0;
-	if (index == 3 && !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP3))
+	if (index == 2 && !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP3))
 		return 0;
-	if (index == 4 && !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP4))
+	if (index == 3 && !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP4))
 		return 0;
-	if (index >= 5 && index <= 7 &&
+	if (index >= 4 && index <= 5 &&
 	    !(i8k_hwmon_flags & I8K_HWMON_HAVE_FAN1))
 		return 0;
-	if (index >= 8 && index <= 10 &&
+	if (index >= 6 && index <= 7 &&
 	    !(i8k_hwmon_flags & I8K_HWMON_HAVE_FAN2))
 		return 0;
 
@@ -659,6 +644,37 @@ static int __init i8k_init_hwmon(void)
 	return 0;
 }
 
+struct i8k_config_data {
+	int fan_mult;
+	int fan_max;
+};
+
+enum i8k_configs {
+	DELL_LATITUDE_D520,
+	DELL_PRECISION_490,
+	DELL_STUDIO,
+	DELL_XPS_M140,
+};
+
+static const struct i8k_config_data i8k_config_data[] = {
+	[DELL_LATITUDE_D520] = {
+		.fan_mult = 1,
+		.fan_max = I8K_FAN_TURBO,
+	},
+	[DELL_PRECISION_490] = {
+		.fan_mult = 1,
+		.fan_max = I8K_FAN_TURBO,
+	},
+	[DELL_STUDIO] = {
+		.fan_mult = 1,
+		.fan_max = I8K_FAN_HIGH,
+	},
+	[DELL_XPS_M140] = {
+		.fan_mult = 1,
+		.fan_max = I8K_FAN_HIGH,
+	},
+};
+
 static struct dmi_system_id i8k_dmi_table[] __initdata = {
 	{
 		.ident = "Dell Inspiron",
@@ -682,6 +698,14 @@ static struct dmi_system_id i8k_dmi_table[] __initdata = {
 		},
 	},
 	{
+		.ident = "Dell Latitude D520",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+			DMI_MATCH(DMI_PRODUCT_NAME, "Latitude D520"),
+		},
+		.driver_data = (void *)&i8k_config_data[DELL_LATITUDE_D520],
+	},
+	{
 		.ident = "Dell Latitude 2",
 		.matches = {
 			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
@@ -703,6 +727,15 @@ static struct dmi_system_id i8k_dmi_table[] __initdata = {
 		},
 	},
 	{
+		.ident = "Dell Precision 490",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+			DMI_MATCH(DMI_PRODUCT_NAME,
+				  "Precision WorkStation 490"),
+		},
+		.driver_data = (void *)&i8k_config_data[DELL_PRECISION_490],
+	},
+	{
 		.ident = "Dell Precision",
 		.matches = {
 			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
@@ -729,7 +762,7 @@ static struct dmi_system_id i8k_dmi_table[] __initdata = {
 			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
 			DMI_MATCH(DMI_PRODUCT_NAME, "Studio"),
 		},
-		.driver_data = (void *)1,	/* fan multiplier override */
+		.driver_data = (void *)&i8k_config_data[DELL_STUDIO],
 	},
 	{
 		.ident = "Dell XPS M140",
@@ -737,7 +770,7 @@ static struct dmi_system_id i8k_dmi_table[] __initdata = {
 			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
 			DMI_MATCH(DMI_PRODUCT_NAME, "MXC051"),
 		},
-		.driver_data = (void *)1,	/* fan multiplier override */
+		.driver_data = (void *)&i8k_config_data[DELL_XPS_M140],
 	},
 	{ }
 };
@@ -777,9 +810,17 @@ static int __init i8k_probe(void)
 	}
 
 	i8k_fan_mult = fan_mult;
+	i8k_fan_max = fan_max ? : I8K_FAN_HIGH;	/* Must not be 0 */
 	id = dmi_first_match(i8k_dmi_table);
-	if (id && fan_mult == I8K_FAN_MULT && id->driver_data)
-		i8k_fan_mult = (unsigned long)id->driver_data;
+	if (id && id->driver_data) {
+		const struct i8k_config_data *conf = id->driver_data;
+
+		if (fan_mult == I8K_FAN_MULT && conf->fan_mult)
+			i8k_fan_mult = conf->fan_mult;
+		if (fan_max == I8K_FAN_HIGH && conf->fan_max)
+			i8k_fan_max = conf->fan_max;
+	}
+	i8k_pwm_mult = DIV_ROUND_UP(255, i8k_fan_max);
 
 	return 0;
 }

drivers/char/xilinx_hwicap/xilinx_hwicap.c

View file

diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.c b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
index f6345f9..9b1a5ac 100644
--- a/drivers/char/xilinx_hwicap/xilinx_hwicap.c
+++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
@@ -661,6 +661,7 @@ static int hwicap_setup(struct device *dev, int id,
 	drvdata->base_address = ioremap(drvdata->mem_start, drvdata->mem_size);
 	if (!drvdata->base_address) {
 		dev_err(dev, "ioremap() failed\n");
+		retval = -ENOMEM;
 		goto failed2;
 	}
 

drivers/dma/Kconfig

View file

diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index 1eca7b9..8f6afbf 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -33,6 +33,24 @@ if DMADEVICES
 
 comment "DMA Devices"
 
+config INTEL_MIC_X100_DMA
+	tristate "Intel MIC X100 DMA Driver"
+	depends on 64BIT && X86 && INTEL_MIC_BUS
+	select DMA_ENGINE
+	help
+	  This enables DMA support for the Intel Many Integrated Core
+	  (MIC) family of PCIe form factor coprocessor X100 devices that
+	  run a 64 bit Linux OS. This driver will be used by both MIC
+	  host and card drivers.
+
+	  If you are building host kernel with a MIC device or a card
+	  kernel for a MIC device, then say M (recommended) or Y, else
+	  say N. If unsure say N.
+
+	  More information about the Intel MIC family as well as the Linux
+	  OS and tools for MIC to use with this driver are available from
+	  <http://software.intel.com/en-us/mic-developer>.
+
 config INTEL_MID_DMAC
 	tristate "Intel MID DMA support for Peripheral DMA controllers"
 	depends on PCI && X86

drivers/dma/Makefile

View file

diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile
index c779e1e..bd9e7fa 100644
--- a/drivers/dma/Makefile
+++ b/drivers/dma/Makefile
@@ -47,3 +47,4 @@ obj-$(CONFIG_MOXART_DMA) += moxart-dma.o
 obj-$(CONFIG_FSL_EDMA) += fsl-edma.o
 obj-$(CONFIG_QCOM_BAM_DMA) += qcom_bam_dma.o
 obj-y += xilinx/
+obj-$(CONFIG_INTEL_MIC_X100_DMA) += mic_x100_dma.o

drivers/dma/mic_x100_dma.c

View file

diff --git a/drivers/dma/mic_x100_dma.c b/drivers/dma/mic_x100_dma.c
new file mode 100644
index 0000000..6de2e67
--- /dev/null
+++ b/drivers/dma/mic_x100_dma.c
@@ -0,0 +1,774 @@
+/*
+ * Intel MIC Platform Software Stack (MPSS)
+ *
+ * Copyright(c) 2014 Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * The full GNU General Public License is included in this distribution in
+ * the file called "COPYING".
+ *
+ * Intel MIC X100 DMA Driver.
+ *
+ * Adapted from IOAT dma driver.
+ */
+#include <linux/module.h>
+#include <linux/io.h>
+#include <linux/seq_file.h>
+
+#include "mic_x100_dma.h"