Changes in Kconfig

67f8bc848ee31831336bd478e57d2f993551902e - Merge drm/drm-fixes into drm-misc-fixes

Tue, 01 Sep 2026 09:38:51 +0200

Merge drm/drm-fixes into drm-misc-fixesLet's start the 7.3 drm-misc-fixes cycle.Signed-off-by: Maxime Ripard List of files: /linux/kernel/dma/Kconfig

b2128290c29902315e632ea59e0504d6bc9e9b42 - Merge remote-tracking branch 'drm/drm-next' into msm-next-backmerge

Sat, 18 Jul 2026 17:06:55 +0200

Merge remote-tracking branch 'drm/drm-next' into msm-next-backmergeBackmerge of drm-next, mainly to pick up dt bindings docs updates toavoid conflicts.Signed-off-by: Rob Clark List of files: /linux/kernel/dma/Kconfig

637315cb400eed1dbe721954fea437a61a2d65b2 - Merge tag 'kvm-riscv-7.3-1' of https://github.com/kvm-riscv/linux into HEAD

Tue, 18 Aug 2026 13:07:31 +0200

Merge tag 'kvm-riscv-7.3-1' of https://github.com/kvm-riscv/linux into HEADKVM/riscv changes for 7.3- Svadu/Zicfiss/Zicfilp FWFT support for Guest- Use try_cmpxchg for IMSIC MRIF RMW- More arch-specific tracepoints in KVM RISC-V- Eager Page Splitting for KVM RISC-V- Optimize hfence request handling for SMP Guests- Improve dirty log clearing by skipping zero bits in mask- Guard HFENCE range loops against overflow- CPU PM notifiers in KVM RISC-V for non-retentive idle states- Fix kernel-mode vector context save/restore for Guest List of files: /linux/kernel/dma/Kconfig

2f43193b88188b184a967c9427602e019f1b8708 - Merge tags 'dma-mapping-7.3-2026-08-24' and 'dma-mapping-7.3-2026-08-24-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux

Mon, 24 Aug 2026 20:35:46 +0200

Merge tags 'dma-mapping-7.3-2026-08-24' and 'dma-mapping-7.3-2026-08-24-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linuxPull dma-mapping updates from Marek Szyprowski: - swiotlb: - new configuration option for the default pool size (Jagadeesh Pagadala) - reduce overhead for high watermark tracking (chenhuguanshen) - minor code cleanups and improvements (Vova Sharaienko, Honglei Huang and Marek Szyprowski) - add proper tracking of the shared DMA state through direct, pool and swiotlb paths (Aneesh Kumar K.V) This is important for confidential-computing* tag 'dma-mapping-7.3-2026-08-24' of git://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux: dma/swiotlb: decouple high watermark tracking from CONFIG_DEBUG_FS MAINTAINERS: update tree for DMA MAPPING HELPERS dma/swiotlb: introduce Kconfig option for compile-time default pool size dma-direct: Improve readability of the dma_direct_map_sg() for P2PDMA case iommu/dma: simplify dma_iova_destroy() and drop the free_iova helper dma-coherent: use KiB in DMA allocation logs dma-coherent: fix spacing coding style issue* tag 'dma-mapping-7.3-2026-08-24-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux: (23 commits) swiotlb: remove unused SWIOTLB_FORCE flag dma: swiotlb: handle set_memory_decrypted() failures dma: swiotlb: free dynamic pools from process context dma-direct: rename ret to cpu_addr in alloc helpers dma-direct: select DMA address encoding from __DMA_ATTR_ALLOC_CC_SHARED dma-direct: set decrypted flag for remapped DMA allocations dma-direct: make dma_direct_map_phys() honor DMA_ATTR_CC_SHARED dma-direct: Move dma_direct_map_phys() to dma/direct.c dma-direct: pass attrs to dma_capable() for DMA_ATTR_CC_SHARED checks dma-mapping: make dma_pgprot() honor __DMA_ATTR_ALLOC_CC_SHARED dma: swiotlb: track pool encryption state and honor DMA_ATTR_CC_SHARED dma: swiotlb: pass mapping attributes by reference dma-pool: track decrypted atomic pools and select them via attrs dma-direct: use __DMA_ATTR_ALLOC_CC_SHARED in alloc/free paths dma-mapping: Add internal shared allocation attribute coco: arm64: s390: powerpc: Mark secure guests with CC_ATTR_GUEST_MEM_ENCRYPT dma-direct: swiotlb: handle swiotlb alloc/free outside __dma_direct_alloc_pages s390: Expose protected virtualization through cc_platform_has() swiotlb: Preserve allocation virtual address for dynamic pools dma: free atomic pool pages by physical address ... List of files: /linux/kernel/dma/Kconfig

3cf67bbc5e5323b3af968bb289cdff33f6180535 - dma/swiotlb: introduce Kconfig option for compile-time default pool size

Thu, 02 Jul 2026 16:09:02 +0200

dma/swiotlb: introduce Kconfig option for compile-time default pool sizeThe SWIOTLB bounce buffer pool size is hardcoded at 64 MB viaIO_TLB_DEFAULT_SIZE with no compile-time knob to adjust it. Onmemory-constrained embedded or mobile platforms equipped with ahardware IOMMU (e.g., ARM SMMU) covering most DMA-capable devices,reserving 64 MB at boot is unnecessarily wasteful — the SWIOTLB isonly exercised for devices that bypass the IOMMU or have restrictedDMA address ranges.Introduce CONFIG_SWIOTLB_DEFAULT_SIZE_MB, an integer Kconfig option(range 1–64 MB, default 64) that allows platforms to set a smallercompile-time default. IO_TLB_DEFAULT_SIZE is updated to derive fromthis value when CONFIG_SWIOTLB is enabled, preserving the existing64 MB default when the option is not configured.The runtime "swiotlb=" kernel parameter override remainsfully supported and takes precedence over the compile-time default.Signed-off-by: Jagadeesh Pagadala Signed-off-by: Bibek Kumar Patro Reviewed-by: Michael Kelley Link: https://lore.kernel.org/r/20260702-swiotlb-v2-1-9205f3ba5408@oss.qualcomm.comSigned-off-by: Marek Szyprowski List of files: /linux/kernel/dma/Kconfig

efe86f088f48f18c27b648e5724048947f3b7fb4 - Merge drm/drm-next into drm-xe-next

Tue, 14 Jul 2026 15:40:31 +0200

Merge drm/drm-next into drm-xe-nextSync some i915/display changesSigned-off-by: Rodrigo Vivi List of files: /linux/kernel/dma/Kconfig

6d177908bad5992e17669030db41caab88041d5e - Merge drm/drm-next into drm-intel-next

Tue, 30 Jun 2026 14:55:43 +0200

Merge drm/drm-next into drm-intel-nextSync with v7.2-rc1.Signed-off-by: Jani Nikula List of files: /linux/kernel/dma/Kconfig

827b9aabd3ea3e96d5e48abed9f44dbd1e550d4e - Merge drm/drm-next into drm-misc-next

Tue, 30 Jun 2026 10:16:00 +0200

Merge drm/drm-next into drm-misc-nextBackmerging to get drm-misc-next to v7.2-rc1.Signed-off-by: Thomas Zimmermann List of files: /linux/kernel/dma/Kconfig

7dd19adaaac9a161723a24de7c270861063ec6ac - Merge tag 'v7.2-rc1' into drm-rust-next

Sun, 28 Jun 2026 22:39:43 +0200

Merge tag 'v7.2-rc1' into drm-rust-nextMerge v7.2-rc1 into drm-rust-next to start the next cycle.Devres now requires T: 'static, which conflicts with shmem::Object usingDevres> without that bound. Resolve by adding 'staticas a supertrait to DriverObject and DeviceContext, which does notrestrict any current use cases since DriverObject is always implementedon owned, refcounted types and DeviceContext is a sealed marker traitwith only unit-type implementors.If DriverObject (or DeviceContext) ever becomes lifetime-parameterized(e.g. via a GAT for TTM backed objects), the 'static supertrait can berelaxed at that point.Signed-off-by: Danilo Krummrich List of files: /linux/kernel/dma/Kconfig

0eaed89c18aeedf0898baf2dbf5ff027c6795152 - Merge tag 'timers-v7.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/daniel.lezcano/linux into timers/clocksource

Mon, 17 Aug 2026 10:29:52 +0200

Merge tag 'timers-v7.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/daniel.lezcano/linux into timers/clocksource - Use designated initializers for sh_mtu2, sh_cmt, and sh_tmu, and drop the unused initializer in the platform_device_id table for sh_mtu2 (Uwe Kleine-König) - Remove redundant dev_err()/dev_err_probe() messages when devm_request_*_irq() fails, as the helper already logs an error message (Pan Chuang) - Fix a boot hang on Allwinner D1 when a forced minimum delta is used with the sun4i timer (Felix Yan) - Fix an IRQ leak in the cpuhp_setup_state() error path by freeing the IRQ on failure in the NXP PIT driver (WenTao Liang) - Fix incorrect unmapping of shared MMIO between the clocksource and clockevent drivers. If one of them fails to initialize, the error path unmaps the shared MMIO region, leaving the other driver with an invalid mapping on clps711x (Guangshuo Li) - Make the samsung_pwm driver compatible with PREEMPT_RT by replacing regular spinlocks with raw_spinlock_t in atomic contexts (Marek Szyprowski) - Use __raw_readl() and __raw_writel() instead of ioread32() and iowrite32() to support SWAP_IO_SPACE in the rtl-otto driver (Rustam Adilov) - Fix a missing clk_disable_unprepare() call in the timer initialization error path of the Armada driver (Yuho Choi)Link: https://lore.kernel.org/lkml/75feea31-683d-45a1-87f4-ab045e0152ae@oss.qualcomm.com List of files: /linux/kernel/dma/Kconfig

b4d85f863e5a6f1fa01b186001af0f68f4f5239e - Merge branch 'next' into for-linus

Sat, 15 Aug 2026 06:26:07 +0200

Merge branch 'next' into for-linusPrepare input updates for 7.3 merge window. List of files: /linux/kernel/dma/Kconfig

76904fccf81936c084faebc73ac72c0919a42941 - Merge tag 'v7.2-rc3' into next

Tue, 14 Jul 2026 04:06:00 +0200

Merge tag 'v7.2-rc3' into nextSync up with mainline to pull in stable fixes to avoid merge conflicts. List of files: /linux/kernel/dma/Kconfig

00599d4841790d05401820a96cf7edb193888b00 - Merge drm/drm-fixes into drm-misc-fixes

Mon, 29 Jun 2026 17:58:00 +0200

Merge drm/drm-fixes into drm-misc-fixesPull in tag v7.2-rc1 so that drm-misc-fixes becomes useful again,and drm-misc-next-fixes can be closed.Signed-off-by: Maarten Lankhorst List of files: /linux/kernel/dma/Kconfig

7a0e692a0381254b2f77c54dec100cd3325a6fdf - Merge branch 'next' into for-linus

Tue, 23 Jun 2026 08:10:08 +0200

Merge branch 'next' into for-linusPrepare input updates for 7.2 merge window. List of files: /linux/kernel/dma/Kconfig

9611c0ce215a66770ccbe5c126bf57ba8c31bcad - Merge commit '6beaec3aee9852438b89e4d7891caf5e84d45851' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into gpio/for-current

Fri, 19 Jun 2026 10:50:17 +0200

Merge commit '6beaec3aee9852438b89e4d7891caf5e84d45851' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into gpio/for-currentThis pulls in the merge commit for MFD updates for v7.2. The PR containsa build-time dependency of one of the GPIO commits that will follow. List of files: /linux/kernel/dma/Kconfig

4cc14386e35030d016478b4ab9b10a6a95727003 - Merge tag 'dma-mapping-7.2-2026-06-16' of git://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux

Wed, 17 Jun 2026 21:20:21 +0200

Merge tag 'dma-mapping-7.2-2026-06-16' of git://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linuxPull dma-mapping updates from Marek Szyprowski: - added checks for DMA attributes in the debug code, especially to ensure that mappings are created and released with matching attributes (Leon Romanovsky) - better default configuration for CMA on NUMA machines (Feng Tang) - code cleanup in dma benchmark tool (Rosen Penev)* tag 'dma-mapping-7.2-2026-06-16' of git://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux: dma: map_benchmark: turn dma_sg_map_param buf into a flexible array dma-contiguous: simplify numa cma area handling dma-contiguous: add kconfig option to setup numa cma area if not configured explicitly dma-debug: Ensure mappings are created and released with matching attributes dma-debug: Feed DMA attribute for unmapping flows too dma-debug: Record DMA attributes in debug entry dma-debug: Remove unused DMA attribute parameter ntb: Use consistent DMA attributes when freeing DMA mappings ntb: Store original DMA address for future release List of files: /linux/kernel/dma/Kconfig

fff88709f9a9153af85b5224b4594caa5387ca60 - Merge tag 'v7.1-rc6' into next

Mon, 01 Jun 2026 04:43:25 +0200

Merge tag 'v7.1-rc6' into nextSync up with mainline to pull in a fix to IMS PCU driver and otherenhancements. List of files: /linux/kernel/dma/Kconfig

d5cae2261b86913e602452ce4a07e6aefc0f603b - dma-contiguous: simplify numa cma area handling

Mon, 25 May 2026 03:51:11 +0200

dma-contiguous: simplify numa cma area handlingCurrently, there are 2 kernel cmdline ways to setup numa cma area:"cma_pernuma=" and "numa_cma=", and there are 2 cma arrays as well,while they have no difference technically. Robin suggested to cleanupthe code and only use one array [1], as "the apparent intent thatusers only want one _or_ the other".Simplify the code by only using one array to save the numa cma area.And in rare case that a user really setup the 2 cmdline parametersat the same time, let the per-node specific size setting 'numa_cma='take priority over the global numa cma setting.Link[1]: https://lore.kernel.org/lkml/43c5301c-fe6a-41e4-9482-ccfc7b62f2a7@arm.com/Suggested-by: Robin Murphy Signed-off-by: Feng Tang Signed-off-by: Marek Szyprowski Link: https://lore.kernel.org/r/20260525015111.6267-1-feng.tang@linux.alibaba.com List of files: /linux/kernel/dma/Kconfig

639609b83f69fe4cd08e01423ae8e12d84484cfa - Merge branch 'arena_direct_access' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next into for-7.2

Mon, 25 May 2026 21:34:24 +0200

Merge branch 'arena_direct_access' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next into for-7.2 List of files: /linux/kernel/dma/Kconfig

7e6ace2535d032c908e4d8747d9a7952617c001a - dma-contiguous: add kconfig option to setup numa cma area if not configured explicitly

Tue, 12 May 2026 10:55:09 +0200

dma-contiguous: add kconfig option to setup numa cma area if not configured explicitlyThere was a report on a multi-numa-nodes arm64 server that when IOMMUis disabled, the dma_alloc_coherent() function always returns memoryfrom node 0 even for devices attaching to other nodes, while they canget local dma memory when IOMMU is on with the same API.The reason is, when IOMMU is disabled, the dma_alloc_coherent() willgo the direct way and call dma_alloc_contiguous(). The system doesn'thave any explicit cma setting (like per-numa cma), and only has adefault 64MB cma reserved area (on node 0), where kernel will tryfirst to allocate memory from.Robin Murphy suggested to setup pernuma cma or disable cma, which didsolve the issue. While there is still concern that for customerswhich don't have much kernel knowledge, they could still suffer fromthis silently as some architectures enable cma area by default (notan issue for X86 though, which set CONFIG_CMA_SIZE_MBYTES to 0 bydefault) for most Linux distributions.One thought is to follow the current cma reserving policy for platformwith 'CONFIG_DMA_NUMA_CMA=y', that if the numa cma (either the 'numa cma'or 'cma pernuma' method) is not explicitly configured, and the platformreally has multiple NUMA nodes, set it up according to size of default'dma_contiguous_default_area'. This way, the default behavior ofplatform with one NUMA node is kept unchanged (say embedded/smalldevices don't need to allocate extra memory), while the general dmalocality is improved.Add a new bool kernel config CONFIG_CMA_SIZE_PERNUMA to control whetherto enable it. Even when the config is enabled, user can still disableit by kernel-cmdline setting like "numa_cma=0:0" or "cma_pernuma=0".Reported-by: Changrong Chen Suggested-by: Ying Huang Suggested-by: Robin Murphy Signed-off-by: Feng Tang Link: https://lore.kernel.org/r/20260512085509.83002-1-feng.tang@linux.alibaba.comLink: https://lore.kernel.org/all/20260520222742.GA1607511@ax162/[mszyprow: squashed changes from both links, added __initdata attribute to the numa_cma_configured variable]Signed-off-by: Marek Szyprowski List of files: /linux/kernel/dma/Kconfig