Commit bb3a6b78 authored by Jiang Liu's avatar Jiang Liu Committed by Joerg Roedel
Browse files

iommu/vt-d: Factor out dmar_alloc_dev_scope() for later reuse 



Factor out function dmar_alloc_dev_scope() from dmar_parse_dev_scope()
for later reuse.

Signed-off-by: default avatarJiang Liu <jiang.liu@linux.intel.com>
Signed-off-by: default avatarJoerg Roedel <joro@8bytes.org>
parent 7e7dfab7

drivers/iommu/dmar.c

+16 −12
Original line number Diff line number Diff line
@@ -117,13 +117,9 @@ static int __init dmar_parse_one_dev_scope(struct acpi_dmar_device_scope *scope, 
	return 0;

}



int __init dmar_parse_dev_scope(void *start, void *end, int *cnt,

				struct pci_dev ***devices, u16 segment)

void *dmar_alloc_dev_scope(void *start, void *end, int *cnt)

{

	struct acpi_dmar_device_scope *scope;

	void * tmp = start;

	int index;

	int ret;



	*cnt = 0;

	while (start < end) {
@@ -138,15 +134,24 @@ int __init dmar_parse_dev_scope(void *start, void *end, int *cnt, 
		start += scope->length;

	}

	if (*cnt == 0)

		return 0;

		return NULL;



	return kcalloc(*cnt, sizeof(struct pci_dev *), GFP_KERNEL);

}



	*devices = kcalloc(*cnt, sizeof(struct pci_dev *), GFP_KERNEL);

	if (!*devices)

int __init dmar_parse_dev_scope(void *start, void *end, int *cnt,

				struct pci_dev ***devices, u16 segment)

{

	struct acpi_dmar_device_scope *scope;

	int index, ret;



	*devices = dmar_alloc_dev_scope(start, end, cnt);

	if (*cnt == 0)

		return 0;

	else if (!*devices)

		return -ENOMEM;



	start = tmp;

	index = 0;

	while (start < end) {

	for (index = 0; start < end; start += scope->length) {

		scope = start;

		if (scope->entry_type == ACPI_DMAR_SCOPE_TYPE_ENDPOINT ||

		    scope->entry_type == ACPI_DMAR_SCOPE_TYPE_BRIDGE) {
@@ -158,7 +163,6 @@ int __init dmar_parse_dev_scope(void *start, void *end, int *cnt, 
			}

			index ++;

		}

		start += scope->length;

	}



	return 0;

include/linux/dmar.h

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ extern int dmar_table_init(void); 
extern int dmar_dev_scope_init(void);

extern int dmar_parse_dev_scope(void *start, void *end, int *cnt,

				struct pci_dev ***devices, u16 segment);

extern void *dmar_alloc_dev_scope(void *start, void *end, int *cnt);

extern void dmar_free_dev_scope(struct pci_dev ***devices, int *cnt);



/* Intel IOMMU detection */