Merge tag 'v5.10.223' into 5.10-main

This is the 5.10.223 stable release

# -----BEGIN PGP SIGNATURE-----
#
# iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmaksnwACgkQONu9yGCS
# aT4PcQ//fATT8wjblT5zZ2dKy/LsTD8xKD8YfNKJDYvuYIMtli1hXmpQeeY237yt
# d/zepYo4pN6onVa00S0gob2TUeR+Zz1/o++blIGsHzU26wme6hkSyvrFys88dR+h
# BDTscrW9Q5ApFg7pJxvqkj+kpirqskXVXS1g2b7OA/8JY1hmDX6X9vxlwXJTaam2
# wjUv+xblOAptmuTmZWxvgiezqJ6nwU8085+F60TOhDdOjx5MAmDbdVqDv2hXQE/U
# VIjZqhUFXxomckwjaN9B2lAFYWxT30aR9+OKUzuck3eLEe4xrcohv6NdZ88obHRM
# 8YWqjjubYhpkfnQ+AsCTPFFNeK3NbnhDADwLIazPdyNUnd76HhVfs/yZOuE/hWPi
# mLz7o+UUBwdmR13qJzYwAgN/ddLZV4VGCmRma3XneSwOAQhEkHomlSjplOc7GafG
# QgKTxM7tmbcdM/NTH6Am+Bc3y9nI2NkjgV5fafant6xj++n7HDAI07UK5L/vUMcF
# QxA/jn74MB9YG71BKXRT6xfVRhUGLQ/OMXBxdyUvUOFCa7nggYm7qCI+S5KdUz50
# UP7KPmBBntsd6Mr06QaH+fgXszjZSSHXhHgeL5QRFZDUVvOWK66XS5S3Z+Ll3xgc
# /26iJ1qYuGFj4k34ab6lM3q2ZuHAT1jS5URY6uVwxWN2BJDvGDQ=
# =7Kf2
# -----END PGP SIGNATURE-----
# gpg: Signature made Sat Jul 27 10:40:28 2024 CEST
# gpg:                using RSA key 647F28654894E3BD457199BE38DBBDC86092693E
# gpg: Can't check signature: No public key

Makefile

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 5
 PATCHLEVEL = 10
-SUBLEVEL = 222
+SUBLEVEL = 223
 EXTRAVERSION =
 NAME = Dare mighty things
 

arch/arm/include/asm/uaccess.h

@@ -148,24 +148,14 @@ extern int __get_user_64t_1(void *);
 extern int __get_user_64t_2(void *);
 extern int __get_user_64t_4(void *);
 
-#define __GUP_CLOBBER_1 "lr", "cc"
-#ifdef CONFIG_CPU_USE_DOMAINS
-#define __GUP_CLOBBER_2 "ip", "lr", "cc"
-#else
-#define __GUP_CLOBBER_2 "lr", "cc"
-#endif
-#define __GUP_CLOBBER_4 "lr", "cc"
-#define __GUP_CLOBBER_32t_8 "lr", "cc"
-#define __GUP_CLOBBER_8 "lr", "cc"
-
 #define __get_user_x(__r2, __p, __e, __l, __s) \
  __asm__ __volatile__ ( \
  __asmeq("%0", "r0") __asmeq("%1", "r2") \
  __asmeq("%3", "r1") \
  "bl __get_user_" #__s \
  : "=&r" (__e), "=r" (__r2) \
  : "0" (__p), "r" (__l) \
- : __GUP_CLOBBER_##__s)
+ : "ip", "lr", "cc")
 
 /* narrowing a double-word get into a single 32bit word register: */
 #ifdef __ARMEB__
@@ -187,7 +177,7 @@ extern int __get_user_64t_4(void *);
  "bl __get_user_64t_" #__s \
  : "=&r" (__e), "=r" (__r2) \
  : "0" (__p), "r" (__l) \
- : __GUP_CLOBBER_##__s)
+ : "ip", "lr", "cc")
 #else
 #define __get_user_x_64t __get_user_x
 #endif

arch/arm64/boot/dts/qcom/msm8996.dtsi

@@ -1796,6 +1796,7 @@
  snps,dis_u2_susphy_quirk;
  snps,dis_enblslpm_quirk;
  snps,is-utmi-l1-suspend;
+ snps,parkmode-disable-ss-quirk;
  tx-fifo-resize;
  };
  };

arch/arm64/kernel/armv8_deprecated.c

@@ -471,6 +471,9 @@ static int run_all_insn_set_hw_mode(unsigned int cpu)
  for (i = 0; i < ARRAY_SIZE(insn_emulations); i++) {
  struct insn_emulation *insn = insn_emulations[i];
  bool enable = READ_ONCE(insn->current_mode) == INSN_HW;
+ if (insn->status == INSN_UNAVAILABLE)
+ continue;
+
  if (insn->set_hw_mode && insn->set_hw_mode(enable)) {
  pr_warn("CPU[%u] cannot support the emulation of %s",
  cpu, insn->name);

arch/mips/kernel/syscalls/syscall_o32.tbl

@@ -27,7 +27,7 @@
 17 o32 break sys_ni_syscall
 # 18 was sys_stat
 18 o32 unused18 sys_ni_syscall
-19 o32 lseek sys_lseek
+19 o32 lseek sys_lseek compat_sys_lseek
 20 o32 getpid sys_getpid
 21 o32 mount sys_mount
 22 o32 umount sys_oldumount

arch/powerpc/kernel/eeh_pe.c

@@ -849,6 +849,7 @@ struct pci_bus *eeh_pe_bus_get(struct eeh_pe *pe)
 {
  struct eeh_dev *edev;
  struct pci_dev *pdev;
+ struct pci_bus *bus = NULL;
 
  if (pe->type & EEH_PE_PHB)
  return pe->phb->bus;
@@ -859,9 +860,11 @@ struct pci_bus *eeh_pe_bus_get(struct eeh_pe *pe)
 
  /* Retrieve the parent PCI bus of first (top) PCI device */
  edev = list_first_entry_or_null(&pe->edevs, struct eeh_dev, entry);
+ pci_lock_rescan_remove();
  pdev = eeh_dev_to_pci_dev(edev);
  if (pdev)
- return pdev->bus;
+ bus = pdev->bus;
+ pci_unlock_rescan_remove();
 
- return NULL;
+ return bus;
 }

arch/powerpc/kvm/book3s_64_vio.c

@@ -117,14 +117,16 @@ extern long kvm_spapr_tce_attach_iommu_group(struct kvm *kvm, int tablefd,
  }
  rcu_read_unlock();
 
- fdput(f);
-
- if (!found)
+ if (!found) {
+ fdput(f);
  return -EINVAL;
+ }
 
  table_group = iommu_group_get_iommudata(grp);
- if (WARN_ON(!table_group))
+ if (WARN_ON(!table_group)) {
+ fdput(f);
  return -EFAULT;
+ }
 
  for (i = 0; i < IOMMU_TABLE_GROUP_MAX_TABLES; ++i) {
  struct iommu_table *tbltmp = table_group->tables[i];
@@ -145,8 +147,10 @@ extern long kvm_spapr_tce_attach_iommu_group(struct kvm *kvm, int tablefd,
  break;
  }
  }
- if (!tbl)
+ if (!tbl) {
+ fdput(f);
  return -EINVAL;
+ }
 
  rcu_read_lock();
  list_for_each_entry_rcu(stit, &stt->iommu_tables, next) {
@@ -157,20 +161,23 @@ extern long kvm_spapr_tce_attach_iommu_group(struct kvm *kvm, int tablefd,
  /* stit is being destroyed */
  iommu_tce_table_put(tbl);
  rcu_read_unlock();
+ fdput(f);
  return -ENOTTY;
  }
  /*
  * The table is already known to this KVM, we just increased
  * its KVM reference counter and can return.
  */
  rcu_read_unlock();
+ fdput(f);
  return 0;
  }
  rcu_read_unlock();
 
  stit = kzalloc(sizeof(*stit), GFP_KERNEL);
  if (!stit) {
  iommu_tce_table_put(tbl);
+ fdput(f);
  return -ENOMEM;
  }
 
@@ -179,6 +186,7 @@ extern long kvm_spapr_tce_attach_iommu_group(struct kvm *kvm, int tablefd,
 
  list_add_rcu(&stit->next, &stt->iommu_tables);
 
+ fdput(f);
  return 0;
 }
 

arch/powerpc/platforms/pseries/setup.c

@@ -312,8 +312,8 @@ static int alloc_dispatch_log_kmem_cache(void)
 {
  void (*ctor)(void *) = get_dtl_cache_ctor();
 
- dtl_cache = kmem_cache_create("dtl", DISPATCH_LOG_BYTES,
- DISPATCH_LOG_BYTES, 0, ctor);
+ dtl_cache = kmem_cache_create_usercopy("dtl", DISPATCH_LOG_BYTES,
+ DISPATCH_LOG_BYTES, 0, 0, DISPATCH_LOG_BYTES, ctor);
  if (!dtl_cache) {
  pr_warn("Failed to create dispatch trace log buffer cache\n");
  pr_warn("Stolen time statistics will be unreliable\n");

drivers/acpi/ec.c

@@ -1316,10 +1316,13 @@ acpi_ec_space_handler(u32 function, acpi_physical_address address,
  if (ec->busy_polling || bits > 8)
  acpi_ec_burst_enable(ec);
 
- for (i = 0; i < bytes; ++i, ++address, ++value)
+ for (i = 0; i < bytes; ++i, ++address, ++value) {
  result = (function == ACPI_READ) ?
  acpi_ec_read(ec, address, value) :
  acpi_ec_write(ec, address, *value);
+ if (result < 0)
+ break;
+ }
 
  if (ec->busy_polling || bits > 8)
  acpi_ec_burst_disable(ec);
@@ -1331,8 +1334,10 @@ acpi_ec_space_handler(u32 function, acpi_physical_address address,
  return AE_NOT_FOUND;
  case -ETIME:
  return AE_TIME;
- default:
+ case 0:
  return AE_OK;
+ default:
+ return AE_ERROR;
  }
 }
 

drivers/acpi/processor_idle.c

@@ -16,7 +16,6 @@
 #include <linux/acpi.h>
 #include <linux/dmi.h>
 #include <linux/sched.h> /* need_resched() */
-#include <linux/sort.h>
 #include <linux/tick.h>
 #include <linux/cpuidle.h>
 #include <linux/cpu.h>
@@ -390,28 +389,24 @@ static void acpi_processor_power_verify_c3(struct acpi_processor *pr,
  return;
 }
 
-static int acpi_cst_latency_cmp(const void *a, const void *b)
+static void acpi_cst_latency_sort(struct acpi_processor_cx *states, size_t length)
 {
- const struct acpi_processor_cx *x = a, *y = b;
+ int i, j, k;
 
- if (!(x->valid && y->valid))
- return 0;
- if (x->latency > y->latency)
- return 1;
- if (x->latency < y->latency)
- return -1;
- return 0;
-}
-static void acpi_cst_latency_swap(void *a, void *b, int n)
-{
- struct acpi_processor_cx *x = a, *y = b;
- u32 tmp;
+ for (i = 1; i < length; i++) {
+ if (!states[i].valid)
+ continue;
 
- if (!(x->valid && y->valid))
- return;
- tmp = x->latency;
- x->latency = y->latency;
- y->latency = tmp;
+ for (j = i - 1, k = i; j >= 0; j--) {
+ if (!states[j].valid)
+ continue;
+
+ if (states[j].latency > states[k].latency)
+ swap(states[j].latency, states[k].latency);
+
+ k = j;
+ }
+ }
 }
 
 static int acpi_processor_power_verify(struct acpi_processor *pr)
@@ -456,10 +451,7 @@ static int acpi_processor_power_verify(struct acpi_processor *pr)
 
  if (buggy_latency) {
  pr_notice("FW issue: working around C-state latencies out of order\n");
- sort(&pr->power.states[1], max_cstate,
- sizeof(struct acpi_processor_cx),
- acpi_cst_latency_cmp,
- acpi_cst_latency_swap);
+ acpi_cst_latency_sort(&pr->power.states[1], max_cstate);
  }
 
  lapic_timer_propagate_broadcast(pr);

drivers/block/null_blk/main.c

@@ -1743,8 +1743,8 @@ static int null_validate_conf(struct nullb_device *dev)
  return -EINVAL;
  }
 
- dev->blocksize = round_down(dev->blocksize, 512);
- dev->blocksize = clamp_t(unsigned int, dev->blocksize, 512, 4096);
+ if (blk_validate_block_size(dev->blocksize))
+  return -EINVAL;
 
  if (dev->queue_mode == NULL_Q_MQ && dev->use_per_node_hctx) {
  if (dev->submit_queues != nr_online_nodes)

drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c

@@ -2069,7 +2069,7 @@ static int sdma_v4_0_process_trap_irq(struct amdgpu_device *adev,
  struct amdgpu_irq_src *source,
  struct amdgpu_iv_entry *entry)
 {
- uint32_t instance;
+ int instance;
 
  DRM_DEBUG("IH: SDMA trap\n");
  instance = sdma_v4_0_irq_id_to_seq(entry->client_id);

drivers/input/mouse/elantech.c

@@ -1476,16 +1476,47 @@ static void elantech_disconnect(struct psmouse *psmouse)
  psmouse->private = NULL;
 }
 
+/*
+ * Some hw_version 4 models fail to properly activate absolute mode on
+ * resume without going through disable/enable cycle.
+ */
+static const struct dmi_system_id elantech_needs_reenable[] = {
+#if defined(CONFIG_DMI) && defined(CONFIG_X86)
+ {
+ /* Lenovo N24 */
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "81AF"),
+ },
+ },
+#endif
+ { }
+};
+
 /*
  * Put the touchpad back into absolute mode when reconnecting
  */
 static int elantech_reconnect(struct psmouse *psmouse)
 {
+ int err;
+
  psmouse_reset(psmouse);
 
  if (elantech_detect(psmouse, 0))
  return -1;
 
+ if (dmi_check_system(elantech_needs_reenable)) {
+ err = ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_DISABLE);
+ if (err)
+ psmouse_warn(psmouse, "failed to deactivate mouse on %s: %d\n",
+ psmouse->ps2dev.serio->phys, err);
+
+ err = ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_ENABLE);
+ if (err)
+ psmouse_warn(psmouse, "failed to reactivate mouse on %s: %d\n",
+ psmouse->ps2dev.serio->phys, err);
+ }
+
  if (elantech_set_absolute_mode(psmouse)) {
  psmouse_err(psmouse,
  "failed to put touchpad back into absolute mode.\n");

drivers/input/serio/i8042-acpipnpio.h

@@ -75,7 +75,7 @@ static inline void i8042_write_command(int val)
 #define SERIO_QUIRK_PROBE_DEFER BIT(5)
 #define SERIO_QUIRK_RESET_ALWAYS BIT(6)
 #define SERIO_QUIRK_RESET_NEVER BIT(7)
-#define SERIO_QUIRK_DIECT BIT(8)
+#define SERIO_QUIRK_DIRECT BIT(8)
 #define SERIO_QUIRK_DUMBKBD BIT(9)
 #define SERIO_QUIRK_NOLOOP BIT(10)
 #define SERIO_QUIRK_NOTIMEOUT BIT(11)
@@ -1235,6 +1235,20 @@ static const struct dmi_system_id i8042_dmi_quirk_table[] __initconst = {
  .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
  SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
  },
+ {
+ /*
+ * The Ayaneo Kun is a handheld device where some the buttons
+ * are handled by an AT keyboard. The keyboard is usually
+ * detected as raw, but sometimes, usually after a cold boot,
+ * it is detected as translated. Make sure that the keyboard
+ * is always in raw mode.
+ */
+ .matches = {
+ DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "AYANEO"),
+ DMI_MATCH(DMI_BOARD_NAME, "KUN"),
+ },
+ .driver_data = (void *)(SERIO_QUIRK_DIRECT)
+ },
  { }
 };
 
@@ -1553,7 +1567,7 @@ static void __init i8042_check_quirks(void)
  if (quirks & SERIO_QUIRK_RESET_NEVER)
  i8042_reset = I8042_RESET_NEVER;
  }
- if (quirks & SERIO_QUIRK_DIECT)
+ if (quirks & SERIO_QUIRK_DIRECT)
  i8042_direct = true;
  if (quirks & SERIO_QUIRK_DUMBKBD)
  i8042_dumbkbd = true;