Skip to content

Commit bc01d52

Browse files
xdevs23xdevs23
committed
Merge remote-tracking branch 'stable/linux-6.14.y' into v6.14+
2 parents 32fca0b + ea061ba commit bc01d52

246 files changed

Lines changed: 2157 additions & 1271 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/arch/arm64/booting.rst‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,12 @@ Before jumping into the kernel, the following conditions must be met:
288288

289289
- SCR_EL3.FGTEn (bit 27) must be initialised to 0b1.
290290

291+
For CPUs with the Fine Grained Traps 2 (FEAT_FGT2) extension present:
292+
293+
- If EL3 is present and the kernel is entered at EL2:
294+
295+
- SCR_EL3.FGTEn2 (bit 59) must be initialised to 0b1.
296+
291297
For CPUs with support for HCRX_EL2 (FEAT_HCX) present:
292298

293299
- If EL3 is present and the kernel is entered at EL2:
@@ -382,6 +388,22 @@ Before jumping into the kernel, the following conditions must be met:
382388

383389
- SMCR_EL2.EZT0 (bit 30) must be initialised to 0b1.
384390

391+
For CPUs with the Performance Monitors Extension (FEAT_PMUv3p9):
392+
393+
- If EL3 is present:
394+
395+
- MDCR_EL3.EnPM2 (bit 7) must be initialised to 0b1.
396+
397+
- If the kernel is entered at EL1 and EL2 is present:
398+
399+
- HDFGRTR2_EL2.nPMICNTR_EL0 (bit 2) must be initialised to 0b1.
400+
- HDFGRTR2_EL2.nPMICFILTR_EL0 (bit 3) must be initialised to 0b1.
401+
- HDFGRTR2_EL2.nPMUACR_EL1 (bit 4) must be initialised to 0b1.
402+
403+
- HDFGWTR2_EL2.nPMICNTR_EL0 (bit 2) must be initialised to 0b1.
404+
- HDFGWTR2_EL2.nPMICFILTR_EL0 (bit 3) must be initialised to 0b1.
405+
- HDFGWTR2_EL2.nPMUACR_EL1 (bit 4) must be initialised to 0b1.
406+
385407
For CPUs with Memory Copy and Memory Set instructions (FEAT_MOPS):
386408

387409
- If the kernel is entered at EL1 and EL2 is present:

‎Documentation/devicetree/bindings/soc/fsl/fsl,ls1028a-reset.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Freescale Layerscape Reset Registers Module
88

99
maintainers:
10-
- Frank Li
10+
- Frank Li <[email protected]>
1111

1212
description:
1313
Reset Module includes chip reset, service processor control and Reset Control

‎Documentation/netlink/specs/ovs_vport.yaml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,12 @@ attribute-sets:
123123

124124
operations:
125125
name-prefix: ovs-vport-cmd-
126+
fixed-header: ovs-header
126127
list:
127128
-
128129
name: new
129130
doc: Create a new OVS vport
130131
attribute-set: vport
131-
fixed-header: ovs-header
132132
do:
133133
request:
134134
attributes:
@@ -141,7 +141,6 @@ operations:
141141
name: del
142142
doc: Delete existing OVS vport from a data path
143143
attribute-set: vport
144-
fixed-header: ovs-header
145144
do:
146145
request:
147146
attributes:
@@ -152,7 +151,6 @@ operations:
152151
name: get
153152
doc: Get / dump OVS vport configuration and state
154153
attribute-set: vport
155-
fixed-header: ovs-header
156154
do: &vport-get-op
157155
request:
158156
attributes:

‎Documentation/netlink/specs/rt_link.yaml‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1101,11 +1101,10 @@ attribute-sets:
11011101
-
11021102
name: prop-list
11031103
type: nest
1104-
nested-attributes: link-attrs
1104+
nested-attributes: prop-list-link-attrs
11051105
-
11061106
name: alt-ifname
11071107
type: string
1108-
multi-attr: true
11091108
-
11101109
name: perm-address
11111110
type: binary
@@ -1148,6 +1147,13 @@ attribute-sets:
11481147
name: max-pacing-offload-horizon
11491148
type: uint
11501149
doc: EDT offload horizon supported by the device (in nsec).
1150+
-
1151+
name: prop-list-link-attrs
1152+
subset-of: link-attrs
1153+
attributes:
1154+
-
1155+
name: alt-ifname
1156+
multi-attr: true
11511157
-
11521158
name: af-spec-attrs
11531159
attributes:
@@ -1570,7 +1576,7 @@ attribute-sets:
15701576
name: nf-call-iptables
15711577
type: u8
15721578
-
1573-
name: nf-call-ip6-tables
1579+
name: nf-call-ip6tables
15741580
type: u8
15751581
-
15761582
name: nf-call-arptables
@@ -2058,7 +2064,7 @@ attribute-sets:
20582064
name: id
20592065
type: u16
20602066
-
2061-
name: flag
2067+
name: flags
20622068
type: binary
20632069
struct: ifla-vlan-flags
20642070
-
@@ -2146,7 +2152,7 @@ attribute-sets:
21462152
type: binary
21472153
struct: ifla-cacheinfo
21482154
-
2149-
name: icmp6-stats
2155+
name: icmp6stats
21502156
type: binary
21512157
struct: ifla-icmp6-stats
21522158
-
@@ -2160,9 +2166,10 @@ attribute-sets:
21602166
type: u32
21612167
-
21622168
name: mctp-attrs
2169+
name-prefix: ifla-mctp-
21632170
attributes:
21642171
-
2165-
name: mctp-net
2172+
name: net
21662173
type: u32
21672174
-
21682175
name: phys-binding
@@ -2434,7 +2441,6 @@ operations:
24342441
- min-mtu
24352442
- max-mtu
24362443
- prop-list
2437-
- alt-ifname
24382444
- perm-address
24392445
- proto-down-reason
24402446
- parent-dev-name

‎Documentation/netlink/specs/rt_neigh.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,25 +13,25 @@ definitions:
1313
type: struct
1414
members:
1515
-
16-
name: family
16+
name: ndm-family
1717
type: u8
1818
-
19-
name: pad
19+
name: ndm-pad
2020
type: pad
2121
len: 3
2222
-
23-
name: ifindex
23+
name: ndm-ifindex
2424
type: s32
2525
-
26-
name: state
26+
name: ndm-state
2727
type: u16
2828
enum: nud-state
2929
-
30-
name: flags
30+
name: ndm-flags
3131
type: u8
3232
enum: ntf-flags
3333
-
34-
name: type
34+
name: ndm-type
3535
type: u8
3636
enum: rtm-type
3737
-
@@ -189,7 +189,7 @@ attribute-sets:
189189
type: binary
190190
display-hint: ipv4
191191
-
192-
name: lladr
192+
name: lladdr
193193
type: binary
194194
display-hint: mac
195195
-

‎Documentation/wmi/devices/msi-wmi-platform.rst‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,10 @@ input data, the meaning of which depends on the subfeature being accessed.
138138
The output buffer contains a single byte which signals success or failure (``0x00`` on failure)
139139
and 31 bytes of output data, the meaning if which depends on the subfeature being accessed.
140140

141+
.. note::
142+
The ACPI control method responsible for handling the WMI method calls is not thread-safe.
143+
This is a firmware bug that needs to be handled inside the driver itself.
144+
141145
WMI method Get_EC()
142146
-------------------
143147

‎Makefile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 6
33
PATCHLEVEL = 14
4-
SUBLEVEL = 3
4+
SUBLEVEL = 4
55
EXTRAVERSION =
66
NAME = Baby Opossum Posse
77

@@ -480,7 +480,6 @@ export rust_common_flags := --edition=2021 \
480480
-Wclippy::ignored_unit_patterns \
481481
-Wclippy::mut_mut \
482482
-Wclippy::needless_bitwise_bool \
483-
-Wclippy::needless_continue \
484483
-Aclippy::needless_lifetimes \
485484
-Wclippy::no_mangle_with_rust_abi \
486485
-Wclippy::undocumented_unsafe_blocks \

‎arch/arm64/include/asm/el2_setup.h‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,30 @@
259259
.Lskip_fgt_\@:
260260
.endm
261261

262+
.macro __init_el2_fgt2
263+
mrs x1, id_aa64mmfr0_el1
264+
ubfx x1, x1, #ID_AA64MMFR0_EL1_FGT_SHIFT, #4
265+
cmp x1, #ID_AA64MMFR0_EL1_FGT_FGT2
266+
b.lt .Lskip_fgt2_\@
267+
268+
mov x0, xzr
269+
mrs x1, id_aa64dfr0_el1
270+
ubfx x1, x1, #ID_AA64DFR0_EL1_PMUVer_SHIFT, #4
271+
cmp x1, #ID_AA64DFR0_EL1_PMUVer_V3P9
272+
b.lt .Lskip_pmuv3p9_\@
273+
274+
orr x0, x0, #HDFGRTR2_EL2_nPMICNTR_EL0
275+
orr x0, x0, #HDFGRTR2_EL2_nPMICFILTR_EL0
276+
orr x0, x0, #HDFGRTR2_EL2_nPMUACR_EL1
277+
.Lskip_pmuv3p9_\@:
278+
msr_s SYS_HDFGRTR2_EL2, x0
279+
msr_s SYS_HDFGWTR2_EL2, x0
280+
msr_s SYS_HFGRTR2_EL2, xzr
281+
msr_s SYS_HFGWTR2_EL2, xzr
282+
msr_s SYS_HFGITR2_EL2, xzr
283+
.Lskip_fgt2_\@:
284+
.endm
285+
262286
.macro __init_el2_gcs
263287
mrs_s x1, SYS_ID_AA64PFR1_EL1
264288
ubfx x1, x1, #ID_AA64PFR1_EL1_GCS_SHIFT, #4
@@ -304,6 +328,7 @@
304328
__init_el2_nvhe_idregs
305329
__init_el2_cptr
306330
__init_el2_fgt
331+
__init_el2_fgt2
307332
__init_el2_gcs
308333
.endm
309334

‎arch/arm64/tools/sysreg‎

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1664,6 +1664,7 @@ EndEnum
16641664
UnsignedEnum 59:56 FGT
16651665
0b0000 NI
16661666
0b0001 IMP
1667+
0b0010 FGT2
16671668
EndEnum
16681669
Res0 55:48
16691670
UnsignedEnum 47:44 EXS
@@ -1725,6 +1726,7 @@ Enum 3:0 PARANGE
17251726
0b0100 44
17261727
0b0101 48
17271728
0b0110 52
1729+
0b0111 56
17281730
EndEnum
17291731
EndSysreg
17301732

@@ -2641,6 +2643,101 @@ Field 0 E0HTRE
26412643
EndSysreg
26422644

26432645

2646+
Sysreg HDFGRTR2_EL2 3 4 3 1 0
2647+
Res0 63:25
2648+
Field 24 nPMBMAR_EL1
2649+
Field 23 nMDSTEPOP_EL1
2650+
Field 22 nTRBMPAM_EL1
2651+
Res0 21
2652+
Field 20 nTRCITECR_EL1
2653+
Field 19 nPMSDSFR_EL1
2654+
Field 18 nSPMDEVAFF_EL1
2655+
Field 17 nSPMID
2656+
Field 16 nSPMSCR_EL1
2657+
Field 15 nSPMACCESSR_EL1
2658+
Field 14 nSPMCR_EL0
2659+
Field 13 nSPMOVS
2660+
Field 12 nSPMINTEN
2661+
Field 11 nSPMCNTEN
2662+
Field 10 nSPMSELR_EL0
2663+
Field 9 nSPMEVTYPERn_EL0
2664+
Field 8 nSPMEVCNTRn_EL0
2665+
Field 7 nPMSSCR_EL1
2666+
Field 6 nPMSSDATA
2667+
Field 5 nMDSELR_EL1
2668+
Field 4 nPMUACR_EL1
2669+
Field 3 nPMICFILTR_EL0
2670+
Field 2 nPMICNTR_EL0
2671+
Field 1 nPMIAR_EL1
2672+
Field 0 nPMECR_EL1
2673+
EndSysreg
2674+
2675+
Sysreg HDFGWTR2_EL2 3 4 3 1 1
2676+
Res0 63:25
2677+
Field 24 nPMBMAR_EL1
2678+
Field 23 nMDSTEPOP_EL1
2679+
Field 22 nTRBMPAM_EL1
2680+
Field 21 nPMZR_EL0
2681+
Field 20 nTRCITECR_EL1
2682+
Field 19 nPMSDSFR_EL1
2683+
Res0 18:17
2684+
Field 16 nSPMSCR_EL1
2685+
Field 15 nSPMACCESSR_EL1
2686+
Field 14 nSPMCR_EL0
2687+
Field 13 nSPMOVS
2688+
Field 12 nSPMINTEN
2689+
Field 11 nSPMCNTEN
2690+
Field 10 nSPMSELR_EL0
2691+
Field 9 nSPMEVTYPERn_EL0
2692+
Field 8 nSPMEVCNTRn_EL0
2693+
Field 7 nPMSSCR_EL1
2694+
Res0 6
2695+
Field 5 nMDSELR_EL1
2696+
Field 4 nPMUACR_EL1
2697+
Field 3 nPMICFILTR_EL0
2698+
Field 2 nPMICNTR_EL0
2699+
Field 1 nPMIAR_EL1
2700+
Field 0 nPMECR_EL1
2701+
EndSysreg
2702+
2703+
Sysreg HFGRTR2_EL2 3 4 3 1 2
2704+
Res0 63:15
2705+
Field 14 nACTLRALIAS_EL1
2706+
Field 13 nACTLRMASK_EL1
2707+
Field 12 nTCR2ALIAS_EL1
2708+
Field 11 nTCRALIAS_EL1
2709+
Field 10 nSCTLRALIAS2_EL1
2710+
Field 9 nSCTLRALIAS_EL1
2711+
Field 8 nCPACRALIAS_EL1
2712+
Field 7 nTCR2MASK_EL1
2713+
Field 6 nTCRMASK_EL1
2714+
Field 5 nSCTLR2MASK_EL1
2715+
Field 4 nSCTLRMASK_EL1
2716+
Field 3 nCPACRMASK_EL1
2717+
Field 2 nRCWSMASK_EL1
2718+
Field 1 nERXGSR_EL1
2719+
Field 0 nPFAR_EL1
2720+
EndSysreg
2721+
2722+
Sysreg HFGWTR2_EL2 3 4 3 1 3
2723+
Res0 63:15
2724+
Field 14 nACTLRALIAS_EL1
2725+
Field 13 nACTLRMASK_EL1
2726+
Field 12 nTCR2ALIAS_EL1
2727+
Field 11 nTCRALIAS_EL1
2728+
Field 10 nSCTLRALIAS2_EL1
2729+
Field 9 nSCTLRALIAS_EL1
2730+
Field 8 nCPACRALIAS_EL1
2731+
Field 7 nTCR2MASK_EL1
2732+
Field 6 nTCRMASK_EL1
2733+
Field 5 nSCTLR2MASK_EL1
2734+
Field 4 nSCTLRMASK_EL1
2735+
Field 3 nCPACRMASK_EL1
2736+
Field 2 nRCWSMASK_EL1
2737+
Res0 1
2738+
Field 0 nPFAR_EL1
2739+
EndSysreg
2740+
26442741
Sysreg HDFGRTR_EL2 3 4 3 1 4
26452742
Field 63 PMBIDR_EL1
26462743
Field 62 nPMSNEVFR_EL1
@@ -2813,6 +2910,12 @@ Field 1 AMEVCNTR00_EL0
28132910
Field 0 AMCNTEN0
28142911
EndSysreg
28152912

2913+
Sysreg HFGITR2_EL2 3 4 3 1 7
2914+
Res0 63:2
2915+
Field 1 nDCCIVAPS
2916+
Field 0 TSBCSYNC
2917+
EndSysreg
2918+
28162919
Sysreg ZCR_EL2 3 4 1 2 0
28172920
Fields ZCR_ELx
28182921
EndSysreg

‎arch/mips/dec/prom/init.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ int (*__pmax_close)(int);
4242
* Detect which PROM the DECSTATION has, and set the callback vectors
4343
* appropriately.
4444
*/
45-
void __init which_prom(s32 magic, s32 *prom_vec)
45+
static void __init which_prom(s32 magic, s32 *prom_vec)
4646
{
4747
/*
4848
* No sign of the REX PROM's magic number means we assume a non-REX

0 commit comments

Comments
 (0)