Skip to content

Commit

Permalink
Merge tag 'v5.13' into next
Browse files Browse the repository at this point in the history
Sync up with the mainline to get the latest parport API.
  • Loading branch information
dtor committed Jul 19, 2021
2 parents f8f84af + 62fb987 commit 320424c
Show file tree
Hide file tree
Showing 12,722 changed files with 656,072 additions and 265,966 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
13 changes: 11 additions & 2 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ ForEachMacros:
- 'css_for_each_child'
- 'css_for_each_descendant_post'
- 'css_for_each_descendant_pre'
- 'cxl_for_each_cmd'
- 'device_for_each_child_node'
- 'displayid_iter_for_each'
- 'dma_fence_chain_for_each'
- 'do_for_each_ftrace_op'
- 'drm_atomic_crtc_for_each_plane'
Expand All @@ -136,6 +136,7 @@ ForEachMacros:
- 'drm_mm_for_each_node_in_range'
- 'drm_mm_for_each_node_safe'
- 'flow_action_for_each'
- 'for_each_acpi_dev_match'
- 'for_each_active_dev_scope'
- 'for_each_active_drhd_unit'
- 'for_each_active_iommu'
Expand Down Expand Up @@ -171,14 +172,14 @@ ForEachMacros:
- 'for_each_dapm_widgets'
- 'for_each_dev_addr'
- 'for_each_dev_scope'
- 'for_each_displayid_db'
- 'for_each_dma_cap_mask'
- 'for_each_dpcm_be'
- 'for_each_dpcm_be_rollback'
- 'for_each_dpcm_be_safe'
- 'for_each_dpcm_fe'
- 'for_each_drhd_unit'
- 'for_each_dss_dev'
- 'for_each_dtpm_table'
- 'for_each_efi_memory_desc'
- 'for_each_efi_memory_desc_in_map'
- 'for_each_element'
Expand Down Expand Up @@ -215,6 +216,7 @@ ForEachMacros:
- 'for_each_migratetype_order'
- 'for_each_msi_entry'
- 'for_each_msi_entry_safe'
- 'for_each_msi_vector'
- 'for_each_net'
- 'for_each_net_continue_reverse'
- 'for_each_netdev'
Expand Down Expand Up @@ -270,6 +272,12 @@ ForEachMacros:
- 'for_each_prime_number_from'
- 'for_each_process'
- 'for_each_process_thread'
- 'for_each_prop_codec_conf'
- 'for_each_prop_dai_codec'
- 'for_each_prop_dai_cpu'
- 'for_each_prop_dlc_codecs'
- 'for_each_prop_dlc_cpus'
- 'for_each_prop_dlc_platforms'
- 'for_each_property_of_node'
- 'for_each_registered_fb'
- 'for_each_requested_gpio'
Expand Down Expand Up @@ -430,6 +438,7 @@ ForEachMacros:
- 'queue_for_each_hw_ctx'
- 'radix_tree_for_each_slot'
- 'radix_tree_for_each_tagged'
- 'rb_for_each'
- 'rbtree_postorder_for_each_entry_safe'
- 'rdma_for_each_block'
- 'rdma_for_each_port'
Expand Down
10 changes: 7 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -48,22 +48,22 @@
*.xz
*.zst
Module.symvers
modules.builtin
modules.order

#
# Top-level generic files
#
/tags
/TAGS
/linux
/modules-only.symvers
/vmlinux
/vmlinux.32
/vmlinux.map
/vmlinux.symvers
/vmlinux-gdb.py
/vmlinuz
/System.map
/Module.markers
/modules.builtin
/modules.builtin.modinfo
/modules.nsdeps

Expand Down Expand Up @@ -112,6 +112,10 @@ patches-*
patches
series

# ctags files
tags
TAGS

# cscope files
cscope.*
ncscope.*
Expand Down
13 changes: 11 additions & 2 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,9 @@ Alexandre Belloni <[email protected]> <alexandre.belloni@free-electr
Alexei Starovoitov <[email protected]> <[email protected]>
Alexei Starovoitov <[email protected]> <[email protected]>
Alexei Starovoitov <[email protected]> <[email protected]>
Alex Shi <[email protected]> <[email protected]>
Alex Shi <[email protected]> <[email protected]>
Alex Shi <[email protected]> <[email protected]>
Alex Shi <[email protected]> <[email protected]>
Alex Shi <[email protected]> <[email protected]>
Al Viro <[email protected]>
Al Viro <[email protected]>
Andi Kleen <[email protected]> <[email protected]>
Expand Down Expand Up @@ -159,6 +160,7 @@ Jeff Layton <[email protected]> <[email protected]>
Jeff Layton <[email protected]> <[email protected]>
Jens Axboe <[email protected]>
Jens Osterkamp <[email protected]>
Jernej Skrabec <[email protected]> <[email protected]>
Jiri Slaby <[email protected]> <[email protected]>
Jiri Slaby <[email protected]> <[email protected]>
Jiri Slaby <[email protected]> <[email protected]>
Expand Down Expand Up @@ -210,6 +212,8 @@ Manivannan Sadhasivam <[email protected]> <[email protected]>
Manivannan Sadhasivam <[email protected]> <[email protected]>
Marcin Nowakowski <[email protected]> <[email protected]>
Marc Zyngier <[email protected]> <[email protected]>
Marek Behún <[email protected]> <[email protected]>
Marek Behún <[email protected]> Marek Behun <[email protected]>
Mark Brown <[email protected]>
Mark Starovoytov <[email protected]> <[email protected]>
Mark Yao <[email protected]> <[email protected]>
Expand Down Expand Up @@ -241,6 +245,9 @@ Maxime Ripard <[email protected]> <[email protected]>
Mayuresh Janorkar <[email protected]>
Michael Buesch <[email protected]>
Michel Dänzer <[email protected]>
Michel Lespinasse <[email protected]>
Michel Lespinasse <[email protected]> <[email protected]>
Michel Lespinasse <[email protected]> <[email protected]>
Miguel Ojeda <[email protected]> <[email protected]>
Mike Rapoport <[email protected]> <[email protected]>
Mike Rapoport <[email protected]> <[email protected]>
Expand All @@ -265,6 +272,8 @@ Nicholas Piggin <[email protected]> <[email protected]>
Nicolas Ferre <[email protected]> <[email protected]>
Nicolas Pitre <[email protected]> <[email protected]>
Nicolas Pitre <[email protected]> <[email protected]>
Nicolas Saenz Julienne <[email protected]> <[email protected]>
Nicolas Saenz Julienne <[email protected]> <[email protected]>
Oleksij Rempel <[email protected]> <[email protected]>
Oleksij Rempel <[email protected]> <[email protected]>
Oleksij Rempel <[email protected]> <[email protected]>
Expand Down
18 changes: 17 additions & 1 deletion CREDITS
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ D: gadget layers, SPI subsystem, GPIO subsystem, and more than a few
D: device drivers. His encouragement also helped many engineers get
D: started working on the Linux kernel. David passed away in early
D: 2011, and will be greatly missed.
W: https://lkml.org/lkml/2011/4/5/36
W: https://lore.kernel.org/lkml/[email protected]

N: Gary Brubaker
E: [email protected]
Expand Down Expand Up @@ -1874,6 +1874,11 @@ S: Krosenska' 543
S: 181 00 Praha 8
S: Czech Republic

N: Murali Karicheri
E: [email protected]
D: Keystone NetCP driver
D: Keystone PCIe host controller driver

N: Jan "Yenya" Kasprzak
E: [email protected]
D: Author of the COSA/SRP sync serial board driver.
Expand Down Expand Up @@ -1933,6 +1938,9 @@ N: Kukjin Kim
E: [email protected]
D: Samsung S3C, S5P and Exynos ARM architectures

N: Milo Kim
D: TI LP855x, LP8727 and LP8788 drivers

N: Sangbeom Kim
E: [email protected]
D: Samsung SoC Audio (ASoC) drivers
Expand Down Expand Up @@ -2536,6 +2544,14 @@ D: Linux/PARISC hacker
D: AD1889 sound driver
S: Ottawa, Canada

N: Peter Meerwald-Stadler
E: [email protected]
W: https://pmeerw.net
D: IIO reviewing, drivers
S: Schießstandstr. 3a
S: A-5061 Elsbethen
S: Austria

N: Dirk Melchers
E: [email protected]
D: 8 bit XT hard disk driver for OMTI5520
Expand Down
2 changes: 1 addition & 1 deletion Documentation/ABI/obsolete/sysfs-class-dax
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
What: /sys/class/dax/
Date: May, 2016
KernelVersion: v4.7
Contact: linux-nvdimm@lists.01.org
Contact: nvdimm@lists.linux.dev
Description: Device DAX is the device-centric analogue of Filesystem
DAX (CONFIG_FS_DAX). It allows memory ranges to be
allocated and mapped without need of an intervening file
Expand Down
2 changes: 1 addition & 1 deletion Documentation/ABI/obsolete/sysfs-kernel-fadump_registered
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
This ABI is renamed and moved to a new location /sys/kernel/fadump/registered.¬
This ABI is renamed and moved to a new location /sys/kernel/fadump/registered.

What: /sys/kernel/fadump_registered
Date: Feb 2012
Expand Down
2 changes: 1 addition & 1 deletion Documentation/ABI/obsolete/sysfs-kernel-fadump_release_mem
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
This ABI is renamed and moved to a new location /sys/kernel/fadump/release_mem.¬
This ABI is renamed and moved to a new location /sys/kernel/fadump/release_mem.

What: /sys/kernel/fadump_release_mem
Date: Feb 2012
Expand Down
2 changes: 1 addition & 1 deletion Documentation/ABI/removed/sysfs-bus-nfit
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
What: /sys/bus/nd/devices/regionX/nfit/ecc_unit_size
Date: Aug, 2017
KernelVersion: v4.14 (Removed v4.18)
Contact: linux-nvdimm@lists.01.org
Contact: nvdimm@lists.linux.dev
Description:
(RO) Size of a write request to a DIMM that will not incur a
read-modify-write cycle at the memory controller.
Expand Down
27 changes: 27 additions & 0 deletions Documentation/ABI/stable/procfs-audit_loginuid
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
What: Audit Login UID
Date: 2005-02-01
KernelVersion: 2.6.11-rc2 1e2d1492e178 ("[PATCH] audit: handle loginuid through proc")
Contact: [email protected]
Users: audit and login applications
Description:
The /proc/$pid/loginuid pseudofile is written to set and
read to get the audit login UID of process $pid as a
decimal unsigned int (%u, u32). If it is unset,
permissions are not needed to set it. The accessor must
have CAP_AUDIT_CONTROL in the initial user namespace to
write it if it has been set. It cannot be written again
if AUDIT_FEATURE_LOGINUID_IMMUTABLE is enabled. It
cannot be unset if AUDIT_FEATURE_ONLY_UNSET_LOGINUID is
enabled.

What: Audit Login Session ID
Date: 2008-03-13
KernelVersion: 2.6.25-rc7 1e0bd7550ea9 ("[PATCH] export sessionid alongside the loginuid in procfs")
Contact: [email protected]
Users: audit and login applications
Description:
The /proc/$pid/sessionid pseudofile is read to get the
audit login session ID of process $pid as a decimal
unsigned int (%u, u32). It is set automatically,
serially assigned with each new login.

70 changes: 54 additions & 16 deletions Documentation/ABI/testing/debugfs-driver-habanalabs
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,24 @@ Description: Allows the root user to read or write 64 bit data directly
If the IOMMU is disabled, it also allows the root user to read
or write from the host a device VA of a host mapped memory

What: /sys/kernel/debug/habanalabs/hl<n>/data_dma
Date: Apr 2021
KernelVersion: 5.13
Contact: [email protected]
Description: Allows the root user to read from the device's internal
memory (DRAM/SRAM) through a DMA engine.
This property is a binary blob that contains the result of the
DMA transfer.
This custom interface is needed (instead of using the generic
Linux user-space PCI mapping) because the amount of internal
memory is huge (>32GB) and reading it via the PCI bar will take
a very long time.
This interface doesn't support concurrency in the same device.
In GAUDI and GOYA, this action can cause undefined behavior
in case the it is done while the device is executing user
workloads.
Only supported on GAUDI at this stage.

What: /sys/kernel/debug/habanalabs/hl<n>/device
Date: Jan 2019
KernelVersion: 5.1
Expand All @@ -90,6 +108,24 @@ Description: Enables the root user to set the device to specific state.
Valid values are "disable", "enable", "suspend", "resume".
User can read this property to see the valid values

What: /sys/kernel/debug/habanalabs/hl<n>/dma_size
Date: Apr 2021
KernelVersion: 5.13
Contact: [email protected]
Description: Specify the size of the DMA transaction when using DMA to read
from the device's internal memory. The value can not be larger
than 128MB. Writing to this value initiates the DMA transfer.
When the write is finished, the user can read the "data_dma"
blob

What: /sys/kernel/debug/habanalabs/hl<n>/dump_security_violations
Date: Jan 2021
KernelVersion: 5.12
Contact: [email protected]
Description: Dumps all security violations to dmesg. This will also ack
all security violations meanings those violations will not be
dumped next time user calls this API

What: /sys/kernel/debug/habanalabs/hl<n>/engines
Date: Jul 2019
KernelVersion: 5.3
Expand Down Expand Up @@ -154,13 +190,30 @@ Description: Displays the hop values and physical address for a given ASID
e.g. to display info about VA 0x1000 for ASID 1 you need to do:
echo "1 0x1000" > /sys/kernel/debug/habanalabs/hl0/mmu

What: /sys/kernel/debug/habanalabs/hl<n>/mmu_error
Date: Mar 2021
KernelVersion: 5.12
Contact: [email protected]
Description: Check and display page fault or access violation mmu errors for
all MMUs specified in mmu_cap_mask.
e.g. to display error info for MMU hw cap bit 9, you need to do:
echo "0x200" > /sys/kernel/debug/habanalabs/hl0/mmu_error
cat /sys/kernel/debug/habanalabs/hl0/mmu_error

What: /sys/kernel/debug/habanalabs/hl<n>/set_power_state
Date: Jan 2019
KernelVersion: 5.1
Contact: [email protected]
Description: Sets the PCI power state. Valid values are "1" for D0 and "2"
for D3Hot

What: /sys/kernel/debug/habanalabs/hl<n>/stop_on_err
Date: Mar 2020
KernelVersion: 5.6
Contact: [email protected]
Description: Sets the stop-on_error option for the device engines. Value of
"0" is for disable, otherwise enable.

What: /sys/kernel/debug/habanalabs/hl<n>/userptr
Date: Jan 2019
KernelVersion: 5.1
Expand All @@ -174,19 +227,4 @@ Date: Jan 2019
KernelVersion: 5.1
Contact: [email protected]
Description: Displays a list with information about all the active virtual
address mappings per ASID

What: /sys/kernel/debug/habanalabs/hl<n>/stop_on_err
Date: Mar 2020
KernelVersion: 5.6
Contact: [email protected]
Description: Sets the stop-on_error option for the device engines. Value of
"0" is for disable, otherwise enable.

What: /sys/kernel/debug/habanalabs/hl<n>/dump_security_violations
Date: Jan 2021
KernelVersion: 5.12
Contact: [email protected]
Description: Dumps all security violations to dmesg. This will also ack
all security violations meanings those violations will not be
dumped next time user calls this API
address mappings per ASID and all user mappings of HW blocks
18 changes: 18 additions & 0 deletions Documentation/ABI/testing/sysfs-block-rnbd
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,21 @@ Date: Feb 2020
KernelVersion: 5.7
Contact: Jack Wang <[email protected]> Danil Kipnis <[email protected]>
Description: Contains the device access mode: ro, rw or migration.

What: /sys/block/rnbd<N>/rnbd/resize
Date: Feb 2020
KernelVersion: 5.7
Contact: Jack Wang <[email protected]> Danil Kipnis <[email protected]>
Description: Write the number of sectors to change the size of the disk.

What: /sys/block/rnbd<N>/rnbd/remap_device
Date: Feb 2020
KernelVersion: 5.7
Contact: Jack Wang <[email protected]> Danil Kipnis <[email protected]>
Description: Remap the disconnected device if the session is not destroyed yet.

What: /sys/block/rnbd<N>/rnbd/nr_poll_queues
Date: Feb 2020
KernelVersion: 5.7
Contact: Jack Wang <[email protected]> Danil Kipnis <[email protected]>
Description: Contains the number of poll-mode queues
14 changes: 14 additions & 0 deletions Documentation/ABI/testing/sysfs-bus-coresight-devices-trbe
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
What: /sys/bus/coresight/devices/trbe<cpu>/align
Date: March 2021
KernelVersion: 5.13
Contact: Anshuman Khandual <[email protected]>
Description: (Read) Shows the TRBE write pointer alignment. This value
is fetched from the TRBIDR register.

What: /sys/bus/coresight/devices/trbe<cpu>/flag
Date: March 2021
KernelVersion: 5.13
Contact: Anshuman Khandual <[email protected]>
Description: (Read) Shows if TRBE updates in the memory are with access
and dirty flag updates as well. This value is fetched from
the TRBIDR register.
Loading

0 comments on commit 320424c

Please sign in to comment.