Skip to content
This repository was archived by the owner on Oct 31, 2024. It is now read-only.

Commit 85795f0

Browse files
xanmodxanmod
committed
Merge tag '6.6.40-xanmod1' into 6.6-rt
2 parents 45b8b5a + e4647b8 commit 85795f0

File tree

340 files changed

+2569
-1375
lines changed

Some content is hidden

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

340 files changed

+2569
-1375
lines changed

‎CONFIGS/xanmod/gcc/config_x86-64-v1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/x86 6.6.36 Kernel Configuration
3+
# Linux/x86 6.6.40 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc-13 (Debian 13.3.0-1) 13.3.0"
66
CONFIG_CC_IS_GCC=y
@@ -18,7 +18,7 @@ CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
1818
CONFIG_TOOLS_SUPPORT_RELR=y
1919
CONFIG_CC_HAS_ASM_INLINE=y
2020
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
21-
CONFIG_PAHOLE_VERSION=126
21+
CONFIG_PAHOLE_VERSION=127
2222
CONFIG_IRQ_WORK=y
2323
CONFIG_BUILDTIME_TABLE_SORT=y
2424
CONFIG_THREAD_INFO_IN_TASK=y

‎CONFIGS/xanmod/gcc/config_x86-64-v2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/x86 6.6.36 Kernel Configuration
3+
# Linux/x86 6.6.40 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc-13 (Debian 13.3.0-1) 13.3.0"
66
CONFIG_CC_IS_GCC=y
@@ -18,7 +18,7 @@ CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
1818
CONFIG_TOOLS_SUPPORT_RELR=y
1919
CONFIG_CC_HAS_ASM_INLINE=y
2020
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
21-
CONFIG_PAHOLE_VERSION=126
21+
CONFIG_PAHOLE_VERSION=127
2222
CONFIG_IRQ_WORK=y
2323
CONFIG_BUILDTIME_TABLE_SORT=y
2424
CONFIG_THREAD_INFO_IN_TASK=y

‎CONFIGS/xanmod/gcc/config_x86-64-v3

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/x86 6.6.36 Kernel Configuration
3+
# Linux/x86 6.6.40 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc-13 (Debian 13.3.0-1) 13.3.0"
66
CONFIG_CC_IS_GCC=y
@@ -18,7 +18,7 @@ CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
1818
CONFIG_TOOLS_SUPPORT_RELR=y
1919
CONFIG_CC_HAS_ASM_INLINE=y
2020
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
21-
CONFIG_PAHOLE_VERSION=126
21+
CONFIG_PAHOLE_VERSION=127
2222
CONFIG_IRQ_WORK=y
2323
CONFIG_BUILDTIME_TABLE_SORT=y
2424
CONFIG_THREAD_INFO_IN_TASK=y

‎CONFIGS/xanmod/gcc/config_x86-64-v4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/x86 6.6.36 Kernel Configuration
3+
# Linux/x86 6.6.40 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc-13 (Debian 13.3.0-1) 13.3.0"
66
CONFIG_CC_IS_GCC=y
@@ -18,7 +18,7 @@ CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
1818
CONFIG_TOOLS_SUPPORT_RELR=y
1919
CONFIG_CC_HAS_ASM_INLINE=y
2020
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
21-
CONFIG_PAHOLE_VERSION=126
21+
CONFIG_PAHOLE_VERSION=127
2222
CONFIG_IRQ_WORK=y
2323
CONFIG_BUILDTIME_TABLE_SORT=y
2424
CONFIG_THREAD_INFO_IN_TASK=y

‎Documentation/kbuild/modules.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ executed to make module versioning work.
128128

129129
modules_install
130130
Install the external module(s). The default location is
131-
/lib/modules/<kernel_release>/extra/, but a prefix may
131+
/lib/modules/<kernel_release>/updates/, but a prefix may
132132
be added with INSTALL_MOD_PATH (discussed in section 5).
133133

134134
clean
@@ -417,7 +417,7 @@ directory:
417417

418418
And external modules are installed in:
419419

420-
/lib/modules/$(KERNELRELEASE)/extra/
420+
/lib/modules/$(KERNELRELEASE)/updates/
421421

422422
5.1 INSTALL_MOD_PATH
423423
--------------------
@@ -438,10 +438,10 @@ And external modules are installed in:
438438
-------------------
439439

440440
External modules are by default installed to a directory under
441-
/lib/modules/$(KERNELRELEASE)/extra/, but you may wish to
441+
/lib/modules/$(KERNELRELEASE)/updates/, but you may wish to
442442
locate modules for a specific functionality in a separate
443443
directory. For this purpose, use INSTALL_MOD_DIR to specify an
444-
alternative name to "extra."::
444+
alternative name to "updates."::
445445

446446
$ make INSTALL_MOD_DIR=gandalf -C $KDIR \
447447
M=$PWD modules_install

‎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 = 6
4-
SUBLEVEL = 36
4+
SUBLEVEL = 40
55
EXTRAVERSION =
66
NAME = Hurr durr I'ma ninja sloth
77

‎arch/arm/boot/dts/rockchip/rk3066a.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@
123123
pinctrl-0 = <&hdmii2c_xfer>, <&hdmi_hpd>;
124124
power-domains = <&power RK3066_PD_VIO>;
125125
rockchip,grf = <&grf>;
126+
#sound-dai-cells = <0>;
126127
status = "disabled";
127128

128129
ports {

‎arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
*/
66

77
/dts-v1/;
8+
9+
#include <dt-bindings/leds/common.h>
810
#include "rk3308.dtsi"
911

1012
/ {
@@ -24,17 +26,21 @@
2426
leds {
2527
compatible = "gpio-leds";
2628
pinctrl-names = "default";
27-
pinctrl-0 = <&green_led_gio>, <&heartbeat_led_gpio>;
29+
pinctrl-0 = <&green_led>, <&heartbeat_led>;
2830

2931
green-led {
32+
color = <LED_COLOR_ID_GREEN>;
3033
default-state = "on";
34+
function = LED_FUNCTION_POWER;
3135
gpios = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>;
3236
label = "rockpis:green:power";
3337
linux,default-trigger = "default-on";
3438
};
3539

3640
blue-led {
41+
color = <LED_COLOR_ID_BLUE>;
3742
default-state = "on";
43+
function = LED_FUNCTION_HEARTBEAT;
3844
gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;
3945
label = "rockpis:blue:user";
4046
linux,default-trigger = "heartbeat";
@@ -126,10 +132,12 @@
126132
};
127133

128134
&emmc {
129-
bus-width = <4>;
130135
cap-mmc-highspeed;
131-
mmc-hs200-1_8v;
136+
cap-sd-highspeed;
137+
no-sdio;
132138
non-removable;
139+
pinctrl-names = "default";
140+
pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd>;
133141
vmmc-supply = <&vcc_io>;
134142
status = "okay";
135143
};
@@ -152,11 +160,11 @@
152160
pinctrl-0 = <&rtc_32k>;
153161

154162
leds {
155-
green_led_gio: green-led-gpio {
163+
green_led: green-led {
156164
rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
157165
};
158166

159-
heartbeat_led_gpio: heartbeat-led-gpio {
167+
heartbeat_led: heartbeat-led {
160168
rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
161169
};
162170
};

‎arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,8 @@
186186
rk805: pmic@18 {
187187
compatible = "rockchip,rk805";
188188
reg = <0x18>;
189-
interrupt-parent = <&gpio2>;
190-
interrupts = <6 IRQ_TYPE_LEVEL_LOW>;
189+
interrupt-parent = <&gpio0>;
190+
interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
191191
#clock-cells = <1>;
192192
clock-output-names = "xin32k", "rk805-clkout2";
193193
gpio-controller;

‎arch/arm64/boot/dts/rockchip/rk3368.dtsi

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -790,6 +790,7 @@
790790
dma-names = "tx";
791791
pinctrl-names = "default";
792792
pinctrl-0 = <&spdif_tx>;
793+
#sound-dai-cells = <0>;
793794
status = "disabled";
794795
};
795796

@@ -801,6 +802,7 @@
801802
clocks = <&cru SCLK_I2S_2CH>, <&cru HCLK_I2S_2CH>;
802803
dmas = <&dmac_bus 6>, <&dmac_bus 7>;
803804
dma-names = "tx", "rx";
805+
#sound-dai-cells = <0>;
804806
status = "disabled";
805807
};
806808

@@ -814,6 +816,7 @@
814816
dma-names = "tx", "rx";
815817
pinctrl-names = "default";
816818
pinctrl-0 = <&i2s_8ch_bus>;
819+
#sound-dai-cells = <0>;
817820
status = "disabled";
818821
};
819822

‎arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ ap_i2c_audio: &i2c8 {
450450
dlg,btn-cfg = <50>;
451451
dlg,mic-det-thr = <500>;
452452
dlg,jack-ins-deb = <20>;
453-
dlg,jack-det-rate = "32ms_64ms";
453+
dlg,jack-det-rate = "32_64";
454454
dlg,jack-rem-deb = <1>;
455455

456456
dlg,a-d-btn-thr = <0xa>;

‎arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@
289289
regulator-name = "vdd_gpu";
290290
regulator-always-on;
291291
regulator-boot-on;
292-
regulator-min-microvolt = <900000>;
292+
regulator-min-microvolt = <500000>;
293293
regulator-max-microvolt = <1350000>;
294294
regulator-ramp-delay = <6001>;
295295

‎arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -390,6 +390,7 @@
390390
pinctrl-0 = <&pmic_pins>, <&rk806_dvs1_null>,
391391
<&rk806_dvs2_null>, <&rk806_dvs3_null>;
392392
spi-max-frequency = <1000000>;
393+
system-power-controller;
393394

394395
vcc1-supply = <&vcc5v0_sys>;
395396
vcc2-supply = <&vcc5v0_sys>;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -840,7 +840,7 @@ __SYSCALL(__NR_pselect6_time64, compat_sys_pselect6_time64)
840840
#define __NR_ppoll_time64 414
841841
__SYSCALL(__NR_ppoll_time64, compat_sys_ppoll_time64)
842842
#define __NR_io_pgetevents_time64 416
843-
__SYSCALL(__NR_io_pgetevents_time64, sys_io_pgetevents)
843+
__SYSCALL(__NR_io_pgetevents_time64, compat_sys_io_pgetevents_time64)
844844
#define __NR_recvmmsg_time64 417
845845
__SYSCALL(__NR_recvmmsg_time64, compat_sys_recvmmsg_time64)
846846
#define __NR_mq_timedsend_time64 418

‎arch/arm64/kernel/syscall.c

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,17 +56,15 @@ static void invoke_syscall(struct pt_regs *regs, unsigned int scno,
5656
syscall_set_return_value(current, regs, 0, ret);
5757

5858
/*
59-
* Ultimately, this value will get limited by KSTACK_OFFSET_MAX(),
60-
* but not enough for arm64 stack utilization comfort. To keep
61-
* reasonable stack head room, reduce the maximum offset to 9 bits.
59+
* This value will get limited by KSTACK_OFFSET_MAX(), which is 10
60+
* bits. The actual entropy will be further reduced by the compiler
61+
* when applying stack alignment constraints: the AAPCS mandates a
62+
* 16-byte aligned SP at function boundaries, which will remove the
63+
* 4 low bits from any entropy chosen here.
6264
*
63-
* The actual entropy will be further reduced by the compiler when
64-
* applying stack alignment constraints: the AAPCS mandates a
65-
* 16-byte (i.e. 4-bit) aligned SP at function boundaries.
66-
*
67-
* The resulting 5 bits of entropy is seen in SP[8:4].
65+
* The resulting 6 bits of entropy is seen in SP[9:4].
6866
*/
69-
choose_random_kstack_offset(get_random_u16() & 0x1FF);
67+
choose_random_kstack_offset(get_random_u16());
7068
}
7169

7270
static inline bool has_syscall_work(unsigned long flags)

‎arch/csky/include/uapi/asm/unistd.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#define __ARCH_WANT_SYS_CLONE3
77
#define __ARCH_WANT_SET_GET_RLIMIT
88
#define __ARCH_WANT_TIME32_SYSCALLS
9+
#define __ARCH_WANT_SYNC_FILE_RANGE2
910
#include <asm-generic/unistd.h>
1011

1112
#define __NR_set_thread_area (__NR_arch_specific_syscall + 0)

‎arch/hexagon/include/asm/syscalls.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
/* SPDX-License-Identifier: GPL-2.0 */
2+
3+
#include <asm-generic/syscalls.h>
4+
5+
asmlinkage long sys_hexagon_fadvise64_64(int fd, int advice,
6+
u32 a2, u32 a3, u32 a4, u32 a5);

‎arch/hexagon/include/uapi/asm/unistd.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,6 @@
3636
#define __ARCH_WANT_SYS_VFORK
3737
#define __ARCH_WANT_SYS_FORK
3838
#define __ARCH_WANT_TIME32_SYSCALLS
39+
#define __ARCH_WANT_SYNC_FILE_RANGE2
3940

4041
#include <asm-generic/unistd.h>

‎arch/hexagon/kernel/syscalltab.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,13 @@
1414
#undef __SYSCALL
1515
#define __SYSCALL(nr, call) [nr] = (call),
1616

17+
SYSCALL_DEFINE6(hexagon_fadvise64_64, int, fd, int, advice,
18+
SC_ARG64(offset), SC_ARG64(len))
19+
{
20+
return ksys_fadvise64_64(fd, SC_VAL64(loff_t, offset), SC_VAL64(loff_t, len), advice);
21+
}
22+
#define sys_fadvise64_64 sys_hexagon_fadvise64_64
23+
1724
void *sys_call_table[__NR_syscalls] = {
1825
#include <asm/unistd.h>
1926
};

‎arch/mips/kernel/syscalls/syscall_n32.tbl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@
354354
412 n32 utimensat_time64 sys_utimensat
355355
413 n32 pselect6_time64 compat_sys_pselect6_time64
356356
414 n32 ppoll_time64 compat_sys_ppoll_time64
357-
416 n32 io_pgetevents_time64 sys_io_pgetevents
357+
416 n32 io_pgetevents_time64 compat_sys_io_pgetevents_time64
358358
417 n32 recvmmsg_time64 compat_sys_recvmmsg_time64
359359
418 n32 mq_timedsend_time64 sys_mq_timedsend
360360
419 n32 mq_timedreceive_time64 sys_mq_timedreceive

‎arch/mips/kernel/syscalls/syscall_o32.tbl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@
403403
412 o32 utimensat_time64 sys_utimensat sys_utimensat
404404
413 o32 pselect6_time64 sys_pselect6 compat_sys_pselect6_time64
405405
414 o32 ppoll_time64 sys_ppoll compat_sys_ppoll_time64
406-
416 o32 io_pgetevents_time64 sys_io_pgetevents sys_io_pgetevents
406+
416 o32 io_pgetevents_time64 sys_io_pgetevents compat_sys_io_pgetevents_time64
407407
417 o32 recvmmsg_time64 sys_recvmmsg compat_sys_recvmmsg_time64
408408
418 o32 mq_timedsend_time64 sys_mq_timedsend sys_mq_timedsend
409409
419 o32 mq_timedreceive_time64 sys_mq_timedreceive sys_mq_timedreceive

‎arch/parisc/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ config PARISC
1414
select ARCH_HAS_UBSAN_SANITIZE_ALL
1515
select ARCH_HAS_PTE_SPECIAL
1616
select ARCH_NO_SG_CHAIN
17+
select ARCH_SPLIT_ARG64 if !64BIT
1718
select ARCH_SUPPORTS_HUGETLBFS if PA20
1819
select ARCH_SUPPORTS_MEMORY_FAILURE
1920
select ARCH_STACKWALK

‎arch/parisc/kernel/sys_parisc32.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,3 @@ asmlinkage long sys32_unimplemented(int r26, int r25, int r24, int r23,
2323
current->comm, current->pid, r20);
2424
return -ENOSYS;
2525
}
26-
27-
asmlinkage long sys32_fanotify_mark(compat_int_t fanotify_fd, compat_uint_t flags,
28-
compat_uint_t mask0, compat_uint_t mask1, compat_int_t dfd,
29-
const char __user * pathname)
30-
{
31-
return sys_fanotify_mark(fanotify_fd, flags,
32-
((__u64)mask1 << 32) | mask0,
33-
dfd, pathname);
34-
}

‎arch/parisc/kernel/syscalls/syscall.tbl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
95 common fchown sys_fchown
109109
96 common getpriority sys_getpriority
110110
97 common setpriority sys_setpriority
111-
98 common recv sys_recv
111+
98 common recv sys_recv compat_sys_recv
112112
99 common statfs sys_statfs compat_sys_statfs
113113
100 common fstatfs sys_fstatfs compat_sys_fstatfs
114114
101 common stat64 sys_stat64
@@ -135,7 +135,7 @@
135135
120 common clone sys_clone_wrapper
136136
121 common setdomainname sys_setdomainname
137137
122 common sendfile sys_sendfile compat_sys_sendfile
138-
123 common recvfrom sys_recvfrom
138+
123 common recvfrom sys_recvfrom compat_sys_recvfrom
139139
124 32 adjtimex sys_adjtimex_time32
140140
124 64 adjtimex sys_adjtimex
141141
125 common mprotect sys_mprotect
@@ -364,7 +364,7 @@
364364
320 common accept4 sys_accept4
365365
321 common prlimit64 sys_prlimit64
366366
322 common fanotify_init sys_fanotify_init
367-
323 common fanotify_mark sys_fanotify_mark sys32_fanotify_mark
367+
323 common fanotify_mark sys_fanotify_mark compat_sys_fanotify_mark
368368
324 32 clock_adjtime sys_clock_adjtime32
369369
324 64 clock_adjtime sys_clock_adjtime
370370
325 common name_to_handle_at sys_name_to_handle_at

‎arch/powerpc/include/asm/interrupt.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,14 @@ static inline void interrupt_nmi_enter_prepare(struct pt_regs *regs, struct inte
336336
if (IS_ENABLED(CONFIG_KASAN))
337337
return;
338338

339+
/*
340+
* Likewise, do not use it in real mode if percpu first chunk is not
341+
* embedded. With CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK enabled there
342+
* are chances where percpu allocation can come from vmalloc area.
343+
*/
344+
if (percpu_first_chunk_is_paged)
345+
return;
346+
339347
/* Otherwise, it should be safe to call it */
340348
nmi_enter();
341349
}
@@ -351,6 +359,8 @@ static inline void interrupt_nmi_exit_prepare(struct pt_regs *regs, struct inter
351359
// no nmi_exit for a pseries hash guest taking a real mode exception
352360
} else if (IS_ENABLED(CONFIG_KASAN)) {
353361
// no nmi_exit for KASAN in real mode
362+
} else if (percpu_first_chunk_is_paged) {
363+
// no nmi_exit if percpu first chunk is not embedded
354364
} else {
355365
nmi_exit();
356366
}

0 commit comments

Comments
 (0)