Merge tag 'v4.19.317' into 4.19-main

This is the 4.19.317 stable release # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmaHmhkACgkQONu9yGCS # aT5SNQ//dUJAgA7/f22534izkTlWe6/W1GK83zMqaiEtfmgoLmRsas3YAUBklwhG # CbeqzUvZ99fRIRqFSAlLaymKIsUZmkEDk/soNfMHfkLGXQlwxGTYZwf2NCtq5CWy # MJ3lMntWx59UBCv72nc0yRu1IKNUl8AC+3mgtqUdFGPktCoJst5zt6nubAa1A07e # BYntZSYVsvtbfbcXqs9PXjwfUYqASvBhcIk6F5rp221pF0BwsHgLRJUXPDtxkIKf # S2HLc03gtSt4gl7QT64zq41nnxryRGr7lgKOlDnZeQOJ/2IJ+MctpC8SSgzJanO6 # 3ko+F3vPdKx3fmU6XCSnwqdI/Ik6tdIN+MWLJocul0mcbGJc3wPonOArbfj52zH9 # ohsMIls5PDr/eyEPCU9n4fp2oGSYD9iX+CQIJM0t4+sq9aDlBylON7I8Z3Cn9aTC # Qr+22hkbUA1Bja3eY7tfN/cugqrUy9kLHxAZeI0zr7OkLuukSgaTIBzcmzhtSBnA # pAfMlNBzmofneH5M1IQ0RBGXt1g3VPENueqUz/23EP5pQLW+o9cWJ1Lz4Z8wocIB # 8vOiZlc0ChR8YwvUEPsfkaoPE9wBSV6QmtTBbsMMK1BVht8BJz0+BQnyfDPoY2Zv # TWzm7BNA5dvqQRlKZO+lHVHFjhYXwK20MGJrJVAQpbQc/AuoENQ= # =MozT # -----END PGP SIGNATURE----- # gpg: Signature made Fri Jul 5 09:00:41 2024 CEST # gpg: using RSA key 647F28654894E3BD457199BE38DBBDC86092693E # gpg: Can't check signature: No public key
frank-w · Sep 14, 2024 · 6270303 · 6270303
2 parents d519470 + 05a68fe
commit 6270303
Show file tree

Hide file tree

Showing 117 changed files with 1,129 additions and 457 deletions.
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 4
 PATCHLEVEL = 19
-SUBLEVEL = 316
+SUBLEVEL = 317
 EXTRAVERSION =
 NAME = "People's Front"
 

diff --git a/arch/arm/boot/dts/exynos4210-smdkv310.dts b/arch/arm/boot/dts/exynos4210-smdkv310.dts
@@ -64,7 +64,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
@@ -437,7 +437,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
@@ -43,7 +43,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/arm64/boot/dts/rockchip/rk3368.dtsi b/arch/arm64/boot/dts/rockchip/rk3368.dtsi
@@ -677,6 +677,7 @@
  dma-names = "tx";
  pinctrl-names = "default";
  pinctrl-0 = <&spdif_tx>;
+ #sound-dai-cells = <0>;
  status = "disabled";
  };
 
@@ -688,6 +689,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";
  };
 
@@ -701,6 +703,7 @@
  dma-names = "tx", "rx";
  pinctrl-names = "default";
  pinctrl-0 = <&i2s_8ch_bus>;
+ #sound-dai-cells = <0>;
  status = "disabled";
  };
 

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/kernel/syscalltab.c b/arch/hexagon/kernel/syscalltab.c
@@ -27,6 +27,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/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/powerpc/include/asm/hvcall.h b/arch/powerpc/include/asm/hvcall.h
@@ -383,7 +383,7 @@ long plpar_hcall_norets(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
@@ -397,7 +397,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
@@ -408,8 +408,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;

diff --git a/arch/powerpc/include/asm/io.h b/arch/powerpc/include/asm/io.h
@@ -569,12 +569,12 @@ __do_out_asm(_rec_outl, "stwbrx")
 #define __do_inw(port) _rec_inw(port)
 #define __do_inl(port) _rec_inl(port)
 #else /* CONFIG_PPC32 */
-#define __do_outb(val, port) writeb(val,(PCI_IO_ADDR)_IO_BASE+port);
-#define __do_outw(val, port) writew(val,(PCI_IO_ADDR)_IO_BASE+port);
-#define __do_outl(val, port) writel(val,(PCI_IO_ADDR)_IO_BASE+port);
-#define __do_inb(port) readb((PCI_IO_ADDR)_IO_BASE + port);
-#define __do_inw(port) readw((PCI_IO_ADDR)_IO_BASE + port);
-#define __do_inl(port) readl((PCI_IO_ADDR)_IO_BASE + port);
+#define __do_outb(val, port) writeb(val,(PCI_IO_ADDR)(_IO_BASE+port));
+#define __do_outw(val, port) writew(val,(PCI_IO_ADDR)(_IO_BASE+port));
+#define __do_outl(val, port) writel(val,(PCI_IO_ADDR)(_IO_BASE+port));
+#define __do_inb(port) readb((PCI_IO_ADDR)(_IO_BASE + port));
+#define __do_inw(port) readw((PCI_IO_ADDR)(_IO_BASE + port));
+#define __do_inl(port) readl((PCI_IO_ADDR)(_IO_BASE + port));
 #endif /* !CONFIG_PPC32 */
 
 #ifdef CONFIG_EEH
@@ -590,12 +590,12 @@ __do_out_asm(_rec_outl, "stwbrx")
 #define __do_writesw(a, b, n) _outsw(PCI_FIX_ADDR(a),(b),(n))
 #define __do_writesl(a, b, n) _outsl(PCI_FIX_ADDR(a),(b),(n))
 
-#define __do_insb(p, b, n) readsb((PCI_IO_ADDR)_IO_BASE+(p), (b), (n))
-#define __do_insw(p, b, n) readsw((PCI_IO_ADDR)_IO_BASE+(p), (b), (n))
-#define __do_insl(p, b, n) readsl((PCI_IO_ADDR)_IO_BASE+(p), (b), (n))
-#define __do_outsb(p, b, n) writesb((PCI_IO_ADDR)_IO_BASE+(p),(b),(n))
-#define __do_outsw(p, b, n) writesw((PCI_IO_ADDR)_IO_BASE+(p),(b),(n))
-#define __do_outsl(p, b, n) writesl((PCI_IO_ADDR)_IO_BASE+(p),(b),(n))
+#define __do_insb(p, b, n) readsb((PCI_IO_ADDR)(_IO_BASE+(p)), (b), (n))
+#define __do_insw(p, b, n) readsw((PCI_IO_ADDR)(_IO_BASE+(p)), (b), (n))
+#define __do_insl(p, b, n) readsl((PCI_IO_ADDR)(_IO_BASE+(p)), (b), (n))
+#define __do_outsb(p, b, n) writesb((PCI_IO_ADDR)(_IO_BASE+(p)),(b),(n))
+#define __do_outsw(p, b, n) writesw((PCI_IO_ADDR)(_IO_BASE+(p)),(b),(n))
+#define __do_outsl(p, b, n) writesl((PCI_IO_ADDR)(_IO_BASE+(p)),(b),(n))
 
 #define __do_memset_io(addr, c, n) \
  _memset_io(PCI_FIX_ADDR(addr), c, n)

diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c
@@ -145,7 +145,14 @@ static int __amd_smn_rw(u16 node, u32 address, u32 *value, bool write)
 
 int amd_smn_read(u16 node, u32 address, u32 *value)
 {
- return __amd_smn_rw(node, address, value, false);
+ int err = __amd_smn_rw(node, address, value, false);
+
+ if (PCI_POSSIBLE_ERROR(*value)) {
+ err = -ENODEV;
+ *value = 0;
+ }
+
+ return err;
 }
 EXPORT_SYMBOL_GPL(amd_smn_read);
 

diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c
@@ -26,26 +26,7 @@
 
 unsigned long profile_pc(struct pt_regs *regs)
 {
- unsigned long pc = instruction_pointer(regs);
-
- if (!user_mode(regs) && in_lock_functions(pc)) {
-#ifdef CONFIG_FRAME_POINTER
- return *(unsigned long *)(regs->bp + sizeof(long));
-#else
- unsigned long *sp =
- (unsigned long *)kernel_stack_pointer(regs);
- /*
- * Return address is either directly at stack pointer
- * or above a saved flags. Eflags has bits 22-31 zero,
- * kernel addresses don't.
- */
- if (sp[0] >> 22)
- return sp[0];
- if (sp[1] >> 22)
- return sp[1];
-#endif
- }
- return pc;
+ return instruction_pointer(regs);
 }
 EXPORT_SYMBOL(profile_pc);
 

diff --git a/drivers/acpi/acpica/exregion.c b/drivers/acpi/acpica/exregion.c
@@ -43,7 +43,6 @@ acpi_ex_system_memory_space_handler(u32 function,
  struct acpi_mem_space_context *mem_info = region_context;
  u32 length;
  acpi_size map_length;
- acpi_size page_boundary_map_length;
 #ifdef ACPI_MISALIGNMENT_NOT_SUPPORTED
  u32 remainder;
 #endif
@@ -120,26 +119,8 @@ acpi_ex_system_memory_space_handler(u32 function,
  map_length = (acpi_size)
  ((mem_info->address + mem_info->length) - address);
 
- /*
- * If mapping the entire remaining portion of the region will cross
- * a page boundary, just map up to the page boundary, do not cross.
- * On some systems, crossing a page boundary while mapping regions
- * can cause warnings if the pages have different attributes
- * due to resource management.
- *
- * This has the added benefit of constraining a single mapping to
- * one page, which is similar to the original code that used a 4k
- * maximum window.
- */
- page_boundary_map_length = (acpi_size)
- (ACPI_ROUND_UP(address, ACPI_DEFAULT_PAGE_SIZE) - address);
- if (page_boundary_map_length == 0) {
- page_boundary_map_length = ACPI_DEFAULT_PAGE_SIZE;
- }
-
- if (map_length > page_boundary_map_length) {
- map_length = page_boundary_map_length;
- }
+ if (map_length > ACPI_DEFAULT_PAGE_SIZE)
+ map_length = ACPI_DEFAULT_PAGE_SIZE;
 
  /* Create a new mapping starting at the address given */
 

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
@@ -6212,8 +6212,10 @@ struct ata_host *ata_host_alloc(struct device *dev, int max_ports)
  if (!host)
  return NULL;
 
- if (!devres_open_group(dev, NULL, GFP_KERNEL))
- goto err_free;
+ if (!devres_open_group(dev, NULL, GFP_KERNEL)) {
+ kfree(host);
+ return NULL;
+ }
 
  dr = devres_alloc(ata_devres_release, 0, GFP_KERNEL);
  if (!dr)
@@ -6245,8 +6247,6 @@ struct ata_host *ata_host_alloc(struct device *dev, int max_ports)
 
  err_out:
  devres_release_group(dev, NULL);
- err_free:
- kfree(host);
  return NULL;
 }
 

diff --git a/drivers/base/core.c b/drivers/base/core.c
@@ -1236,8 +1236,11 @@ static ssize_t uevent_show(struct device *dev, struct device_attribute *attr,
  if (!env)
  return -ENOMEM;
 
+ /* Synchronize with really_probe() */
+ device_lock(dev);
  /* let the kset specific function add its keys */
  retval = kset->uevent_ops->uevent(kset, &dev->kobj, env);
+ device_unlock(dev);
  if (retval)
  goto out;
 

diff --git a/drivers/dma/dma-axi-dmac.c b/drivers/dma/dma-axi-dmac.c
@@ -710,8 +710,8 @@ static int axi_dmac_remove(struct platform_device *pdev)
 {
  struct axi_dmac *dmac = platform_get_drvdata(pdev);
 
- of_dma_controller_free(pdev->dev.of_node);
  free_irq(dmac->irq, dmac);
+ of_dma_controller_free(pdev->dev.of_node);
  tasklet_kill(&dmac->chan.vchan.task);
  dma_async_device_unregister(&dmac->dma_dev);
  clk_disable_unprepare(dmac->clk);

diff --git a/drivers/dma/ioat/init.c b/drivers/dma/ioat/init.c
@@ -1429,6 +1429,7 @@ module_init(ioat_init_module);
 static void __exit ioat_exit_module(void)
 {
  pci_unregister_driver(&ioat_pci_driver);
+ kmem_cache_destroy(ioat_sed_cache);
  kmem_cache_destroy(ioat_cache);
 }
 module_exit(ioat_exit_module);
diff --git a/drivers/gpio/gpio-davinci.c b/drivers/gpio/gpio-davinci.c
@@ -207,6 +207,11 @@ static int davinci_gpio_probe(struct platform_device *pdev)
  else
  nirq = DIV_ROUND_UP(ngpio, 16);
 
+ if (nirq > MAX_INT_PER_BANK) {
+ dev_err(dev, "Too many IRQs!\n");
+ return -EINVAL;
+ }
+
  nbank = DIV_ROUND_UP(ngpio, 32);
  chips = devm_kcalloc(dev,
  nbank, sizeof(struct davinci_gpio_controller),

diff --git a/drivers/gpu/drm/amd/amdgpu/kv_dpm.c b/drivers/gpu/drm/amd/amdgpu/kv_dpm.c
@@ -164,6 +164,8 @@ static void sumo_construct_vid_mapping_table(struct amdgpu_device *adev,
 
  for (i = 0; i < SUMO_MAX_HARDWARE_POWERLEVELS; i++) {
  if (table[i].ulSupportedSCLK != 0) {
+ if (table[i].usVoltageIndex >= SUMO_MAX_NUMBER_VOLTAGES)
+ continue;
  vid_mapping_table->entries[table[i].usVoltageIndex].vid_7bit =
  table[i].usVoltageID;
  vid_mapping_table->entries[table[i].usVoltageIndex].vid_2bit =

diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.c
@@ -620,6 +620,12 @@ void enc1_stream_encoder_set_mst_bandwidth(
  x),
  26));
 
+ // If y rounds up to integer, carry it over to x.
+ if (y >> 26) {
+ x += 1;
+ y = 0;
+ }
+
  REG_SET_2(DP_MSE_RATE_CNTL, 0,
  DP_MSE_RATE_X, x,
  DP_MSE_RATE_Y, y);

diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c
@@ -205,9 +205,12 @@ EXPORT_SYMBOL(drm_panel_bridge_remove);
 
 static void devm_drm_panel_bridge_release(struct device *dev, void *res)
 {
- struct drm_bridge **bridge = res;
+ struct drm_bridge *bridge = *(struct drm_bridge **)res;
 
- drm_panel_bridge_remove(*bridge);
+ if (!bridge)
+ return;
+
+ drm_bridge_remove(bridge);
 }
 
 struct drm_bridge *devm_drm_panel_bridge_add(struct device *dev,

diff --git a/drivers/gpu/drm/exynos/exynos_drm_vidi.c b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
@@ -302,6 +302,7 @@ static int vidi_get_modes(struct drm_connector *connector)
  struct vidi_context *ctx = ctx_from_connector(connector);
  struct edid *edid;
  int edid_len;
+ int count;
 
  /*
  * the edid data comes from user side and it would be set
@@ -321,7 +322,11 @@ static int vidi_get_modes(struct drm_connector *connector)
 
  drm_connector_update_edid_property(connector, edid);
 
- return drm_add_edid_modes(connector, edid);
+ count = drm_add_edid_modes(connector, edid);
+
+ kfree(edid);
+
+ return count;
 }
 
 static const struct drm_connector_helper_funcs vidi_connector_helper_funcs = {