This commit updates drivers/accel/qaic to upstream v6.18 but leaves it unconfigured by default.
JIRA: https://issues.redhat.com/browse/RHEL-138457
Conflicts: none
Commit list:
52e59f7740ba accel/qaic: Synchronize access to DBC request queue head & tail pointer
11f08c30a3e4 accel/qaic: Treat remaining == 0 as error in find_and_map_user_pages()
fd6e385528d8 accel/qaic: Fix bootlog initialization ordering
c5ae936db72d accel/qaic: Use dev_printk() in RAS
c598d5eb9fb3 Merge drm/drm-next into drm-misc-next
41cb08555c41 treewide, timers: Rename from_timer() to timer_container_of()
93614c2ab39a accel/qaic: delete qaic_bo.handle
3719a04a80ca Merge tag 'pci-v6.16-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci
c11a50b170e7 accel/qaic: Add Reliability, Accessibility, Serviceability (RAS)
8fe743b5eba0 PCI: Add CONFIG_MMU dependency
ecc2b7478bdc accel/qaic: Test for imported buffers with drm_gem_is_imported()
1afba39f9305 Merge drm/drm-next into drm-misc-next
8fa7292fee5c treewide: Switch/rename to timer_delete_sync
0c86b42439b6 Merge tag 'drm-next-2025-03-28' of https://gitlab.freedesktop.org/drm/kernel
83a0237859bc accel/qaic: Remove redundant 'flush_workqueue()' calls
67d15c7aa086 accel/qaic: Fix integer overflow in qaic_validate_req()
84a833d90635 accel/qaic: Fix possible data corruption in BOs > 2G
7271a8862985 accel/qaic: Add AIC200 support
5bbe412bc793 accel/qaic: Add config structs for supported cards
8685520474bf accel/qaic: Mask out SR-IOV PCI resources
0600195ec70a accel/qaic: Add support for MSI-X
ab73d8083673 accel/qaic: Allocate an exact number of MSIs
931a765c2d95 accel/qaic: Change aic100_image_table definition
33f029af8979 Merge remote-tracking branch 'drm/drm-next' into drm-misc-next
cb2e1c2136f7 drm: remove driver date from struct drm_driver and all drivers
cdd30ebb1b9f module: Convert symbol namespace to string literal
57250e0fa301 accel/qaic: Drop redundant vfree() null check in sahara
30169bb64580 Backmerge v6.12-rc6 of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next
93accc16a8d4 accel/qaic: Add crashdump to Sahara
11fc5ce6e2a6 accel/qaic: Pass string literal as format argument of alloc_workqueue()
c5e8e938 accel/qaic: Fix the for loop used to walk SG table
b8128f7815ff accel/qaic: Add AIC080 support
2af5deb614e7 accel/qaic: Add ipc_router channel
2dd0ef5d951e Merge drm/drm-next into drm-misc-next
ef77507bc849 accel/qaic: Change to use DEFINE_SHOW_ATTRIBUTE macro
334304ac dma-mapping: don't return errors from dma_set_max_seg_size
42d34193 accel/qaic: mark debugfs stub functions as static inline
76b801aa accel/qaic: Add Sahara implementation for firmware loading
e495e523 accel/qaic: Add fifo queued debugfs
b05d3572 accel/qaic: Add fifo size debugfs
5f8df5c6 accel/qaic: Add bootlog debugfs
155ad86b accel/qaic: Constify aic100_channels
Signed-off-by: John Wiele [email protected]
The DRM backport's goal is to backport all the changes in the DRM subsystem to the kernel target version, with the biggest value being that we get the upstream hardware enablement (and bug fixes) into RHEL.
After the main DRM Backport, this MR backport as many fixes from the linux-stable tree for the target version: v6.18.6.
JIRA: https://issues.redhat.com/browse/RHEL-135337
Signed-off-by: José Expósito [email protected]
The DRM backport's goal is to backport all the changes in the DRM subsystem to the kernel target version, with the biggest value being that we get the upstream hardware enablement (and bug fixes) into RHEL.
After the main DRM Backport, this MR backport as many fixes from the linux-stable tree for the target version: v6.18.6.
Other:
JIRA: https://issues.redhat.com/browse/RHEL-142315
Signed-off-by: Anusha Srivatsa [email protected]
All submissions to CentOS Stream must reference a ticket in Red Hat Jira.
List tickets each on their own line of this description using the format "Resolves: RHEL-76229", "Related: RHEL-76229" or "Reverts: RHEL-76229", as appropriate.
JIRA: https://issues.redhat.com/browse/RHEL-126642
The DRM backport's goal is to backport all the changes in the DRM subsystem to the kernel target version, with the biggest value being that we get the upstream hardware enablement (and bug fixes) into RHEL. This merge request is the initial step of the DRM backport: identify and backport the dependencies of the DRM backport outside of drivers/gpu. Dependencies Backport taken care in:!1724
This MR depends on 6.16 Main and Dependencies backport and 6.17 Main And Dependencies Backport. And also dependencies backport for 6.18rc4
Depends: !1448
Depends: !1436
Depends: !1596
Depends: !1597
Depends: !1724
Patches that will be brought in by stable backport:
Omitted-fix: 9acc3295813b9b846791fd3eab0a78a3144af560 ("drm/xe: fix drm_gpusvm_init() arguments")
Omitted-fix: 630efee9493cf64ff7b9a1652978807fef385fdd ("drm: Fix object leak in DRM_IOCTL_GEM_CHANGE_HANDLE")
Omitted-fix: 9acc3295813b9b846791fd3eab0a78a3144af560 ("drm/xe: fix drm_gpusvm_init() arguments")
Omitted-fix: c350d9e2684f5ee9e753b825cf4bc3fbac8fe865 (""Reapply "drm/amdgpu: fix incorrect vm flags to map bo")
Omitted-fix: c51f6fe14cd7e2e0a0e1094d38805dcbbd04a058 ("MAINTAINERS: adjust file entry in DRM ACCEL DRIVER FOR ROCKCHIP NPU")
Omitted-fix: bbfe987c5a2854705393ad79813074e5eadcbde6 ("PM: hibernate: Fix pm_hibernation_mode_is_suspend() build breakage")
Omitted-fix: 98718e80af0bb1cd80f4bfe565dd60c57debad51 ("mei: late_bind: Fix -Wincompatible-function-pointer-types-strict")
Omitted-fix: 8f8ef09fcf6a3b00369bfc704e8f68d7474eca94 ("drm/i915/panic: fix panic structure allocation memory leak")
Omitted-fix: 089702632f1dd38fadc9af13816485d6aa518dbb ("drm/amdkfd: assign AID to uuid in topology for SPX mode")
Omitted-fix: 6c640592e84cd04cd6c61bf7afd83808cc20c9f4 ("Revert "drm/xe/vf: Post migration, repopulate ring area for pending request"")
Omitted-fix: 08c98f3f2bd7bf5dddd98b17c7caf94d07fad107 ("Revert "drm/xe/vf: Rebase exec queue parallel commands during migration recovery"")
Omitted-fix: a0559012a18a5a6ad87516e982892765a403b8ab ("drm/amdgpu/userq: fix SDMA and compute validation")
Omitted-fix: 5427e32fa3a0ba9a016db83877851ed277b065fb ("drm/amdgpu: fix cyan_skillfish2 gpu info fw handling")
Omitted-fix: 1a7a7b80a22448dff55e1ad69a4681fd8b760b85 ("drm/panel: novatek-nt35560: avoid on-stack device structure")
Patches that belong to paths that are rejected during DRM backport:
Omitted-fix: 9e16c8bf9aebf629344cfd4cd5e3dc7d8c3f7d82 ("accel/amdxdna: Fix an integer overflow in aie2_query_ctx_status_array()")
Omitted-fix: 81233d5419cf20e4f5ef505882951616888a2ef9 ("accel/amdxdna: Fix uninitialized return value")
Omitted-fix: ce6b656b5d64d612e9fc1c495eba6a362051c2ca ("accel/rocket: Fix usages of kfree() and sizeof()")
Omitted-fix: 78e399955d352a2387a4b22713385a0c5d737685 ("accel/rocket: Check the correct DMA irq status to warn about")
Omitted-fix: 09e6d39cc83b18a17857b8d4d6a8902bc87dfbc2 ("accel/rocket: Fix some error checking in rocket_core_init()")
Omitted-fix: c4d24127aaf1c50753c8bcdf050ed39b7c709869 ("accel/rocket: Fix indentation of Kconfig entry")
Omitted-fix: 503b0ed38ca60cfb5ba101517a680beebd38d377 ("accel/rocket: Depend on DRM_ACCEL not just DRM")
Omitted-fix: efe927b9702643a1d80472664c2642f0304cb608 ("drm/msm: fix msm_gem_vma_new() allocations for managed GPUVMs")
Omitted-fix: 457f4393d02fdb612a93912fb09cef70e6e545c9 ("accel/amdxdna: Call dma_buf_vmap_unlocked() for imported object")
Omitted-fix: 42bbf82b73bda18bbc3e158cb6fda040bb586feb ("drm/rcar-du: dsi: Fix missing parameter in RXSETR_...EN macros")
Omitted-fix: de0bdcaf36494c9d91653cb062766846f7c51041 ("MAINTAINERS: fix typo in TYR DRM driver entry")
Omitted-fix: 97872fa28b33a1ca6acc0a7b260750c9a123b193 ("MAINTAINERS: exclude the tyr driver from DRM MISC")
Signed-off-by: Anusha Srivatsa [email protected]
All submissions to CentOS Stream must reference a ticket in Red Hat Jira.
List tickets each on their own line of this description using the format "Resolves: RHEL-76229", "Related: RHEL-76229" or "Reverts: RHEL-76229", as appropriate.
JIRA: https://issues.redhat.com/browse/RHEL-116879
The DRM backport's goal is to backport all the changes in the DRM subsystem to the kernel target version, with the biggest value being that we get the upstream hardware enablement (and bug fixes) into RHEL.
The first step of the DRM backport is identifying dependencies of the DRM backport outside of drivers/gpu. Done in !1596
This MR is the second step: Backporting the changes in the DRM subsystem.
One change by a commit in MR follows the common kernel practise of grouping multiple .o files into one logical object.
Introduced by f86ad0ed620cb3c91ec7d5468e93ac68d727539d ("drm/gpusvm, drm/pagemap: Move migration functionality to drm_pagemap") It moves gpusvm under drm_gpusvm_helper. It is a safe change to bring in since it doesnt change the functionality of gpusvm module but rather just brings it under the drm_gpusvm_helper umbrella along with drm_pagemap.
Upstream Patch: https://lore.kernel.org/all/[email protected]/
This MR depends on the 6.16 dependencies and main backports and the 6.17 dependencies backport:
Depends: !1448
Depends: !1436
Depends: !1596
Omitted-fix: ff780f4f80323148d43198f2052c14160c8428d3 ("drm/amdgpu: set an error on all fences from a bad context")
Omitted-fix: 1f22fcb88bfef26a966e9eb242c692c6bf253d47 ("drm/amdgpu: handle wrap around in reemit handling")
Omitted-fix: 4d22db6d070ed3934f02ed15391283f6feb258ad ("drm/amdgpu: fix link error for !PM_SLEEP")
Omitted-fix: 0a6e9e098fcc318fec0f45a05a5c4743a81a60d9 ("drm/amd: Fix hybrid sleep")
Omitted-fix: bbfe987c5a2854705393ad79813074e5eadcbde6 ("PM: hibernate: Fix pm_hibernation_mode_is_suspend() build breakage")
Omitted-fix: 6ec4b94e8e959b4201ca0bfc43fa50dc946d10cb ("gpio: TODO: remove the task for converting to the new line setters")
Omitted-fix: 42464c51ccccb6343a932a7ea8bc9181e589f270 ("drm/msm: Fix objtool warning in submit_lock_objects()")
Omitted-fix: 86404a9e3013d814a772ac407573be5d3cd4ee0d ("drm/msm: make sure last_fence is always updated")
Omitted-fix: 08c5b422807435cdb79bee60da84262102e5f26a ("drm/msm: Defer fd_install in VM_BIND ioctl")
Omitted-fix: 278f8904434aa96055e793936b5977c010549e28 ("drm/msm: Fix obj leak in VM_BIND error path")
Omitted-fix: 3a3bef68a6c15d079646a964ebc4dc8bb0aedb06 ("drm/msm: Fix missing VM_BIND offset/range validation")
Omitted-fix: 00d5f09719aa6c37545be5c05d25a1eaf8f3da7e ("drm/msm: Ensure vm is created in VM_BIND ioctl")
Omitted-fix: 1cf1205ef2685cf43db3785706b017d1e54e0bec ("drm/amd/display: Reduce Stack Usage by moving 'audio_output' into 'stream_res' v4")
Omitted-fix: 033559473dd3b55558b535aa37b8848c207b5cbb ("dma-fence: Fix safe access wrapper to call timeline name method")
Omitted-fix: e1bf212d0604d2cbb5514e47ccec252b656071fb ("fuse: virtio_fs: fix page fault for DAX page address")
Omitted-fix: 20a8e0454d833d80d0c0cae304841a50a2a126bd ("cramfs: fix incorrect physical page address calculation")
Omitted-fix: f8f6e72fe28595969829d63db93ecaa56a0c2811 ("drm/omap: Pass along the format info from .fb_create() to drm_helper_mode_fill_fb_struct()")
Omitted-fix: f4ca529de235791aeeddc32ee6741a6b6872f564 ("drm/msm: Fix pagetables setup/teardown serialization")
Omitted-fix: 0a51bf3e54dd8b77e6f1febbbb66def0660862d2 ("drm/xe/vm: Don't pin the vm_resv during validation")
Omitted-fix: 1af59cd5cc2b65d7fc95165f056695ce3f171133 ("drm/xe/i2c: Don't rely on d3cold.allowed flag in system PM path")
Omitted-fix: 92e34a5241ddf4b084df20e6953275d16f156aa8 ("drm/display: bridge-connector: correct CEC bridge pointers in drm_bridge_connector_init")
Omitted-fix: dc8aa0cb87a7836b59422cc02d969c8df849ee39 ("drm/i915/dmc: Clear HRR EVT_CTL/HTP to zero on ADL-S")
Omitted-fix: 357d90be2c7aaa526a840cddffd2b8d676fe75a6 ("drm/amdgpu: fix handling of harvesting for ip_discovery firmware")
Omitted-fix: de651b6e040ba419418a37401e45d24f133e8a59 ("drm/msm: Fix refcnt underflow in error path")
Omitted-fix: c34e08ba6c0037a72a7433741225b020c989e4ae ("drm/msm: Fix GEM free for imported dma-bufs")
Omitted-fix: 2650bc4007c15e05f995f472b4fc89e793162bc4 ("drm/sched: Fix a race in DRM_GPU_SCHED_STAT_NO_HANG test")
Omitted-fix: 3257bd193fa1702791978d8418c9a96e3def082c ("drm/imx: parallel-display: convert to devm_drm_bridge_alloc() API")
Omitted-fix: 4aa8961b1b9c7498550b41168a91cf1558133dd3 ("drm/dp: drm_edp_backlight_set_level: do not always send 3-byte commands")
Omitted-fix: 476a4e10a3361509b1e436ec49e9a2896052a4b6 ("drm/amdgpu: print root PD address in PDE format instead of GPU")
Omitted-fix: bba9aa41654036534d86b198f5647a9ce15ebd7f ("drm/dp: Change AUX DPCD probe address from LANE0_1_STATUS to TRAINING_PATTERN_SET")
Omitted-fix: f5b1819193667bf62c3c99d3921b9429997a14b2 ("drm/mediatek: dsi: Fix DSI host and panel bridge pre-enable order")
Omitted-fix: 33f8f321e7aa7715ce19560801ee5223ba8b9a7d ("drm/vmwgfx: fix missing assignment to ts")
Omitted-fix: 7413e9f2be6b2b0caff9c517efa123d988914bba ("drm/xe: Handle mixed mappings and existing VRAM on atomic faults")
Omitted-fix: 3362692fea915ce56345366364a501c629c9ff17 ("drm/amd/display: Don't stretch non-native images by default in eDP")
Omitted-fix: 90b75e12a6e831c8516498f690058d4165d5a5d6 ("drm/amdgpu: set default gfx reset masks for gfx6-8")
Omitted-fix: 7132f7e025f9382157543dd86a62d161335b48b9 ("drm/amd/amdgpu: Ensure isp_kernel_buffer_alloc() creates a new BO")
Omitted-fix: 5474560381775bc70cc90ed2acefad48ffd6ee07 ("drm/i915/xe3: Restrict PTL intel_encoder_is_c10phy() to only PHY A")
Omitted-fix: 6eb2e056b0e418718fc5a3cfe79bdb41d9a2851d ("drm/pcids: Split PTL pciids group to make wcl subplatform")
Omitted-fix: 913253ed47b9925454cbb17faa3e350015b3d67a ("drm/i915/display: Add definition for wcl as subplatform")
Omitted-fix: fa766e759ff7b128ab77323d9d9c232434621bb6 ("drm/i915/xe3lpd: Load DMC for Xe3_LPD version 30.02")
Omitted-fix: 0e234632e39bd21dd28ffc9ba3ae8eec4deb949c ("drm/xe/guc: Fix stack_depot usage")
Signed-off-by: Anusha Srivatsa [email protected]
All submissions to CentOS Stream must reference a ticket in Red Hat Jira.
List tickets each on their own line of this description using the format "Resolves: RHEL-76229", "Related: RHEL-76229" or "Reverts: RHEL-76229", as appropriate.
JIRA: https://issues.redhat.com/browse/RHEL-106696
CVE: CVE-2025-38449
commit 5307dce878d4126e1b375587318955bd019c3741
Author: Thomas Zimmermann <[email protected]>
Date: Mon Jun 30 10:36:47 2025 +0200
drm/gem: Acquire references on GEM handles for framebuffers
A GEM handle can be released while the GEM buffer object is attached
to a DRM framebuffer. This leads to the release of the dma-buf backing
the buffer object, if any. [1] Trying to use the framebuffer in further
mode-setting operations leads to a segmentation fault. Most easily
happens with driver that use shadow planes for vmap-ing the dma-buf
during a page flip. An example is shown below.
[ 156.791968] ------------[ cut here ]------------
[ 156.796830] WARNING: CPU: 2 PID: 2255 at drivers/dma-buf/dma-buf.c:1527 dma_buf_vmap+0x224/0x430
[...]
[ 156.942028] RIP: 0010:dma_buf_vmap+0x224/0x430
[ 157.043420] Call Trace:
[ 157.045898] <TASK>
[ 157.048030] ? show_trace_log_lvl+0x1af/0x2c0
[ 157.052436] ? show_trace_log_lvl+0x1af/0x2c0
[ 157.056836] ? show_trace_log_lvl+0x1af/0x2c0
[ 157.061253] ? drm_gem_shmem_vmap+0x74/0x710
[ 157.065567] ? dma_buf_vmap+0x224/0x430
[ 157.069446] ? __warn.cold+0x58/0xe4
[ 157.073061] ? dma_buf_vmap+0x224/0x430
[ 157.077111] ? report_bug+0x1dd/0x390
[ 157.080842] ? handle_bug+0x5e/0xa0
[ 157.084389] ? exc_invalid_op+0x14/0x50
[ 157.088291] ? asm_exc_invalid_op+0x16/0x20
[ 157.092548] ? dma_buf_vmap+0x224/0x430
[ 157.096663] ? dma_resv_get_singleton+0x6d/0x230
[ 157.101341] ? __pfx_dma_buf_vmap+0x10/0x10
[ 157.105588] ? __pfx_dma_resv_get_singleton+0x10/0x10
[ 157.110697] drm_gem_shmem_vmap+0x74/0x710
[ 157.114866] drm_gem_vmap+0xa9/0x1b0
[ 157.118763] drm_gem_vmap_unlocked+0x46/0xa0
[ 157.123086] drm_gem_fb_vmap+0xab/0x300
[ 157.126979] drm_atomic_helper_prepare_planes.part.0+0x487/0xb10
[ 157.133032] ? lockdep_init_map_type+0x19d/0x880
[ 157.137701] drm_atomic_helper_commit+0x13d/0x2e0
[ 157.142671] ? drm_atomic_nonblocking_commit+0xa0/0x180
[ 157.147988] drm_mode_atomic_ioctl+0x766/0xe40
[...]
[ 157.346424] ---[ end trace 0000000000000000 ]---
Acquiring GEM handles for the framebuffer's GEM buffer objects prevents
this from happening. The framebuffer's cleanup later puts the handle
references.
Commit 1a148af06000 ("drm/gem-shmem: Use dma_buf from GEM object
instance") triggers the segmentation fault easily by using the dma-buf
field more widely. The underlying issue with reference counting has
been present before.
v2:
- acquire the handle instead of the BO (Christian)
- fix comment style (Christian)
- drop the Fixes tag (Christian)
- rename err_ gotos
- add missing Link tag
Suggested-by: Christian König <[email protected]>
Signed-off-by: Thomas Zimmermann <[email protected]>
Link: https://elixir.bootlin.com/linux/v6.15/source/drivers/gpu/drm/drm_gem.c#L241 # [1]
Cc: Thomas Zimmermann <[email protected]>
Cc: Anusha Srivatsa <[email protected]>
Cc: Christian König <[email protected]>
Cc: Maarten Lankhorst <[email protected]>
Cc: Maxime Ripard <[email protected]>
Cc: Sumit Semwal <[email protected]>
Cc: "Christian König" <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: <[email protected]>
Reviewed-by: Christian König <[email protected]>
Link: https://lore.kernel.org/r/[email protected]Signed-off-by: Robert Foss [email protected]
Omitted-fix: 0ecfb8ddb953605cadd806de5b62e632c8e0e49e
Omitted-fix: 1e9d2aed7c2248bc5ba7d0dfea4fcc0b2f80b4f7
Omitted-fix: bb7f4972a6ff9a537b87e1b0ecf0e561f2761dd3
Omitted-fix: 6d496e9569983a0d7a05be6661126d0702cf94f7
Omitted-fix: 0ecfb8ddb953605cadd806de5b62e632c8e0e49e
Omitted-fix: 1e9d2aed7c2248bc5ba7d0dfea4fcc0b2f80b4f7
Omitted-fix: bb7f4972a6ff9a537b87e1b0ecf0e561f2761dd3
Omitted-fix: 6d496e9569983a0d7a05be6661126d0702cf94f7
Created 2025-07-31 10:19 UTC by backporter - KWF FAQ - Slack #team-kernel-workflow - Source - Documentation - Report an issue
The DRM backport's goal is to backport all the changes in the DRM subsystem to the kernel target version, with the biggest value being that we get the upstream hardware enablement (and bug fixes) into RHEL.
The first step of the DRM backport is identifying dependencies of the DRM backport outside of drivers/gpu. Done in !606
This MR is the second step: Backporting the changes in the DRM subsystem.
This branch will be rebased of top of !606 when required.
This MR depends on the DRM Dependencies Backport, which is split in these 4 MRs:
Depends: !627
Depends: !628
Depends: !606
Depends: !825
The module diff test is failing because:
drm_vram_helper.ko), previously selected by DRM_BOCHS, is not selected by any module and, therefore, it is removedcirrus.ko is renamed to cirrus-qemu.ko
These module changes should be fine because:
drm_vram_helper.ko is used as a library containing helpers for VRAM memory management. Because these helpers are not used anymore, it is safe to remove them.cirrus.ko is
safe because it is autoloaded by VMs.Both issues are solved by this MR: redhat/centos-stream/tests/kernel/kernel-tests!3804
JIRA: https://issues.redhat.com/browse/RHEL-75957
Signed-off-by: José Expósito [email protected]
The DRM backport's goal is to backport all the changes in the DRM subsystem to the kernel target version, with the biggest value being that we get the upstream hardware enablement (and bug fixes) into RHEL.
The first step of the DRM backport is identifying dependencies of the DRM backport outside of drivers/gpu. Done in !825 for kernel 6.15.
This MR is the second step: Backporting the changes in the DRM subsystem.
Since 6.15 will be released pretty late, 6.13 and 6.14 are handled in a different MR: !615
This MR depends on the DRM Dependencies Backport for 6.15 as well as on the Dependencies and Main Backports for 6.13 and 6.14:
These fixes are omitted as they'll be backported by the DRM stable backport:
Omitted-fix: 9d80698bcd97a5ad1088bcbb055e73fd068895e2
Omitted-fix: 5cc3325584c425069c1c3355c775314d64bf8770
Omitted-fix: 70e5043ba85eae199b232e39921abd706b5c1fa4
Omitted-fix: d6fb4f01736a1d18cc981eb04fa2907a7121fc27
Omitted-fix: 8e8d76f62329127b31c64a034b052fb9e30e92af
Omitted-fix: 7e0351ae91ed2b6178abbfae96c3c6aaa1652567
Omitted-fix: d6fb4f01736a1d18cc981eb04fa2907a7121fc27
Omitted-fix: 9c7632faad434c98f1f2cc06f3647a5a5d05ddbf
Omitted-fix: d30f61076268fd7ce01e4ec9e4d84bfaf90365f7
Omitted-fix: d26625d034fb8d596f0488472969493fa02d03f3
Omitted-fix: e22d7acf9f47b01c9a538f3dac5c8e8d46fbca96
Omitted-fix: 791d76005de0ab556b590473eb4cbfede727fce0
Omitted-fix: 10646ddac2917b31c985ceff0e4982c42a9c924b
Omitted-fix: 4557cc834712eca4eae7adbd9f0a06bdd8f79c99
Omitted-fix: a47e36dc5d90dc664cac87304c17d50f1595d634
Omitted-fix: a738fa9105ac2897701ba4067c33e85faa27d1e2
Omitted-fix: d51adf038ebe59b592005166209b70218b1da849
Omitted-fix: 6acbf71463f74838854ed9fcfc2af7bb9ee04ffa
Omitted-fix: 988b1d2164a1cbe56616a1ded0c877a3ae753558
Omitted-fix: 69a58ef4fa77759b0e0c2f79834fa51b00a50c0b
Omitted-fix: c1f4534b213d7be41b5d8b815a42d201a8f2978f
Omitted-fix: 5cccf10f652122a17b40df9d672ccf2ed69cd82f
Omitted-fix: 6bf4d5649230ca65725ec4793333fb5eba18d646
Omitted-fix: 3393c90daf4e1704c6a5c3833439f461663a2e1d
Omitted-fix: 57145afa3326947154c3a890b1118774b55212a0
Omitted-fix: 8cf8cde41ad01150afbd1327ad1942387787f7fd
Omitted-fix: a55737dab6ba63eb4241e9c6547629058af31e12
Omitted-fix: 99579c55c3d6132a5236926652c0a72a526b809d
Omitted-fix: fb721b2c35b1829b8ecf62e3adb41cf30260316a
Omitted-fix: 9205999e9f13a07cb29d5a8836c25afdca186007
Omitted-fix: 73eab78721f7b85216f1ca8c7b732f13213b5b32
Omitted-fix: afcad92411772a1f361339f22c49f855c6cc7d0f
Omitted-fix: 2d5cff2b4bc567dcaad7ab5b46c973ba534cc062
Omitted-fix: 34659c1a1f4fd4c148ab13e13b11fd64df01ffcd
Omitted-fix: 6d33df611a39a1b4ad9f2b609ded5d6efa04d97e
These non-blocking fixes will be backported as well:
Omitted-fix: c67c0fef5d4d1b888275a588f0fb0f6f2755924b
Omitted-fix: 25b2f46bd7de2f0007d742de9d2e72e65db0edf3
Omitted-fix: 1450e4525f9a719a674f0b0c3bbe7c290cf933d4
Omitted-fix: 50af973cd71ab9eea3b18429343659f4a6ebd825
Omitted-fix: c8c70ff3a766a077e5b3a717e91722638d50e2a6
Omitted-fix: 5307dce878d4126e1b375587318955bd019c3741
Omitted-fix: f6bfc9afc7510cb5e6fbe0a17c507917b0120280
JIRA: https://issues.redhat.com/browse/RHEL-88418
Signed-off-by: José Expósito [email protected]
Depends: !627
Depends: !628
Depends: !606
Depends: !615
Depends: !825
[jwilson: added explicit Depends lines for dependency MRs]
Signed-off-by: Jarod Wilson [email protected]
The DRM backport's goal is to backport all the changes in the DRM subsystem to the kernel target version, with the biggest value being that we get the upstream hardware enablement (and bug fixes) into RHEL.
The first step of the DRM backport is identifying dependencies of the DRM backport outside of drivers/gpu. Done in !606
This MR is the second step: Backporting the changes in the DRM subsystem.
This branch will be rebased of top of !606 when required.
This MR depends on the DRM Dependencies Backport, which is split in these 4 MRs:
Depends: !627
Depends: !628
Depends: !606
Depends: !825
The module diff test is failing because:
drm_vram_helper.ko), previously selected by DRM_BOCHS, is not selected by any module and, therefore, it is removedcirrus.ko is renamed to cirrus-qemu.ko
These module changes should be fine because:
drm_vram_helper.ko is used as a library containing helpers for VRAM memory management. Because these helpers are not used anymore, it is safe to remove them.cirrus.ko is
safe because it is autoloaded by VMs.Both issues are solved by this MR: redhat/centos-stream/tests/kernel/kernel-tests!3804
JIRA: https://issues.redhat.com/browse/RHEL-75957
Signed-off-by: José Expósito [email protected]
The DRM backport goal is to backport all the changes in the DRM subsystem to the kernel target version, with the biggest value being that we get the upstream hardware enablement (and bug fixes) into RHEL.
This merge request is the initial step of the DRM backport: identify and backport the dependencies of the DRM backport outside of drivers/gpu.
Check !6708 for the main backport MR.
!6864 - b35108a51cf7 jiffies: Define secs_to_jiffies()
Omitted-fix: f4293c2baf6faa5f1a1638bcce698ed88d0d396e
Omitted-fix: 75c2d6399baa16781f3821ac702cffbdba5d85dd
Omitted-fix: 5ad2abf9e12c6e81e6cb218d6cf3ab4e01430852
Omitted-fix: 1969392adf4a1b0771a2a5aa0b757ef7e4f799cf
Omitted-fix: 84c398ce2a1c032224337128247d0b8ce986fcef
Omitted-fix: c2cd5986ebcd911cc97cd3e14439dd6f9ad82923
Omitted-fix: b4aa02fbefb81525567f39aa60e1c5c23cbe4434
Omitted-fix: 84bbaeb0eda3da7fba1284c93dfb15f2417db838
Omitted-fix: 38b2ea18aaff18f6066a3f1a145797b09bf65d29
Omitted-fix: 4d69f4c972984cdbed0e1d89397206100499a879
Omitted-fix: 3d1a26adec3b1b3bcdd2793157dd3de0eddc3f5a
Omitted-fix: b29425972c5234a59b6fb634125420ed74266377
Omitted-fix: eefdb1941fce1b56d42b186da12793d94b4bd9cf
Omitted-fix: e3b5acec8c849205c56b956df7b6f75d9853d2e8
Omitted-fix: f5ea0319ef4f05afe24645cbec9155c2b44d5174
Omitted-fix: b6ca5bbcfd9f8d8a4b35a651d865536fb63e8e0d
Omitted-fix: f87e4f2434430b0f750fbdff4fd0601807571bb2
Omitted-fix: 734ff310d38cfdc27a1b3eac9fa83ff754356ae7
Omitted-fix: bb2784d9ab49587ba4fbff37a319fff2924db289
Omitted-fix: 7d2497ff7e5ffd5a2e4fb1a7f2547db61bcbebdd
Omitted-fix: a9d5131e2239791131407cf6f8e1b8e36bf4c545
Omitted-fix: e3e627e6b218fbc8c1b277c008a901cc70524fcc
Omitted-fix: 3f0a819e8c4f8c83c584f7b035488d3ae16c0704
Omitted-fix: c9d84da18d1e0d28a7e16ca6df8e6d47570501d4
Omitted-fix: a131f20804d6a817140c1b78fb2a23696a1e2098
Omitted-fix: 84c34d0105877836a1c000b97bd6025d20f390e8
Omitted-fix: 78cf56f8832a932ade20b8340a029ace14ac0e98
Omitted-fix: 344825e17cfa9a7506ad4fd4fc62df6181162c4a
Omitted-fix: 8ef9019ed2acdf74dce7c8b5618bf2bdabb47004
Omitted-fix: d5834614a4d97b2c88be83f736602b7c3dbc3a4d
Omitted-fix: a877cd2a6487f9f3ba8aa701d4d780efdc034596
Omitted-fix: 2c54b24fefa8481e1c2e2330db636e5781acc229
Omitted-fix: 6cf828d2fbebd41d26f8233624bab88e5afc323b
Omitted-fix: 32fcd1b9c397ccca7fde2fcbcf4fc7e0ec8f34aa
Omitted-fix: eee6af2319f81497bf02389a2036c14e0cf01e38
Omitted-fix: 1d2e01d53a8ebfffb49e8cc656f8c85239121b26
Omitted-fix: 7c9a8c57143c2163407967790fd46ab9545f51d4
Omitted-fix: 96b8f4658b70ac2efe543ddbeb328b5b1941a571
Omitted-fix: 8ba1b428cf1a0905c260b5da4e44502a8457edae
Omitted-fix: b3e8dc1143b93e0048c631eeb2947584960da33b
Omitted-fix: 66644d80a4f9835f3dae0bfee6c6e529f6b082fe
Omitted-fix: f873136416293b786e7611d36226c9f5a8f6d20b
Omitted-fix: 44059790a5cb9258ae6137387e4c39b717fd2ced
JIRA: https://issues.redhat.com/browse/RHEL-75950
Signed-off-by: Robert Foss [email protected]
Marco left, let's replace him with the other kernel developers in the team that are currently working on the kernel, and Dave as a tech lead.
Next to that, adjust some of the Jira components to be a bit more precise.
JIRA: https://issues.redhat.com/browse/RHEL-59051
CVE: CVE-2024-44960 CVE JIRA: https://issues.redhat.com/browse/RHEL-57138
CVE: CVE-2024-46675 CVE JIRA: https://issues.redhat.com/browse/RHEL-64322
This MR rebases supported USB/TBT drivers to upstream kernel v6.11. By design, changes on this rebase are limited to supported USB/Thunderbolt drivers and infrastructure. Changes which happen to touch the drivers but are tree-wide are selectively or partially pulled in, whenever relevant.
Notes:
I) Omits:
Omitted-fix: aefa036be8c2 ("phy: freescale: imx8qm-hsio: Include bitfield.h for FIELD_PREP") Omitted-fix: 2d6213bd592b ("crypto: spacc - Add ifndef around MIN") Omitted-fix: b8fc70ab7b5f ("Revert "crypto: spacc - Add SPAcc Skcipher support") Omitted-fix: bf791751162a ("thunderbolt: Add only on-board retimers when !CONFIG_USB4_DEBUGFS_MARGINING")
II) This MR drops rtsx_pci_ms driver because it became dead code with
commit ("misc: rtsx: Add support for RTS5261"), which as
consequence was latter dropped on commit ("memstick:
rtsx_pci_ms: Remove Realtek PCI memstick driver"). The latter is being
merged here.
III) This MR also includes minmax updates to fix these build and test errors:
1 - Signedness error:
drivers/usb/typec/ucsi/ucsi.c: In function 'ucsi_get_pd_message':
./include/linux/build_bug.h:78:41: error: static assertion failed: "min(bytes, (((con->ucsi)->version < 0x0200) ? 0x10 : 0xff)) signedness error, fix types or consider umin() before min_t()"
78 | #define __static_assert(expr, msg, ...) _Static_assert(expr, msg)2 - ISO C90 error:
drivers/scsi/Makefile:196: FORCE prerequisite is missing
lib/vsprintf.c: In function 'resource_string':
lib/vsprintf.c:1068:9: error: ISO C90 forbids variable length array 'sym' [-Werror=vla]
1068 | char sym[max(2*RSRC_BUF_SIZE + DECODED_BUF_SIZE,
| ^~~~3 - Oops on drm_gem_shmem CKI testing:
Unable to handle kernel paging request at virtual address ffffffff80000000
...
Internal error: Oops: 0000000096000146 [#1] SMP
...
drm_gem_shmem_test_obj_create_private+0x1cc/0x41c [drm_gem_shmem_test]
...
# drm_gem_shmem_test_obj_create_private: try faulted: last line seen drivers/gpu/drm/tests/drm_gem_shmem_test.c:120
# drm_gem_shmem_test_obj_create_private: internal error occurred preventing test case from running: -4 Signed-off-by: Desnes Nunes [email protected]
JIRA: https://issues.redhat.com/browse/RHEL-59051
CVE: CVE-2024-44960 CVE JIRA: https://issues.redhat.com/browse/RHEL-57138
CVE: CVE-2024-46675 CVE JIRA: https://issues.redhat.com/browse/RHEL-64322
This MR rebases supported USB/TBT drivers to upstream kernel v6.11. By design, changes on this rebase are limited to supported USB/Thunderbolt drivers and infrastructure. Changes which happen to touch the drivers but are tree-wide are selectively or partially pulled in, whenever relevant.
Notes:
I) Omits:
Omitted-fix: aefa036be8c2 ("phy: freescale: imx8qm-hsio: Include bitfield.h for FIELD_PREP") Omitted-fix: 2d6213bd592b ("crypto: spacc - Add ifndef around MIN") Omitted-fix: b8fc70ab7b5f ("Revert "crypto: spacc - Add SPAcc Skcipher support") Omitted-fix: bf791751162a ("thunderbolt: Add only on-board retimers when !CONFIG_USB4_DEBUGFS_MARGINING")
II) This MR drops rtsx_pci_ms driver because it became dead code with
commit ("misc: rtsx: Add support for RTS5261"), which as
consequence was latter dropped on commit ("memstick:
rtsx_pci_ms: Remove Realtek PCI memstick driver"). The latter is being
merged here.
III) This MR also includes minmax updates to fix these build and test errors:
1 - Signedness error:
drivers/usb/typec/ucsi/ucsi.c: In function 'ucsi_get_pd_message':
./include/linux/build_bug.h:78:41: error: static assertion failed: "min(bytes, (((con->ucsi)->version < 0x0200) ? 0x10 : 0xff)) signedness error, fix types or consider umin() before min_t()"
78 | #define __static_assert(expr, msg, ...) _Static_assert(expr, msg)2 - ISO C90 error:
drivers/scsi/Makefile:196: FORCE prerequisite is missing
lib/vsprintf.c: In function 'resource_string':
lib/vsprintf.c:1068:9: error: ISO C90 forbids variable length array 'sym' [-Werror=vla]
1068 | char sym[max(2*RSRC_BUF_SIZE + DECODED_BUF_SIZE,
| ^~~~3 - Oops on drm_gem_shmem CKI testing:
Unable to handle kernel paging request at virtual address ffffffff80000000
...
Internal error: Oops: 0000000096000146 [#1] SMP
...
drm_gem_shmem_test_obj_create_private+0x1cc/0x41c [drm_gem_shmem_test]
...
# drm_gem_shmem_test_obj_create_private: try faulted: last line seen drivers/gpu/drm/tests/drm_gem_shmem_test.c:120
# drm_gem_shmem_test_obj_create_private: internal error occurred preventing test case from running: -4 Signed-off-by: Desnes Nunes [email protected]