Skip to content

Commit 2e21dee

Browse files
author
Jiri Kosina
committed
Merge branch 'for-6.9/amd-sfh' into for-linus
- assorted fixes and optimizations for amd-sfh (Basavaraj Natikar) Signed-off-by: Jiri Kosina <jkosina@suse.com>
2 parents 9a5b152 + 90184f9 commit 2e21dee

3,950 files changed

Lines changed: 110475 additions & 37227 deletions

File tree

Some content is hidden

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

.editorconfig

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
2+
3+
root = true
4+
5+
[{*.{awk,c,dts,dtsi,dtso,h,mk,s,S},Kconfig,Makefile,Makefile.*}]
6+
charset = utf-8
7+
end_of_line = lf
8+
trim_trailing_whitespace = true
9+
insert_final_newline = true
10+
indent_style = tab
11+
indent_size = 8
12+
13+
[*.{json,py,rs}]
14+
charset = utf-8
15+
end_of_line = lf
16+
trim_trailing_whitespace = true
17+
insert_final_newline = true
18+
indent_style = space
19+
indent_size = 4
20+
21+
# this must be below the general *.py to overwrite it
22+
[tools/{perf,power,rcu,testing/kunit}/**.py,]
23+
indent_style = tab
24+
indent_size = 8
25+
26+
[*.yaml]
27+
charset = utf-8
28+
end_of_line = lf
29+
trim_trailing_whitespace = unset
30+
insert_final_newline = true
31+
indent_style = space
32+
indent_size = 2

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ modules.order
9696
#
9797
!.clang-format
9898
!.cocciconfig
99+
!.editorconfig
99100
!.get_maintainer.ignore
100101
!.gitattributes
101102
!.gitignore

.mailmap

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,7 @@ Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com>
289289
John Crispin <john@phrozen.org> <blogic@openwrt.org>
290290
John Fastabend <john.fastabend@gmail.com> <john.r.fastabend@intel.com>
291291
John Keeping <john@keeping.me.uk> <john@metanate.com>
292+
John Moon <john@jmoon.dev> <quic_johmoo@quicinc.com>
292293
John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
293294
John Stultz <johnstul@us.ibm.com>
294295
<jon.toppins+linux@gmail.com> <jtoppins@cumulusnetworks.com>
@@ -344,6 +345,7 @@ Leonid I Ananiev <leonid.i.ananiev@intel.com>
344345
Leon Romanovsky <leon@kernel.org> <leon@leon.nu>
345346
Leon Romanovsky <leon@kernel.org> <leonro@mellanox.com>
346347
Leon Romanovsky <leon@kernel.org> <leonro@nvidia.com>
348+
Leo Yan <leo.yan@linux.dev> <leo.yan@linaro.org>
347349
Liam Mark <quic_lmark@quicinc.com> <lmark@codeaurora.org>
348350
Linas Vepstas <linas@austin.ibm.com>
349351
Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>
@@ -363,7 +365,6 @@ Maheshwar Ajja <quic_majja@quicinc.com> <majja@codeaurora.org>
363365
Malathi Gottam <quic_mgottam@quicinc.com> <mgottam@codeaurora.org>
364366
Manikanta Pubbisetty <quic_mpubbise@quicinc.com> <mpubbise@codeaurora.org>
365367
Manivannan Sadhasivam <mani@kernel.org> <manivannanece23@gmail.com>
366-
Manivannan Sadhasivam <mani@kernel.org> <manivannan.sadhasivam@linaro.org>
367368
Manoj Basapathi <quic_manojbm@quicinc.com> <manojbm@codeaurora.org>
368369
Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>
369370
Marc Zyngier <maz@kernel.org> <marc.zyngier@arm.com>
@@ -391,9 +392,10 @@ Matthias Fuchs <socketcan@esd.eu> <matthias.fuchs@esd.eu>
391392
Matthieu Baerts <matttbe@kernel.org> <matthieu.baerts@tessares.net>
392393
Matthieu CASTET <castet.matthieu@free.fr>
393394
Matti Vaittinen <mazziesaccount@gmail.com> <matti.vaittinen@fi.rohmeurope.com>
394-
Matt Ranostay <matt.ranostay@konsulko.com> <matt@ranostay.consulting>
395-
Matt Ranostay <mranostay@gmail.com> Matthew Ranostay <mranostay@embeddedalley.com>
396-
Matt Ranostay <mranostay@gmail.com> <matt.ranostay@intel.com>
395+
Matt Ranostay <matt@ranostay.sg> <matt.ranostay@konsulko.com>
396+
Matt Ranostay <matt@ranostay.sg> <matt@ranostay.consulting>
397+
Matt Ranostay <matt@ranostay.sg> Matthew Ranostay <mranostay@embeddedalley.com>
398+
Matt Ranostay <matt@ranostay.sg> <matt.ranostay@intel.com>
397399
Matt Redfearn <matt.redfearn@mips.com> <matt.redfearn@imgtec.com>
398400
Maulik Shah <quic_mkshah@quicinc.com> <mkshah@codeaurora.org>
399401
Mauro Carvalho Chehab <mchehab@kernel.org> <maurochehab@gmail.com>
@@ -504,6 +506,9 @@ Ralf Baechle <ralf@linux-mips.org>
504506
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
505507
Ram Chandra Jangir <quic_rjangir@quicinc.com> <rjangir@codeaurora.org>
506508
Randy Dunlap <rdunlap@infradead.org> <rdunlap@xenotime.net>
509+
Randy Dunlap <rdunlap@infradead.org> <randy.dunlap@oracle.com>
510+
Randy Dunlap <rdunlap@infradead.org> <rddunlap@osdl.org>
511+
Randy Dunlap <rdunlap@infradead.org> <randy.dunlap@intel.com>
507512
Ravi Kumar Bokka <quic_rbokka@quicinc.com> <rbokka@codeaurora.org>
508513
Ravi Kumar Siddojigari <quic_rsiddoji@quicinc.com> <rsiddoji@codeaurora.org>
509514
Rémi Denis-Courmont <rdenis@simphalempin.com>
@@ -582,6 +587,7 @@ Surabhi Vishnoi <quic_svishnoi@quicinc.com> <svishnoi@codeaurora.org>
582587
Takashi YOSHII <takashi.yoshii.zj@renesas.com>
583588
Tamizh Chelvam Raja <quic_tamizhr@quicinc.com> <tamizhr@codeaurora.org>
584589
Taniya Das <quic_tdas@quicinc.com> <tdas@codeaurora.org>
590+
Tanzir Hasan <tanzhasanwork@gmail.com> <tanzirh@google.com>
585591
Tejun Heo <htejun@gmail.com>
586592
Tomeu Vizoso <tomeu@tomeuvizoso.net> <tomeu.vizoso@collabora.com>
587593
Thomas Graf <tgraf@suug.ch>

CREDITS

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ E: ralf@gnu.org
179179
P: 1024/AF7B30C1 CF 97 C2 CC 6D AE A7 FE C8 BA 9C FC 88 DE 32 C3
180180
D: Linux/MIPS port
181181
D: Linux/68k hacker
182+
D: AX25 maintainer
182183
S: Hauptstrasse 19
183184
S: 79837 St. Blasien
184185
S: Germany
@@ -677,6 +678,10 @@ D: Media subsystem (V4L/DVB) drivers and core
677678
D: EDAC drivers and EDAC 3.0 core rework
678679
S: Brazil
679680

681+
N: Landen Chao
682+
E: Landen.Chao@mediatek.com
683+
D: MT7531 Ethernet switch support
684+
680685
N: Raymond Chen
681686
E: raymondc@microsoft.com
682687
D: Author of Configure script
@@ -814,6 +819,10 @@ D: Support for Xircom PGSDB9 (firmware and host driver)
814819
S: Bucharest
815820
S: Romania
816821

822+
N: John Crispin
823+
E: john@phrozen.org
824+
D: MediaTek MT7623 Gigabit ethernet support
825+
817826
N: Laurence Culhane
818827
E: loz@holmes.demon.co.uk
819828
D: Wrote the initial alpha SLIP code
@@ -1538,6 +1547,10 @@ N: Andrew Haylett
15381547
E: ajh@primag.co.uk
15391548
D: Selection mechanism
15401549

1550+
N: Johan Hedberg
1551+
E: johan.hedberg@gmail.com
1552+
D: Bluetooth subsystem maintainer
1553+
15411554
N: Andre Hedrick
15421555
E: andre@linux-ide.org
15431556
E: andre@linuxdiskcert.org
@@ -2148,6 +2161,19 @@ N: Mike Kravetz
21482161
E: mike.kravetz@oracle.com
21492162
D: Maintenance and development of the hugetlb subsystem
21502163

2164+
N: Seth Jennings
2165+
E: sjenning@redhat.com
2166+
D: Creation and maintenance of zswap
2167+
2168+
N: Dan Streetman
2169+
E: ddstreet@ieee.org
2170+
D: Maintenance and development of zswap
2171+
D: Creation and maintenance of the zpool API
2172+
2173+
N: Vitaly Wool
2174+
E: vitaly.wool@konsulko.com
2175+
D: Maintenance and development of zswap
2176+
21512177
N: Andreas S. Krebs
21522178
E: akrebs@altavista.net
21532179
D: CYPRESS CY82C693 chipset IDE, Digital's PC-Alpha 164SX boards
@@ -3052,6 +3078,10 @@ S: Demonstratsii 8-382
30523078
S: Tula 300000
30533079
S: Russia
30543080

3081+
N: Thomas Petazzoni
3082+
E: thomas.petazzoni@bootlin.com
3083+
D: Driver for the Marvell Armada 370/XP network unit.
3084+
30553085
N: Gordon Peters
30563086
E: GordPeters@smarttech.com
30573087
D: Isochronous receive for IEEE 1394 driver (OHCI module).
@@ -3950,6 +3980,10 @@ S: 21513 Conradia Ct
39503980
S: Cupertino, CA 95014
39513981
S: USA
39523982

3983+
N: Manohar Vanga
3984+
E: manohar.vanga@gmail.com
3985+
D: VME subsystem maintainer
3986+
39533987
N: Thibaut Varène
39543988
E: hacks+kernel@slashdirt.org
39553989
W: http://hacks.slashdirt.org/
@@ -4050,6 +4084,10 @@ D: Fixes for the NE/2-driver
40504084
D: Miscellaneous MCA-support
40514085
D: Cleanup of the Config-files
40524086

4087+
N: Martyn Welch
4088+
E: martyn@welchs.me.uk
4089+
D: VME subsystem maintainer
4090+
40534091
N: Matt Welsh
40544092
E: mdw@metalab.unc.edu
40554093
W: http://www.cs.berkeley.edu/~mdw
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
What: /sys/kernel/debug/vfio
2+
Date: December 2023
3+
KernelVersion: 6.8
4+
Contact: Longfang Liu <liulongfang@huawei.com>
5+
Description: This debugfs file directory is used for debugging
6+
of vfio devices, it's a common directory for all vfio devices.
7+
Vfio core will create a device subdirectory under this
8+
directory.
9+
10+
What: /sys/kernel/debug/vfio/<device>/migration
11+
Date: December 2023
12+
KernelVersion: 6.8
13+
Contact: Longfang Liu <liulongfang@huawei.com>
14+
Description: This debugfs file directory is used for debugging
15+
of vfio devices that support live migration.
16+
The debugfs of each vfio device that supports live migration
17+
could be created under this directory.
18+
19+
What: /sys/kernel/debug/vfio/<device>/migration/state
20+
Date: December 2023
21+
KernelVersion: 6.8
22+
Contact: Longfang Liu <liulongfang@huawei.com>
23+
Description: Read the live migration status of the vfio device.
24+
The contents of the state file reflects the migration state
25+
relative to those defined in the vfio_device_mig_state enum

Documentation/ABI/testing/sysfs-bus-cdx

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,13 @@ Description:
9898

9999
# echo 1 > /sys/bus/cdx/devices/.../remove
100100

101+
What: /sys/bus/cdx/devices/.../resource<N>
102+
Date: July 2023
103+
Contact: puneet.gupta@amd.com
104+
Description:
105+
The resource binary file contains the content of the memory
106+
regions. These files can be m'maped from userspace.
107+
101108
What: /sys/bus/cdx/devices/.../modalias
102109
Date: July 2023
103110
Contact: nipun.gupta@amd.com

Documentation/ABI/testing/sysfs-bus-coresight-devices-tmc

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,3 +91,19 @@ Contact: Mathieu Poirier <mathieu.poirier@linaro.org>
9191
Description: (RW) Size of the trace buffer for TMC-ETR when used in SYSFS
9292
mode. Writable only for TMC-ETR configurations. The value
9393
should be aligned to the kernel pagesize.
94+
95+
What: /sys/bus/coresight/devices/<memory_map>.tmc/buf_modes_available
96+
Date: August 2023
97+
KernelVersion: 6.7
98+
Contact: Anshuman Khandual <anshuman.khandual@arm.com>
99+
Description: (Read) Shows all supported Coresight TMC-ETR buffer modes available
100+
for the users to configure explicitly. This file is avaialble only
101+
for TMC ETR devices.
102+
103+
What: /sys/bus/coresight/devices/<memory_map>.tmc/buf_mode_preferred
104+
Date: August 2023
105+
KernelVersion: 6.7
106+
Contact: Anshuman Khandual <anshuman.khandual@arm.com>
107+
Description: (RW) Current Coresight TMC-ETR buffer mode selected. But user could
108+
only provide a mode which is supported for a given ETR device. This
109+
file is available only for TMC ETR devices.

0 commit comments

Comments
 (0)