Skip to content

Commit 6ffbc98

Browse files
frank-wfrank-w
committed
Merge tag 'v6.12.17' into 6.12-main
This is the 6.12.17 stable release # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmfAWzUACgkQONu9yGCS # aT6xNQ//Wkh2tlzGBajsCAFQT3d5scMZcHPhZ010IXJuHTnd/4NUhpRnY6HPoRAx # I4U9z5iPtkkSCFIbdLwt+BXO8VOwVslsZsyzqljDEGRxuOaJ6AwTgydpW8AQCHuu # o+CqY6zmXjOybL87F3j8LVHyOcfpxiKpkXI6jAVHWQAOZ+Fcl7p1+bU8Gai03G+a # bY9LyIIUM2pyy0/rk0fV241xGV8sOyUSLLoEI6dbvdOlLOsBXfJrP7o3KiHAwQz1 # VuR8guBz2WRtDW/dIN4dzh8/MUBsF97rcGl1OGxGuWqn5Ng1slU8PFHPWhEtkCV9 # OCz3B7lojuKmDjQdsvY95IFEYktJWNtcwtB4eoazUiQ3lxqz17oSW4utxG8ETabm # QcBISgVz71pWdOqygyH8uON0bioMRsR8kuzJkR/xeStUv0WB1Rl5dfiB6yROt01j # eVCO8vJiBjJ/vngVFlZ1Va1e1CHjhNpIMU+Gkzs2sJU3mgZESv6SMN4qOocpQPND # f1WKsbk8OcP9+T0gA38iWPwEnCdY/dxc3ZGqNTLlD4bF9l1dOZxBQftczbOOI2MS # s4hVoGGeViWtG70zOwNtKq0t0Ur3X9AM0GHwW0/U18VfKwJI3osQqRVFQv0DFrEJ # uGkpoWpk4y9wrvasBZGtRsrozFutLBwhcPT4aq8a3ylCc5cnRXY= # =tBkm # -----END PGP SIGNATURE----- # gpg: Signature made Thu Feb 27 13:31:49 2025 CET # gpg: using RSA key 647F28654894E3BD457199BE38DBBDC86092693E # gpg: Can't check signature: No public key
2 parents 743ac81 + 41b2224 commit 6ffbc98

File tree

181 files changed

+3556
-1540
lines changed

Some content is hidden

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

181 files changed

+3556
-1540
lines changed

‎Documentation/networking/strparser.rst

+8-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ Functions
112112
Callbacks
113113
=========
114114

115-
There are six callbacks:
115+
There are seven callbacks:
116116

117117
::
118118

@@ -182,6 +182,13 @@ There are six callbacks:
182182
the length of the message. skb->len - offset may be greater
183183
then full_len since strparser does not trim the skb.
184184

185+
::
186+
187+
int (*read_sock)(struct strparser *strp, read_descriptor_t *desc,
188+
sk_read_actor_t recv_actor);
189+
190+
The read_sock callback is used by strparser instead of
191+
sock->ops->read_sock, if provided.
185192
::
186193

187194
int (*read_sock_done)(struct strparser *strp, int err);

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 6
33
PATCHLEVEL = 12
4-
SUBLEVEL = 16
4+
SUBLEVEL = 17
55
EXTRAVERSION =
66
NAME = Baby Opossum Posse
77

‎arch/arm64/boot/dts/mediatek/mt8183-pumpkin.dts

+121-2
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,18 @@
6363
pulldown-ohm = <0>;
6464
io-channels = <&auxadc 0>;
6565
};
66+
67+
connector {
68+
compatible = "hdmi-connector";
69+
label = "hdmi";
70+
type = "d";
71+
72+
port {
73+
hdmi_connector_in: endpoint {
74+
remote-endpoint = <&hdmi_connector_out>;
75+
};
76+
};
77+
};
6678
};
6779

6880
&auxadc {
@@ -120,6 +132,43 @@
120132
pinctrl-0 = <&i2c6_pins>;
121133
status = "okay";
122134
clock-frequency = <100000>;
135+
#address-cells = <1>;
136+
#size-cells = <0>;
137+
138+
it66121hdmitx: hdmitx@4c {
139+
compatible = "ite,it66121";
140+
reg = <0x4c>;
141+
pinctrl-names = "default";
142+
pinctrl-0 = <&ite_pins>;
143+
reset-gpios = <&pio 160 GPIO_ACTIVE_LOW>;
144+
interrupt-parent = <&pio>;
145+
interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
146+
vcn33-supply = <&mt6358_vcn33_reg>;
147+
vcn18-supply = <&mt6358_vcn18_reg>;
148+
vrf12-supply = <&mt6358_vrf12_reg>;
149+
150+
ports {
151+
#address-cells = <1>;
152+
#size-cells = <0>;
153+
154+
port@0 {
155+
reg = <0>;
156+
157+
it66121_in: endpoint {
158+
bus-width = <12>;
159+
remote-endpoint = <&dpi_out>;
160+
};
161+
};
162+
163+
port@1 {
164+
reg = <1>;
165+
166+
hdmi_connector_out: endpoint {
167+
remote-endpoint = <&hdmi_connector_in>;
168+
};
169+
};
170+
};
171+
};
123172
};
124173

125174
&keyboard {
@@ -362,6 +411,67 @@
362411
input-enable;
363412
};
364413
};
414+
415+
ite_pins: ite-pins {
416+
pins-irq {
417+
pinmux = <PINMUX_GPIO4__FUNC_GPIO4>;
418+
input-enable;
419+
bias-pull-up;
420+
};
421+
422+
pins-rst {
423+
pinmux = <PINMUX_GPIO160__FUNC_GPIO160>;
424+
output-high;
425+
};
426+
};
427+
428+
dpi_func_pins: dpi-func-pins {
429+
pins-dpi {
430+
pinmux = <PINMUX_GPIO12__FUNC_I2S5_BCK>,
431+
<PINMUX_GPIO46__FUNC_I2S5_LRCK>,
432+
<PINMUX_GPIO47__FUNC_I2S5_DO>,
433+
<PINMUX_GPIO13__FUNC_DBPI_D0>,
434+
<PINMUX_GPIO14__FUNC_DBPI_D1>,
435+
<PINMUX_GPIO15__FUNC_DBPI_D2>,
436+
<PINMUX_GPIO16__FUNC_DBPI_D3>,
437+
<PINMUX_GPIO17__FUNC_DBPI_D4>,
438+
<PINMUX_GPIO18__FUNC_DBPI_D5>,
439+
<PINMUX_GPIO19__FUNC_DBPI_D6>,
440+
<PINMUX_GPIO20__FUNC_DBPI_D7>,
441+
<PINMUX_GPIO21__FUNC_DBPI_D8>,
442+
<PINMUX_GPIO22__FUNC_DBPI_D9>,
443+
<PINMUX_GPIO23__FUNC_DBPI_D10>,
444+
<PINMUX_GPIO24__FUNC_DBPI_D11>,
445+
<PINMUX_GPIO25__FUNC_DBPI_HSYNC>,
446+
<PINMUX_GPIO26__FUNC_DBPI_VSYNC>,
447+
<PINMUX_GPIO27__FUNC_DBPI_DE>,
448+
<PINMUX_GPIO28__FUNC_DBPI_CK>;
449+
};
450+
};
451+
452+
dpi_idle_pins: dpi-idle-pins {
453+
pins-idle {
454+
pinmux = <PINMUX_GPIO12__FUNC_GPIO12>,
455+
<PINMUX_GPIO46__FUNC_GPIO46>,
456+
<PINMUX_GPIO47__FUNC_GPIO47>,
457+
<PINMUX_GPIO13__FUNC_GPIO13>,
458+
<PINMUX_GPIO14__FUNC_GPIO14>,
459+
<PINMUX_GPIO15__FUNC_GPIO15>,
460+
<PINMUX_GPIO16__FUNC_GPIO16>,
461+
<PINMUX_GPIO17__FUNC_GPIO17>,
462+
<PINMUX_GPIO18__FUNC_GPIO18>,
463+
<PINMUX_GPIO19__FUNC_GPIO19>,
464+
<PINMUX_GPIO20__FUNC_GPIO20>,
465+
<PINMUX_GPIO21__FUNC_GPIO21>,
466+
<PINMUX_GPIO22__FUNC_GPIO22>,
467+
<PINMUX_GPIO23__FUNC_GPIO23>,
468+
<PINMUX_GPIO24__FUNC_GPIO24>,
469+
<PINMUX_GPIO25__FUNC_GPIO25>,
470+
<PINMUX_GPIO26__FUNC_GPIO26>,
471+
<PINMUX_GPIO27__FUNC_GPIO27>,
472+
<PINMUX_GPIO28__FUNC_GPIO28>;
473+
};
474+
};
365475
};
366476

367477
&pmic {
@@ -412,6 +522,15 @@
412522
status = "okay";
413523
};
414524

415-
&dsi0 {
416-
status = "disabled";
525+
&dpi0 {
526+
pinctrl-names = "default", "sleep";
527+
pinctrl-0 = <&dpi_func_pins>;
528+
pinctrl-1 = <&dpi_idle_pins>;
529+
status = "okay";
530+
531+
port {
532+
dpi_out: endpoint {
533+
remote-endpoint = <&it66121_in>;
534+
};
535+
};
417536
};

‎arch/arm64/boot/dts/mediatek/mt8183.dtsi

+1
Original file line numberDiff line numberDiff line change
@@ -1835,6 +1835,7 @@
18351835
resets = <&mmsys MT8183_MMSYS_SW0_RST_B_DISP_DSI0>;
18361836
phys = <&mipi_tx0>;
18371837
phy-names = "dphy";
1838+
status = "disabled";
18381839
};
18391840

18401841
dpi0: dpi@14015000 {

‎arch/arm64/boot/dts/rockchip/px30-ringneck-haikou.dts

-1
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,6 @@
226226
};
227227

228228
&uart5 {
229-
pinctrl-0 = <&uart5_xfer>;
230229
rts-gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>;
231230
status = "okay";
232231
};

‎arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi

+6
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,12 @@
373373
status = "okay";
374374
};
375375

376+
&uart5 {
377+
/delete-property/ dmas;
378+
/delete-property/ dma-names;
379+
pinctrl-0 = <&uart5_xfer>;
380+
};
381+
376382
/* Mule UCAN */
377383
&usb_host0_ehci {
378384
status = "okay";

‎arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus-lts.dts

+4-2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@
1515
};
1616

1717
&gmac2io {
18+
/delete-property/ tx_delay;
19+
/delete-property/ rx_delay;
20+
1821
phy-handle = <&yt8531c>;
19-
tx_delay = <0x19>;
20-
rx_delay = <0x05>;
22+
phy-mode = "rgmii-id";
2123

2224
mdio {
2325
/delete-node/ ethernet-phy@1;

‎arch/arm64/boot/dts/rockchip/rk3588-base.dtsi

+11-11
Original file line numberDiff line numberDiff line change
@@ -549,10 +549,10 @@
549549
mmu600_pcie: iommu@fc900000 {
550550
compatible = "arm,smmu-v3";
551551
reg = <0x0 0xfc900000 0x0 0x200000>;
552-
interrupts = <GIC_SPI 369 IRQ_TYPE_LEVEL_HIGH 0>,
553-
<GIC_SPI 371 IRQ_TYPE_LEVEL_HIGH 0>,
554-
<GIC_SPI 374 IRQ_TYPE_LEVEL_HIGH 0>,
555-
<GIC_SPI 367 IRQ_TYPE_LEVEL_HIGH 0>;
552+
interrupts = <GIC_SPI 369 IRQ_TYPE_EDGE_RISING 0>,
553+
<GIC_SPI 371 IRQ_TYPE_EDGE_RISING 0>,
554+
<GIC_SPI 374 IRQ_TYPE_EDGE_RISING 0>,
555+
<GIC_SPI 367 IRQ_TYPE_EDGE_RISING 0>;
556556
interrupt-names = "eventq", "gerror", "priq", "cmdq-sync";
557557
#iommu-cells = <1>;
558558
status = "disabled";
@@ -561,10 +561,10 @@
561561
mmu600_php: iommu@fcb00000 {
562562
compatible = "arm,smmu-v3";
563563
reg = <0x0 0xfcb00000 0x0 0x200000>;
564-
interrupts = <GIC_SPI 381 IRQ_TYPE_LEVEL_HIGH 0>,
565-
<GIC_SPI 383 IRQ_TYPE_LEVEL_HIGH 0>,
566-
<GIC_SPI 386 IRQ_TYPE_LEVEL_HIGH 0>,
567-
<GIC_SPI 379 IRQ_TYPE_LEVEL_HIGH 0>;
564+
interrupts = <GIC_SPI 381 IRQ_TYPE_EDGE_RISING 0>,
565+
<GIC_SPI 383 IRQ_TYPE_EDGE_RISING 0>,
566+
<GIC_SPI 386 IRQ_TYPE_EDGE_RISING 0>,
567+
<GIC_SPI 379 IRQ_TYPE_EDGE_RISING 0>;
568568
interrupt-names = "eventq", "gerror", "priq", "cmdq-sync";
569569
#iommu-cells = <1>;
570570
status = "disabled";
@@ -2626,9 +2626,9 @@
26262626
rockchip,hw-tshut-temp = <120000>;
26272627
rockchip,hw-tshut-mode = <0>; /* tshut mode 0:CRU 1:GPIO */
26282628
rockchip,hw-tshut-polarity = <0>; /* tshut polarity 0:LOW 1:HIGH */
2629-
pinctrl-0 = <&tsadc_gpio_func>;
2630-
pinctrl-1 = <&tsadc_shut>;
2631-
pinctrl-names = "gpio", "otpout";
2629+
pinctrl-0 = <&tsadc_shut_org>;
2630+
pinctrl-1 = <&tsadc_gpio_func>;
2631+
pinctrl-names = "default", "sleep";
26322632
#thermal-sensor-cells = <1>;
26332633
status = "disabled";
26342634
};

‎arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-genbook.dts

+2-2
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
compatible = "regulator-fixed";
102102
regulator-name = "vcc3v3_lcd";
103103
enable-active-high;
104-
gpio = <&gpio1 RK_PC4 GPIO_ACTIVE_HIGH>;
104+
gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>;
105105
pinctrl-names = "default";
106106
pinctrl-0 = <&lcdpwr_en>;
107107
vin-supply = <&vcc3v3_sys>;
@@ -207,7 +207,7 @@
207207
&pinctrl {
208208
lcd {
209209
lcdpwr_en: lcdpwr-en {
210-
rockchip,pins = <1 RK_PC4 RK_FUNC_GPIO &pcfg_pull_down>;
210+
rockchip,pins = <0 RK_PC4 RK_FUNC_GPIO &pcfg_pull_down>;
211211
};
212212

213213
bl_en: bl-en {

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

+6-3
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,12 @@ static inline unsigned long arch_calc_vm_flag_bits(struct file *file,
4141
* backed by tags-capable memory. The vm_flags may be overridden by a
4242
* filesystem supporting MTE (RAM-based).
4343
*/
44-
if (system_supports_mte() &&
45-
((flags & MAP_ANONYMOUS) || shmem_file(file)))
46-
return VM_MTE_ALLOWED;
44+
if (system_supports_mte()) {
45+
if ((flags & MAP_ANONYMOUS) && !(flags & MAP_HUGETLB))
46+
return VM_MTE_ALLOWED;
47+
if (shmem_file(file))
48+
return VM_MTE_ALLOWED;
49+
}
4750

4851
return 0;
4952
}

‎arch/powerpc/include/asm/book3s/64/hash-4k.h

+10-2
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,17 @@
7777
/*
7878
* With 4K page size the real_pte machinery is all nops.
7979
*/
80-
#define __real_pte(e, p, o) ((real_pte_t){(e)})
80+
static inline real_pte_t __real_pte(pte_t pte, pte_t *ptep, int offset)
81+
{
82+
return (real_pte_t){pte};
83+
}
84+
8185
#define __rpte_to_pte(r) ((r).pte)
82-
#define __rpte_to_hidx(r,index) (pte_val(__rpte_to_pte(r)) >> H_PAGE_F_GIX_SHIFT)
86+
87+
static inline unsigned long __rpte_to_hidx(real_pte_t rpte, unsigned long index)
88+
{
89+
return pte_val(__rpte_to_pte(rpte)) >> H_PAGE_F_GIX_SHIFT;
90+
}
8391

8492
#define pte_iterate_hashed_subpages(rpte, psize, va, index, shift) \
8593
do { \

‎arch/powerpc/lib/code-patching.c

+3-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ static int text_area_cpu_up(unsigned int cpu)
108108
unsigned long addr;
109109
int err;
110110

111-
area = get_vm_area(PAGE_SIZE, VM_ALLOC);
111+
area = get_vm_area(PAGE_SIZE, 0);
112112
if (!area) {
113113
WARN_ONCE(1, "Failed to create text area for cpu %d\n",
114114
cpu);
@@ -493,7 +493,9 @@ static int __do_patch_instructions_mm(u32 *addr, u32 *code, size_t len, bool rep
493493

494494
orig_mm = start_using_temp_mm(patching_mm);
495495

496+
kasan_disable_current();
496497
err = __patch_instructions(patch_addr, code, len, repeat_instr);
498+
kasan_enable_current();
497499

498500
/* context synchronisation performed by __patch_instructions */
499501
stop_using_temp_mm(patching_mm, orig_mm);

‎arch/s390/boot/startup.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ static int cmma_test_essa(void)
7575
: [reg1] "=&d" (reg1),
7676
[reg2] "=&a" (reg2),
7777
[rc] "+&d" (rc),
78-
[tmp] "=&d" (tmp),
78+
[tmp] "+&d" (tmp),
7979
"+Q" (get_lowcore()->program_new_psw),
8080
"=Q" (old)
8181
: [psw_old] "a" (&old),

‎arch/x86/events/intel/core.c

+7-13
Original file line numberDiff line numberDiff line change
@@ -397,34 +397,28 @@ static struct event_constraint intel_lnc_event_constraints[] = {
397397
METRIC_EVENT_CONSTRAINT(INTEL_TD_METRIC_FETCH_LAT, 6),
398398
METRIC_EVENT_CONSTRAINT(INTEL_TD_METRIC_MEM_BOUND, 7),
399399

400+
INTEL_EVENT_CONSTRAINT(0x20, 0xf),
401+
402+
INTEL_UEVENT_CONSTRAINT(0x012a, 0xf),
403+
INTEL_UEVENT_CONSTRAINT(0x012b, 0xf),
400404
INTEL_UEVENT_CONSTRAINT(0x0148, 0x4),
401405
INTEL_UEVENT_CONSTRAINT(0x0175, 0x4),
402406

403407
INTEL_EVENT_CONSTRAINT(0x2e, 0x3ff),
404408
INTEL_EVENT_CONSTRAINT(0x3c, 0x3ff),
405-
/*
406-
* Generally event codes < 0x90 are restricted to counters 0-3.
407-
* The 0x2E and 0x3C are exception, which has no restriction.
408-
*/
409-
INTEL_EVENT_CONSTRAINT_RANGE(0x01, 0x8f, 0xf),
410409

411-
INTEL_UEVENT_CONSTRAINT(0x01a3, 0xf),
412-
INTEL_UEVENT_CONSTRAINT(0x02a3, 0xf),
413410
INTEL_UEVENT_CONSTRAINT(0x08a3, 0x4),
414411
INTEL_UEVENT_CONSTRAINT(0x0ca3, 0x4),
415412
INTEL_UEVENT_CONSTRAINT(0x04a4, 0x1),
416413
INTEL_UEVENT_CONSTRAINT(0x08a4, 0x1),
417414
INTEL_UEVENT_CONSTRAINT(0x10a4, 0x1),
418415
INTEL_UEVENT_CONSTRAINT(0x01b1, 0x8),
416+
INTEL_UEVENT_CONSTRAINT(0x01cd, 0x3fc),
419417
INTEL_UEVENT_CONSTRAINT(0x02cd, 0x3),
420-
INTEL_EVENT_CONSTRAINT(0xce, 0x1),
421418

422419
INTEL_EVENT_CONSTRAINT_RANGE(0xd0, 0xdf, 0xf),
423-
/*
424-
* Generally event codes >= 0x90 are likely to have no restrictions.
425-
* The exception are defined as above.
426-
*/
427-
INTEL_EVENT_CONSTRAINT_RANGE(0x90, 0xfe, 0x3ff),
420+
421+
INTEL_UEVENT_CONSTRAINT(0x00e0, 0xf),
428422

429423
EVENT_CONSTRAINT_END
430424
};

‎arch/x86/events/intel/ds.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1178,7 +1178,7 @@ struct event_constraint intel_lnc_pebs_event_constraints[] = {
11781178
INTEL_FLAGS_UEVENT_CONSTRAINT(0x100, 0x100000000ULL), /* INST_RETIRED.PREC_DIST */
11791179
INTEL_FLAGS_UEVENT_CONSTRAINT(0x0400, 0x800000000ULL),
11801180

1181-
INTEL_HYBRID_LDLAT_CONSTRAINT(0x1cd, 0x3ff),
1181+
INTEL_HYBRID_LDLAT_CONSTRAINT(0x1cd, 0x3fc),
11821182
INTEL_HYBRID_STLAT_CONSTRAINT(0x2cd, 0x3),
11831183
INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_LD(0x11d0, 0xf), /* MEM_INST_RETIRED.STLB_MISS_LOADS */
11841184
INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_ST(0x12d0, 0xf), /* MEM_INST_RETIRED.STLB_MISS_STORES */

0 commit comments

Comments
 (0)