Merge branch 'master' into mm-hotfixes-stable

Documentation/ABI/testing/sysfs-class-led

@@ -59,15 +59,6 @@ Description:
  brightness. Reading this file when no hw brightness change
  event has happened will return an ENODATA error.
 
-What: /sys/class/leds/<led>/color
-Date: June 2023
-KernelVersion: 6.5
-Description:
- Color of the LED.
-
- This is a read-only file. Reading this file returns the color
- of the LED as a string (e.g: "red", "green", "multicolor").
-
 What: /sys/class/leds/<led>/trigger
 Date: March 2006
 KernelVersion: 2.6.17

Documentation/devicetree/bindings/pinctrl/nxp,s32g2-siul2-pinctrl.yaml

@@ -9,7 +9,7 @@ title: NXP S32G2 pin controller
 
 maintainers:
  - Ghennadi Procopciuc <[email protected]>
- - Chester Lin <clin@suse.com>
+ - Chester Lin <chester62515@gmail.com>
 
 description: |
  S32G2 pinmux is implemented in SIUL2 (System Integration Unit Lite2),

Documentation/devicetree/bindings/usb/microchip,usb5744.yaml

@@ -36,7 +36,11 @@ properties:
 
  vdd-supply:
  description:
- VDD power supply to the hub
+ 3V3 power supply to the hub
+
+ vdd2-supply:
+ description:
+ 1V2 power supply to the hub
 
  peer-hub:
  $ref: /schemas/types.yaml#/definitions/phandle
@@ -62,6 +66,7 @@ allOf:
  properties:
  reset-gpios: false
  vdd-supply: false
+ vdd2-supply: false
  peer-hub: false
  i2c-bus: false
  else:

Documentation/devicetree/bindings/usb/qcom,dwc3.yaml

@@ -521,8 +521,8 @@ examples:
 
  interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>,
  <GIC_SPI 486 IRQ_TYPE_LEVEL_HIGH>,
- <GIC_SPI 488 IRQ_TYPE_LEVEL_HIGH>,
- <GIC_SPI 489 IRQ_TYPE_LEVEL_HIGH>;
+ <GIC_SPI 488 IRQ_TYPE_EDGE_BOTH>,
+ <GIC_SPI 489 IRQ_TYPE_EDGE_BOTH>;
  interrupt-names = "hs_phy_irq", "ss_phy_irq",
  "dm_hs_phy_irq", "dp_hs_phy_irq";
 

Documentation/devicetree/bindings/usb/usb-hcd.yaml

@@ -41,7 +41,7 @@ examples:
  - |
  usb {
  phys = <&usb2_phy1>, <&usb3_phy1>;
- phy-names = "usb";
+ phy-names = "usb2", "usb3";
  #address-cells = <1>;
  #size-cells = <0>;
 

MAINTAINERS

@@ -5064,7 +5064,6 @@ CLANG CONTROL FLOW INTEGRITY SUPPORT
 M: Sami Tolvanen <[email protected]>
 M: Kees Cook <[email protected]>
 R: Nathan Chancellor <[email protected]>
-R: Nick Desaulniers <[email protected]>
 L: [email protected]
 S: Supported
 B: https://github.com/ClangBuiltLinux/linux/issues
@@ -5079,8 +5078,9 @@ F: .clang-format
 
 CLANG/LLVM BUILD SUPPORT
 M: Nathan Chancellor <[email protected]>
-M: Nick Desaulniers <[email protected]>
-R: Tom Rix <[email protected]>
+R: Nick Desaulniers <[email protected]>
+R: Bill Wendling <[email protected]>
+R: Justin Stitt <[email protected]>
 L: [email protected]
 S: Supported
 W: https://clangbuiltlinux.github.io/
@@ -5230,7 +5230,6 @@ F: drivers/platform/x86/compal-laptop.c
 
 COMPILER ATTRIBUTES
 M: Miguel Ojeda <[email protected]>
-R: Nick Desaulniers <[email protected]>
 S: Maintained
 F: include/linux/compiler_attributes.h
 
@@ -11458,7 +11457,6 @@ F: fs/autofs/
 KERNEL BUILD + files below scripts/ (unless maintained elsewhere)
 M: Masahiro Yamada <[email protected]>
 R: Nathan Chancellor <[email protected]>
-R: Nick Desaulniers <[email protected]>
 R: Nicolas Schier <[email protected]>
 L: [email protected]
 S: Maintained
@@ -17881,6 +17879,8 @@ L: [email protected]
 L: [email protected]
 S: Maintained
 F: drivers/iommu/arm/arm-smmu/qcom_iommu.c
+F: drivers/iommu/arm/arm-smmu/arm-smmu-qcom*
+F: drivers/iommu/msm_iommu*
 
 QUALCOMM IPC ROUTER (QRTR) DRIVER
 M: Manivannan Sadhasivam <[email protected]>
@@ -21988,6 +21988,7 @@ F: drivers/watchdog/tqmx86_wdt.c
 TRACING
 M: Steven Rostedt <[email protected]>
 M: Masami Hiramatsu <[email protected]>
+R: Mathieu Desnoyers <[email protected]>
 L: [email protected]
 L: [email protected]
 S: Maintained

Makefile

@@ -2,7 +2,7 @@
 VERSION = 6
 PATCHLEVEL = 7
 SUBLEVEL = 0
-EXTRAVERSION = -rc2
+EXTRAVERSION = -rc4
 NAME = Hurr durr I'ma ninja sloth
 
 # *DOCUMENTATION*

arch/arm/xen/enlighten.c

@@ -484,7 +484,8 @@ static int __init xen_guest_init(void)
  * for secondary CPUs as they are brought up.
  * For uniformity we use VCPUOP_register_vcpu_info even on cpu0.
  */
- xen_vcpu_info = alloc_percpu(struct vcpu_info);
+ xen_vcpu_info = __alloc_percpu(sizeof(struct vcpu_info),
+ 1 << fls(sizeof(struct vcpu_info) - 1));
  if (xen_vcpu_info == NULL)
  return -ENOMEM;
 

arch/arm64/Makefile

@@ -158,7 +158,7 @@ endif
 
 all: $(notdir $(KBUILD_IMAGE))
 
-
+vmlinuz.efi: Image
 Image vmlinuz.efi: vmlinux
  $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
 

arch/arm64/include/asm/setup.h

@@ -21,9 +21,22 @@ static inline bool arch_parse_debug_rodata(char *arg)
  extern bool rodata_enabled;
  extern bool rodata_full;
 
- if (arg && !strcmp(arg, "full")) {
+ if (!arg)
+ return false;
+
+ if (!strcmp(arg, "full")) {
+ rodata_enabled = rodata_full = true;
+ return true;
+ }
+
+ if (!strcmp(arg, "off")) {
+ rodata_enabled = rodata_full = false;
+ return true;
+ }
+
+ if (!strcmp(arg, "on")) {
  rodata_enabled = true;
- rodata_full = true;
+ rodata_full = false;
  return true;
  }
 

arch/arm64/kernel/cpufeature.c

@@ -1839,6 +1839,10 @@ static int __init __kpti_install_ng_mappings(void *__unused)
 
 static void __init kpti_install_ng_mappings(void)
 {
+ /* Check whether KPTI is going to be used */
+ if (!cpus_have_cap(ARM64_UNMAP_KERNEL_AT_EL0))
+ return;
+
  /*
  * We don't need to rewrite the page-tables if either we've done
  * it already or we have KASLR enabled and therefore have not

arch/arm64/mm/pageattr.c

@@ -29,8 +29,8 @@ bool can_set_direct_map(void)
  *
  * KFENCE pool requires page-granular mapping if initialized late.
  */
- return (rodata_enabled && rodata_full) || debug_pagealloc_enabled() ||
-  arm64_kfence_can_set_direct_map();
+ return rodata_full || debug_pagealloc_enabled() ||
+  arm64_kfence_can_set_direct_map();
 }
 
 static int change_page_range(pte_t *ptep, unsigned long addr, void *data)
@@ -105,8 +105,7 @@ static int change_memory_common(unsigned long addr, int numpages,
  * If we are manipulating read-only permissions, apply the same
  * change to the linear mapping of the pages that back this VM area.
  */
- if (rodata_enabled &&
- rodata_full && (pgprot_val(set_mask) == PTE_RDONLY ||
+ if (rodata_full && (pgprot_val(set_mask) == PTE_RDONLY ||
  pgprot_val(clear_mask) == PTE_RDONLY)) {
  for (i = 0; i < area->nr_pages; i++) {
  __change_memory_common((u64)page_address(area->pages[i]),

arch/parisc/Kconfig

@@ -115,9 +115,12 @@ config ARCH_HAS_ILOG2_U64
  default n
 
 config GENERIC_BUG
- bool
- default y
+ def_bool y
  depends on BUG
+ select GENERIC_BUG_RELATIVE_POINTERS if 64BIT
+
+config GENERIC_BUG_RELATIVE_POINTERS
+ bool
 
 config GENERIC_HWEIGHT
  bool

arch/parisc/include/asm/alternative.h

@@ -34,7 +34,8 @@ void apply_alternatives(struct alt_instr *start, struct alt_instr *end,
 
 /* Alternative SMP implementation. */
 #define ALTERNATIVE(cond, replacement) "!0:" \
- ".section .altinstructions, \"aw\" !" \
+ ".section .altinstructions, \"a\" !" \
+ ".align 4 !" \
  ".word (0b-4-.) !" \
  ".hword 1, " __stringify(cond) " !" \
  ".word " __stringify(replacement) " !" \
@@ -44,15 +45,17 @@ void apply_alternatives(struct alt_instr *start, struct alt_instr *end,
 
 /* to replace one single instructions by a new instruction */
 #define ALTERNATIVE(from, to, cond, replacement)\
- .section .altinstructions, "aw" ! \
+ .section .altinstructions, "a" ! \
+ .align 4 ! \
  .word (from - .) ! \
  .hword (to - from)/4, cond ! \
  .word replacement ! \
  .previous
 
 /* to replace multiple instructions by new code */
 #define ALTERNATIVE_CODE(from, num_instructions, cond, new_instr_ptr)\
- .section .altinstructions, "aw" ! \
+ .section .altinstructions, "a" ! \
+ .align 4 ! \
  .word (from - .) ! \
  .hword -num_instructions, cond ! \
  .word (new_instr_ptr - .) ! \

arch/parisc/include/asm/assembly.h

@@ -574,6 +574,7 @@
  */
 #define ASM_EXCEPTIONTABLE_ENTRY(fault_addr, except_addr) \
  .section __ex_table,"aw" ! \
+ .align 4 ! \
  .word (fault_addr - .), (except_addr - .) ! \
  .previous
 

arch/parisc/include/asm/bug.h

@@ -17,24 +17,27 @@
 #define PARISC_BUG_BREAK_ASM "break 0x1f, 0x1fff"
 #define PARISC_BUG_BREAK_INSN 0x03ffe01f /* PARISC_BUG_BREAK_ASM */
 
-#if defined(CONFIG_64BIT)
-#define ASM_WORD_INSN ".dword\t"
+#ifdef CONFIG_GENERIC_BUG_RELATIVE_POINTERS
+# define __BUG_REL(val) ".word " __stringify(val) " - ."
 #else
-#define ASM_WORD_INSN ".word\t"
+# define __BUG_REL(val) ".word " __stringify(val)
 #endif
 
+
 #ifdef CONFIG_DEBUG_BUGVERBOSE
 #define BUG() \
  do { \
  asm volatile("\n" \
  "1:\t" PARISC_BUG_BREAK_ASM "\n" \
- "\t.pushsection __bug_table,\"aw\"\n" \
- "2:\t" ASM_WORD_INSN "1b, %c0\n" \
- "\t.short %c1, %c2\n" \
- "\t.org 2b+%c3\n" \
+ "\t.pushsection __bug_table,\"a\"\n" \
+ "\t.align 4\n" \
+ "2:\t" __BUG_REL(1b) "\n" \
+ "\t" __BUG_REL(%c0) "\n" \
+ "\t.short %1, %2\n" \
+ "\t.blockz %3-2*4-2*2\n" \
  "\t.popsection" \
  : : "i" (__FILE__), "i" (__LINE__), \
- "i" (0), "i" (sizeof(struct bug_entry)) ); \
+ "i" (0), "i" (sizeof(struct bug_entry)) ); \
  unreachable(); \
  } while(0)
 
@@ -51,10 +54,12 @@
  do { \
  asm volatile("\n" \
  "1:\t" PARISC_BUG_BREAK_ASM "\n" \
- "\t.pushsection __bug_table,\"aw\"\n" \
- "2:\t" ASM_WORD_INSN "1b, %c0\n" \
- "\t.short %c1, %c2\n" \
- "\t.org 2b+%c3\n" \
+ "\t.pushsection __bug_table,\"a\"\n" \
+ "\t.align 4\n" \
+ "2:\t" __BUG_REL(1b) "\n" \
+ "\t" __BUG_REL(%c0) "\n" \
+ "\t.short %1, %2\n" \
+ "\t.blockz %3-2*4-2*2\n" \
  "\t.popsection" \
  : : "i" (__FILE__), "i" (__LINE__), \
  "i" (BUGFLAG_WARNING|(flags)), \
@@ -65,10 +70,11 @@
  do { \
  asm volatile("\n" \
  "1:\t" PARISC_BUG_BREAK_ASM "\n" \
- "\t.pushsection __bug_table,\"aw\"\n" \
- "2:\t" ASM_WORD_INSN "1b\n" \
- "\t.short %c0\n" \
- "\t.org 2b+%c1\n" \
+ "\t.pushsection __bug_table,\"a\"\n" \
+ "\t.align %2\n" \
+ "2:\t" __BUG_REL(1b) "\n" \
+ "\t.short %0\n" \
+ "\t.blockz %1-4-2\n" \
  "\t.popsection" \
  : : "i" (BUGFLAG_WARNING|(flags)), \
  "i" (sizeof(struct bug_entry)) ); \

arch/parisc/include/asm/jump_label.h

@@ -15,10 +15,12 @@ static __always_inline bool arch_static_branch(struct static_key *key, bool bran
  asm_volatile_goto("1:\n\t"
  "nop\n\t"
  ".pushsection __jump_table, \"aw\"\n\t"
+ ".align %1\n\t"
  ".word 1b - ., %l[l_yes] - .\n\t"
  __stringify(ASM_ULONG_INSN) " %c0 - .\n\t"
  ".popsection\n\t"
- : : "i" (&((char *)key)[branch]) : : l_yes);
+ : : "i" (&((char *)key)[branch]), "i" (sizeof(long))
+ : : l_yes);
 
  return false;
 l_yes:
@@ -30,10 +32,12 @@ static __always_inline bool arch_static_branch_jump(struct static_key *key, bool
  asm_volatile_goto("1:\n\t"
  "b,n %l[l_yes]\n\t"
  ".pushsection __jump_table, \"aw\"\n\t"
+ ".align %1\n\t"
  ".word 1b - ., %l[l_yes] - .\n\t"
  __stringify(ASM_ULONG_INSN) " %c0 - .\n\t"
  ".popsection\n\t"
- : : "i" (&((char *)key)[branch]) : : l_yes);
+ : : "i" (&((char *)key)[branch]), "i" (sizeof(long))
+ : : l_yes);
 
  return false;
 l_yes:

arch/parisc/include/asm/ldcw.h

@@ -55,7 +55,7 @@
 })
 
 #ifdef CONFIG_SMP
-# define __lock_aligned __section(".data..lock_aligned")
+# define __lock_aligned __section(".data..lock_aligned") __aligned(16)
 #endif
 
 #endif /* __PARISC_LDCW_H */

arch/parisc/include/asm/uaccess.h

@@ -41,6 +41,7 @@ struct exception_table_entry {
 
 #define ASM_EXCEPTIONTABLE_ENTRY( fault_addr, except_addr )\
  ".section __ex_table,\"aw\"\n" \
+ ".align 4\n" \
  ".word (" #fault_addr " - .), (" #except_addr " - .)\n\t" \
  ".previous\n"
 

arch/parisc/include/uapi/asm/errno.h

@@ -75,7 +75,6 @@
 
 /* We now return you to your regularly scheduled HPUX. */
 
-#define ENOSYM 215 /* symbol does not exist in executable */
 #define ENOTSOCK 216 /* Socket operation on non-socket */
 #define EDESTADDRREQ 217 /* Destination address required */
 #define EMSGSIZE 218 /* Message too long */
@@ -101,7 +100,6 @@
 #define ETIMEDOUT 238 /* Connection timed out */
 #define ECONNREFUSED 239 /* Connection refused */
 #define EREFUSED ECONNREFUSED /* for HP's NFS apparently */
-#define EREMOTERELEASE 240 /* Remote peer released connection */
 #define EHOSTDOWN 241 /* Host is down */
 #define EHOSTUNREACH 242 /* No route to host */
 

arch/parisc/kernel/vmlinux.lds.S

@@ -130,6 +130,7 @@ SECTIONS
  RO_DATA(8)
 
  /* unwind info */
+ . = ALIGN(4);
  .PARISC.unwind : {
  __start___unwind = .;
  *(.PARISC.unwind)