]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
6.12-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 20 Jun 2025 10:31:55 +0000 (12:31 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 20 Jun 2025 10:31:55 +0000 (12:31 +0200)
added patches:
accel-ivpu-fix-warning-in-ivpu_gem_bo_free.patch
accel-ivpu-improve-buffer-object-logging.patch
accel-ivpu-use-dma_resv_lock-instead-of-a-custom-mutex.patch
accel-ivpu-use-firmware-names-from-upstream-repo.patch
iio-accel-fxls8962af-fix-temperature-scan-element-sign.patch

queue-6.12/accel-ivpu-fix-warning-in-ivpu_gem_bo_free.patch [new file with mode: 0644]
queue-6.12/accel-ivpu-improve-buffer-object-logging.patch [new file with mode: 0644]
queue-6.12/accel-ivpu-use-dma_resv_lock-instead-of-a-custom-mutex.patch [new file with mode: 0644]
queue-6.12/accel-ivpu-use-firmware-names-from-upstream-repo.patch [new file with mode: 0644]
queue-6.12/iio-accel-fxls8962af-fix-temperature-scan-element-sign.patch [new file with mode: 0644]
queue-6.12/series

diff --git a/queue-6.12/accel-ivpu-fix-warning-in-ivpu_gem_bo_free.patch b/queue-6.12/accel-ivpu-fix-warning-in-ivpu_gem_bo_free.patch
new file mode 100644 (file)
index 0000000..ae12ad0
--- /dev/null
@@ -0,0 +1,35 @@
+From 91274fd4ed9ba110b02c53d71d2778b7d13b49ac Mon Sep 17 00:00:00 2001
+From: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
+Date: Wed, 28 May 2025 19:12:20 +0200
+Subject: accel/ivpu: Fix warning in ivpu_gem_bo_free()
+
+From: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
+
+commit 91274fd4ed9ba110b02c53d71d2778b7d13b49ac upstream.
+
+Don't WARN if imported buffers are in use in ivpu_gem_bo_free() as they
+can be indeed used in the original context/driver.
+
+Fixes: 647371a6609d ("accel/ivpu: Add GEM buffer object management")
+Cc: stable@vger.kernel.org # v6.3
+Reviewed-by: Jeff Hugo <jeff.hugo@oss.qualcomm.com>
+Reviewed-by: Lizhi Hou <lizhi.hou@amd.com>
+Signed-off-by: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
+Link: https://lore.kernel.org/r/20250528171220.513225-1-jacek.lawrynowicz@linux.intel.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/accel/ivpu/ivpu_gem.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/accel/ivpu/ivpu_gem.c
++++ b/drivers/accel/ivpu/ivpu_gem.c
+@@ -242,7 +242,8 @@ static void ivpu_gem_bo_free(struct drm_
+       list_del(&bo->bo_list_node);
+       mutex_unlock(&vdev->bo_list_lock);
+-      drm_WARN_ON(&vdev->drm, !dma_resv_test_signaled(obj->resv, DMA_RESV_USAGE_READ));
++      drm_WARN_ON(&vdev->drm, !drm_gem_is_imported(&bo->base.base) &&
++                  !dma_resv_test_signaled(obj->resv, DMA_RESV_USAGE_READ));
+       drm_WARN_ON(&vdev->drm, ivpu_bo_size(bo) == 0);
+       drm_WARN_ON(&vdev->drm, bo->base.vaddr);
diff --git a/queue-6.12/accel-ivpu-improve-buffer-object-logging.patch b/queue-6.12/accel-ivpu-improve-buffer-object-logging.patch
new file mode 100644 (file)
index 0000000..7115e84
--- /dev/null
@@ -0,0 +1,137 @@
+From a01e93ee44f7ed76f872d0ede82f8d31bf0a048a Mon Sep 17 00:00:00 2001
+From: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
+Date: Tue, 6 May 2025 11:13:03 +0200
+Subject: accel/ivpu: Improve buffer object logging
+
+From: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
+
+commit a01e93ee44f7ed76f872d0ede82f8d31bf0a048a upstream.
+
+- Fix missing alloc log when drm_gem_handle_create() fails in
+  drm_vma_node_allow() and open callback is not called
+- Add ivpu_bo->ctx_id that enables to log the actual context
+  id instead of using 0 as default
+- Add couple WARNs and errors so we can catch more memory
+  corruption issues
+
+Fixes: 37dee2a2f433 ("accel/ivpu: Improve buffer object debug logs")
+Cc: stable@vger.kernel.org # v6.8+
+Reviewed-by: Jeff Hugo <jeff.hugo@oss.qualcomm.com>
+Reviewed-by: Lizhi Hou <lizhi.hou@amd.com>
+Signed-off-by: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
+Link: https://lore.kernel.org/r/20250506091303.262034-1-jacek.lawrynowicz@linux.intel.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/accel/ivpu/ivpu_gem.c |   25 +++++++++++++++++--------
+ drivers/accel/ivpu/ivpu_gem.h |    1 +
+ 2 files changed, 18 insertions(+), 8 deletions(-)
+
+--- a/drivers/accel/ivpu/ivpu_gem.c
++++ b/drivers/accel/ivpu/ivpu_gem.c
+@@ -26,7 +26,7 @@ static inline void ivpu_dbg_bo(struct iv
+ {
+       ivpu_dbg(vdev, BO,
+                "%6s: bo %8p vpu_addr %9llx size %8zu ctx %d has_pages %d dma_mapped %d mmu_mapped %d wc %d imported %d\n",
+-               action, bo, bo->vpu_addr, ivpu_bo_size(bo), bo->ctx ? bo->ctx->id : 0,
++               action, bo, bo->vpu_addr, ivpu_bo_size(bo), bo->ctx_id,
+                (bool)bo->base.pages, (bool)bo->base.sgt, bo->mmu_mapped, bo->base.map_wc,
+                (bool)bo->base.base.import_attach);
+ }
+@@ -92,8 +92,6 @@ ivpu_bo_alloc_vpu_addr(struct ivpu_bo *b
+               ivpu_err(vdev, "Failed to add BO to context %u: %d\n", ctx->id, ret);
+       }
+-      ivpu_dbg_bo(vdev, bo, "alloc");
+-
+       mutex_unlock(&bo->lock);
+       drm_dev_exit(idx);
+@@ -172,7 +170,7 @@ struct drm_gem_object *ivpu_gem_create_o
+       return &bo->base.base;
+ }
+-static struct ivpu_bo *ivpu_bo_alloc(struct ivpu_device *vdev, u64 size, u32 flags)
++static struct ivpu_bo *ivpu_bo_alloc(struct ivpu_device *vdev, u64 size, u32 flags, u32 ctx_id)
+ {
+       struct drm_gem_shmem_object *shmem;
+       struct ivpu_bo *bo;
+@@ -190,6 +188,7 @@ static struct ivpu_bo *ivpu_bo_alloc(str
+               return ERR_CAST(shmem);
+       bo = to_ivpu_bo(&shmem->base);
++      bo->ctx_id = ctx_id;
+       bo->base.map_wc = flags & DRM_IVPU_BO_WC;
+       bo->flags = flags;
+@@ -197,6 +196,8 @@ static struct ivpu_bo *ivpu_bo_alloc(str
+       list_add_tail(&bo->bo_list_node, &vdev->bo_list);
+       mutex_unlock(&vdev->bo_list_lock);
++      ivpu_dbg_bo(vdev, bo, "alloc");
++
+       return bo;
+ }
+@@ -235,8 +236,13 @@ static void ivpu_gem_bo_free(struct drm_
+       mutex_unlock(&vdev->bo_list_lock);
+       drm_WARN_ON(&vdev->drm, !dma_resv_test_signaled(obj->resv, DMA_RESV_USAGE_READ));
++      drm_WARN_ON(&vdev->drm, ivpu_bo_size(bo) == 0);
++      drm_WARN_ON(&vdev->drm, bo->base.vaddr);
+       ivpu_bo_unbind_locked(bo);
++      drm_WARN_ON(&vdev->drm, bo->mmu_mapped);
++      drm_WARN_ON(&vdev->drm, bo->ctx);
++
+       mutex_destroy(&bo->lock);
+       drm_WARN_ON(obj->dev, bo->base.pages_use_count > 1);
+@@ -271,7 +277,7 @@ int ivpu_bo_create_ioctl(struct drm_devi
+       if (size == 0)
+               return -EINVAL;
+-      bo = ivpu_bo_alloc(vdev, size, args->flags);
++      bo = ivpu_bo_alloc(vdev, size, args->flags, file_priv->ctx.id);
+       if (IS_ERR(bo)) {
+               ivpu_err(vdev, "Failed to allocate BO: %pe (ctx %u size %llu flags 0x%x)",
+                        bo, file_priv->ctx.id, args->size, args->flags);
+@@ -279,7 +285,10 @@ int ivpu_bo_create_ioctl(struct drm_devi
+       }
+       ret = drm_gem_handle_create(file, &bo->base.base, &args->handle);
+-      if (!ret)
++      if (ret)
++              ivpu_err(vdev, "Failed to create handle for BO: %pe (ctx %u size %llu flags 0x%x)",
++                       bo, file_priv->ctx.id, args->size, args->flags);
++      else
+               args->vpu_addr = bo->vpu_addr;
+       drm_gem_object_put(&bo->base.base);
+@@ -302,7 +311,7 @@ ivpu_bo_create(struct ivpu_device *vdev,
+       drm_WARN_ON(&vdev->drm, !PAGE_ALIGNED(range->end));
+       drm_WARN_ON(&vdev->drm, !PAGE_ALIGNED(size));
+-      bo = ivpu_bo_alloc(vdev, size, flags);
++      bo = ivpu_bo_alloc(vdev, size, flags, IVPU_GLOBAL_CONTEXT_MMU_SSID);
+       if (IS_ERR(bo)) {
+               ivpu_err(vdev, "Failed to allocate BO: %pe (vpu_addr 0x%llx size %llu flags 0x%x)",
+                        bo, range->start, size, flags);
+@@ -406,7 +415,7 @@ static void ivpu_bo_print_info(struct iv
+       mutex_lock(&bo->lock);
+       drm_printf(p, "%-9p %-3u 0x%-12llx %-10lu 0x%-8x %-4u",
+-                 bo, bo->ctx ? bo->ctx->id : 0, bo->vpu_addr, bo->base.base.size,
++                 bo, bo->ctx_id, bo->vpu_addr, bo->base.base.size,
+                  bo->flags, kref_read(&bo->base.base.refcount));
+       if (bo->base.pages)
+--- a/drivers/accel/ivpu/ivpu_gem.h
++++ b/drivers/accel/ivpu/ivpu_gem.h
+@@ -21,6 +21,7 @@ struct ivpu_bo {
+       u64 vpu_addr;
+       u32 flags;
+       u32 job_status; /* Valid only for command buffer */
++      u32 ctx_id;
+       bool mmu_mapped;
+ };
diff --git a/queue-6.12/accel-ivpu-use-dma_resv_lock-instead-of-a-custom-mutex.patch b/queue-6.12/accel-ivpu-use-dma_resv_lock-instead-of-a-custom-mutex.patch
new file mode 100644 (file)
index 0000000..afa177a
--- /dev/null
@@ -0,0 +1,232 @@
+From 98d3f772ca7d6822bdfc8c960f5f909574db97c9 Mon Sep 17 00:00:00 2001
+From: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
+Date: Wed, 28 May 2025 17:43:25 +0200
+Subject: accel/ivpu: Use dma_resv_lock() instead of a custom mutex
+
+From: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
+
+commit 98d3f772ca7d6822bdfc8c960f5f909574db97c9 upstream.
+
+This fixes a potential race conditions in:
+ - ivpu_bo_unbind_locked() where we modified the shmem->sgt without
+   holding the dma_resv_lock().
+ - ivpu_bo_print_info() where we read the shmem->pages without
+   holding the dma_resv_lock().
+
+Using dma_resv_lock() also protects against future syncronisation
+issues that may arise when accessing drm_gem_shmem_object or
+drm_gem_object members.
+
+Fixes: 42328003ecb6 ("accel/ivpu: Refactor BO creation functions")
+Cc: stable@vger.kernel.org # v6.9+
+Reviewed-by: Lizhi Hou <lizhi.hou@amd.com>
+Signed-off-by: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
+Link: https://lore.kernel.org/r/20250528154325.500684-1-jacek.lawrynowicz@linux.intel.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/accel/ivpu/ivpu_gem.c |   63 ++++++++++++++++++++++--------------------
+ drivers/accel/ivpu/ivpu_gem.h |    1 
+ 2 files changed, 34 insertions(+), 30 deletions(-)
+
+--- a/drivers/accel/ivpu/ivpu_gem.c
++++ b/drivers/accel/ivpu/ivpu_gem.c
+@@ -31,6 +31,16 @@ static inline void ivpu_dbg_bo(struct iv
+                (bool)bo->base.base.import_attach);
+ }
++static inline int ivpu_bo_lock(struct ivpu_bo *bo)
++{
++      return dma_resv_lock(bo->base.base.resv, NULL);
++}
++
++static inline void ivpu_bo_unlock(struct ivpu_bo *bo)
++{
++      dma_resv_unlock(bo->base.base.resv);
++}
++
+ /*
+  * ivpu_bo_pin() - pin the backing physical pages and map them to VPU.
+  *
+@@ -41,22 +51,22 @@ static inline void ivpu_dbg_bo(struct iv
+ int __must_check ivpu_bo_pin(struct ivpu_bo *bo)
+ {
+       struct ivpu_device *vdev = ivpu_bo_to_vdev(bo);
++      struct sg_table *sgt;
+       int ret = 0;
+-      mutex_lock(&bo->lock);
+-
+       ivpu_dbg_bo(vdev, bo, "pin");
+-      drm_WARN_ON(&vdev->drm, !bo->ctx);
+-      if (!bo->mmu_mapped) {
+-              struct sg_table *sgt = drm_gem_shmem_get_pages_sgt(&bo->base);
++      sgt = drm_gem_shmem_get_pages_sgt(&bo->base);
++      if (IS_ERR(sgt)) {
++              ret = PTR_ERR(sgt);
++              ivpu_err(vdev, "Failed to map BO in IOMMU: %d\n", ret);
++              return ret;
++      }
+-              if (IS_ERR(sgt)) {
+-                      ret = PTR_ERR(sgt);
+-                      ivpu_err(vdev, "Failed to map BO in IOMMU: %d\n", ret);
+-                      goto unlock;
+-              }
++      ivpu_bo_lock(bo);
++      if (!bo->mmu_mapped) {
++              drm_WARN_ON(&vdev->drm, !bo->ctx);
+               ret = ivpu_mmu_context_map_sgt(vdev, bo->ctx, bo->vpu_addr, sgt,
+                                              ivpu_bo_is_snooped(bo));
+               if (ret) {
+@@ -67,7 +77,7 @@ int __must_check ivpu_bo_pin(struct ivpu
+       }
+ unlock:
+-      mutex_unlock(&bo->lock);
++      ivpu_bo_unlock(bo);
+       return ret;
+ }
+@@ -82,7 +92,7 @@ ivpu_bo_alloc_vpu_addr(struct ivpu_bo *b
+       if (!drm_dev_enter(&vdev->drm, &idx))
+               return -ENODEV;
+-      mutex_lock(&bo->lock);
++      ivpu_bo_lock(bo);
+       ret = ivpu_mmu_context_insert_node(ctx, range, ivpu_bo_size(bo), &bo->mm_node);
+       if (!ret) {
+@@ -92,7 +102,7 @@ ivpu_bo_alloc_vpu_addr(struct ivpu_bo *b
+               ivpu_err(vdev, "Failed to add BO to context %u: %d\n", ctx->id, ret);
+       }
+-      mutex_unlock(&bo->lock);
++      ivpu_bo_unlock(bo);
+       drm_dev_exit(idx);
+@@ -103,7 +113,7 @@ static void ivpu_bo_unbind_locked(struct
+ {
+       struct ivpu_device *vdev = ivpu_bo_to_vdev(bo);
+-      lockdep_assert(lockdep_is_held(&bo->lock) || !kref_read(&bo->base.base.refcount));
++      lockdep_assert(dma_resv_held(bo->base.base.resv) || !kref_read(&bo->base.base.refcount));
+       if (bo->mmu_mapped) {
+               drm_WARN_ON(&vdev->drm, !bo->ctx);
+@@ -121,14 +131,12 @@ static void ivpu_bo_unbind_locked(struct
+       if (bo->base.base.import_attach)
+               return;
+-      dma_resv_lock(bo->base.base.resv, NULL);
+       if (bo->base.sgt) {
+               dma_unmap_sgtable(vdev->drm.dev, bo->base.sgt, DMA_BIDIRECTIONAL, 0);
+               sg_free_table(bo->base.sgt);
+               kfree(bo->base.sgt);
+               bo->base.sgt = NULL;
+       }
+-      dma_resv_unlock(bo->base.base.resv);
+ }
+ void ivpu_bo_unbind_all_bos_from_context(struct ivpu_device *vdev, struct ivpu_mmu_context *ctx)
+@@ -140,12 +148,12 @@ void ivpu_bo_unbind_all_bos_from_context
+       mutex_lock(&vdev->bo_list_lock);
+       list_for_each_entry(bo, &vdev->bo_list, bo_list_node) {
+-              mutex_lock(&bo->lock);
++              ivpu_bo_lock(bo);
+               if (bo->ctx == ctx) {
+                       ivpu_dbg_bo(vdev, bo, "unbind");
+                       ivpu_bo_unbind_locked(bo);
+               }
+-              mutex_unlock(&bo->lock);
++              ivpu_bo_unlock(bo);
+       }
+       mutex_unlock(&vdev->bo_list_lock);
+ }
+@@ -165,7 +173,6 @@ struct drm_gem_object *ivpu_gem_create_o
+       bo->base.pages_mark_dirty_on_put = true; /* VPU can dirty a BO anytime */
+       INIT_LIST_HEAD(&bo->bo_list_node);
+-      mutex_init(&bo->lock);
+       return &bo->base.base;
+ }
+@@ -243,8 +250,6 @@ static void ivpu_gem_bo_free(struct drm_
+       drm_WARN_ON(&vdev->drm, bo->mmu_mapped);
+       drm_WARN_ON(&vdev->drm, bo->ctx);
+-      mutex_destroy(&bo->lock);
+-
+       drm_WARN_ON(obj->dev, bo->base.pages_use_count > 1);
+       drm_gem_shmem_free(&bo->base);
+ }
+@@ -327,9 +332,9 @@ ivpu_bo_create(struct ivpu_device *vdev,
+               goto err_put;
+       if (flags & DRM_IVPU_BO_MAPPABLE) {
+-              dma_resv_lock(bo->base.base.resv, NULL);
++              ivpu_bo_lock(bo);
+               ret = drm_gem_shmem_vmap(&bo->base, &map);
+-              dma_resv_unlock(bo->base.base.resv);
++              ivpu_bo_unlock(bo);
+               if (ret)
+                       goto err_put;
+@@ -352,9 +357,9 @@ void ivpu_bo_free(struct ivpu_bo *bo)
+       struct iosys_map map = IOSYS_MAP_INIT_VADDR(bo->base.vaddr);
+       if (bo->flags & DRM_IVPU_BO_MAPPABLE) {
+-              dma_resv_lock(bo->base.base.resv, NULL);
++              ivpu_bo_lock(bo);
+               drm_gem_shmem_vunmap(&bo->base, &map);
+-              dma_resv_unlock(bo->base.base.resv);
++              ivpu_bo_unlock(bo);
+       }
+       drm_gem_object_put(&bo->base.base);
+@@ -373,12 +378,12 @@ int ivpu_bo_info_ioctl(struct drm_device
+       bo = to_ivpu_bo(obj);
+-      mutex_lock(&bo->lock);
++      ivpu_bo_lock(bo);
+       args->flags = bo->flags;
+       args->mmap_offset = drm_vma_node_offset_addr(&obj->vma_node);
+       args->vpu_addr = bo->vpu_addr;
+       args->size = obj->size;
+-      mutex_unlock(&bo->lock);
++      ivpu_bo_unlock(bo);
+       drm_gem_object_put(obj);
+       return ret;
+@@ -412,7 +417,7 @@ int ivpu_bo_wait_ioctl(struct drm_device
+ static void ivpu_bo_print_info(struct ivpu_bo *bo, struct drm_printer *p)
+ {
+-      mutex_lock(&bo->lock);
++      ivpu_bo_lock(bo);
+       drm_printf(p, "%-9p %-3u 0x%-12llx %-10lu 0x%-8x %-4u",
+                  bo, bo->ctx_id, bo->vpu_addr, bo->base.base.size,
+@@ -429,7 +434,7 @@ static void ivpu_bo_print_info(struct iv
+       drm_printf(p, "\n");
+-      mutex_unlock(&bo->lock);
++      ivpu_bo_unlock(bo);
+ }
+ void ivpu_bo_list(struct drm_device *dev, struct drm_printer *p)
+--- a/drivers/accel/ivpu/ivpu_gem.h
++++ b/drivers/accel/ivpu/ivpu_gem.h
+@@ -17,7 +17,6 @@ struct ivpu_bo {
+       struct list_head bo_list_node;
+       struct drm_mm_node mm_node;
+-      struct mutex lock; /* Protects: ctx, mmu_mapped, vpu_addr */
+       u64 vpu_addr;
+       u32 flags;
+       u32 job_status; /* Valid only for command buffer */
diff --git a/queue-6.12/accel-ivpu-use-firmware-names-from-upstream-repo.patch b/queue-6.12/accel-ivpu-use-firmware-names-from-upstream-repo.patch
new file mode 100644 (file)
index 0000000..19b057d
--- /dev/null
@@ -0,0 +1,51 @@
+From 1c2c0e29f24360b3130c005a3c261cb8c7b363c6 Mon Sep 17 00:00:00 2001
+From: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
+Date: Tue, 6 May 2025 11:20:30 +0200
+Subject: accel/ivpu: Use firmware names from upstream repo
+
+From: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
+
+commit 1c2c0e29f24360b3130c005a3c261cb8c7b363c6 upstream.
+
+Use FW names from linux-firmware repo instead of deprecated ones.
+The vpu_37xx.bin style names were never released and were only used for
+internal testing, so it is safe to remove them.
+
+Fixes: c140244f0cfb ("accel/ivpu: Add initial Panther Lake support")
+Cc: stable@vger.kernel.org # v6.13+
+Reviewed-by: Lizhi Hou <lizhi.hou@amd.com>
+Reviewed-by: Jeff Hugo <jeff.hugo@oss.qualcomm.com>
+Signed-off-by: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
+Link: https://lore.kernel.org/r/20250506092030.280276-1-jacek.lawrynowicz@linux.intel.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/accel/ivpu/ivpu_fw.c |   12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+--- a/drivers/accel/ivpu/ivpu_fw.c
++++ b/drivers/accel/ivpu/ivpu_fw.c
+@@ -53,18 +53,18 @@ static struct {
+       int gen;
+       const char *name;
+ } fw_names[] = {
+-      { IVPU_HW_IP_37XX, "vpu_37xx.bin" },
++      { IVPU_HW_IP_37XX, "intel/vpu/vpu_37xx_v1.bin" },
+       { IVPU_HW_IP_37XX, "intel/vpu/vpu_37xx_v0.0.bin" },
+-      { IVPU_HW_IP_40XX, "vpu_40xx.bin" },
++      { IVPU_HW_IP_40XX, "intel/vpu/vpu_40xx_v1.bin" },
+       { IVPU_HW_IP_40XX, "intel/vpu/vpu_40xx_v0.0.bin" },
+-      { IVPU_HW_IP_50XX, "vpu_50xx.bin" },
++      { IVPU_HW_IP_50XX, "intel/vpu/vpu_50xx_v1.bin" },
+       { IVPU_HW_IP_50XX, "intel/vpu/vpu_50xx_v0.0.bin" },
+ };
+ /* Production fw_names from the table above */
+-MODULE_FIRMWARE("intel/vpu/vpu_37xx_v0.0.bin");
+-MODULE_FIRMWARE("intel/vpu/vpu_40xx_v0.0.bin");
+-MODULE_FIRMWARE("intel/vpu/vpu_50xx_v0.0.bin");
++MODULE_FIRMWARE("intel/vpu/vpu_37xx_v1.bin");
++MODULE_FIRMWARE("intel/vpu/vpu_40xx_v1.bin");
++MODULE_FIRMWARE("intel/vpu/vpu_50xx_v1.bin");
+ static int ivpu_fw_request(struct ivpu_device *vdev)
+ {
diff --git a/queue-6.12/iio-accel-fxls8962af-fix-temperature-scan-element-sign.patch b/queue-6.12/iio-accel-fxls8962af-fix-temperature-scan-element-sign.patch
new file mode 100644 (file)
index 0000000..dc36b83
--- /dev/null
@@ -0,0 +1,35 @@
+From 9c78317b42e7c32523c91099859bc4721e9f75dd Mon Sep 17 00:00:00 2001
+From: Sean Nyekjaer <sean@geanix.com>
+Date: Mon, 5 May 2025 21:20:08 +0200
+Subject: iio: accel: fxls8962af: Fix temperature scan element sign
+
+From: Sean Nyekjaer <sean@geanix.com>
+
+commit 9c78317b42e7c32523c91099859bc4721e9f75dd upstream.
+
+Mark the temperature element signed, data read from the TEMP_OUT register
+is in two's complement format.
+This will avoid the temperature being mishandled and miss displayed.
+
+Fixes: a3e0b51884ee ("iio: accel: add support for FXLS8962AF/FXLS8964AF accelerometers")
+Suggested-by: Marcelo Schmitt <marcelo.schmitt1@gmail.com>
+Cc: stable@vger.kernel.org
+Reviewed-by: Marcelo Schmitt <marcelo.schmitt1@gmail.com>
+Signed-off-by: Sean Nyekjaer <sean@geanix.com>
+Link: https://patch.msgid.link/20250505-fxls-v4-2-a38652e21738@geanix.com
+Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/iio/accel/fxls8962af-core.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/iio/accel/fxls8962af-core.c
++++ b/drivers/iio/accel/fxls8962af-core.c
+@@ -739,6 +739,7 @@ static const struct iio_event_spec fxls8
+                             BIT(IIO_CHAN_INFO_OFFSET),\
+       .scan_index = -1, \
+       .scan_type = { \
++              .sign = 's', \
+               .realbits = 8, \
+               .storagebits = 8, \
+       }, \
index 3baafc685542bab150744320e08a0e897801be19..efad1ccb181dd71f00ac4eff09b973f87ee4d823 100644 (file)
@@ -153,3 +153,8 @@ pci-add-acs-quirk-for-loongson-pcie.patch
 pci-fix-lock-symmetry-in-pci_slot_unlock.patch
 pci-dw-rockchip-remove-pcie_l0s_entry-check-from-rockchip_pcie_link_up.patch
 pci-dw-rockchip-fix-phy-function-call-sequence-in-rockchip_pcie_phy_deinit.patch
+iio-accel-fxls8962af-fix-temperature-scan-element-sign.patch
+accel-ivpu-improve-buffer-object-logging.patch
+accel-ivpu-use-firmware-names-from-upstream-repo.patch
+accel-ivpu-use-dma_resv_lock-instead-of-a-custom-mutex.patch
+accel-ivpu-fix-warning-in-ivpu_gem_bo_free.patch