Patch "swiotlb: Convert swiotlb_force from int to enum" has been added to the 4.9-stable tree
Subsystems (9)
This is a note to let you know that I've just added the patch titled
swiotlb: Convert swiotlb_force from int to enum
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
swiotlb-convert-swiotlb_force-from-int-to-enum.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
ae7871be189cb41184f1e05742b4a99e2c59774dMon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <[email protected]>
Date: Fri, 16 Dec 2016 14:28:41 +0100
Subject: swiotlb: Convert swiotlb_force from int to enum
From: Geert Uytterhoeven <[email protected]>
commit ae7871be189cb41184f1e05742b4a99e2c59774d upstream.
Convert the flag swiotlb_force from an int to an enum, to prepare for the advent of more possible values.
--- arch/arm64/mm/dma-mapping.c | 3 ++- arch/arm64/mm/init.c | 3 ++- arch/x86/kernel/pci-swiotlb.c | 2 +- arch/x86/xen/pci-swiotlb-xen.c | 2 +- drivers/xen/swiotlb-xen.c | 4 ++-- include/linux/swiotlb.h | 7 ++++++- include/trace/events/swiotlb.h | 16 +++++++++------- lib/swiotlb.c | 8 ++++---- 8 files changed, 27 insertions(+), 18 deletions(-)
arch/arm64/mm/dma-mapping.c +2 -1
@@ -524,7 +524,8 @@ EXPORT_SYMBOL(dummy_dma_ops);static int __init arm64_dma_init (void ) { -if (swiotlb_force || max_pfn > (arm64_dma_phys_limit >>PAGE_SHIFT )) +if (swiotlb_force ==SWIOTLB_FORCE || + max_pfn > (arm64_dma_phys_limit >>PAGE_SHIFT )) swiotlb =1 ;return atomic_pool_init ();
arch/arm64/mm/init.c +2 -1
@@ -401,7 +401,8 @@ static void __init free_unused_memmap(vo*/ void __init mem_init (void ) { -if (swiotlb_force || max_pfn > (arm64_dma_phys_limit >>PAGE_SHIFT )) +if (swiotlb_force ==SWIOTLB_FORCE || + max_pfn > (arm64_dma_phys_limit >>PAGE_SHIFT ))swiotlb_init (1 );else swiotlb_force =SWIOTLB_NO_FORCE ;
arch/x86/kernel/pci-swiotlb.c +1 -1
@@ -70,7 +70,7 @@ int __init pci_swiotlb_detect_override(v {int use_swiotlb = swiotlb | swiotlb_force; -if (swiotlb_force) +if (swiotlb_force ==SWIOTLB_FORCE ) swiotlb =1 ;return use_swiotlb;
arch/x86/xen/pci-swiotlb-xen.c +1 -1
@@ -49,7 +49,7 @@ int __init pci_xen_swiotlb_detect(void)* activate this IOMMU. If running as PV privileged, activate it * irregardless. */ -if ((xen_initial_domain () || swiotlb || swiotlb_force)) +if (xen_initial_domain () || swiotlb || swiotlb_force ==SWIOTLB_FORCE ) xen_swiotlb =1 ;/* If we are running under Xen, we MUST disable the native SWIOTLB.
drivers/xen/swiotlb-xen.c +2 -2
@@ -392,7 +392,7 @@ dma_addr_t xen_swiotlb_map_page(struct dif (dma_capable (dev, dev_addr, size) && !range_straddles_page_boundary (phys, size) && !xen_arch_need_swiotlb (dev, phys, dev_addr) && - !swiotlb_force) { + (swiotlb_force !=SWIOTLB_FORCE )) {/* we are not interested in the dma_addr returned by * xen_dma_map_page, only in the potential cache flushes executed * by the function. */
@@ -549,7 +549,7 @@ xen_swiotlb_map_sg_attrs(struct device *phys_addr_t paddr =sg_phys (sg);dma_addr_t dev_addr =xen_phys_to_bus (paddr); -if (swiotlb_force || +if (swiotlb_force ==SWIOTLB_FORCE ||xen_arch_need_swiotlb (hwdev, paddr, dev_addr) || !dma_capable (hwdev, dev_addr, sg->length) ||range_straddles_page_boundary (paddr, sg->length)) {
include/linux/swiotlb.h +6 -1
@@ -9,7 +9,12 @@ struct device;struct page ;struct scatterlist ; -extern int swiotlb_force; +enum swiotlb_force { +SWIOTLB_NORMAL ,/* Default - depending on HW DMA mask etc. */ +SWIOTLB_FORCE ,/* swiotlb=force */ +}; + +extern enum swiotlb_force swiotlb_force;/* * Maximum allowable number of contiguous slabs to map,
include/trace/events/swiotlb.h +9 -7
@@ -11,16 +11,16 @@ TRACE_EVENT(swiotlb_bounced, TP_PROTO(struct device *dev, dma_addr_t dev_addr, size_t size, - int swiotlb_force), + enum swiotlb_force swiotlb_force), TP_ARGS(dev, dev_addr, size, swiotlb_force), TP_STRUCT__entry( - __string( dev_name, dev_name(dev) ) -__field (u64 ,dma_mask ) -__field ( dma_addr_t, dev_addr ) -__field ( size_t, size ) -__field ( int, swiotlb_force ) + __string( dev_name, dev_name(dev) ) + __field( u64, dma_mask ) + __field( dma_addr_t, dev_addr ) + __field( size_t, size ) + __field( enum swiotlb_force, swiotlb_force ) ), TP_fast_assign(
@@ -37,7 +37,9 @@ TRACE_EVENT(swiotlb_bounced, __entry->dma_mask, (unsigned long long )__entry->dev_addr, __entry->size, - __entry->swiotlb_force ? "swiotlb_force" : "" ) +__print_symbolic (__entry->swiotlb_force, + { SWIOTLB_NORMAL, "NORMAL" }, + { SWIOTLB_FORCE, "FORCE" })) );#endif /* _TRACE_SWIOTLB_H */
lib/swiotlb.c +4 -4
@@ -53,7 +53,7 @@*/ #define IO_TLB_MIN_SLABS ((1<<20) >> IO_TLB_SHIFT) -int swiotlb_force; +enum swiotlb_force swiotlb_force;/* * Used to do a quick range check in swiotlb_tbl_unmap_single and
@@ -107,7 +107,7 @@ setup_io_tlb_npages(char *str)if (*str ==',' ) ++str;if (!strcmp (str,"force" )) - swiotlb_force =1 ; + swiotlb_force =SWIOTLB_FORCE ;return 0 ; }
@@ -749,7 +749,7 @@ dma_addr_t swiotlb_map_page(struct devic* we can safely return the device addr and not worry about bounce * buffering it. */ -if (dma_capable (dev, dev_addr, size) && !swiotlb_force) +if (dma_capable (dev, dev_addr, size) && swiotlb_force !=SWIOTLB_FORCE )return dev_addr;trace_swiotlb_bounced (dev, dev_addr, size, swiotlb_force);
@@ -888,7 +888,7 @@ swiotlb_map_sg_attrs(struct device *hwdephys_addr_t paddr =sg_phys (sg);dma_addr_t dev_addr =phys_to_dma (hwdev, paddr); -if (swiotlb_force || +if (swiotlb_force ==SWIOTLB_FORCE || !dma_capable (hwdev, dev_addr, sg->length)) {phys_addr_t map =map_single (hwdev,sg_phys (sg), sg->length, dir);
Patches currently in stable-queue which might be from [email protected] are
queue-4.9/arm-dts-r8a7794-use-sysc-always-on-pm-domain-for-sound.patch queue-4.9/arm-dts-r8a7794-remove-z-clock.patch queue-4.9/arm64-fix-swiotlb-fallback-allocation.patch queue-4.9/swiotlb-add-swiotlb-noforce-debug-option.patch queue-4.9/swiotlb-convert-swiotlb_force-from-int-to-enum.patch