Skip to content

Commit c95baf1

Browse files
committed
Merge drm-intel-next-queued into gvt-next
Backmerge to pull in https://patchwork.freedesktop.org/patch/353621/?series=73544&rev=1 Signed-off-by: Zhenyu Wang <[email protected]>
2 parents 690c3df + e24bcd3 commit c95baf1

File tree

13,160 files changed

+658033
-304019
lines changed

Some content is hidden

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

13,160 files changed

+658033
-304019
lines changed

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
*.c diff=cpp
22
*.h diff=cpp
3+
*.dtsi diff=dts
4+
*.dts diff=dts

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
*.lzo
3333
*.mod
3434
*.mod.c
35-
*.ns_deps
3635
*.o
3736
*.o.*
3837
*.patch
@@ -61,6 +60,7 @@ modules.order
6160
/System.map
6261
/Module.markers
6362
/modules.builtin.modinfo
63+
/modules.nsdeps
6464

6565
#
6666
# RPM spec file (make rpm-pkg)

.mailmap

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ Andy Adamson <[email protected]>
3232
Antoine Tenart <[email protected]>
3333
3434
Archit Taneja <[email protected]>
35+
3536
Arnaud Patard <[email protected]>
3637
Arnd Bergmann <[email protected]>
3738
Axel Dyks <[email protected]>
@@ -98,16 +99,24 @@ Jacob Shin <[email protected]>
9899
99100
100101
102+
101103
James Bottomley <jejb@mulgrave.(none)>
102104
James Bottomley <[email protected]>
103105
James E Wilson <[email protected]>
104106
105107
106108
James Ketrenos <jketreno@io.(none)>
109+
110+
111+
107112
108113
109114
110115
116+
117+
118+
119+
111120
Jean Tourrilhes <[email protected]>
112121
113122
Jeff Garzik <[email protected]>
@@ -144,13 +153,15 @@ Linus Lüssing <[email protected]> <[email protected]>
144153
145154
146155
156+
147157
148158
149159
150160
Mark Brown <[email protected]>
151161
152162
153163
164+
154165
Mathieu Othacehe <[email protected]>
155166
156167
@@ -196,7 +207,8 @@ Oleksij Rempel <[email protected]> <[email protected]>
196207
197208
Paolo 'Blaisorblade' Giarrusso <[email protected]>
198209
Patrick Mochel <[email protected]>
199-
210+
211+
200212
Peter A Jonsson <[email protected]>
201213
Peter Oruba <[email protected]>
202214
Peter Oruba <[email protected]>
@@ -229,6 +241,7 @@ Shuah Khan <[email protected]> <[email protected]>
229241
230242
231243
244+
232245
Simon Kelley <[email protected]>
233246
Stéphane Witzmann <[email protected]>
234247
Stephen Hemminger <[email protected]>
@@ -254,6 +267,7 @@ Vinod Koul <[email protected]> <[email protected]>
254267
255268
256269
270+
257271
258272
259273
@@ -265,3 +279,5 @@ Gustavo Padovan <[email protected]>
265279
Gustavo Padovan <[email protected]>
266280
267281
282+
283+

CREDITS

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1637,6 +1637,10 @@ S: Panoramastrasse 18
16371637
S: D-69126 Heidelberg
16381638
S: Germany
16391639

1640+
N: Simon Horman
1641+
1642+
D: Renesas ARM/ARM64 SoC maintainer
1643+
16401644
N: Christopher Horn
16411645
16421646
D: Miscellaneous sysctl hacks
@@ -1871,8 +1875,9 @@ S: The Netherlands
18711875

18721876
N: Martin Kepplinger
18731877
1874-
E: martin.kepplinger@ginzinger.com
1878+
E: martin.kepplinger@puri.sm
18751879
W: http://www.martinkepplinger.com
1880+
P: 4096R/5AB387D3 F208 2B88 0F9E 4239 3468 6E3F 5003 98DF 5AB3 87D3
18761881
D: mma8452 accelerators iio driver
18771882
D: pegasus_notetaker input driver
18781883
D: Kernel fixes and cleanups

Documentation/ABI/stable/sysfs-class-infiniband

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -314,25 +314,6 @@ Description:
314314
board_id: (RO) Manufacturing board ID
315315

316316

317-
sysfs interface for Chelsio T3 RDMA Driver (cxgb3)
318-
--------------------------------------------------
319-
320-
What: /sys/class/infiniband/cxgb3_X/hw_rev
321-
What: /sys/class/infiniband/cxgb3_X/hca_type
322-
What: /sys/class/infiniband/cxgb3_X/board_id
323-
Date: Feb, 2007
324-
KernelVersion: v2.6.21
325-
326-
Description:
327-
hw_rev: (RO) Hardware revision number
328-
329-
hca_type: (RO) HCA type. Here it is a driver short name.
330-
It should normally match the name in its bus
331-
driver structure (e.g. pci_driver::name).
332-
333-
board_id: (RO) Manufacturing board id
334-
335-
336317
sysfs interface for Mellanox ConnectX HCA IB driver (mlx4)
337318
----------------------------------------------------------
338319

Documentation/ABI/stable/sysfs-driver-aspeed-vuart

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,19 @@ Description: Configures which IO port the host side of the UART
66
Users: OpenBMC. Proposed changes should be mailed to
77
88

9-
What: /sys/bus/platform/drivers/aspeed-vuart*/sirq
9+
What: /sys/bus/platform/drivers/aspeed-vuart/*/sirq
1010
Date: April 2017
1111
Contact: Jeremy Kerr <[email protected]>
1212
Description: Configures which interrupt number the host side of
1313
the UART will appear on the host <-> BMC LPC bus.
1414
Users: OpenBMC. Proposed changes should be mailed to
1515
16+
17+
What: /sys/bus/platform/drivers/aspeed-vuart/*/sirq_polarity
18+
Date: July 2019
19+
Contact: Oskar Senft <[email protected]>
20+
Description: Configures the polarity of the serial interrupt to the
21+
host via the BMC LPC bus.
22+
Set to 0 for active-low or 1 for active-high.
23+
Users: OpenBMC. Proposed changes should be mailed to
24+

Documentation/ABI/stable/sysfs-driver-ib_srp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ Description: Interface for making ib_srp connect to a new target.
6767
initiator is allowed to queue per SCSI host. The default
6868
value for this parameter is 62. The lowest supported value
6969
is 2.
70+
* max_it_iu_size, a decimal number specifying the maximum
71+
initiator to target information unit length.
7072

7173
What: /sys/class/infiniband_srp/srp-<hca>-<port_number>/ibdev
7274
Date: January 2, 2006

Documentation/ABI/stable/sysfs-driver-mlxreg-io

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ Description: This file shows the system fans direction:
2929

3030
The files are read only.
3131

32-
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/jtag_enable
32+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/cpld3_version
3333

3434
Date: November 2018
3535
KernelVersion: 5.0
3636
Contact: Vadim Pasternak <vadimpmellanox.com>
3737
Description: These files show with which CPLD versions have been burned
38-
on LED board.
38+
on LED or Gearbox board.
3939

4040
The files are read only.
4141

@@ -121,6 +121,15 @@ Description: These files show the system reset cause, as following: ComEx
121121

122122
The files are read only.
123123

124+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/cpld4_version
125+
Date: November 2018
126+
KernelVersion: 5.0
127+
Contact: Vadim Pasternak <vadimpmellanox.com>
128+
Description: These files show with which CPLD versions have been burned
129+
on LED board.
130+
131+
The files are read only.
132+
124133
Date: June 2019
125134
KernelVersion: 5.3
126135
Contact: Vadim Pasternak <vadimpmellanox.com>
Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
What: /sys/kernel/debug/hisi_hpre/<bdf>/cluster[0-3]/regs
2+
Date: Sep 2019
3+
4+
Description: Dump debug registers from the HPRE cluster.
5+
Only available for PF.
6+
7+
What: /sys/kernel/debug/hisi_hpre/<bdf>/cluster[0-3]/cluster_ctrl
8+
Date: Sep 2019
9+
10+
Description: Write the HPRE core selection in the cluster into this file,
11+
and then we can read the debug information of the core.
12+
Only available for PF.
13+
14+
What: /sys/kernel/debug/hisi_hpre/<bdf>/rdclr_en
15+
Date: Sep 2019
16+
17+
Description: HPRE cores debug registers read clear control. 1 means enable
18+
register read clear, otherwise 0. Writing to this file has no
19+
functional effect, only enable or disable counters clear after
20+
reading of these registers.
21+
Only available for PF.
22+
23+
What: /sys/kernel/debug/hisi_hpre/<bdf>/current_qm
24+
Date: Sep 2019
25+
26+
Description: One HPRE controller has one PF and multiple VFs, each function
27+
has a QM. Select the QM which below qm refers to.
28+
Only available for PF.
29+
30+
What: /sys/kernel/debug/hisi_hpre/<bdf>/regs
31+
Date: Sep 2019
32+
33+
Description: Dump debug registers from the HPRE.
34+
Only available for PF.
35+
36+
What: /sys/kernel/debug/hisi_hpre/<bdf>/qm/qm_regs
37+
Date: Sep 2019
38+
39+
Description: Dump debug registers from the QM.
40+
Available for PF and VF in host. VF in guest currently only
41+
has one debug register.
42+
43+
What: /sys/kernel/debug/hisi_hpre/<bdf>/qm/current_q
44+
Date: Sep 2019
45+
46+
Description: One QM may contain multiple queues. Select specific queue to
47+
show its debug registers in above qm_regs.
48+
Only available for PF.
49+
50+
What: /sys/kernel/debug/hisi_hpre/<bdf>/qm/clear_enable
51+
Date: Sep 2019
52+
53+
Description: QM debug registers(qm_regs) read clear control. 1 means enable
54+
register read clear, otherwise 0.
55+
Writing to this file has no functional effect, only enable or
56+
disable counters clear after reading of these registers.
57+
Only available for PF.
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
What: /sys/kernel/debug/hisi_sec/<bdf>/sec_dfx
2+
Date: Oct 2019
3+
4+
Description: Dump the debug registers of SEC cores.
5+
Only available for PF.
6+
7+
What: /sys/kernel/debug/hisi_sec/<bdf>/clear_enable
8+
Date: Oct 2019
9+
10+
Description: Enabling/disabling of clear action after reading
11+
the SEC debug registers.
12+
0: disable, 1: enable.
13+
Only available for PF, and take no other effect on SEC.
14+
15+
What: /sys/kernel/debug/hisi_sec/<bdf>/current_qm
16+
Date: Oct 2019
17+
18+
Description: One SEC controller has one PF and multiple VFs, each function
19+
has a QM. This file can be used to select the QM which below
20+
qm refers to.
21+
Only available for PF.
22+
23+
What: /sys/kernel/debug/hisi_sec/<bdf>/qm/qm_regs
24+
Date: Oct 2019
25+
26+
Description: Dump of QM related debug registers.
27+
Available for PF and VF in host. VF in guest currently only
28+
has one debug register.
29+
30+
What: /sys/kernel/debug/hisi_sec/<bdf>/qm/current_q
31+
Date: Oct 2019
32+
33+
Description: One QM of SEC may contain multiple queues. Select specific
34+
queue to show its debug registers in above 'qm_regs'.
35+
Only available for PF.
36+
37+
What: /sys/kernel/debug/hisi_sec/<bdf>/qm/clear_enable
38+
Date: Oct 2019
39+
40+
Description: Enabling/disabling of clear action after reading
41+
the SEC's QM debug registers.
42+
0: disable, 1: enable.
43+
Only available for PF, and take no other effect on SEC.

0 commit comments

Comments
 (0)