Skip to content

Commit 9f67627

Browse files
torvaldstorvalds
committed
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 ...
2 parents 82b5173 + 6adb8ef commit 9f67627

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+9170
-675
lines changed

‎Documentation/ABI/testing/debugfs-driver-genwqe

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
What: /sys/kernel/debug/genwqe/genwqe<n>_card/ddcb_info
2+
Date: Oct 2013
3+
Contact: haver@linux.vnet.ibm.com
4+
Description: DDCB queue dump used for debugging queueing problems.
5+
6+
What: /sys/kernel/debug/genwqe/genwqe<n>_card/curr_regs
7+
Date: Oct 2013
8+
Contact: haver@linux.vnet.ibm.com
9+
Description: Dump of the current error registers.
10+
Only available for PF.
11+
12+
What: /sys/kernel/debug/genwqe/genwqe<n>_card/curr_dbg_uid0
13+
Date: Oct 2013
14+
Contact: haver@linux.vnet.ibm.com
15+
Description: Internal chip state of UID0 (unit id 0).
16+
Only available for PF.
17+
18+
What: /sys/kernel/debug/genwqe/genwqe<n>_card/curr_dbg_uid1
19+
Date: Oct 2013
20+
Contact: haver@linux.vnet.ibm.com
21+
Description: Internal chip state of UID1.
22+
Only available for PF.
23+
24+
What: /sys/kernel/debug/genwqe/genwqe<n>_card/curr_dbg_uid2
25+
Date: Oct 2013
26+
Contact: haver@linux.vnet.ibm.com
27+
Description: Internal chip state of UID2.
28+
Only available for PF.
29+
30+
What: /sys/kernel/debug/genwqe/genwqe<n>_card/prev_regs
31+
Date: Oct 2013
32+
Contact: haver@linux.vnet.ibm.com
33+
Description: Dump of the error registers before the last reset of
34+
the card occured.
35+
Only available for PF.
36+
37+
What: /sys/kernel/debug/genwqe/genwqe<n>_card/prev_dbg_uid0
38+
Date: Oct 2013
39+
Contact: haver@linux.vnet.ibm.com
40+
Description: Internal chip state of UID0 before card was reset.
41+
Only available for PF.
42+
43+
What: /sys/kernel/debug/genwqe/genwqe<n>_card/prev_dbg_uid1
44+
Date: Oct 2013
45+
Contact: haver@linux.vnet.ibm.com
46+
Description: Internal chip state of UID1 before card was reset.
47+
Only available for PF.
48+
49+
What: /sys/kernel/debug/genwqe/genwqe<n>_card/prev_dbg_uid2
50+
Date: Oct 2013
51+
Contact: haver@linux.vnet.ibm.com
52+
Description: Internal chip state of UID2 before card was reset.
53+
Only available for PF.
54+
55+
What: /sys/kernel/debug/genwqe/genwqe<n>_card/info
56+
Date: Oct 2013
57+
Contact: haver@linux.vnet.ibm.com
58+
Description: Comprehensive summary of bitstream version and software
59+
version. Used bitstream and bitstream clocking information.
60+
61+
What: /sys/kernel/debug/genwqe/genwqe<n>_card/err_inject
62+
Date: Oct 2013
63+
Contact: haver@linux.vnet.ibm.com
64+
Description: Possibility to inject error cases to ensure that the drivers
65+
error handling code works well.
66+
67+
What: /sys/kernel/debug/genwqe/genwqe<n>_card/vf<0..14>_jobtimeout_msec
68+
Date: Oct 2013
69+
Contact: haver@linux.vnet.ibm.com
70+
Description: Default VF timeout 250ms. Testing might require 1000ms.
71+
Using 0 will use the cards default value (whatever that is).
72+
73+
The timeout depends on the max number of available cards
74+
in the system and the maximum allowed queue size.
75+
76+
The driver ensures that the settings are done just before
77+
the VFs get enabled. Changing the timeouts in flight is not
78+
possible.
79+
Only available for PF.
80+
81+
What: /sys/kernel/debug/genwqe/genwqe<n>_card/jobtimer
82+
Date: Oct 2013
83+
Contact: haver@linux.vnet.ibm.com
84+
Description: Dump job timeout register values for PF and VFs.
85+
Only available for PF.
86+
87+
What: /sys/kernel/debug/genwqe/genwqe<n>_card/queue_working_time
88+
Date: Dec 2013
89+
Contact: haver@linux.vnet.ibm.com
90+
Description: Dump queue working time register values for PF and VFs.
91+
Only available for PF.

‎Documentation/ABI/testing/sysfs-driver-genwqe

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
What: /sys/class/genwqe/genwqe<n>_card/version
2+
Date: Oct 2013
3+
Contact: haver@linux.vnet.ibm.com
4+
Description: Unique bitstream identification e.g.
5+
'0000000330336283.00000000475a4950'.
6+
7+
What: /sys/class/genwqe/genwqe<n>_card/appid
8+
Date: Oct 2013
9+
Contact: haver@linux.vnet.ibm.com
10+
Description: Identifies the currently active card application e.g. 'GZIP'
11+
for compression/decompression.
12+
13+
What: /sys/class/genwqe/genwqe<n>_card/type
14+
Date: Oct 2013
15+
Contact: haver@linux.vnet.ibm.com
16+
Description: Type of the card e.g. 'GenWQE5-A7'.
17+
18+
What: /sys/class/genwqe/genwqe<n>_card/curr_bitstream
19+
Date: Oct 2013
20+
Contact: haver@linux.vnet.ibm.com
21+
Description: Currently active bitstream. 1 is default, 0 is backup.
22+
23+
What: /sys/class/genwqe/genwqe<n>_card/next_bitstream
24+
Date: Oct 2013
25+
Contact: haver@linux.vnet.ibm.com
26+
Description: Interface to set the next bitstream to be used.
27+
28+
What: /sys/class/genwqe/genwqe<n>_card/tempsens
29+
Date: Oct 2013
30+
Contact: haver@linux.vnet.ibm.com
31+
Description: Interface to read the cards temperature sense register.
32+
33+
What: /sys/class/genwqe/genwqe<n>_card/freerunning_timer
34+
Date: Oct 2013
35+
Contact: haver@linux.vnet.ibm.com
36+
Description: Interface to read the cards free running timer.
37+
Used for performance and utilization measurements.
38+
39+
What: /sys/class/genwqe/genwqe<n>_card/queue_working_time
40+
Date: Oct 2013
41+
Contact: haver@linux.vnet.ibm.com
42+
Description: Interface to read queue working time.
43+
Used for performance and utilization measurements.
44+
45+
What: /sys/class/genwqe/genwqe<n>_card/state
46+
Date: Oct 2013
47+
Contact: haver@linux.vnet.ibm.com
48+
Description: State of the card: "unused", "used", "error".
49+
50+
What: /sys/class/genwqe/genwqe<n>_card/base_clock
51+
Date: Oct 2013
52+
Contact: haver@linux.vnet.ibm.com
53+
Description: Base clock frequency of the card.
54+
55+
What: /sys/class/genwqe/genwqe<n>_card/device/sriov_numvfs
56+
Date: Oct 2013
57+
Contact: haver@linux.vnet.ibm.com
58+
Description: Enable VFs (1..15):
59+
sudo sh -c 'echo 15 > \
60+
/sys/bus/pci/devices/0000\:1b\:00.0/sriov_numvfs'
61+
Disable VFs:
62+
Write a 0 into the same sysfs entry.

‎Documentation/HOWTO

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ required reading:
112112

113113
Other excellent descriptions of how to create patches properly are:
114114
"The Perfect Patch"
115-
http://kerneltrap.org/node/3737
115+
http://www.ozlabs.org/~akpm/stuff/tpp.txt
116116
"Linux kernel patch submission format"
117117
http://linux.yyz.us/patch-format.html
118118

@@ -579,7 +579,7 @@ all time. It should describe the patch completely, containing:
579579
For more details on what this should all look like, please see the
580580
ChangeLog section of the document:
581581
"The Perfect Patch"
582-
http://userweb.kernel.org/~akpm/stuff/tpp.txt
582+
http://www.ozlabs.org/~akpm/stuff/tpp.txt
583583

584584

585585

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ TC/TCLIB Timer required properties:
2020
- interrupts: Should contain all interrupts for the TC block
2121
Note that you can specify several interrupt cells if the TC
2222
block has one interrupt per channel.
23+
- clock-names: tuple listing input clock names.
24+
Required elements: "t0_clk"
25+
Optional elements: "t1_clk", "t2_clk"
26+
- clocks: phandles to input clocks.
2327

2428
Examples:
2529

@@ -28,13 +32,17 @@ One interrupt per TC block:
2832
compatible = "atmel,at91rm9200-tcb";
2933
reg = <0xfff7c000 0x100>;
3034
interrupts = <18 4>;
35+
clocks = <&tcb0_clk>;
36+
clock-names = "t0_clk";
3137
};
3238

3339
One interrupt per TC channel in a TC block:
3440
tcb1: timer@fffdc000 {
3541
compatible = "atmel,at91rm9200-tcb";
3642
reg = <0xfffdc000 0x100>;
3743
interrupts = <26 4 27 4 28 4>;
44+
clocks = <&tcb1_clk>;
45+
clock-names = "t0_clk";
3846
};
3947

4048
RSTC Reset Controller required properties:

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@ EXTCON FOR PALMAS/TWL CHIPS
22

33
PALMAS USB COMPARATOR
44
Required Properties:
5-
- compatible : Should be "ti,palmas-usb" or "ti,twl6035-usb"
5+
- compatible: should contain one of:
6+
* "ti,palmas-usb-vid".
7+
* "ti,twl6035-usb-vid".
8+
* "ti,palmas-usb" (DEPRECATED - use "ti,palmas-usb-vid").
9+
* "ti,twl6035-usb" (DEPRECATED - use "ti,twl6035-usb-vid").
610

711
Optional Properties:
812
- ti,wakeup : To enable the wakeup comparator in probe

‎Documentation/devicetree/bindings/misc/atmel-ssc.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ Required properties:
66
- atmel,at91sam9g45-ssc: support dma transfer
77
- reg: Should contain SSC registers location and length
88
- interrupts: Should contain SSC interrupt
9+
- clock-names: tuple listing input clock names.
10+
Required elements: "pclk"
11+
- clocks: phandles to input clocks.
912

1013

1114
Required properties for devices compatible with "atmel,at91sam9g45-ssc":
@@ -20,6 +23,8 @@ ssc0: ssc@fffbc000 {
2023
compatible = "atmel,at91rm9200-ssc";
2124
reg = <0xfffbc000 0x4000>;
2225
interrupts = <14 4 5>;
26+
clocks = <&ssc0_clk>;
27+
clock-names = "pclk";
2328
};
2429

2530
- DMA transfer:

‎Documentation/devicetree/bindings/misc/bmp085.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ Optional properties:
88
- temp-measurement-period: temperature measurement period (milliseconds)
99
- default-oversampling: default oversampling value to be used at startup,
1010
value range is 0-3 with rising sensitivity.
11+
- interrupt-parent: should be the phandle for the interrupt controller
12+
- interrupts: interrupt mapping for IRQ
1113

1214
Example:
1315

@@ -17,4 +19,6 @@ pressure@77 {
1719
chip-id = <10>;
1820
temp-measurement-period = <100>;
1921
default-oversampling = <2>;
22+
interrupt-parent = <&gpio0>;
23+
interrupts = <25 IRQ_TYPE_EDGE_RISING>;
2024
};

‎Documentation/extcon/porting-android-switch-class

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ so that they are still compatible with legacy userspace processes.
5050
Extcon's extended features for switch device drivers with
5151
complex features usually required magic numbers in state
5252
value of switch_dev. With extcon, such magic numbers that
53-
support multiple cables (
53+
support multiple cables are no more required or supported.
5454

5555
1. Define cable names at edev->supported_cable.
5656
2. (Recommended) remove print_state callback.
@@ -114,11 +114,8 @@ exclusive, the two cables cannot be in ATTACHED state simulteneously.
114114

115115
****** ABI Location
116116

117-
If "CONFIG_ANDROID" is enabled and "CONFIG_ANDROID_SWITCH" is
118-
disabled, /sys/class/switch/* are created as symbolic links to
119-
/sys/class/extcon/*. Because CONFIG_ANDROID_SWITCH creates
120-
/sys/class/switch directory, we disable symboling linking if
121-
CONFIG_ANDROID_SWITCH is enabled.
117+
If "CONFIG_ANDROID" is enabled, /sys/class/switch/* are created
118+
as symbolic links to /sys/class/extcon/*.
122119

123120
The two files of switch class, name and state, are provided with
124121
extcon, too. When the multistate support (STEP 2 of CHAPTER 1.) is

‎Documentation/ja_JP/HOWTO

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ linux-api@ver.kernel.org に送ることを勧めます。
149149
この他にパッチを作る方法についてのよくできた記述は-
150150

151151
"The Perfect Patch"
152-
http://userweb.kernel.org/~akpm/stuff/tpp.txt
152+
http://www.ozlabs.org/~akpm/stuff/tpp.txt
153153
"Linux kernel patch submission format"
154154
http://linux.yyz.us/patch-format.html
155155

@@ -622,7 +622,7 @@ Linux カーネルコミュニティは、一度に大量のコードの塊を
622622
これについて全てがどのようにあるべきかについての詳細は、以下のドキュメ
623623
ントの ChangeLog セクションを見てください-
624624
"The Perfect Patch"
625-
http://userweb.kernel.org/~akpm/stuff/tpp.txt
625+
http://www.ozlabs.org/~akpm/stuff/tpp.txt
626626

627627
これらのどれもが、時にはとても困難です。これらの慣例を完璧に実施するに
628628
は数年かかるかもしれません。これは継続的な改善のプロセスであり、そのた

0 commit comments

Comments
 (0)