Skip to contentSkip to conversation

IOMMU fixes and updates

GIT PULL Joerg Roedel 1 participant 1 message Mar 9, 2010

lore
Share & tools
lore
#0 lore raw

Hi Linus,

I know that this pull-request comes too late, but these changes had kvm dependencies (this is the reason I didn't sent these changes via Ingo). The KVM changes appeared in your tree last friday and as I checked my prepared branch against the result I found out that the KVM people rebased the branch I put the largepage changes on. So I had to rebase my largepage branch too to eliminate the old commits and put a new pull-branch together.
Sadly the KVM branch was rebased to some stage of your tree in the merge window which didn't even boot my test machine. So I spent the whole day yesterday to get the result booting and tested. After finding the reason for the boot crash I passed this issue to Boris which sent a fix for this one (see http://lkml.org/lkml/2010/3/8/199). Here is the tested result. With Boris fix it boots and has no know regressions. Please consider to pull these changes. If you decide thats too late to pull this it has to wait for the next merge window.

Anyway:

The following changes since commit 57d54889cd00db2752994b389ba714138652e60c:
Linus Torvalds (1):

        Linux 2.6.34-rc1

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu.git iommu/updates-2.6.34

Chris Wright (1):
x86/amd-iommu: Pt mode fix for domain_destroy

Joerg Roedel (14):
x86/amd-iommu: Protect IOMMU-API map/unmap path
x86/amd-iommu: Report errors in acpi parsing functions upstream
iommu-api: Rename ->{un}map function pointers to ->{un}map_range
iommu-api: Add iommu_map and iommu_unmap functions
iommu-api: Add ->{un}map callbacks to iommu_ops
VT-d: Change {un}map_range functions to implement {un}map interface
kvm: Change kvm_iommu_map_pages to map large pages
x86/amd-iommu: Make iommu_map_page and alloc_pte aware of page sizes x86/amd-iommu: Make iommu_unmap_page and fetch_pte aware of page sizes x86/amd-iommu: Make amd_iommu_iova_to_phys aware of multiple page sizes x86/amd-iommu: Implement ->{un}map callbacks for iommu-api
iommu-api: Remove iommu_{un}map_range functions
x86/amd-iommu: Use helper function to destroy domain
Merge branches 'iommu/largepages' and 'amd-iommu/fixes' into iommu/updates-2.6.34

Julia Lawall (1):
x86/amd-iommu: Remove double NULL check in check_device

 arch/x86/include/asm/amd_iommu_types.h |   36 ++++++
 arch/x86/kernel/amd_iommu.c            |  210 +++++++++++++++++++++-----------
 arch/x86/kernel/amd_iommu_init.c       |   38 ++++--
 drivers/base/iommu.c                   |   43 +++++--
 drivers/pci/intel-iommu.c              |   22 ++--
 include/linux/iommu.h                  |   24 ++--
 virt/kvm/iommu.c                       |  113 ++++++++++++++----
 7 files changed, 343 insertions(+), 143 deletions(-)