Messages in this thread | | | Date | Fri, 24 Oct 2008 13:39:06 +0200 | From | Ingo Molnar <> | Subject | Re: [GIT *] iommu fixes for 2.6.28 |
| |
* FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> wrote:
> On Fri, 24 Oct 2008 13:22:17 +0200 > Ingo Molnar <mingo@elte.hu> wrote: > > > * FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> wrote: > > > > > On Fri, 24 Oct 2008 13:01:25 +0200 > > > Ingo Molnar <mingo@elte.hu> wrote: > > > > > > > > > > > * David Woodhouse <dwmw2@infradead.org> wrote: > > > > > > > > > This contains a few iommu-related fixes -- it restores DMA remapping > > > > > on newer Intel hardware, which was disabled by the interrupt remapping > > > > > patches, adds IA64 support for the Intel IOMMU, and some other small > > > > > fixes. > > > > > > > > > > MAINTAINERS | 7 + > > > > > arch/x86/kernel/amd_iommu_init.c | 2 +- > > > > > arch/x86/kernel/pci-dma.c | 16 --- > > > > > drivers/pci/dmar.c | 119 +++++++++++++----- > > > > > drivers/pci/intel-iommu.c | 250 ++++++++++++++++++++------------------ > > > > > drivers/pci/quirks.c | 14 ++ > > > > > include/asm-x86/iommu.h | 4 + > > > > > include/linux/dma_remapping.h | 27 ++-- > > > > > include/linux/intel-iommu.h | 66 ++++++++--- > > > > > 9 files changed, 305 insertions(+), 200 deletions(-) > > > > > > > > hm, i just updated to v2.6.28-rc1, and these changes broke the x86 > > > > 32-bit build: > > > > > > > > arch/x86/kernel/built-in.o: In function `dma_supported': > > > > (.text+0x5797): undefined reference to `forbid_dac' > > > > arch/x86/kernel/built-in.o: In function `iommu_setup': > > > > pci-dma.c:(.init.text+0x326c): undefined reference to `forbid_dac' > > > > pci-dma.c:(.init.text+0x328b): undefined reference to `forbid_dac' > > > > pci-dma.c:(.init.text+0x32aa): undefined reference to `forbid_dac' > > > > > > > > seems to be caused by: > > > > > > > > 5b6985c: intel-iommu: IA64 support > > > > > > http://marc.info/?l=linux-kernel&m=122480590627590&w=2 > > > > > > > > > Sharing forbid_dac between IA64 and X86 doesn't make sense and IA64 > > > doesn't even use forbid_dac... Reverting the forbid_dac relocation is > > > the right fix, I think. > > > > could you send a patch for it please? Commit 5b6985c does many things at > > once so the revert is not trivial. > > The above Fenghua's patch exactly does what I said (reverting the > forbid_dac relocation, which the commit 5b6985c did).
ah, cool - it's a partial revert and i assumed the 'revert' you referenced was a full revert of 5b6985c.
This partial revert should go via the PCI tree i guess?
Ingo
| |