Skip to content

Commit cc11f37

Browse files
gregkhgregkh
committed
Merge branch 'master' into staging-next
We need the network changes in staging-next in order to be able to fix up the rtl8821ae driver to build properly. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2 parents 5b4af8b + 77d143d commit cc11f37

File tree

6,772 files changed

+296408
-137923
lines changed

Some content is hidden

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

6,772 files changed

+296408
-137923
lines changed

‎Documentation/ABI/testing/configfs-usb-gadget-ffs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
What: /config/usb-gadget/gadget/functions/ffs.name
2+
Date: Nov 2013
3+
KenelVersion: 3.13
4+
Description: The purpose of this directory is to create and remove it.
5+
6+
A corresponding USB function instance is created/removed.
7+
There are no attributes here.
8+
9+
All parameters are set through FunctionFS.

‎Documentation/ABI/testing/configfs-usb-gadget-loopback

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
What: /config/usb-gadget/gadget/functions/Loopback.name
2+
Date: Nov 2013
3+
KenelVersion: 3.13
4+
Description:
5+
The attributes:
6+
7+
qlen - depth of loopback queue
8+
bulk_buflen - buffer length

‎Documentation/ABI/testing/configfs-usb-gadget-sourcesink

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
What: /config/usb-gadget/gadget/functions/SourceSink.name
2+
Date: Nov 2013
3+
KenelVersion: 3.13
4+
Description:
5+
The attributes:
6+
7+
pattern - 0 (all zeros), 1 (mod63), 2 (none)
8+
isoc_interval - 1..16
9+
isoc_maxpacket - 0 - 1023 (fs), 0 - 1024 (hs/ss)
10+
isoc_mult - 0..2 (hs/ss only)
11+
isoc_maxburst - 0..15 (ss only)
12+
qlen - buffer length

‎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-bus-pci

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,18 +70,15 @@ Date: September, 2011
7070
Contact: Neil Horman <nhorman@tuxdriver.com>
7171
Description:
7272
The /sys/devices/.../msi_irqs directory contains a variable set
73-
of sub-directories, with each sub-directory being named after a
74-
corresponding msi irq vector allocated to that device. Each
75-
numbered sub-directory N contains attributes of that irq.
76-
Note that this directory is not created for device drivers which
77-
do not support msi irqs
73+
of files, with each file being named after a corresponding msi
74+
irq vector allocated to that device.
7875

79-
What: /sys/bus/pci/devices/.../msi_irqs/<N>/mode
76+
What: /sys/bus/pci/devices/.../msi_irqs/<N>
8077
Date: September 2011
8178
Contact: Neil Horman <nhorman@tuxdriver.com>
8279
Description:
8380
This attribute indicates the mode that the irq vector named by
84-
the parent directory is in (msi vs. msix)
81+
the file is in (msi vs. msix)
8582

8683
What: /sys/bus/pci/devices/.../remove
8784
Date: January 2009

‎Documentation/ABI/testing/sysfs-bus-usb

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,19 @@ Description:
5050
This may allow the driver to support more hardware than
5151
was included in the driver's static device ID support
5252
table at compile time. The format for the device ID is:
53-
idVendor idProduct bInterfaceClass.
53+
idVendor idProduct bInterfaceClass RefIdVendor RefIdProduct
5454
The vendor ID and device ID fields are required, the
55-
interface class is optional.
55+
rest is optional. The Ref* tuple can be used to tell the
56+
driver to use the same driver_data for the new device as
57+
it is used for the reference device.
5658
Upon successfully adding an ID, the driver will probe
5759
for the device and attempt to bind to it. For example:
5860
# echo "8086 10f5" > /sys/bus/usb/drivers/foo/new_id
5961

62+
Here add a new device (0458:7045) using driver_data from
63+
an already supported device (0458:704c):
64+
# echo "0458 7045 0 0458 704c" > /sys/bus/usb/drivers/foo/new_id
65+
6066
Reading from this file will list all dynamically added
6167
device IDs in the same format, with one entry per
6268
line. For example:

‎Documentation/ABI/testing/sysfs-class-net-mesh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,14 @@ Description:
6868
Defines the penalty which will be applied to an
6969
originator message's tq-field on every hop.
7070

71+
What: /sys/class/net/<mesh_iface>/mesh/isolation_mark
72+
Date: Nov 2013
73+
Contact: Antonio Quartulli <antonio@meshcoding.com>
74+
Description:
75+
Defines the isolation mark (and its bitmask) which
76+
is used to classify clients as "isolated" by the
77+
Extended Isolation feature.
78+
7179
What: /sys/class/net/<mesh_iface>/mesh/network_coding
7280
Date: Nov 2012
7381
Contact: Martin Hundeboll <martin@hundeboll.net>

‎Documentation/ABI/testing/sysfs-devices-system-cpu

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,3 +200,27 @@ Description: address and size of the percpu note.
200200
note of cpu#.
201201

202202
crash_notes_size: size of the note of cpu#.
203+
204+
205+
What: /sys/devices/system/cpu/intel_pstate/max_perf_pct
206+
/sys/devices/system/cpu/intel_pstate/min_perf_pct
207+
/sys/devices/system/cpu/intel_pstate/no_turbo
208+
Date: February 2013
209+
Contact: linux-pm@vger.kernel.org
210+
Description: Parameters for the Intel P-state driver
211+
212+
Logic for selecting the current P-state in Intel
213+
Sandybridge+ processors. The three knobs control
214+
limits for the P-state that will be requested by the
215+
driver.
216+
217+
max_perf_pct: limits the maximum P state that will be requested by
218+
the driver stated as a percentage of the available performance.
219+
220+
min_perf_pct: limits the minimum P state that will be requested by
221+
the driver stated as a percentage of the available performance.
222+
223+
no_turbo: limits the driver to selecting P states below the turbo
224+
frequency range.
225+
226+
More details can be found in Documentation/cpu-freq/intel-pstate.txt

‎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/ABI/testing/sysfs-firmware-efi

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
What: /sys/firmware/efi/fw_vendor
2+
Date: December 2013
3+
Contact: Dave Young <dyoung@redhat.com>
4+
Description: It shows the physical address of firmware vendor field in the
5+
EFI system table.
6+
Users: Kexec
7+
8+
What: /sys/firmware/efi/runtime
9+
Date: December 2013
10+
Contact: Dave Young <dyoung@redhat.com>
11+
Description: It shows the physical address of runtime service table entry in
12+
the EFI system table.
13+
Users: Kexec
14+
15+
What: /sys/firmware/efi/config_table
16+
Date: December 2013
17+
Contact: Dave Young <dyoung@redhat.com>
18+
Description: It shows the physical address of config table entry in the EFI
19+
system table.
20+
Users: Kexec

0 commit comments

Comments
 (0)