@@ -44,9 +44,13 @@ unsigned int x86_swiotlb_flags;
static void __init pci_swiotlb_detect(void)
{
/* don't initialize swiotlb if iommu=off (no_iommu=1) */
- if (!no_iommu && max_possible_pfn > MAX_DMA32_PFN) {
- x86_swiotlb_enable = true;
+ if (no_iommu)
+ x86_swiotlb_flags |= SWIOTLB_INIT_FORCE_DISABLE;
+
+ if (max_possible_pfn > MAX_DMA32_PFN) {
x86_swiotlb_flags |= SWIOTLB_INIT_ADDRESSING_LIMIT;
+ if (!no_iommu)
+ x86_swiotlb_enable = true;
}
/*
@@ -83,7 +87,8 @@ static void __init pci_xen_swiotlb_init(void)
return;
x86_swiotlb_enable = true;
/* Xen can use a SWIOTLB pool anywhere in directly mapped memory. */
- x86_swiotlb_flags &= ~SWIOTLB_INIT_ADDRESSING_LIMIT;
+ x86_swiotlb_flags &= ~(SWIOTLB_INIT_ADDRESSING_LIMIT |
+ SWIOTLB_INIT_FORCE_DISABLE);
x86_swiotlb_flags |= SWIOTLB_INIT_REMAP | SWIOTLB_ANY;
swiotlb_init_remap(x86_swiotlb_flags, xen_swiotlb_fixup);
dma_ops = &xen_swiotlb_dma_ops;
@@ -20,6 +20,8 @@ struct scatterlist;
#define SWIOTLB_INIT_ADDRESSING_LIMIT (1 << 2)
/* Initialize a default-sized pool that requires architecture remapping. */
#define SWIOTLB_INIT_REMAP (1 << 3)
+/* Do not initialize a pool unless SWIOTLB is explicitly required. */
+#define SWIOTLB_INIT_FORCE_DISABLE (1 << 4)
/*
* Maximum allowable number of contiguous slabs to map,
@@ -563,10 +563,16 @@ swiotlb_select_pool_policy(unsigned int flags)
if (flags & SWIOTLB_INIT_REMAP)
return SWIOTLB_POOL_DEFAULT;
- if (flags & SWIOTLB_INIT_ADDRESSING_LIMIT)
+ if (swiotlb_force_bounce)
return SWIOTLB_POOL_DEFAULT;
- if (swiotlb_force_bounce)
+ /*
+ * Explicit requirements above override an architecture's default opt-out.
+ */
+ if (flags & SWIOTLB_INIT_FORCE_DISABLE)
+ return SWIOTLB_POOL_NONE;
+
+ if (flags & SWIOTLB_INIT_ADDRESSING_LIMIT)
return SWIOTLB_POOL_DEFAULT;
if (swiotlb_kmalloc_needs_bounce())
On x86, iommu=off historically prevented SWIOTLB initialization by not setting SWIOTLB_INIT_ADDRESSING_LIMIT. This overloads that flag: it controls both whether a pool is selected and where the pool is allocated. If another requirement, swiotlb=force selects a pool independently, omitting SWIOTLB_INIT_ADDRESSING_LIMIT may place it above the addressable range of devices which need bounce buffering. Add SWIOTLB_INIT_FORCE_DISABLE to let an architecture opt out of normal pool initialization without discarding the pool placement constraints. Unlike swiotlb_force_disable, which is set by swiotlb=noforce and unconditionally prevents pool initialization, the new flag is an architecture default. Explicit requirements such as memory encryption, architecture remapping, or swiotlb=force take precedence over it. iommu=soft retains SWIOTLB_INIT_ADDRESSING_LIMIT because it requests software bounce buffering for devices whose DMA masks cannot address all system memory. Such devices must be able to reach the bounce pool. Clear both flags for Xen because Xen explicitly requires a remapped SWIOTLB pool and may allocate it anywhere in directly mapped memory. With no override, iommu=off disables both hardware IOMMU translation and SWIOTLB bouncing. Direct DMA remains available; mappings outside a device's addressable range fail instead of being bounced. Signed-off-by: Aneesh Kumar K.V (Arm) <aneesh.kumar@kernel.org> --- arch/x86/kernel/pci-dma.c | 11 ++++++++--- include/linux/swiotlb.h | 2 ++ kernel/dma/swiotlb.c | 10 ++++++++-- 3 files changed, 18 insertions(+), 5 deletions(-)