redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

iommu/vt-d: Allocate space for ACPI devices

Browse source 
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
David Woodhouse 2014-03-07 14:39:27 +00:00
parent e625b4a95d
commit 07cb52ff6a
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
drivers/iommu/dmar.c
View file

@ -84,7 +84,8 @@ void *dmar_alloc_dev_scope(void *start, void *end, int *cnt)
*cnt = 0; *cnt = 0;
while (start < end) { while (start < end) {
scope = start; scope = start;
if (scope->entry_type == ACPI_DMAR_SCOPE_TYPE_ENDPOINT || if (scope->entry_type == ACPI_DMAR_SCOPE_TYPE_ACPI ||
scope->entry_type == ACPI_DMAR_SCOPE_TYPE_ENDPOINT ||
scope->entry_type == ACPI_DMAR_SCOPE_TYPE_BRIDGE) scope->entry_type == ACPI_DMAR_SCOPE_TYPE_BRIDGE)
(*cnt)++; (*cnt)++;
else if (scope->entry_type != ACPI_DMAR_SCOPE_TYPE_IOAPIC && else if (scope->entry_type != ACPI_DMAR_SCOPE_TYPE_IOAPIC &&
@ -342,21 +343,18 @@ dmar_parse_one_drhd(struct acpi_dmar_header *header)
dmaru->reg_base_addr = drhd->address; dmaru->reg_base_addr = drhd->address;
dmaru->segment = drhd->segment; dmaru->segment = drhd->segment;
dmaru->include_all = drhd->flags & 0x1; /* BIT0: INCLUDE_ALL */ dmaru->include_all = drhd->flags & 0x1; /* BIT0: INCLUDE_ALL */
if (!dmaru->include_all) { dmaru->devices = dmar_alloc_dev_scope((void *)(drhd + 1),
dmaru->devices = dmar_alloc_dev_scope((void *)(drhd + 1), ((void *)drhd) + drhd->header.length,
((void *)drhd) + drhd->header.length, &dmaru->devices_cnt);
&dmaru->devices_cnt); if (dmaru->devices_cnt && dmaru->devices == NULL) {
if (dmaru->devices_cnt && dmaru->devices == NULL) { kfree(dmaru);
kfree(dmaru); return -ENOMEM;
return -ENOMEM;
}
} }
ret = alloc_iommu(dmaru); ret = alloc_iommu(dmaru);
if (ret) { if (ret) {
if (!dmaru->include_all) dmar_free_dev_scope(&dmaru->devices,
dmar_free_dev_scope(&dmaru->devices, &dmaru->devices_cnt);
&dmaru->devices_cnt);
kfree(dmaru); kfree(dmaru);
return ret; return ret;
} }