Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-09-28 19:03:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

x64, x2apic/intr-remap: use CONFIG_DMAR for DMA-remapping specific code

Browse Source 
DMA remapping specific code covered with CONFIG_DMAR in
the generic code which will also be used later for enabling Interrupt-remapping.

Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: akpm@linux-foundation.org
Cc: arjan@linux.intel.com
Cc: andi@firstfloor.org
Cc: ebiederm@xmission.com
Cc: jbarnes@virtuousgeek.org
Cc: steiner@sgi.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Suresh Siddha 2008-07-10 11:16:38 -07:00 committed by Ingo Molnar
parent 1886e8a90a
commit aaa9d1dd63
1 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/pci/dmar.c
View File

@ -39,7 +39,6 @@
* these units are not supported by the architecture. * these units are not supported by the architecture.
*/ */
LIST_HEAD(dmar_drhd_units); LIST_HEAD(dmar_drhd_units);
LIST_HEAD(dmar_rmrr_units);
static struct acpi_table_header * __initdata dmar_tbl; static struct acpi_table_header * __initdata dmar_tbl;
@ -55,11 +54,6 @@ static void __init dmar_register_drhd_unit(struct dmar_drhd_unit *drhd)
list_add(&drhd->list, &dmar_drhd_units); list_add(&drhd->list, &dmar_drhd_units);
} }
static void __init dmar_register_rmrr_unit(struct dmar_rmrr_unit *rmrr)
{
list_add(&rmrr->list, &dmar_rmrr_units);
}
static int __init dmar_parse_one_dev_scope(struct acpi_dmar_device_scope *scope, static int __init dmar_parse_one_dev_scope(struct acpi_dmar_device_scope *scope,
struct pci_dev **dev, u16 segment) struct pci_dev **dev, u16 segment)
{ {
@ -224,6 +218,15 @@ dmar_parse_dev(struct dmar_drhd_unit *dmaru)
return ret; return ret;
} }
#ifdef CONFIG_DMAR
LIST_HEAD(dmar_rmrr_units);
static void __init dmar_register_rmrr_unit(struct dmar_rmrr_unit *rmrr)
{
list_add(&rmrr->list, &dmar_rmrr_units);
}
static int __init static int __init
dmar_parse_one_rmrr(struct acpi_dmar_header *header) dmar_parse_one_rmrr(struct acpi_dmar_header *header)
{ {
@ -260,6 +263,7 @@ rmrr_parse_dev(struct dmar_rmrr_unit *rmrru)
} }
return ret; return ret;
} }
#endif
static void __init static void __init
dmar_table_print_dmar_entry(struct acpi_dmar_header *header) dmar_table_print_dmar_entry(struct acpi_dmar_header *header)
@ -284,6 +288,7 @@ dmar_table_print_dmar_entry(struct acpi_dmar_header *header)
} }
} }
/** /**
* parse_dmar_table - parses the DMA reporting table * parse_dmar_table - parses the DMA reporting table
*/ */
@ -316,7 +321,9 @@ parse_dmar_table(void)
ret = dmar_parse_one_drhd(entry_header); ret = dmar_parse_one_drhd(entry_header);
break; break;
case ACPI_DMAR_TYPE_RESERVED_MEMORY: case ACPI_DMAR_TYPE_RESERVED_MEMORY:
#ifdef CONFIG_DMAR
ret = dmar_parse_one_rmrr(entry_header); ret = dmar_parse_one_rmrr(entry_header);
#endif
break; break;
default: default:
printk(KERN_WARNING PREFIX printk(KERN_WARNING PREFIX
@ -366,7 +373,6 @@ dmar_find_matched_drhd_unit(struct pci_dev *dev)
int __init dmar_dev_scope_init(void) int __init dmar_dev_scope_init(void)
{ {
struct dmar_drhd_unit *drhd; struct dmar_drhd_unit *drhd;
struct dmar_rmrr_unit *rmrr;
int ret = -ENODEV; int ret = -ENODEV;
for_each_drhd_unit(drhd) { for_each_drhd_unit(drhd) {
@ -375,11 +381,16 @@ int __init dmar_dev_scope_init(void)
return ret; return ret;
} }
for_each_rmrr_units(rmrr) { #ifdef CONFIG_DMAR
ret = rmrr_parse_dev(rmrr); {
if (ret) struct dmar_rmrr_unit *rmrr;
return ret; for_each_rmrr_units(rmrr) {
ret = rmrr_parse_dev(rmrr);
if (ret)
return ret;
}
} }
#endif
return ret; return ret;
} }
@ -407,10 +418,12 @@ int __init dmar_table_init(void)
return -ENODEV; return -ENODEV;
} }
#ifdef CONFIG_DMAR
if (list_empty(&dmar_rmrr_units)) { if (list_empty(&dmar_rmrr_units)) {
printk(KERN_INFO PREFIX "No RMRR found\n"); printk(KERN_INFO PREFIX "No RMRR found\n");
return -ENODEV; return -ENODEV;
} }
#endif
return 0; return 0;
} }