Skip to content

Commit 01ff3a2

Browse files
committed
Merge tag 'v6.18.14' into 6.18-main
This is the 6.18.14 stable release # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCgAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmmg0G0ACgkQONu9yGCS # aT45MBAApWsI70WzfLawMYLN9Oyn4NQuI9SCnh6Y7YLUFRTql6D/pSm4kPL8LToD # oY4Hb3COCrfJF0DdKN4QivZIYgcBHfDPWd3I29cMwl7iQAGM6AmUc3Zah3aHBG+3 # SmAERqs6uAUsokCxcpqhX0RQvpcJ4daXWKKYxtYb1NfInsdT8UZAqlSuzCq/KktY # 4UViRbIwmJkygjoqXpEouxidqJH7QLuIabSSFAbCKfM8xj/sHYpxoIQgc5W48JdD # 8mv9EATYYsN4mkPTyBpTUrIEa6h6+DmtQStQo1PYbRlyTJLV/Ym066o4tgACGZlU # ke8omNEKo3gARr0bf5ANpj0aRq4bxJoKZni3Cnhweig7SRNl2KfrN1LOaIFlKCG6 # 1m67LGG3Etl84Te6mOzdQicO3nXoNDxpKbOOrJEN7Qhwn4plJH2vNmvpMKcsuM9O # eZ66NbYCOBtrtH6NSVTced8+60/m3PepwO8BmQcLv6YbYmmKawpAmmDBC9mzZKIi # reH+JUvPJ2cbChVV2JylpduwdY7THcq6S/ua19gnjWFMZdLnhaj8nJ9bSxxE8D6+ # 7zCYJfVGNTaBr/dROYcxIDy06mk8L2mhqpq051hc0iN/mNUrLjYW1vidV/DA3XL7 # jZyrtB1dFx+otTZ54MtYifxQJNQe0o3YQpl2yJ0Z1zEK/W5bSeo= # =RzH/ # -----END PGP SIGNATURE----- # gpg: Signature made Thu Feb 26 23:59:57 2026 CET # gpg: using RSA key 647F28654894E3BD457199BE38DBBDC86092693E # gpg: Can't check signature: No public key
2 parents 3be7bf3 + 2ad6657 commit 01ff3a2

724 files changed

Lines changed: 11619 additions & 7575 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.

Documentation/PCI/endpoint/pci-vntb-howto.rst

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@ pci-epf-vntb device, the following commands can be used::
5252
# cd /sys/kernel/config/pci_ep/
5353
# mkdir functions/pci_epf_vntb/func1
5454

55-
The "mkdir func1" above creates the pci-epf-ntb function device that will
55+
The "mkdir func1" above creates the pci-epf-vntb function device that will
5656
be probed by pci_epf_vntb driver.
5757

5858
The PCI endpoint framework populates the directory with the following
5959
configurable fields::
6060

61-
# ls functions/pci_epf_ntb/func1
62-
baseclass_code deviceid msi_interrupts pci-epf-ntb.0
61+
# ls functions/pci_epf_vntb/func1
62+
baseclass_code deviceid msi_interrupts pci-epf-vntb.0
6363
progif_code secondary subsys_id vendorid
6464
cache_line_size interrupt_pin msix_interrupts primary
6565
revid subclass_code subsys_vendor_id
@@ -111,13 +111,13 @@ A sample configuration for virtual NTB driver for virtual PCI bus::
111111
# echo 0x080A > functions/pci_epf_vntb/func1/pci_epf_vntb.0/vntb_pid
112112
# echo 0x10 > functions/pci_epf_vntb/func1/pci_epf_vntb.0/vbus_number
113113

114-
Binding pci-epf-ntb Device to EP Controller
114+
Binding pci-epf-vntb Device to EP Controller
115115
--------------------------------------------
116116

117117
NTB function device should be attached to PCI endpoint controllers
118118
connected to the host.
119119

120-
# ln -s controllers/5f010000.pcie_ep functions/pci-epf-ntb/func1/primary
120+
# ln -s controllers/5f010000.pcie_ep functions/pci_epf_vntb/func1/primary
121121

122122
Once the above step is completed, the PCI endpoint controllers are ready to
123123
establish a link with the host.
@@ -139,7 +139,7 @@ lspci Output at Host side
139139
-------------------------
140140

141141
Note that the devices listed here correspond to the values populated in
142-
"Creating pci-epf-ntb Device" section above::
142+
"Creating pci-epf-vntb Device" section above::
143143

144144
# lspci
145145
00:00.0 PCI bridge: Freescale Semiconductor Inc Device 0000 (rev 01)
@@ -152,7 +152,7 @@ lspci Output at EP Side / Virtual PCI bus
152152
-----------------------------------------
153153

154154
Note that the devices listed here correspond to the values populated in
155-
"Creating pci-epf-ntb Device" section above::
155+
"Creating pci-epf-vntb Device" section above::
156156

157157
# lspci
158158
10:00.0 Unassigned class [ffff]: Dawicontrol Computersysteme GmbH Device 1234 (rev ff)

Documentation/devicetree/bindings/media/qcom,qcs8300-camss.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,14 @@ properties:
120120
items:
121121
- const: top
122122

123+
vdda-phy-supply:
124+
description:
125+
Phandle to a 0.88V regulator supply to CSI PHYs.
126+
127+
vdda-pll-supply:
128+
description:
129+
Phandle to 1.2V regulator supply to CSI PHYs pll block.
130+
123131
ports:
124132
$ref: /schemas/graph.yaml#/properties/ports
125133

@@ -160,6 +168,8 @@ required:
160168
- power-domains
161169
- power-domain-names
162170
- ports
171+
- vdda-phy-supply
172+
- vdda-pll-supply
163173

164174
additionalProperties: false
165175

@@ -328,6 +338,9 @@ examples:
328338
power-domains = <&camcc CAM_CC_TITAN_TOP_GDSC>;
329339
power-domain-names = "top";
330340
341+
vdda-phy-supply = <&vreg_l4a_0p88>;
342+
vdda-pll-supply = <&vreg_l1c_1p2>;
343+
331344
ports {
332345
#address-cells = <1>;
333346
#size-cells = <0>;

Documentation/devicetree/bindings/phy/qcom,edp-phy.yaml

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,15 @@ properties:
3737
- description: PLL register block
3838

3939
clocks:
40-
maxItems: 2
40+
minItems: 2
41+
maxItems: 3
4142

4243
clock-names:
44+
minItems: 2
4345
items:
4446
- const: aux
4547
- const: cfg_ahb
48+
- const: ref
4649

4750
"#clock-cells":
4851
const: 1
@@ -64,6 +67,29 @@ required:
6467
- "#clock-cells"
6568
- "#phy-cells"
6669

70+
allOf:
71+
- if:
72+
properties:
73+
compatible:
74+
enum:
75+
- qcom,x1e80100-dp-phy
76+
then:
77+
properties:
78+
clocks:
79+
minItems: 3
80+
maxItems: 3
81+
clock-names:
82+
minItems: 3
83+
maxItems: 3
84+
else:
85+
properties:
86+
clocks:
87+
minItems: 2
88+
maxItems: 2
89+
clock-names:
90+
minItems: 2
91+
maxItems: 2
92+
6793
additionalProperties: false
6894

6995
examples:

Documentation/devicetree/bindings/sound/asahi-kasei,ak4458.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ properties:
2121
reg:
2222
maxItems: 1
2323

24-
avdd-supply:
24+
AVDD-supply:
2525
description: Analog power supply
2626

27-
dvdd-supply:
27+
DVDD-supply:
2828
description: Digital power supply
2929

3030
reset-gpios:
@@ -60,7 +60,7 @@ allOf:
6060
properties:
6161
dsd-path: false
6262

63-
additionalProperties: false
63+
unevaluatedProperties: false
6464

6565
examples:
6666
- |

Documentation/devicetree/bindings/sound/asahi-kasei,ak5558.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ properties:
1919
reg:
2020
maxItems: 1
2121

22-
avdd-supply:
22+
AVDD-supply:
2323
description: A 1.8V supply that powers up the AVDD pin.
2424

25-
dvdd-supply:
25+
DVDD-supply:
2626
description: A 1.2V supply that powers up the DVDD pin.
2727

2828
reset-gpios:

Documentation/driver-api/dpll.rst

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -198,26 +198,28 @@ be requested with the same attribute with ``DPLL_CMD_DEVICE_SET`` command.
198198
================================== ======================================
199199

200200
Device may also provide ability to adjust a signal phase on a pin.
201-
If pin phase adjustment is supported, minimal and maximal values that pin
202-
handle shall be provide to the user on ``DPLL_CMD_PIN_GET`` respond
203-
with ``DPLL_A_PIN_PHASE_ADJUST_MIN`` and ``DPLL_A_PIN_PHASE_ADJUST_MAX``
201+
If pin phase adjustment is supported, minimal and maximal values and
202+
granularity that pin handle shall be provided to the user on
203+
``DPLL_CMD_PIN_GET`` respond with ``DPLL_A_PIN_PHASE_ADJUST_MIN``,
204+
``DPLL_A_PIN_PHASE_ADJUST_MAX`` and ``DPLL_A_PIN_PHASE_ADJUST_GRAN``
204205
attributes. Configured phase adjust value is provided with
205206
``DPLL_A_PIN_PHASE_ADJUST`` attribute of a pin, and value change can be
206207
requested with the same attribute with ``DPLL_CMD_PIN_SET`` command.
207208

208-
=============================== ======================================
209-
``DPLL_A_PIN_ID`` configured pin id
210-
``DPLL_A_PIN_PHASE_ADJUST_MIN`` attr minimum value of phase adjustment
211-
``DPLL_A_PIN_PHASE_ADJUST_MAX`` attr maximum value of phase adjustment
212-
``DPLL_A_PIN_PHASE_ADJUST`` attr configured value of phase
213-
adjustment on parent dpll device
214-
``DPLL_A_PIN_PARENT_DEVICE`` nested attribute for requesting
215-
configuration on given parent dpll
216-
device
217-
``DPLL_A_PIN_PARENT_ID`` parent dpll device id
218-
``DPLL_A_PIN_PHASE_OFFSET`` attr measured phase difference
219-
between a pin and parent dpll device
220-
=============================== ======================================
209+
================================ ==========================================
210+
``DPLL_A_PIN_ID`` configured pin id
211+
``DPLL_A_PIN_PHASE_ADJUST_GRAN`` attr granularity of phase adjustment value
212+
``DPLL_A_PIN_PHASE_ADJUST_MIN`` attr minimum value of phase adjustment
213+
``DPLL_A_PIN_PHASE_ADJUST_MAX`` attr maximum value of phase adjustment
214+
``DPLL_A_PIN_PHASE_ADJUST`` attr configured value of phase
215+
adjustment on parent dpll device
216+
``DPLL_A_PIN_PARENT_DEVICE`` nested attribute for requesting
217+
configuration on given parent dpll
218+
device
219+
``DPLL_A_PIN_PARENT_ID`` parent dpll device id
220+
``DPLL_A_PIN_PHASE_OFFSET`` attr measured phase difference
221+
between a pin and parent dpll device
222+
================================ ==========================================
221223

222224
All phase related values are provided in pico seconds, which represents
223225
time difference between signals phase. The negative value means that
@@ -384,6 +386,8 @@ according to attribute purpose.
384386
frequencies
385387
``DPLL_A_PIN_ANY_FREQUENCY_MIN`` attr minimum value of frequency
386388
``DPLL_A_PIN_ANY_FREQUENCY_MAX`` attr maximum value of frequency
389+
``DPLL_A_PIN_PHASE_ADJUST_GRAN`` attr granularity of phase
390+
adjustment value
387391
``DPLL_A_PIN_PHASE_ADJUST_MIN`` attr minimum value of phase
388392
adjustment
389393
``DPLL_A_PIN_PHASE_ADJUST_MAX`` attr maximum value of phase

Documentation/netlink/specs/dpll.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -440,6 +440,12 @@ attribute-sets:
440440
doc: |
441441
Capable pin provides list of pins that can be bound to create a
442442
reference-sync pin pair.
443+
-
444+
name: phase-adjust-gran
445+
type: u32
446+
doc: |
447+
Granularity of phase adjustment, in picoseconds. The value of
448+
phase adjustment must be a multiple of this granularity.
443449
444450
-
445451
name: pin-parent-device
@@ -616,6 +622,7 @@ operations:
616622
- capabilities
617623
- parent-device
618624
- parent-pin
625+
- phase-adjust-gran
619626
- phase-adjust-min
620627
- phase-adjust-max
621628
- phase-adjust

Documentation/networking/ip-sysctl.rst

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3195,12 +3195,13 @@ enhanced_dad - BOOLEAN
31953195
===========
31963196

31973197
ratelimit - INTEGER
3198-
Limit the maximal rates for sending ICMPv6 messages.
3198+
Limit the maximal rates for sending ICMPv6 messages to a particular
3199+
peer.
31993200

32003201
0 to disable any limiting,
3201-
otherwise the minimal space between responses in milliseconds.
3202+
otherwise the space between responses in milliseconds.
32023203

3203-
Default: 1000
3204+
Default: 100
32043205

32053206
ratemask - list of comma separated ranges
32063207
For ICMPv6 message types matching the ranges in the ratemask, limit

Documentation/trace/events-pci.rst

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
.. SPDX-License-Identifier: GPL-2.0
2+
3+
===========================
4+
Subsystem Trace Points: PCI
5+
===========================
6+
7+
Overview
8+
========
9+
The PCI tracing system provides tracepoints to monitor critical hardware events
10+
that can impact system performance and reliability. These events normally show
11+
up here:
12+
13+
/sys/kernel/tracing/events/pci
14+
15+
Cf. include/trace/events/pci.h for the events definitions.
16+
17+
Available Tracepoints
18+
=====================
19+
20+
pci_hp_event
21+
------------
22+
23+
Monitors PCI hotplug events including card insertion/removal and link
24+
state changes.
25+
::
26+
27+
pci_hp_event "%s slot:%s, event:%s\n"
28+
29+
**Event Types**:
30+
31+
* ``LINK_UP`` - PCIe link established
32+
* ``LINK_DOWN`` - PCIe link lost
33+
* ``CARD_PRESENT`` - Card detected in slot
34+
* ``CARD_NOT_PRESENT`` - Card removed from slot
35+
36+
**Example Usage**::
37+
38+
# Enable the tracepoint
39+
echo 1 > /sys/kernel/debug/tracing/events/pci/pci_hp_event/enable
40+
41+
# Monitor events (the following output is generated when a device is hotplugged)
42+
cat /sys/kernel/debug/tracing/trace_pipe
43+
irq/51-pciehp-88 [001] ..... 1311.177459: pci_hp_event: 0000:00:02.0 slot:10, event:CARD_PRESENT
44+
45+
irq/51-pciehp-88 [001] ..... 1311.177566: pci_hp_event: 0000:00:02.0 slot:10, event:LINK_UP
46+
47+
pcie_link_event
48+
---------------
49+
50+
Monitors PCIe link speed changes and provides detailed link status information.
51+
::
52+
53+
pcie_link_event "%s type:%d, reason:%d, cur_bus_speed:%d, max_bus_speed:%d, width:%u, flit_mode:%u, status:%s\n"
54+
55+
**Parameters**:
56+
57+
* ``type`` - PCIe device type (4=Root Port, etc.)
58+
* ``reason`` - Reason for link change:
59+
60+
- ``0`` - Link retrain
61+
- ``1`` - Bus enumeration
62+
- ``2`` - Bandwidth notification enable
63+
- ``3`` - Bandwidth notification IRQ
64+
- ``4`` - Hotplug event
65+
66+
67+
**Example Usage**::
68+
69+
# Enable the tracepoint
70+
echo 1 > /sys/kernel/debug/tracing/events/pci/pcie_link_event/enable
71+
72+
# Monitor events (the following output is generated when a device is hotplugged)
73+
cat /sys/kernel/debug/tracing/trace_pipe
74+
irq/51-pciehp-88 [001] ..... 381.545386: pcie_link_event: 0000:00:02.0 type:4, reason:4, cur_bus_speed:20, max_bus_speed:23, width:1, flit_mode:0, status:DLLLA

Documentation/trace/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ applications.
5454
events-power
5555
events-nmi
5656
events-msr
57+
events-pci
5758
boottime-trace
5859
histogram
5960
histogram-design

0 commit comments

Comments
 (0)