lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'amd-iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into x86/urgent

Browse Source
This commit is contained in:
Ingo Molnar
2009-07-03 14:35:02 +02:00
parent c7210e1ff8 1bc6f83813
commit 22a26e6663
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
arch/x86/kernel/amd_iommu_init.c
View File

@@ -472,6 +472,8 @@ static u8 * __init alloc_event_buffer(struct amd_iommu *iommu)
if (iommu->evt_buf == NULL) if (iommu->evt_buf == NULL)
return NULL; return NULL;
iommu->evt_buf_size = EVT_BUFFER_SIZE;
return iommu->evt_buf; return iommu->evt_buf;
} }
@@ -691,6 +693,7 @@ static void __init init_iommu_from_acpi(struct amd_iommu *iommu,
devid = e->devid; devid = e->devid;
devid_to = e->ext >> 8; devid_to = e->ext >> 8;
set_dev_entry_from_acpi(iommu, devid , e->flags, 0);
set_dev_entry_from_acpi(iommu, devid_to, e->flags, 0); set_dev_entry_from_acpi(iommu, devid_to, e->flags, 0);
amd_iommu_alias_table[devid] = devid_to; amd_iommu_alias_table[devid] = devid_to;
break; break;
@@ -749,11 +752,13 @@ static void __init init_iommu_from_acpi(struct amd_iommu *iommu,
devid = e->devid; devid = e->devid;
for (dev_i = devid_start; dev_i <= devid; ++dev_i) { for (dev_i = devid_start; dev_i <= devid; ++dev_i) {
if (alias) if (alias) {
amd_iommu_alias_table[dev_i] = devid_to; amd_iommu_alias_table[dev_i] = devid_to;
set_dev_entry_from_acpi(iommu, set_dev_entry_from_acpi(iommu,
amd_iommu_alias_table[dev_i], devid_to, flags, ext_flags);
flags, ext_flags); }
set_dev_entry_from_acpi(iommu, dev_i,
flags, ext_flags);
} }
break; break;
default: default: