Skip to content

Commit fb4e059

Browse files
committed
Merge tag 'irqchip-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/core
Pull irqchip updates from Marc Zyngier - The huge (and terrifying) TI INTR/INTA set of drivers - Rewrite of the stm32mp1-exti driver as a platform driver - Update the IOMMU MSI mapping API to be RT friendly - A number of cleanups and other low impact fixes
2 parents 471ba0e + 16e32c3 commit fb4e059

File tree

1,057 files changed

+13787
-10350
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,057 files changed

+13787
-10350
lines changed

.clang-format

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ ForEachMacros:
7878
- 'ata_qc_for_each_with_internal'
7979
- 'ax25_for_each'
8080
- 'ax25_uid_for_each'
81+
- '__bio_for_each_bvec'
82+
- 'bio_for_each_bvec'
8183
- 'bio_for_each_integrity_vec'
8284
- '__bio_for_each_segment'
8385
- 'bio_for_each_segment'
@@ -118,10 +120,12 @@ ForEachMacros:
118120
- 'drm_for_each_legacy_plane'
119121
- 'drm_for_each_plane'
120122
- 'drm_for_each_plane_mask'
123+
- 'drm_for_each_privobj'
121124
- 'drm_mm_for_each_hole'
122125
- 'drm_mm_for_each_node'
123126
- 'drm_mm_for_each_node_in_range'
124127
- 'drm_mm_for_each_node_safe'
128+
- 'flow_action_for_each'
125129
- 'for_each_active_drhd_unit'
126130
- 'for_each_active_iommu'
127131
- 'for_each_available_child_of_node'
@@ -158,6 +162,9 @@ ForEachMacros:
158162
- 'for_each_dss_dev'
159163
- 'for_each_efi_memory_desc'
160164
- 'for_each_efi_memory_desc_in_map'
165+
- 'for_each_element'
166+
- 'for_each_element_extid'
167+
- 'for_each_element_id'
161168
- 'for_each_endpoint_of_node'
162169
- 'for_each_evictable_lru'
163170
- 'for_each_fib6_node_rt_rcu'
@@ -195,6 +202,7 @@ ForEachMacros:
195202
- 'for_each_net_rcu'
196203
- 'for_each_new_connector_in_state'
197204
- 'for_each_new_crtc_in_state'
205+
- 'for_each_new_mst_mgr_in_state'
198206
- 'for_each_new_plane_in_state'
199207
- 'for_each_new_private_obj_in_state'
200208
- 'for_each_node'
@@ -210,8 +218,10 @@ ForEachMacros:
210218
- 'for_each_of_pci_range'
211219
- 'for_each_old_connector_in_state'
212220
- 'for_each_old_crtc_in_state'
221+
- 'for_each_old_mst_mgr_in_state'
213222
- 'for_each_oldnew_connector_in_state'
214223
- 'for_each_oldnew_crtc_in_state'
224+
- 'for_each_oldnew_mst_mgr_in_state'
215225
- 'for_each_oldnew_plane_in_state'
216226
- 'for_each_oldnew_plane_in_state_reverse'
217227
- 'for_each_oldnew_private_obj_in_state'
@@ -243,6 +253,9 @@ ForEachMacros:
243253
- 'for_each_sg_dma_page'
244254
- 'for_each_sg_page'
245255
- 'for_each_sibling_event'
256+
- 'for_each_subelement'
257+
- 'for_each_subelement_extid'
258+
- 'for_each_subelement_id'
246259
- '__for_each_thread'
247260
- 'for_each_thread'
248261
- 'for_each_zone'
@@ -252,6 +265,8 @@ ForEachMacros:
252265
- 'fwnode_for_each_child_node'
253266
- 'fwnode_graph_for_each_endpoint'
254267
- 'gadget_for_each_ep'
268+
- 'genradix_for_each'
269+
- 'genradix_for_each_from'
255270
- 'hash_for_each'
256271
- 'hash_for_each_possible'
257272
- 'hash_for_each_possible_rcu'
@@ -293,7 +308,11 @@ ForEachMacros:
293308
- 'key_for_each'
294309
- 'key_for_each_safe'
295310
- 'klp_for_each_func'
311+
- 'klp_for_each_func_safe'
312+
- 'klp_for_each_func_static'
296313
- 'klp_for_each_object'
314+
- 'klp_for_each_object_safe'
315+
- 'klp_for_each_object_static'
297316
- 'kvm_for_each_memslot'
298317
- 'kvm_for_each_vcpu'
299318
- 'list_for_each'
@@ -324,6 +343,8 @@ ForEachMacros:
324343
- 'media_device_for_each_intf'
325344
- 'media_device_for_each_link'
326345
- 'media_device_for_each_pad'
346+
- 'mp_bvec_for_each_page'
347+
- 'mp_bvec_for_each_segment'
327348
- 'nanddev_io_for_each_page'
328349
- 'netdev_for_each_lower_dev'
329350
- 'netdev_for_each_lower_private'
@@ -375,6 +396,7 @@ ForEachMacros:
375396
- 'rht_for_each_rcu'
376397
- 'rht_for_each_rcu_continue'
377398
- '__rq_for_each_bio'
399+
- 'rq_for_each_bvec'
378400
- 'rq_for_each_segment'
379401
- 'scsi_for_each_prot_sg'
380402
- 'scsi_for_each_sg'
@@ -410,6 +432,8 @@ ForEachMacros:
410432
- 'v4l2_m2m_for_each_src_buf_safe'
411433
- 'virtio_device_for_each_vq'
412434
- 'xa_for_each'
435+
- 'xa_for_each_marked'
436+
- 'xa_for_each_start'
413437
- 'xas_for_each'
414438
- 'xas_for_each_conflict'
415439
- 'xas_for_each_marked'

.mailmap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,8 @@ Morten Welinder <[email protected]>
156156
Morten Welinder <[email protected]>
157157
Mythri P K <[email protected]>
158158
Nguyen Anh Quynh <[email protected]>
159+
160+
159161
Paolo 'Blaisorblade' Giarrusso <[email protected]>
160162
Patrick Mochel <[email protected]>
161163
@@ -224,3 +226,5 @@ Yakir Yang <[email protected]> <[email protected]>
224226
Yusuke Goda <[email protected]>
225227
Gustavo Padovan <[email protected]>
226228
Gustavo Padovan <[email protected]>
229+
230+

Documentation/accounting/psi.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,12 @@ situation from a state where some tasks are stalled but the CPU is
5656
still doing productive work. As such, time spent in this subset of the
5757
stall state is tracked separately and exported in the "full" averages.
5858

59-
The ratios are tracked as recent trends over ten, sixty, and three
60-
hundred second windows, which gives insight into short term events as
61-
well as medium and long term trends. The total absolute stall time is
62-
tracked and exported as well, to allow detection of latency spikes
63-
which wouldn't necessarily make a dent in the time averages, or to
64-
average trends over custom time frames.
59+
The ratios (in %) are tracked as recent trends over ten, sixty, and
60+
three hundred second windows, which gives insight into short term events
61+
as well as medium and long term trends. The total absolute stall time
62+
(in us) is tracked and exported as well, to allow detection of latency
63+
spikes which wouldn't necessarily make a dent in the time averages,
64+
or to average trends over custom time frames.
6565

6666
Cgroup2 interface
6767
=================

Documentation/bpf/btf.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,16 +148,16 @@ The ``btf_type.size * 8`` must be equal to or greater than ``BTF_INT_BITS()``
148148
for the type. The maximum value of ``BTF_INT_BITS()`` is 128.
149149

150150
The ``BTF_INT_OFFSET()`` specifies the starting bit offset to calculate values
151-
for this int. For example, a bitfield struct member has: * btf member bit
152-
offset 100 from the start of the structure, * btf member pointing to an int
153-
type, * the int type has ``BTF_INT_OFFSET() = 2`` and ``BTF_INT_BITS() = 4``
151+
for this int. For example, a bitfield struct member has:
152+
* btf member bit offset 100 from the start of the structure,
153+
* btf member pointing to an int type,
154+
* the int type has ``BTF_INT_OFFSET() = 2`` and ``BTF_INT_BITS() = 4``
154155

155156
Then in the struct memory layout, this member will occupy ``4`` bits starting
156157
from bits ``100 + 2 = 102``.
157158

158159
Alternatively, the bitfield struct member can be the following to access the
159160
same bits as the above:
160-
161161
* btf member bit offset 102,
162162
* btf member pointing to an int type,
163163
* the int type has ``BTF_INT_OFFSET() = 0`` and ``BTF_INT_BITS() = 4``

Documentation/devicetree/bindings/arm/cpus.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ patternProperties:
228228
- renesas,r9a06g032-smp
229229
- rockchip,rk3036-smp
230230
- rockchip,rk3066-smp
231-
- socionext,milbeaut-m10v-smp
231+
- socionext,milbeaut-m10v-smp
232232
- ste,dbx500-smp
233233

234234
cpu-release-addr:

Documentation/devicetree/bindings/arm/keystone/ti,sci.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ relationship between the TI-SCI parent node to the child node.
2424

2525
Required properties:
2626
-------------------
27-
- compatible: should be "ti,k2g-sci"
27+
- compatible: should be "ti,k2g-sci" for TI 66AK2G SoC
28+
should be "ti,am654-sci" for for TI AM654 SoC
2829
- mbox-names:
2930
"rx" - Mailbox corresponding to receive path
3031
"tx" - Mailbox corresponding to transmit path

Documentation/devicetree/bindings/hwmon/adc128d818.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ Required node properties:
2626

2727
Optional node properties:
2828

29-
- ti,mode: Operation mode (see above).
29+
- ti,mode: Operation mode (u8) (see above).
3030

3131

3232
Example (operation mode 2):
3333

3434
adc128d818@1d {
3535
compatible = "ti,adc128d818";
3636
reg = <0x1d>;
37-
ti,mode = <2>;
37+
ti,mode = /bits/ 8 <2>;
3838
};

0 commit comments

Comments
 (0)