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

Commit 9f67627a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

  Lots of little things, and a new "big" driver, genwqe.  Full details
  are in the shortlog"

* tag 'char-misc-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (90 commits)
  mei: limit the number of consecutive resets
  mei: revamp mei reset state machine
  drivers/char: don't use module_init in non-modular ttyprintk.c
  VMCI: fix error handling path when registering guest driver
  extcon: gpio: Add power resume support
  Documentation: HOWTO: Updates on subsystem trees, patchwork, -next (vs. -mm) in ko_KR
  Documentation: HOWTO: update for 2.6.x -> 3.x versioning in ko_KR
  Documentation: HOWTO: update stable address in ko_KR
  Documentation: HOWTO: update LXR web link in ko_KR
  char: nwbutton: open-code interruptible_sleep_on
  mei: fix syntax in comments and debug output
  mei: nfc: mei_nfc_free has to be called under lock
  mei: use hbm idle state to prevent spurious resets
  mei: do not run reset flow from the interrupt thread
  misc: genwqe: fix return value check in genwqe_device_create()
  GenWQE: Fix warnings for sparc
  GenWQE: Fix compile problems for Alpha
  Documentation/misc-devices/mei/mei-amt-version.c: remove unneeded call of mei_deinit()
  GenWQE: Rework return code for flash-update ioctl
  sgi-xp: open-code interruptible_sleep_on_timeout
  ...
parents 82b51734 6adb8efb

Documentation/ABI/testing/debugfs-driver-genwqe

0 → 100644
+91 −0
Original line number Diff line number Diff line 
What:           /sys/kernel/debug/genwqe/genwqe<n>_card/ddcb_info

Date:           Oct 2013

Contact:        haver@linux.vnet.ibm.com

Description:    DDCB queue dump used for debugging queueing problems.



What:           /sys/kernel/debug/genwqe/genwqe<n>_card/curr_regs

Date:           Oct 2013

Contact:        haver@linux.vnet.ibm.com

Description:    Dump of the current error registers.

                Only available for PF.



What:           /sys/kernel/debug/genwqe/genwqe<n>_card/curr_dbg_uid0

Date:           Oct 2013

Contact:        haver@linux.vnet.ibm.com

Description:    Internal chip state of UID0 (unit id 0).

                Only available for PF.



What:           /sys/kernel/debug/genwqe/genwqe<n>_card/curr_dbg_uid1

Date:           Oct 2013

Contact:        haver@linux.vnet.ibm.com

Description:    Internal chip state of UID1.

                Only available for PF.



What:           /sys/kernel/debug/genwqe/genwqe<n>_card/curr_dbg_uid2

Date:           Oct 2013

Contact:        haver@linux.vnet.ibm.com

Description:    Internal chip state of UID2.

                Only available for PF.



What:           /sys/kernel/debug/genwqe/genwqe<n>_card/prev_regs

Date:           Oct 2013

Contact:        haver@linux.vnet.ibm.com

Description:    Dump of the error registers before the last reset of

                the card occured.

                Only available for PF.



What:           /sys/kernel/debug/genwqe/genwqe<n>_card/prev_dbg_uid0

Date:           Oct 2013

Contact:        haver@linux.vnet.ibm.com

Description:    Internal chip state of UID0 before card was reset.

                Only available for PF.



What:           /sys/kernel/debug/genwqe/genwqe<n>_card/prev_dbg_uid1

Date:           Oct 2013

Contact:        haver@linux.vnet.ibm.com

Description:    Internal chip state of UID1 before card was reset.

                Only available for PF.



What:           /sys/kernel/debug/genwqe/genwqe<n>_card/prev_dbg_uid2

Date:           Oct 2013

Contact:        haver@linux.vnet.ibm.com

Description:    Internal chip state of UID2 before card was reset.

                Only available for PF.



What:           /sys/kernel/debug/genwqe/genwqe<n>_card/info

Date:           Oct 2013

Contact:        haver@linux.vnet.ibm.com

Description:    Comprehensive summary of bitstream version and software

                version. Used bitstream and bitstream clocking information.



What:           /sys/kernel/debug/genwqe/genwqe<n>_card/err_inject

Date:           Oct 2013

Contact:        haver@linux.vnet.ibm.com

Description:    Possibility to inject error cases to ensure that the drivers

                error handling code works well.



What:           /sys/kernel/debug/genwqe/genwqe<n>_card/vf<0..14>_jobtimeout_msec

Date:           Oct 2013

Contact:        haver@linux.vnet.ibm.com

Description:    Default VF timeout 250ms. Testing might require 1000ms.

                Using 0 will use the cards default value (whatever that is).



                The timeout depends on the max number of available cards

                in the system and the maximum allowed queue size.



                The driver ensures that the settings are done just before

                the VFs get enabled. Changing the timeouts in flight is not

                possible.

                Only available for PF.



What:           /sys/kernel/debug/genwqe/genwqe<n>_card/jobtimer

Date:           Oct 2013

Contact:        haver@linux.vnet.ibm.com

Description:    Dump job timeout register values for PF and VFs.

                Only available for PF.



What:           /sys/kernel/debug/genwqe/genwqe<n>_card/queue_working_time

Date:           Dec 2013

Contact:        haver@linux.vnet.ibm.com

Description:    Dump queue working time register values for PF and VFs.

                Only available for PF.

Documentation/ABI/testing/sysfs-driver-genwqe

0 → 100644
+62 −0
Original line number Diff line number Diff line 
What:           /sys/class/genwqe/genwqe<n>_card/version

Date:           Oct 2013

Contact:        haver@linux.vnet.ibm.com

Description:    Unique bitstream identification e.g.

                '0000000330336283.00000000475a4950'.



What:           /sys/class/genwqe/genwqe<n>_card/appid

Date:           Oct 2013

Contact:        haver@linux.vnet.ibm.com

Description:    Identifies the currently active card application e.g. 'GZIP'

                for compression/decompression.



What:           /sys/class/genwqe/genwqe<n>_card/type

Date:           Oct 2013

Contact:        haver@linux.vnet.ibm.com

Description:    Type of the card e.g. 'GenWQE5-A7'.



What:           /sys/class/genwqe/genwqe<n>_card/curr_bitstream

Date:           Oct 2013

Contact:        haver@linux.vnet.ibm.com

Description:    Currently active bitstream. 1 is default, 0 is backup.



What:           /sys/class/genwqe/genwqe<n>_card/next_bitstream

Date:           Oct 2013

Contact:        haver@linux.vnet.ibm.com

Description:    Interface to set the next bitstream to be used.



What:           /sys/class/genwqe/genwqe<n>_card/tempsens

Date:           Oct 2013

Contact:        haver@linux.vnet.ibm.com

Description:    Interface to read the cards temperature sense register.



What:           /sys/class/genwqe/genwqe<n>_card/freerunning_timer

Date:           Oct 2013

Contact:        haver@linux.vnet.ibm.com

Description:    Interface to read the cards free running timer.

                Used for performance and utilization measurements.



What:           /sys/class/genwqe/genwqe<n>_card/queue_working_time

Date:           Oct 2013

Contact:        haver@linux.vnet.ibm.com

Description:    Interface to read queue working time.

                Used for performance and utilization measurements.



What:           /sys/class/genwqe/genwqe<n>_card/state

Date:           Oct 2013

Contact:        haver@linux.vnet.ibm.com

Description:    State of the card: "unused", "used", "error".



What:           /sys/class/genwqe/genwqe<n>_card/base_clock

Date:           Oct 2013

Contact:        haver@linux.vnet.ibm.com

Description:    Base clock frequency of the card.



What:           /sys/class/genwqe/genwqe<n>_card/device/sriov_numvfs

Date:           Oct 2013

Contact:        haver@linux.vnet.ibm.com

Description:    Enable VFs (1..15):

                  sudo sh -c 'echo 15 > \

                    /sys/bus/pci/devices/0000\:1b\:00.0/sriov_numvfs'

                Disable VFs:

                  Write a 0 into the same sysfs entry.

Documentation/HOWTO

+2 −2
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ required reading: 


    Other excellent descriptions of how to create patches properly are:

	"The Perfect Patch"

		http://kerneltrap.org/node/3737

		http://www.ozlabs.org/~akpm/stuff/tpp.txt

	"Linux kernel patch submission format"

		http://linux.yyz.us/patch-format.html
@@ -579,7 +579,7 @@ all time. It should describe the patch completely, containing: 
For more details on what this should all look like, please see the

ChangeLog section of the document:

  "The Perfect Patch"

      http://userweb.kernel.org/~akpm/stuff/tpp.txt

      http://www.ozlabs.org/~akpm/stuff/tpp.txt

Documentation/devicetree/bindings/arm/atmel-at91.txt

+8 −0
Original line number Diff line number Diff line
@@ -20,6 +20,10 @@ TC/TCLIB Timer required properties: 
- interrupts: Should contain all interrupts for the TC block

  Note that you can specify several interrupt cells if the TC

  block has one interrupt per channel.

- clock-names: tuple listing input clock names.

	Required elements: "t0_clk"

	Optional elements: "t1_clk", "t2_clk"

- clocks: phandles to input clocks.



Examples:
@@ -28,6 +32,8 @@ One interrupt per TC block: 
		compatible = "atmel,at91rm9200-tcb";

		reg = <0xfff7c000 0x100>;

		interrupts = <18 4>;

		clocks = <&tcb0_clk>;

		clock-names = "t0_clk";

	};



One interrupt per TC channel in a TC block:
@@ -35,6 +41,8 @@ One interrupt per TC channel in a TC block: 
		compatible = "atmel,at91rm9200-tcb";

		reg = <0xfffdc000 0x100>;

		interrupts = <26 4 27 4 28 4>;

		clocks = <&tcb1_clk>;

		clock-names = "t0_clk";

	};



RSTC Reset Controller required properties:

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

+5 −1
Original line number Diff line number Diff line
@@ -2,7 +2,11 @@ EXTCON FOR PALMAS/TWL CHIPS 


PALMAS USB COMPARATOR

Required Properties:

 - compatible : Should be "ti,palmas-usb" or "ti,twl6035-usb"

 - compatible: should contain one of:

   * "ti,palmas-usb-vid".

   * "ti,twl6035-usb-vid".

   * "ti,palmas-usb" (DEPRECATED - use "ti,palmas-usb-vid").

   * "ti,twl6035-usb" (DEPRECATED - use "ti,twl6035-usb-vid").



Optional Properties:

 - ti,wakeup : To enable the wakeup comparator in probe