Skip to content

Commit fd6b519

Browse files
committed
Merge tag 'v5.9-rc5' into asoc-5.10
Linux 5.9-rc5
2 parents 4349913 + 856deb8 commit fd6b519

File tree

1,894 files changed

+10991
-6958
lines changed

Some content is hidden

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

1,894 files changed

+10991
-6958
lines changed

.clang-format

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ ForEachMacros:
111111
- 'css_for_each_descendant_pre'
112112
- 'device_for_each_child_node'
113113
- 'dma_fence_chain_for_each'
114+
- 'do_for_each_ftrace_op'
114115
- 'drm_atomic_crtc_for_each_plane'
115116
- 'drm_atomic_crtc_state_for_each_plane'
116117
- 'drm_atomic_crtc_state_for_each_plane_state'
@@ -136,6 +137,7 @@ ForEachMacros:
136137
- 'for_each_active_dev_scope'
137138
- 'for_each_active_drhd_unit'
138139
- 'for_each_active_iommu'
140+
- 'for_each_aggr_pgid'
139141
- 'for_each_available_child_of_node'
140142
- 'for_each_bio'
141143
- 'for_each_board_func_rsrc'
@@ -234,6 +236,7 @@ ForEachMacros:
234236
- 'for_each_node_state'
235237
- 'for_each_node_with_cpus'
236238
- 'for_each_node_with_property'
239+
- 'for_each_nonreserved_multicast_dest_pgid'
237240
- 'for_each_of_allnodes'
238241
- 'for_each_of_allnodes_from'
239242
- 'for_each_of_cpu_node'
@@ -256,6 +259,7 @@ ForEachMacros:
256259
- 'for_each_pci_dev'
257260
- 'for_each_pci_msi_entry'
258261
- 'for_each_pcm_streams'
262+
- 'for_each_physmem_range'
259263
- 'for_each_populated_zone'
260264
- 'for_each_possible_cpu'
261265
- 'for_each_present_cpu'
@@ -265,6 +269,8 @@ ForEachMacros:
265269
- 'for_each_process_thread'
266270
- 'for_each_property_of_node'
267271
- 'for_each_registered_fb'
272+
- 'for_each_requested_gpio'
273+
- 'for_each_requested_gpio_in_range'
268274
- 'for_each_reserved_mem_region'
269275
- 'for_each_rtd_codec_dais'
270276
- 'for_each_rtd_codec_dais_rollback'
@@ -278,12 +284,17 @@ ForEachMacros:
278284
- 'for_each_sg'
279285
- 'for_each_sg_dma_page'
280286
- 'for_each_sg_page'
287+
- 'for_each_sgtable_dma_page'
288+
- 'for_each_sgtable_dma_sg'
289+
- 'for_each_sgtable_page'
290+
- 'for_each_sgtable_sg'
281291
- 'for_each_sibling_event'
282292
- 'for_each_subelement'
283293
- 'for_each_subelement_extid'
284294
- 'for_each_subelement_id'
285295
- '__for_each_thread'
286296
- 'for_each_thread'
297+
- 'for_each_unicast_dest_pgid'
287298
- 'for_each_wakeup_source'
288299
- 'for_each_zone'
289300
- 'for_each_zone_zonelist'
@@ -464,6 +475,7 @@ ForEachMacros:
464475
- 'v4l2_m2m_for_each_src_buf'
465476
- 'v4l2_m2m_for_each_src_buf_safe'
466477
- 'virtio_device_for_each_vq'
478+
- 'while_for_each_ftrace_op'
467479
- 'xa_for_each'
468480
- 'xa_for_each_marked'
469481
- 'xa_for_each_range'

.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,7 @@ Tony Luck <[email protected]>
308308
309309
310310
Tsuneo Yoshioka <[email protected]>
311+
311312
Uwe Kleine-König <[email protected]>
312313
Uwe Kleine-König <[email protected]>
313314
Uwe Kleine-König <[email protected]>

Documentation/RCU/lockdep.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ checking of rcu_dereference() primitives:
4949
is invoked by both RCU-sched readers and updaters.
5050
srcu_dereference_check(p, c):
5151
Use explicit check expression "c" along with
52-
srcu_read_lock_held()(). This is useful in code that
52+
srcu_read_lock_held(). This is useful in code that
5353
is invoked by both SRCU readers and updaters.
5454
rcu_dereference_raw(p):
5555
Don't check. (Use sparingly, if at all.)

Documentation/admin-guide/devices.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1662,7 +1662,7 @@
16621662

16631663
98 block User-mode virtual block device
16641664
0 = /dev/ubda First user-mode block device
1665-
16 = /dev/udbb Second user-mode block device
1665+
16 = /dev/ubdb Second user-mode block device
16661666
...
16671667

16681668
Partitions are handled in the same way as for IDE

Documentation/admin-guide/dynamic-debug-howto.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ against. Possible keywords are:::
156156
``line-range`` cannot contain space, e.g.
157157
"1-30" is valid range but "1 - 30" is not.
158158

159-
``module=foo`` combined keyword=value form is interchangably accepted
160159

161160
The meanings of each keyword are:
162161

Documentation/admin-guide/laptops/thinkpad-acpi.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1434,7 +1434,7 @@ on the feature, restricting the viewing angles.
14341434

14351435

14361436
DYTC Lapmode sensor
1437-
------------------
1437+
-------------------
14381438

14391439
sysfs: dytc_lapmode
14401440

Documentation/admin-guide/pm/intel_pstate.rst

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,9 @@ Energy-Performance Bias (EPB) knob (otherwise), which means that the processor's
123123
internal P-state selection logic is expected to focus entirely on performance.
124124

125125
This will override the EPP/EPB setting coming from the ``sysfs`` interface
126-
(see `Energy vs Performance Hints`_ below).
126+
(see `Energy vs Performance Hints`_ below). Moreover, any attempts to change
127+
the EPP/EPB to a value different from 0 ("performance") via ``sysfs`` in this
128+
configuration will be rejected.
127129

128130
Also, in this configuration the range of P-states available to the processor's
129131
internal P-state selection logic is always restricted to the upper boundary
@@ -564,8 +566,8 @@ Energy-Performance Preference (EPP) knob (if supported) or its
564566
Energy-Performance Bias (EPB) knob. It is also possible to write a positive
565567
integer value between 0 to 255, if the EPP feature is present. If the EPP
566568
feature is not present, writing integer value to this attribute is not
567-
supported. In this case, user can use
568-
"/sys/devices/system/cpu/cpu*/power/energy_perf_bias" interface.
569+
supported. In this case, user can use the
570+
"/sys/devices/system/cpu/cpu*/power/energy_perf_bias" interface.
569571

570572
[Note that tasks may by migrated from one CPU to another by the scheduler's
571573
load-balancing algorithm and if different energy vs performance hints are

Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.txt

Lines changed: 0 additions & 66 deletions
This file was deleted.
Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/interrupt-controller/ti,sci-inta.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Texas Instruments K3 Interrupt Aggregator
8+
9+
maintainers:
10+
- Lokesh Vutla <[email protected]>
11+
12+
allOf:
13+
- $ref: /schemas/arm/keystone/ti,k3-sci-common.yaml#
14+
15+
description: |
16+
The Interrupt Aggregator (INTA) provides a centralized machine
17+
which handles the termination of system events to that they can
18+
be coherently processed by the host(s) in the system. A maximum
19+
of 64 events can be mapped to a single interrupt.
20+
21+
Interrupt Aggregator
22+
+-----------------------------------------+
23+
| Intmap VINT |
24+
| +--------------+ +------------+ |
25+
m ------>| | vint | bit | | 0 |.....|63| vint0 |
26+
. | +--------------+ +------------+ | +------+
27+
. | . . | | HOST |
28+
Globalevents ------>| . . |----->| IRQ |
29+
. | . . | | CTRL |
30+
. | . . | +------+
31+
n ------>| +--------------+ +------------+ |
32+
| | vint | bit | | 0 |.....|63| vintx |
33+
| +--------------+ +------------+ |
34+
| |
35+
+-----------------------------------------+
36+
37+
Configuration of these Intmap registers that maps global events to vint is
38+
done by a system controller (like the Device Memory and Security Controller
39+
on AM654 SoC). Driver should request the system controller to get the range
40+
of global events and vints assigned to the requesting host. Management
41+
of these requested resources should be handled by driver and requests
42+
system controller to map specific global event to vint, bit pair.
43+
44+
Communication between the host processor running an OS and the system
45+
controller happens through a protocol called TI System Control Interface
46+
(TISCI protocol).
47+
48+
properties:
49+
compatible:
50+
const: ti,sci-inta
51+
52+
reg:
53+
maxItems: 1
54+
55+
interrupt-controller: true
56+
57+
msi-controller: true
58+
59+
ti,interrupt-ranges:
60+
$ref: /schemas/types.yaml#/definitions/uint32-matrix
61+
description: |
62+
Interrupt ranges that converts the INTA output hw irq numbers
63+
to parents's input interrupt numbers.
64+
items:
65+
items:
66+
- description: |
67+
"output_irq" specifies the base for inta output irq
68+
- description: |
69+
"parent's input irq" specifies the base for parent irq
70+
- description: |
71+
"limit" specifies the limit for translation
72+
73+
required:
74+
- compatible
75+
- reg
76+
- interrupt-controller
77+
- msi-controller
78+
- ti,sci
79+
- ti,sci-dev-id
80+
- ti,interrupt-ranges
81+
82+
examples:
83+
- |
84+
bus {
85+
#address-cells = <2>;
86+
#size-cells = <2>;
87+
88+
main_udmass_inta: msi-controller@33d00000 {
89+
compatible = "ti,sci-inta";
90+
reg = <0x0 0x33d00000 0x0 0x100000>;
91+
interrupt-controller;
92+
msi-controller;
93+
interrupt-parent = <&main_navss_intr>;
94+
ti,sci = <&dmsc>;
95+
ti,sci-dev-id = <179>;
96+
ti,interrupt-ranges = <0 0 256>;
97+
};
98+
};

Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.txt

Lines changed: 0 additions & 82 deletions
This file was deleted.

0 commit comments

Comments
 (0)