Skip to content

Commit 34fa2d5

Browse files
frank-wfrank-w
committed
Merge tag 'v6.12.46' into 6.12-main
This is the 6.12.46 stable release # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCgAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmjAXSkACgkQONu9yGCS # aT5fHg/+PRQbHJtXQEPLt3q50lsDbsc3abCx+wpyukkZLKRYH7ku/lteMkypvTxf # q4XMCUbfrJ/W9flGfGw6fbZlW5EiGvL21YvKgiGkh2jQvC3UcGSlR9L40Ywx3+OT # KhQW0BKrP0wYlf9UPkbumuF3HvTctcGzL7aFcOL30wjWpkDPaFqlLBY0kiv39ZnU # DPH9fhUR0gp33ejVKs+fZ2FydVIVAk6pl1FboFgcz2CXlFXsNEj6Rk989DXx1C01 # uJnKv8KkzvVJVOFAvp0X9bW56Xsn+RV5vTjMEeHAGbqwn/P+TtBXpxcbAJXI2SZk # pFJDNMoABf1zVGdPdo81KPINfO3wlWGeKTxXs4T9XTvBhPZjzPSVbHrMTlrqkRIo # j5JWndN+jguM5ynI3thNpYZsHOPb3XJBpRtjmtQ/BFtiMzjHih28r/ofkWp/DqVN # nuMjcGhZLyz0BWIgnhUiexgYhYLXsrQ3BZKBLFZkQ6grYOBYF9bYPItGzzyi6+wV # OhCmmNVN2Yqz3mFCvVlMHSXjTUZYAhVvTjrP0ubv7tHkAgIrhjbUHHyVbmpoLZI0 # 0vB4rEAbiveUS8redC2hJTPqvhXzShcWvuhImm0OsP0T2ci+GTSSrfEhhL1o/jVv # jIsS9ioKclGBZH47ijhYY0TLOhyHqeW9ENwMkOkRZi/CXS+0glc= # =Sxe7 # -----END PGP SIGNATURE----- # gpg: Signature made Tue Sep 9 19:00:25 2025 CEST # gpg: using RSA key 647F28654894E3BD457199BE38DBBDC86092693E # gpg: Can't check signature: No public key
2 parents e9f0fcc + d497f07 commit 34fa2d5

186 files changed

Lines changed: 1778 additions & 921 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.

‎Makefile‎

Lines changed: 1 addition & 1 deletion
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 = 45
4+
SUBLEVEL = 46
55
EXTRAVERSION =
66
NAME = Baby Opossum Posse
77

‎arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc.dts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -555,6 +555,7 @@
555555
pinctrl-2 = <&pinctrl_usdhc2_200mhz>, <&pinctrl_usdhc2_gpio>;
556556
cd-gpios = <&gpio2 12 GPIO_ACTIVE_LOW>;
557557
vmmc-supply = <&reg_usdhc2_vmmc>;
558+
vqmmc-supply = <&ldo5>;
558559
bus-width = <4>;
559560
status = "okay";
560561
};

‎arch/arm64/boot/dts/freescale/imx8mp-dhcom-som.dtsi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -609,6 +609,7 @@
609609
pinctrl-2 = <&pinctrl_usdhc2_200mhz>, <&pinctrl_usdhc2_gpio>;
610610
cd-gpios = <&gpio2 12 GPIO_ACTIVE_LOW>;
611611
vmmc-supply = <&reg_usdhc2_vmmc>;
612+
vqmmc-supply = <&ldo5>;
612613
bus-width = <4>;
613614
status = "okay";
614615
};

‎arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql-mba8mp-ras314.dts‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -467,6 +467,10 @@
467467
status = "okay";
468468
};
469469

470+
&reg_usdhc2_vqmmc {
471+
status = "okay";
472+
};
473+
470474
&sai5 {
471475
pinctrl-names = "default";
472476
pinctrl-0 = <&pinctrl_sai5>;
@@ -876,8 +880,7 @@
876880
<MX8MP_IOMUXC_SD2_DATA0__USDHC2_DATA0 0x1d2>,
877881
<MX8MP_IOMUXC_SD2_DATA1__USDHC2_DATA1 0x1d2>,
878882
<MX8MP_IOMUXC_SD2_DATA2__USDHC2_DATA2 0x1d2>,
879-
<MX8MP_IOMUXC_SD2_DATA3__USDHC2_DATA3 0x1d2>,
880-
<MX8MP_IOMUXC_GPIO1_IO04__USDHC2_VSELECT 0xc0>;
883+
<MX8MP_IOMUXC_SD2_DATA3__USDHC2_DATA3 0x1d2>;
881884
};
882885

883886
pinctrl_usdhc2_100mhz: usdhc2-100mhzgrp {
@@ -886,8 +889,7 @@
886889
<MX8MP_IOMUXC_SD2_DATA0__USDHC2_DATA0 0x1d4>,
887890
<MX8MP_IOMUXC_SD2_DATA1__USDHC2_DATA1 0x1d4>,
888891
<MX8MP_IOMUXC_SD2_DATA2__USDHC2_DATA2 0x1d4>,
889-
<MX8MP_IOMUXC_SD2_DATA3__USDHC2_DATA3 0x1d4>,
890-
<MX8MP_IOMUXC_GPIO1_IO04__USDHC2_VSELECT 0xc0>;
892+
<MX8MP_IOMUXC_SD2_DATA3__USDHC2_DATA3 0x1d4>;
891893
};
892894

893895
pinctrl_usdhc2_200mhz: usdhc2-200mhzgrp {
@@ -896,8 +898,7 @@
896898
<MX8MP_IOMUXC_SD2_DATA0__USDHC2_DATA0 0x1d4>,
897899
<MX8MP_IOMUXC_SD2_DATA1__USDHC2_DATA1 0x1d4>,
898900
<MX8MP_IOMUXC_SD2_DATA2__USDHC2_DATA2 0x1d4>,
899-
<MX8MP_IOMUXC_SD2_DATA3__USDHC2_DATA3 0x1d4>,
900-
<MX8MP_IOMUXC_GPIO1_IO04__USDHC2_VSELECT 0xc0>;
901+
<MX8MP_IOMUXC_SD2_DATA3__USDHC2_DATA3 0x1d4>;
901902
};
902903

903904
pinctrl_usdhc2_gpio: usdhc2-gpiogrp {

‎arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql-mba8mpxl.dts‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -603,6 +603,10 @@
603603
status = "okay";
604604
};
605605

606+
&reg_usdhc2_vqmmc {
607+
status = "okay";
608+
};
609+
606610
&sai3 {
607611
pinctrl-names = "default";
608612
pinctrl-0 = <&pinctrl_sai3>;
@@ -982,8 +986,7 @@
982986
<MX8MP_IOMUXC_SD2_DATA0__USDHC2_DATA0 0x1d2>,
983987
<MX8MP_IOMUXC_SD2_DATA1__USDHC2_DATA1 0x1d2>,
984988
<MX8MP_IOMUXC_SD2_DATA2__USDHC2_DATA2 0x1d2>,
985-
<MX8MP_IOMUXC_SD2_DATA3__USDHC2_DATA3 0x1d2>,
986-
<MX8MP_IOMUXC_GPIO1_IO04__USDHC2_VSELECT 0xc0>;
989+
<MX8MP_IOMUXC_SD2_DATA3__USDHC2_DATA3 0x1d2>;
987990
};
988991

989992
pinctrl_usdhc2_100mhz: usdhc2-100mhzgrp {
@@ -992,8 +995,7 @@
992995
<MX8MP_IOMUXC_SD2_DATA0__USDHC2_DATA0 0x1d4>,
993996
<MX8MP_IOMUXC_SD2_DATA1__USDHC2_DATA1 0x1d4>,
994997
<MX8MP_IOMUXC_SD2_DATA2__USDHC2_DATA2 0x1d4>,
995-
<MX8MP_IOMUXC_SD2_DATA3__USDHC2_DATA3 0x1d4>,
996-
<MX8MP_IOMUXC_GPIO1_IO04__USDHC2_VSELECT 0xc0>;
998+
<MX8MP_IOMUXC_SD2_DATA3__USDHC2_DATA3 0x1d4>;
997999
};
9981000

9991001
pinctrl_usdhc2_200mhz: usdhc2-200mhzgrp {
@@ -1002,8 +1004,7 @@
10021004
<MX8MP_IOMUXC_SD2_DATA0__USDHC2_DATA0 0x1d4>,
10031005
<MX8MP_IOMUXC_SD2_DATA1__USDHC2_DATA1 0x1d4>,
10041006
<MX8MP_IOMUXC_SD2_DATA2__USDHC2_DATA2 0x1d4>,
1005-
<MX8MP_IOMUXC_SD2_DATA3__USDHC2_DATA3 0x1d4>,
1006-
<MX8MP_IOMUXC_GPIO1_IO04__USDHC2_VSELECT 0xc0>;
1007+
<MX8MP_IOMUXC_SD2_DATA3__USDHC2_DATA3 0x1d4>;
10071008
};
10081009

10091010
pinctrl_usdhc2_gpio: usdhc2-gpiogrp {

‎arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql.dtsi‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,20 @@
2424
regulator-max-microvolt = <3300000>;
2525
regulator-always-on;
2626
};
27+
28+
reg_usdhc2_vqmmc: regulator-usdhc2-vqmmc {
29+
compatible = "regulator-gpio";
30+
pinctrl-names = "default";
31+
pinctrl-0 = <&pinctrl_reg_usdhc2_vqmmc>;
32+
regulator-name = "V_SD2";
33+
regulator-min-microvolt = <1800000>;
34+
regulator-max-microvolt = <3300000>;
35+
gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>;
36+
states = <1800000 0x1>,
37+
<3300000 0x0>;
38+
vin-supply = <&ldo5_reg>;
39+
status = "disabled";
40+
};
2741
};
2842

2943
&A53_0 {
@@ -179,6 +193,10 @@
179193
};
180194
};
181195

196+
&usdhc2 {
197+
vqmmc-supply = <&reg_usdhc2_vqmmc>;
198+
};
199+
182200
&usdhc3 {
183201
pinctrl-names = "default", "state_100mhz", "state_200mhz";
184202
pinctrl-0 = <&pinctrl_usdhc3>;
@@ -228,6 +246,10 @@
228246
fsl,pins = <MX8MP_IOMUXC_SD2_RESET_B__GPIO2_IO19 0x10>;
229247
};
230248

249+
pinctrl_reg_usdhc2_vqmmc: regusdhc2vqmmcgrp {
250+
fsl,pins = <MX8MP_IOMUXC_GPIO1_IO04__GPIO1_IO04 0xc0>;
251+
};
252+
231253
pinctrl_usdhc3: usdhc3grp {
232254
fsl,pins = <MX8MP_IOMUXC_NAND_WE_B__USDHC3_CLK 0x194>,
233255
<MX8MP_IOMUXC_NAND_WP_B__USDHC3_CMD 0x1d4>,

‎arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -966,6 +966,7 @@
966966
reg = <0>;
967967
m25p,fast-read;
968968
spi-max-frequency = <10000000>;
969+
vcc-supply = <&vcc_3v0>;
969970
};
970971
};
971972

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ struct mod_arch_specific {
1919

2020
/* for CONFIG_DYNAMIC_FTRACE */
2121
struct plt_entry *ftrace_trampolines;
22+
struct plt_entry *init_ftrace_trampolines;
2223
};
2324

2425
u64 module_emit_plt_entry(struct module *mod, Elf64_Shdr *sechdrs,

‎arch/arm64/include/asm/module.lds.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ SECTIONS {
22
.plt 0 : { BYTE(0) }
33
.init.plt 0 : { BYTE(0) }
44
.text.ftrace_trampoline 0 : { BYTE(0) }
5+
.init.text.ftrace_trampoline 0 : { BYTE(0) }
56

67
#ifdef CONFIG_KASAN_SW_TAGS
78
/*

‎arch/arm64/kernel/ftrace.c‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,10 +195,17 @@ int ftrace_update_ftrace_func(ftrace_func_t func)
195195
return ftrace_modify_code(pc, 0, new, false);
196196
}
197197

198-
static struct plt_entry *get_ftrace_plt(struct module *mod)
198+
static struct plt_entry *get_ftrace_plt(struct module *mod, unsigned long addr)
199199
{
200200
#ifdef CONFIG_MODULES
201-
struct plt_entry *plt = mod->arch.ftrace_trampolines;
201+
struct plt_entry *plt = NULL;
202+
203+
if (within_module_mem_type(addr, mod, MOD_INIT_TEXT))
204+
plt = mod->arch.init_ftrace_trampolines;
205+
else if (within_module_mem_type(addr, mod, MOD_TEXT))
206+
plt = mod->arch.ftrace_trampolines;
207+
else
208+
return NULL;
202209

203210
return &plt[FTRACE_PLT_IDX];
204211
#else
@@ -270,7 +277,7 @@ static bool ftrace_find_callable_addr(struct dyn_ftrace *rec,
270277
if (WARN_ON(!mod))
271278
return false;
272279

273-
plt = get_ftrace_plt(mod);
280+
plt = get_ftrace_plt(mod, pc);
274281
if (!plt) {
275282
pr_err("ftrace: no module PLT for %ps\n", (void *)*addr);
276283
return false;

0 commit comments

Comments
 (0)