Skip to content

Commit 3914e80

Browse files
committed
Automatic merge of 'master' into merge-test (2024-12-02 12:28)
2 parents a85c72f + 40384c8 commit 3914e80

File tree

3,769 files changed

+131507
-111012
lines changed

Some content is hidden

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

3,769 files changed

+131507
-111012
lines changed

.clippy.toml

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
3+
check-private-items = true
4+
5+
disallowed-macros = [
6+
# The `clippy::dbg_macro` lint only works with `std::dbg!`, thus we simulate
7+
# it here, see: https://github.com/rust-lang/rust-clippy/issues/11303.
8+
{ path = "kernel::dbg", reason = "the `dbg!` macro is intended as a debugging tool" },
9+
]

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ modules.order
104104
#
105105
!.github
106106
!.clang-format
107+
!.clippy.toml
107108
!.cocciconfig
108109
!.editorconfig
109110
!.get_maintainer.ignore
@@ -129,6 +130,7 @@ series
129130

130131
# ctags files
131132
tags
133+
!tags/
132134
TAGS
133135

134136
# cscope files

Documentation/ABI/testing/configfs-usb-gadget-uvc

+64
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,70 @@ Description: Specific uncompressed frame descriptors
342342
support
343343
========================= =====================================
344344

345+
What: /config/usb-gadget/gadget/functions/uvc.name/streaming/framebased
346+
Date: Sept 2024
347+
KernelVersion: 5.15
348+
Description: Framebased format descriptors
349+
350+
What: /config/usb-gadget/gadget/functions/uvc.name/streaming/framebased/name
351+
Date: Sept 2024
352+
KernelVersion: 5.15
353+
Description: Specific framebased format descriptors
354+
355+
================== =======================================
356+
bFormatIndex unique id for this format descriptor;
357+
only defined after parent header is
358+
linked into the streaming class;
359+
read-only
360+
bmaControls this format's data for bmaControls in
361+
the streaming header
362+
bmInterlaceFlags specifies interlace information,
363+
read-only
364+
bAspectRatioY the X dimension of the picture aspect
365+
ratio, read-only
366+
bAspectRatioX the Y dimension of the picture aspect
367+
ratio, read-only
368+
bDefaultFrameIndex optimum frame index for this stream
369+
bBitsPerPixel number of bits per pixel used to
370+
specify color in the decoded video
371+
frame
372+
guidFormat globally unique id used to identify
373+
stream-encoding format
374+
================== =======================================
375+
376+
What: /config/usb-gadget/gadget/functions/uvc.name/streaming/framebased/name/name
377+
Date: Sept 2024
378+
KernelVersion: 5.15
379+
Description: Specific framebased frame descriptors
380+
381+
========================= =====================================
382+
bFrameIndex unique id for this framedescriptor;
383+
only defined after parent format is
384+
linked into the streaming header;
385+
read-only
386+
dwFrameInterval indicates how frame interval can be
387+
programmed; a number of values
388+
separated by newline can be specified
389+
dwDefaultFrameInterval the frame interval the device would
390+
like to use as default
391+
dwBytesPerLine Specifies the number of bytes per line
392+
of video for packed fixed frame size
393+
formats, allowing the receiver to
394+
perform stride alignment of the video.
395+
If the bVariableSize value (above) is
396+
TRUE (1), or if the format does not
397+
permit such alignment, this value shall
398+
be set to zero (0).
399+
dwMaxBitRate the maximum bit rate at the shortest
400+
frame interval in bps
401+
dwMinBitRate the minimum bit rate at the longest
402+
frame interval in bps
403+
wHeight height of decoded bitmap frame in px
404+
wWidth width of decoded bitmam frame in px
405+
bmCapabilities still image support, fixed frame-rate
406+
support
407+
========================= =====================================
408+
345409
What: /config/usb-gadget/gadget/functions/uvc.name/streaming/header
346410
Date: Dec 2014
347411
KernelVersion: 4.0
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
What: /sys/kernel/debug/vfio/<device>/migration/hisi_acc/dev_data
2+
Date: Jan 2025
3+
KernelVersion: 6.13
4+
Contact: Longfang Liu <[email protected]>
5+
Description: Read the configuration data and some status data
6+
required for device live migration. These data include device
7+
status data, queue configuration data, some task configuration
8+
data and device attribute data. The output format of the data
9+
is defined by the live migration driver.
10+
11+
What: /sys/kernel/debug/vfio/<device>/migration/hisi_acc/migf_data
12+
Date: Jan 2025
13+
KernelVersion: 6.13
14+
Contact: Longfang Liu <[email protected]>
15+
Description: Read the data from the last completed live migration.
16+
This data includes the same device status data as in "dev_data".
17+
The migf_data is the dev_data that is migrated.
18+
19+
What: /sys/kernel/debug/vfio/<device>/migration/hisi_acc/cmd_state
20+
Date: Jan 2025
21+
KernelVersion: 6.13
22+
Contact: Longfang Liu <[email protected]>
23+
Description: Used to obtain the device command sending and receiving
24+
channel status. Returns failure or success logs based on the
25+
results.

Documentation/ABI/testing/sysfs-bus-event_source-devices-vpa-pmu

+8-7
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,18 @@ Description: Read-only. Attribute group to describe the magic bits
88
Each attribute under this group defines a bit range of the
99
perf_event_attr.config. Supported attribute are listed
1010
below::
11-
event = "config:0-31" - event ID
1211

13-
For example::
12+
event = "config:0-31" - event ID
1413

15-
l1_to_l2_lat = "event=0x1"
14+
For example::
15+
16+
l1_to_l2_lat = "event=0x1"
1617

1718
What: /sys/bus/event_source/devices/vpa_pmu/events
1819
Date: November 2024
1920
Contact: Linux on PowerPC Developer List <[email protected]>
20-
Description: Read-only. Attribute group to describe performance monitoring
21+
Description: Read-only. Attribute group to describe performance monitoring
2122
events for the Virtual Processor Area events. Each attribute
22-
in this group describes a single performance monitoring event
23-
supported by vpa_pmu. The name of the file is the name of
24-
the event (See ABI/testing/sysfs-bus-event_source-devices-events).
23+
in this group describes a single performance monitoring event
24+
supported by vpa_pmu. The name of the file is the name of
25+
the event (See ABI/testing/sysfs-bus-event_source-devices-events).

Documentation/ABI/testing/sysfs-bus-iio

+32
Original file line numberDiff line numberDiff line change
@@ -2268,6 +2268,30 @@ Description:
22682268
An example format is 16-bytes, 2-digits-per-byte, HEX-string
22692269
representing the sensor unique ID number.
22702270

2271+
What: /sys/bus/iio/devices/iio:deviceX/filter_type_available
2272+
What: /sys/bus/iio/devices/iio:deviceX/in_voltage-voltage_filter_mode_available
2273+
KernelVersion: 6.1
2274+
2275+
Description:
2276+
Reading returns a list with the possible filter modes. Options
2277+
for the attribute:
2278+
2279+
* "sinc3" - The digital sinc3 filter. Moderate 1st
2280+
conversion time. Good noise performance.
2281+
* "sinc4" - Sinc 4. Excellent noise performance. Long
2282+
1st conversion time.
2283+
* "sinc5" - The digital sinc5 filter. Excellent noise
2284+
performance
2285+
* "sinc4+sinc1" - Sinc4 + averaging by 8. Low 1st conversion
2286+
time.
2287+
* "sinc3+rej60" - Sinc3 + 60Hz rejection.
2288+
* "sinc3+sinc1" - Sinc3 + averaging by 8. Low 1st conversion
2289+
time.
2290+
* "sinc3+pf1" - Sinc3 + device specific Post Filter 1.
2291+
* "sinc3+pf2" - Sinc3 + device specific Post Filter 2.
2292+
* "sinc3+pf3" - Sinc3 + device specific Post Filter 3.
2293+
* "sinc3+pf4" - Sinc3 + device specific Post Filter 4.
2294+
22712295
What: /sys/.../events/in_proximity_thresh_either_runningperiod
22722296
KernelVersion: 6.6
22732297
@@ -2339,3 +2363,11 @@ KernelVersion: 6.10
23392363
23402364
Description:
23412365
The value of current sense resistor in Ohms.
2366+
2367+
What: /sys/.../iio:deviceX/in_attention_input
2368+
KernelVersion: 6.13
2369+
2370+
Description:
2371+
Value representing the user's attention to the system expressed
2372+
in units as percentage. This usually means if the user is
2373+
looking at the screen or not.

Documentation/ABI/testing/sysfs-bus-iio-adc-ad4130

-46
This file was deleted.

Documentation/ABI/testing/sysfs-bus-pci

+11
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,17 @@ Description:
163163
will be present in sysfs. Writing 1 to this file
164164
will perform reset.
165165

166+
What: /sys/bus/pci/devices/.../reset_subordinate
167+
Date: October 2024
168+
169+
Description:
170+
This is visible only for bridge devices. If you want to reset
171+
all devices attached through the subordinate bus of a specific
172+
bridge device, writing 1 to this will try to do it. This will
173+
affect all devices attached to the system through this bridge
174+
similiar to writing 1 to their individual "reset" file, so use
175+
with caution.
176+
166177
What: /sys/bus/pci/devices/.../vpd
167178
Date: February 2008
168179
Contact: Ben Hutchings <[email protected]>

Documentation/ABI/testing/sysfs-class-typec

+27
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,19 @@ Description:
149149
advertise to the partner. The currently used capabilities are in
150150
brackets. Selection happens by writing to the file.
151151

152+
What: /sys/class/typec/<port>/usb_capability
153+
Date: November 2024
154+
Contact: Heikki Krogerus <[email protected]>
155+
Description: Lists the supported USB Modes. The default USB mode that is used
156+
next time with the Enter_USB Message is in brackets. The default
157+
mode can be changed by writing to the file when supported by the
158+
driver.
159+
160+
Valid values:
161+
- usb2 (USB 2.0)
162+
- usb3 (USB 3.2)
163+
- usb4 (USB4)
164+
152165
USB Type-C partner devices (eg. /sys/class/typec/port0-partner/)
153166

154167
What: /sys/class/typec/<port>-partner/accessory_mode
@@ -220,6 +233,20 @@ Description:
220233
directory exists, it will have an attribute file for every VDO
221234
in Discover Identity command result.
222235

236+
What: /sys/class/typec/<port>-partner/usb_mode
237+
Date: November 2024
238+
Contact: Heikki Krogerus <[email protected]>
239+
Description: The USB Modes that the partner device supports. The active mode
240+
is displayed in brackets. The active USB mode can be changed by
241+
writing to this file when the port driver is able to send Data
242+
Reset Message to the partner. That requires USB Power Delivery
243+
contract between the partner and the port.
244+
245+
Valid values:
246+
- usb2 (USB 2.0)
247+
- usb3 (USB 3.2)
248+
- usb4 (USB4)
249+
223250
USB Type-C cable devices (eg. /sys/class/typec/port0-cable/)
224251

225252
Note: Electronically Marked Cables will have a device also for one cable plug

Documentation/ABI/testing/sysfs-fs-f2fs

+11-2
Original file line numberDiff line numberDiff line change
@@ -311,10 +311,13 @@ Description: Do background GC aggressively when set. Set to 0 by default.
311311
GC approach and turns SSR mode on.
312312
gc urgent low(2): lowers the bar of checking I/O idling in
313313
order to process outstanding discard commands and GC a
314-
little bit aggressively. uses cost benefit GC approach.
314+
little bit aggressively. always uses cost benefit GC approach,
315+
and will override age-threshold GC approach if ATGC is enabled
316+
at the same time.
315317
gc urgent mid(3): does GC forcibly in a period of given
316318
gc_urgent_sleep_time and executes a mid level of I/O idling check.
317-
uses cost benefit GC approach.
319+
always uses cost benefit GC approach, and will override
320+
age-threshold GC approach if ATGC is enabled at the same time.
318321

319322
What: /sys/fs/f2fs/<disk>/gc_urgent_sleep_time
320323
Date: August 2017
@@ -819,3 +822,9 @@ Description: It controls the valid block ratio threshold not to trigger excessiv
819822
for zoned deivces. The initial value of it is 95(%). F2FS will stop the
820823
background GC thread from intiating GC for sections having valid blocks
821824
exceeding the ratio.
825+
826+
What: /sys/fs/f2fs/<disk>/max_read_extent_count
827+
Date: November 2024
828+
Contact: "Chao Yu" <[email protected]>
829+
Description: It controls max read extent count for per-inode, the value of threshold
830+
is 10240 by default.

Documentation/PCI/endpoint/pci-endpoint.rst

+29
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,35 @@ by the PCI endpoint function driver.
117117
The PCI endpoint function driver should use pci_epc_mem_free_addr() to
118118
free the memory space allocated using pci_epc_mem_alloc_addr().
119119

120+
* pci_epc_map_addr()
121+
122+
A PCI endpoint function driver should use pci_epc_map_addr() to map to a RC
123+
PCI address the CPU address of local memory obtained with
124+
pci_epc_mem_alloc_addr().
125+
126+
* pci_epc_unmap_addr()
127+
128+
A PCI endpoint function driver should use pci_epc_unmap_addr() to unmap the
129+
CPU address of local memory mapped to a RC address with pci_epc_map_addr().
130+
131+
* pci_epc_mem_map()
132+
133+
A PCI endpoint controller may impose constraints on the RC PCI addresses that
134+
can be mapped. The function pci_epc_mem_map() allows endpoint function
135+
drivers to allocate and map controller memory while handling such
136+
constraints. This function will determine the size of the memory that must be
137+
allocated with pci_epc_mem_alloc_addr() for successfully mapping a RC PCI
138+
address range. This function will also indicate the size of the PCI address
139+
range that was actually mapped, which can be less than the requested size, as
140+
well as the offset into the allocated memory to use for accessing the mapped
141+
RC PCI address range.
142+
143+
* pci_epc_mem_unmap()
144+
145+
A PCI endpoint function driver can use pci_epc_mem_unmap() to unmap and free
146+
controller memory that was allocated and mapped using pci_epc_mem_map().
147+
148+
120149
Other EPC APIs
121150
~~~~~~~~~~~~~~
122151

Documentation/PCI/index.rst

+1
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@ PCI Bus Subsystem
1818
pcieaer-howto
1919
endpoint/index
2020
boot-interrupts
21+
tph

Documentation/PCI/pciebus-howto.rst

+9-5
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,12 @@ capability structure except the PCI Express capability structure,
217217
that is shared between many drivers including the service drivers.
218218
RMW Capability accessors (pcie_capability_clear_and_set_word(),
219219
pcie_capability_set_word(), and pcie_capability_clear_word()) protect
220-
a selected set of PCI Express Capability Registers (Link Control
221-
Register and Root Control Register). Any change to those registers
222-
should be performed using RMW accessors to avoid problems due to
223-
concurrent updates. For the up-to-date list of protected registers,
224-
see pcie_capability_clear_and_set_word().
220+
a selected set of PCI Express Capability Registers:
221+
222+
* Link Control Register
223+
* Root Control Register
224+
* Link Control 2 Register
225+
226+
Any change to those registers should be performed using RMW accessors to
227+
avoid problems due to concurrent updates. For the up-to-date list of
228+
protected registers, see pcie_capability_clear_and_set_word().

0 commit comments

Comments
 (0)