Merge tag 'v5.15.162' into 5.15-main

This is the 5.15.162 stable release # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmaHnXIACgkQONu9yGCS # aT7HNxAAmASvz57AVygCTkX5sTHN0xr0esa2AqtU9d5IpulEz8O6Y3A2UIzZvuo5 # gh03+3J0jWhJghfXezaQzm5CpVPy0nQlTrQ9WgquBzJ0/xk1Zw/zffrlbvoAvhBT # 4LRxsFACcGzb0so1aDF1G/YLjNdx+JpvXVwvj9O9/32l+qdN9yPNr6VfM+t6/4NG # EvFN6FJ+f7ESOxUCNngSTxQ1uQlex80yqcXlj516I+6FcAFhKXJlYMihqUe86x/3 # BsrrBpw2/7kZyDImOwd7MXKGW8uEPXPehqsX7vY9vyT1QNf5NA0yiDbRTz6SGGKf # a3nDDycJMRWXa4wO8qpDsR2r1fz5kydat8xPmX1ly76a8R66WZQsZtap7i5o+wMB # tTbduRF7unjBfAlw6rfn2pxZk0hIY/NbWoIQ87z5CBwnfYk6yn0ZCNCQ9LrnaThx # F5sjnpw384T4s6CVOlj00Ud6SST36G2IRlE3Q6TjZkJU4Vxm4gEeMyc9IuUmg7xZ # bYHdB3F8jfwPmf/ZX7EGEd8VADXPPK/dcpnUFlnBxilcG2LPHbJo6BDkTtG7mvNN # P8lOg2jbhgAwq60LvqE92eOAzaWvJbpAkN2jSfwkOcZbEgvbulKlcB/RKlNK+C0C # W0tD/FGKAbaXIDMU32gEi28CbKHivwO3p0EIYIUYoAASMprujKw= # =YvOD # -----END PGP SIGNATURE----- # gpg: Signature made Fri Jul 5 09:14:58 2024 CEST # gpg: using RSA key 647F28654894E3BD457199BE38DBBDC86092693E # gpg: Can't check signature: No public key
frank-w · Aug 11, 2024 · 7a0231b · 7a0231b
2 parents 6e089ff + f45bea2
commit 7a0231b
Show file tree

Hide file tree

Showing 363 changed files with 3,866 additions and 2,534 deletions.
diff --git a/Documentation/devicetree/bindings/i2c/google,cros-ec-i2c-tunnel.yaml b/Documentation/devicetree/bindings/i2c/google,cros-ec-i2c-tunnel.yaml
@@ -22,7 +22,7 @@ description: |
  google,cros-ec-spi or google,cros-ec-i2c.
 
 allOf:
- - $ref: i2c-controller.yaml#
+ - $ref: /schemas/i2c/i2c-controller.yaml#
 
 properties:
  compatible:

diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 5
 PATCHLEVEL = 15
-SUBLEVEL = 161
+SUBLEVEL = 162
 EXTRAVERSION =
 NAME = Trick or Treat
 
@@ -959,7 +959,6 @@ endif
 ifdef CONFIG_LTO_CLANG
 ifdef CONFIG_LTO_CLANG_THIN
 CC_FLAGS_LTO := -flto=thin -fsplit-lto-unit
-KBUILD_LDFLAGS += --thinlto-cache-dir=$(extmod_prefix).thinlto-cache
 else
 CC_FLAGS_LTO := -flto
 endif
@@ -1560,7 +1559,7 @@ endif # CONFIG_MODULES
 # Directories & files removed with 'make clean'
 CLEAN_FILES += include/ksym vmlinux.symvers modules-only.symvers \
  modules.builtin modules.builtin.modinfo modules.nsdeps \
- compile_commands.json .thinlto-cache
+ compile_commands.json
 
 # Directories & files removed with 'make mrproper'
 MRPROPER_FILES += include/config include/generated \
@@ -1788,7 +1787,7 @@ PHONY += compile_commands.json
 
 clean-dirs := $(KBUILD_EXTMOD)
 clean: rm-files := $(KBUILD_EXTMOD)/Module.symvers $(KBUILD_EXTMOD)/modules.nsdeps \
- $(KBUILD_EXTMOD)/compile_commands.json $(KBUILD_EXTMOD)/.thinlto-cache
+ $(KBUILD_EXTMOD)/compile_commands.json
 
 PHONY += prepare
 # now expand this into a simple variable to reduce the cost of shell evaluations

diff --git a/arch/arm/boot/dts/exynos4210-smdkv310.dts b/arch/arm/boot/dts/exynos4210-smdkv310.dts
@@ -84,7 +84,7 @@
 &keypad {
  samsung,keypad-num-rows = <2>;
  samsung,keypad-num-columns = <8>;
- linux,keypad-no-autorepeat;
+ linux,input-no-autorepeat;
  wakeup-source;
  pinctrl-names = "default";
  pinctrl-0 = <&keypad_rows &keypad_cols>;

diff --git a/arch/arm/boot/dts/exynos4412-origen.dts b/arch/arm/boot/dts/exynos4412-origen.dts
@@ -448,7 +448,7 @@
 &keypad {
  samsung,keypad-num-rows = <3>;
  samsung,keypad-num-columns = <2>;
- linux,keypad-no-autorepeat;
+ linux,input-no-autorepeat;
  wakeup-source;
  pinctrl-0 = <&keypad_rows &keypad_cols>;
  pinctrl-names = "default";

diff --git a/arch/arm/boot/dts/exynos4412-smdk4412.dts b/arch/arm/boot/dts/exynos4412-smdk4412.dts
@@ -65,7 +65,7 @@
 &keypad {
  samsung,keypad-num-rows = <3>;
  samsung,keypad-num-columns = <8>;
- linux,keypad-no-autorepeat;
+ linux,input-no-autorepeat;
  wakeup-source;
  pinctrl-0 = <&keypad_rows &keypad_cols>;
  pinctrl-names = "default";

diff --git a/arch/arm/boot/dts/rk3066a.dtsi b/arch/arm/boot/dts/rk3066a.dtsi
@@ -124,6 +124,7 @@
  pinctrl-0 = <&hdmii2c_xfer>, <&hdmi_hpd>;
  power-domains = <&power RK3066_PD_VIO>;
  rockchip,grf = <&grf>;
+ #sound-dai-cells = <0>;
  status = "disabled";
 
  ports {

diff --git a/arch/arm64/boot/dts/freescale/imx8qm-mek.dts b/arch/arm64/boot/dts/freescale/imx8qm-mek.dts
@@ -32,7 +32,7 @@
  regulator-name = "SD1_SPWR";
  regulator-min-microvolt = <3000000>;
  regulator-max-microvolt = <3000000>;
- gpio = <&lsio_gpio4 19 GPIO_ACTIVE_HIGH>;
+ gpio = <&lsio_gpio4 7 GPIO_ACTIVE_HIGH>;
  enable-active-high;
  };
 };

diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts
@@ -186,8 +186,8 @@
  rk805: pmic@18 {
  compatible = "rockchip,rk805";
  reg = <0x18>;
- interrupt-parent = <&gpio2>;
- interrupts = <6 IRQ_TYPE_LEVEL_LOW>;
+ interrupt-parent = <&gpio0>;
+ interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
  #clock-cells = <1>;
  clock-output-names = "xin32k", "rk805-clkout2";
  gpio-controller;

diff --git a/arch/arm64/boot/dts/rockchip/rk3368.dtsi b/arch/arm64/boot/dts/rockchip/rk3368.dtsi
@@ -678,6 +678,7 @@
  dma-names = "tx";
  pinctrl-names = "default";
  pinctrl-0 = <&spdif_tx>;
+ #sound-dai-cells = <0>;
  status = "disabled";
  };
 
@@ -689,6 +690,7 @@
  clocks = <&cru SCLK_I2S_2CH>, <&cru HCLK_I2S_2CH>;
  dmas = <&dmac_bus 6>, <&dmac_bus 7>;
  dma-names = "tx", "rx";
+ #sound-dai-cells = <0>;
  status = "disabled";
  };
 
@@ -702,6 +704,7 @@
  dma-names = "tx", "rx";
  pinctrl-names = "default";
  pinctrl-0 = <&i2s_8ch_bus>;
+ #sound-dai-cells = <0>;
  status = "disabled";
  };
 

diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h
@@ -419,6 +419,7 @@ struct kvm_vcpu_arch {
 #define KVM_ARM64_EXCEPT_MASK (7 << 9) /* Target EL/MODE */
 #define KVM_ARM64_DEBUG_STATE_SAVE_SPE (1 << 12) /* Save SPE context if active */
 #define KVM_ARM64_DEBUG_STATE_SAVE_TRBE (1 << 13) /* Save TRBE context if active */
+#define KVM_ARM64_VCPU_IN_WFI (1 << 14) /* WFI instruction trapped */
 
 #define KVM_GUESTDBG_VALID_MASK (KVM_GUESTDBG_ENABLE | \
  KVM_GUESTDBG_USE_SW_BP | \

diff --git a/arch/arm64/include/asm/unistd32.h b/arch/arm64/include/asm/unistd32.h
@@ -840,7 +840,7 @@ __SYSCALL(__NR_pselect6_time64, compat_sys_pselect6_time64)
 #define __NR_ppoll_time64 414
 __SYSCALL(__NR_ppoll_time64, compat_sys_ppoll_time64)
 #define __NR_io_pgetevents_time64 416
-__SYSCALL(__NR_io_pgetevents_time64, sys_io_pgetevents)
+__SYSCALL(__NR_io_pgetevents_time64, compat_sys_io_pgetevents_time64)
 #define __NR_recvmmsg_time64 417
 __SYSCALL(__NR_recvmmsg_time64, compat_sys_recvmmsg_time64)
 #define __NR_mq_timedsend_time64 418

diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c
@@ -379,13 +379,15 @@ void kvm_arch_vcpu_blocking(struct kvm_vcpu *vcpu)
  */
  preempt_disable();
  kvm_vgic_vmcr_sync(vcpu);
- vgic_v4_put(vcpu, true);
+ vcpu->arch.flags |= KVM_ARM64_VCPU_IN_WFI;
+ vgic_v4_put(vcpu);
  preempt_enable();
 }
 
 void kvm_arch_vcpu_unblocking(struct kvm_vcpu *vcpu)
 {
  preempt_disable();
+ vcpu->arch.flags &= ~KVM_ARM64_VCPU_IN_WFI;
  vgic_v4_load(vcpu);
  preempt_enable();
 }
@@ -696,7 +698,7 @@ static void check_vcpu_requests(struct kvm_vcpu *vcpu)
  if (kvm_check_request(KVM_REQ_RELOAD_GICv4, vcpu)) {
  /* The distributor enable bits were changed */
  preempt_disable();
- vgic_v4_put(vcpu, false);
+ vgic_v4_put(vcpu);
  vgic_v4_load(vcpu);
  preempt_enable();
  }

diff --git a/arch/arm64/kvm/vgic/vgic-v3.c b/arch/arm64/kvm/vgic/vgic-v3.c
@@ -715,7 +715,7 @@ void vgic_v3_put(struct kvm_vcpu *vcpu)
 {
  struct vgic_v3_cpu_if *cpu_if = &vcpu->arch.vgic_cpu.vgic_v3;
 
- WARN_ON(vgic_v4_put(vcpu, false));
+ WARN_ON(vgic_v4_put(vcpu));
 
  vgic_v3_vmcr_sync(vcpu);
 

diff --git a/arch/arm64/kvm/vgic/vgic-v4.c b/arch/arm64/kvm/vgic/vgic-v4.c
@@ -333,14 +333,15 @@ void vgic_v4_teardown(struct kvm *kvm)
  its_vm->vpes = NULL;
 }
 
-int vgic_v4_put(struct kvm_vcpu *vcpu, bool need_db)
+int vgic_v4_put(struct kvm_vcpu *vcpu)
 {
  struct its_vpe *vpe = &vcpu->arch.vgic_cpu.vgic_v3.its_vpe;
 
  if (!vgic_supports_direct_msis(vcpu->kvm) || !vpe->resident)
  return 0;
 
- return its_make_vpe_non_resident(vpe, need_db);
+ return its_make_vpe_non_resident(vpe,
+ vcpu->arch.flags & KVM_ARM64_VCPU_IN_WFI);
 }
 
 int vgic_v4_load(struct kvm_vcpu *vcpu)
@@ -351,6 +352,9 @@ int vgic_v4_load(struct kvm_vcpu *vcpu)
  if (!vgic_supports_direct_msis(vcpu->kvm) || vpe->resident)
  return 0;
 
+ if (vcpu->arch.flags & KVM_ARM64_VCPU_IN_WFI)
+ return 0;
+
  /*
  * Before making the VPE resident, make sure the redistributor
  * corresponding to our current CPU expects us here. See the

diff --git a/arch/csky/include/uapi/asm/unistd.h b/arch/csky/include/uapi/asm/unistd.h
@@ -6,6 +6,7 @@
 #define __ARCH_WANT_SYS_CLONE3
 #define __ARCH_WANT_SET_GET_RLIMIT
 #define __ARCH_WANT_TIME32_SYSCALLS
+#define __ARCH_WANT_SYNC_FILE_RANGE2
 #include <asm-generic/unistd.h>
 
 #define __NR_set_thread_area (__NR_arch_specific_syscall + 0)

diff --git a/arch/hexagon/include/asm/syscalls.h b/arch/hexagon/include/asm/syscalls.h
@@ -0,0 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
+#include <asm-generic/syscalls.h>
+
+asmlinkage long sys_hexagon_fadvise64_64(int fd, int advice,
+ u32 a2, u32 a3, u32 a4, u32 a5);
diff --git a/arch/hexagon/include/uapi/asm/unistd.h b/arch/hexagon/include/uapi/asm/unistd.h
@@ -36,5 +36,6 @@
 #define __ARCH_WANT_SYS_VFORK
 #define __ARCH_WANT_SYS_FORK
 #define __ARCH_WANT_TIME32_SYSCALLS
+#define __ARCH_WANT_SYNC_FILE_RANGE2
 
 #include <asm-generic/unistd.h>
diff --git a/arch/hexagon/kernel/syscalltab.c b/arch/hexagon/kernel/syscalltab.c
@@ -14,6 +14,13 @@
 #undef __SYSCALL
 #define __SYSCALL(nr, call) [nr] = (call),
 
+SYSCALL_DEFINE6(hexagon_fadvise64_64, int, fd, int, advice,
+ SC_ARG64(offset), SC_ARG64(len))
+{
+ return ksys_fadvise64_64(fd, SC_VAL64(loff_t, offset), SC_VAL64(loff_t, len), advice);
+}
+#define sys_fadvise64_64 sys_hexagon_fadvise64_64
+
 void *sys_call_table[__NR_syscalls] = {
 #include <asm/unistd.h>
 };
diff --git a/arch/mips/bmips/setup.c b/arch/mips/bmips/setup.c
@@ -110,7 +110,8 @@ static void bcm6358_quirks(void)
  * RAC flush causes kernel panics on BCM6358 when booting from TP1
  * because the bootloader is not initializing it properly.
  */
- bmips_rac_flush_disable = !!(read_c0_brcm_cmt_local() & (1 << 31));
+ bmips_rac_flush_disable = !!(read_c0_brcm_cmt_local() & (1 << 31)) ||
+ !!BMIPS_GET_CBR();
 }
 
 static void bcm6368_quirks(void)

diff --git a/arch/mips/kernel/syscalls/syscall_n32.tbl b/arch/mips/kernel/syscalls/syscall_n32.tbl
@@ -354,7 +354,7 @@
 412 n32 utimensat_time64 sys_utimensat
 413 n32 pselect6_time64 compat_sys_pselect6_time64
 414 n32 ppoll_time64 compat_sys_ppoll_time64
-416 n32 io_pgetevents_time64 sys_io_pgetevents
+416 n32 io_pgetevents_time64 compat_sys_io_pgetevents_time64
 417 n32 recvmmsg_time64 compat_sys_recvmmsg_time64
 418 n32 mq_timedsend_time64 sys_mq_timedsend
 419 n32 mq_timedreceive_time64 sys_mq_timedreceive

diff --git a/arch/mips/kernel/syscalls/syscall_o32.tbl b/arch/mips/kernel/syscalls/syscall_o32.tbl
@@ -403,7 +403,7 @@
 412 o32 utimensat_time64 sys_utimensat sys_utimensat
 413 o32 pselect6_time64 sys_pselect6 compat_sys_pselect6_time64
 414 o32 ppoll_time64 sys_ppoll compat_sys_ppoll_time64
-416 o32 io_pgetevents_time64 sys_io_pgetevents sys_io_pgetevents
+416 o32 io_pgetevents_time64 sys_io_pgetevents compat_sys_io_pgetevents_time64
 417 o32 recvmmsg_time64 sys_recvmmsg compat_sys_recvmmsg_time64
 418 o32 mq_timedsend_time64 sys_mq_timedsend sys_mq_timedsend
 419 o32 mq_timedreceive_time64 sys_mq_timedreceive sys_mq_timedreceive

diff --git a/arch/mips/pci/ops-rc32434.c b/arch/mips/pci/ops-rc32434.c
@@ -112,8 +112,8 @@ static int read_config_dword(struct pci_bus *bus, unsigned int devfn,
  * gives them time to settle
  */
  if (where == PCI_VENDOR_ID) {
- if (ret == 0xffffffff || ret == 0x00000000 ||
- ret == 0x0000ffff || ret == 0xffff0000) {
+ if (*val == 0xffffffff || *val == 0x00000000 ||
+ *val == 0x0000ffff || *val == 0xffff0000) {
  if (delay > 4)
  return 0;
  delay *= 2;

diff --git a/arch/mips/pci/pcie-octeon.c b/arch/mips/pci/pcie-octeon.c
@@ -230,12 +230,18 @@ static inline uint64_t __cvmx_pcie_build_config_addr(int pcie_port, int bus,
 {
  union cvmx_pcie_address pcie_addr;
  union cvmx_pciercx_cfg006 pciercx_cfg006;
+ union cvmx_pciercx_cfg032 pciercx_cfg032;
 
  pciercx_cfg006.u32 =
  cvmx_pcie_cfgx_read(pcie_port, CVMX_PCIERCX_CFG006(pcie_port));
  if ((bus <= pciercx_cfg006.s.pbnum) && (dev != 0))
  return 0;
 
+ pciercx_cfg032.u32 =
+ cvmx_pcie_cfgx_read(pcie_port, CVMX_PCIERCX_CFG032(pcie_port));
+ if ((pciercx_cfg032.s.dlla == 0) || (pciercx_cfg032.s.lt == 1))
+ return 0;
+
  pcie_addr.u64 = 0;
  pcie_addr.config.upper = 2;
  pcie_addr.config.io = 1;

diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
@@ -12,6 +12,7 @@ config PARISC
  select ARCH_HAS_STRICT_MODULE_RWX
  select ARCH_HAS_UBSAN_SANITIZE_ALL
  select ARCH_NO_SG_CHAIN
+ select ARCH_SPLIT_ARG64 if !64BIT
  select ARCH_SUPPORTS_HUGETLBFS if PA20
  select ARCH_SUPPORTS_MEMORY_FAILURE
  select DMA_OPS

diff --git a/arch/parisc/kernel/sys_parisc32.c b/arch/parisc/kernel/sys_parisc32.c
@@ -23,12 +23,3 @@ asmlinkage long sys32_unimplemented(int r26, int r25, int r24, int r23,
  current->comm, current->pid, r20);
  return -ENOSYS;
 }
-
-asmlinkage long sys32_fanotify_mark(compat_int_t fanotify_fd, compat_uint_t flags,
- compat_uint_t mask0, compat_uint_t mask1, compat_int_t dfd,
- const char __user * pathname)
-{
- return sys_fanotify_mark(fanotify_fd, flags,
- ((__u64)mask1 << 32) | mask0,
- dfd, pathname);
-}
diff --git a/arch/parisc/kernel/syscalls/syscall.tbl b/arch/parisc/kernel/syscalls/syscall.tbl
@@ -108,7 +108,7 @@
 95 common fchown sys_fchown
 96 common getpriority sys_getpriority
 97 common setpriority sys_setpriority
-98 common recv sys_recv
+98 common recv sys_recv compat_sys_recv
 99 common statfs sys_statfs compat_sys_statfs
 100 common fstatfs sys_fstatfs compat_sys_fstatfs
 101 common stat64 sys_stat64
@@ -135,7 +135,7 @@
 120 common clone sys_clone_wrapper
 121 common setdomainname sys_setdomainname
 122 common sendfile sys_sendfile compat_sys_sendfile
-123 common recvfrom sys_recvfrom
+123 common recvfrom sys_recvfrom compat_sys_recvfrom
 124 32 adjtimex sys_adjtimex_time32
 124 64 adjtimex sys_adjtimex
 125 common mprotect sys_mprotect
@@ -364,7 +364,7 @@
 320 common accept4 sys_accept4
 321 common prlimit64 sys_prlimit64
 322 common fanotify_init sys_fanotify_init
-323 common fanotify_mark sys_fanotify_mark sys32_fanotify_mark
+323 common fanotify_mark sys_fanotify_mark compat_sys_fanotify_mark
 324 32 clock_adjtime sys_clock_adjtime32
 324 64 clock_adjtime sys_clock_adjtime
 325 common name_to_handle_at sys_name_to_handle_at

diff --git a/arch/powerpc/include/asm/fadump-internal.h b/arch/powerpc/include/asm/fadump-internal.h
@@ -19,11 +19,6 @@
 
 #define memblock_num_regions(memblock_type) (memblock.memblock_type.cnt)
 
-/* Alignment per CMA requirement. */
-#define FADUMP_CMA_ALIGNMENT (PAGE_SIZE << \
- max_t(unsigned long, MAX_ORDER - 1, \
- pageblock_order))
-
 /* FAD commands */
 #define FADUMP_REGISTER 1
 #define FADUMP_UNREGISTER 2

diff --git a/arch/powerpc/include/asm/hvcall.h b/arch/powerpc/include/asm/hvcall.h
@@ -472,7 +472,7 @@ long plpar_hcall_norets_notrace(unsigned long opcode, ...);
  * Used for all but the craziest of phyp interfaces (see plpar_hcall9)
  */
 #define PLPAR_HCALL_BUFSIZE 4
-long plpar_hcall(unsigned long opcode, unsigned long *retbuf, ...);
+long plpar_hcall(unsigned long opcode, unsigned long retbuf[static PLPAR_HCALL_BUFSIZE], ...);
 
 /**
  * plpar_hcall_raw: - Make a hypervisor call without calculating hcall stats
@@ -486,7 +486,7 @@ long plpar_hcall(unsigned long opcode, unsigned long *retbuf, ...);
  * plpar_hcall, but plpar_hcall_raw works in real mode and does not
  * calculate hypervisor call statistics.
  */
-long plpar_hcall_raw(unsigned long opcode, unsigned long *retbuf, ...);
+long plpar_hcall_raw(unsigned long opcode, unsigned long retbuf[static PLPAR_HCALL_BUFSIZE], ...);
 
 /**
  * plpar_hcall9: - Make a pseries hypervisor call with up to 9 return arguments
@@ -497,8 +497,8 @@ long plpar_hcall_raw(unsigned long opcode, unsigned long *retbuf, ...);
  * PLPAR_HCALL9_BUFSIZE to size the return argument buffer.
  */
 #define PLPAR_HCALL9_BUFSIZE 9
-long plpar_hcall9(unsigned long opcode, unsigned long *retbuf, ...);
-long plpar_hcall9_raw(unsigned long opcode, unsigned long *retbuf, ...);
+long plpar_hcall9(unsigned long opcode, unsigned long retbuf[static PLPAR_HCALL9_BUFSIZE], ...);
+long plpar_hcall9_raw(unsigned long opcode, unsigned long retbuf[static PLPAR_HCALL9_BUFSIZE], ...);
 
 struct hvcall_mpp_data {
  unsigned long entitled_mem;