Skip to contentSkip to conversation

Fix pci_unmap_addr() et al on i386.

PATCH New David Woodhouse 1 participant 1 message Jul 1, 2009 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix pci_unmap_addr() et al on i386.

We can run a 32-bit kernel on boxes with an IOMMU, so we need pci_unmap_addr() etc. to work -- without it, drivers will leak mappings.

To be honest, this whole thing looks like it's more pain than it's worth; I'm half inclined to remove the no-op #else case altogether.

But this is the minimal fix, which just does the right thing if CONFIG_DMAR is set.

---
Needed in 2.6.30, but not earlier because you can't enable CONFIG_DMAR before that. Jörg, if you ever enable the AMD IOMMU in 32-bit mode you may have to fix this again (unless we just make it unconditionally do the right thing, which probably gets my vote).

arch/x86/include/asm/pci.h +1 -1
index 927958d..1ff685c 100644
@@ -91,7 +91,7 @@ extern void pci_iommu_alloc(void);
 
 #define PCI_DMA_BUS_IS_PHYS (dma_ops->is_phys)
 
-#if defined(CONFIG_X86_64) || defined(CONFIG_DMA_API_DEBUG)
+#if defined(CONFIG_X86_64) || defined(CONFIG_DMAR) || defined(CONFIG_DMA_API_DEBUG)
 
 #define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)       \
 	        dma_addr_t ADDR_NAME;
Signature · 2 lines
David Woodhouse                            Open Source Technology Centre
[email protected]                              Intel Corporation