Skip to content

Commit

Permalink
iommu/vt-d, trivial: simplify code with existing macros
Browse files Browse the repository at this point in the history 
Simplify vt-d related code with existing macros and introduce a new
macro for_each_active_drhd_unit() to enumerate all active DRHD unit.

Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Signed-off-by: Joerg Roedel <joro@8bytes.org>
  • Loading branch information
@joergroedel
Jiang Liu authored and joergroedel committed Jan 9, 2014
1 parent 2fe2c60 commit 7c91977
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 68 deletions.
7 changes: 3 additions & 4 deletions drivers/iommu/dmar.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1305,15 +1305,14 @@ int dmar_set_interrupt(struct intel_iommu *iommu)
int __init enable_drhd_fault_handling(void)
{
struct dmar_drhd_unit *drhd;
struct intel_iommu *iommu;

/*
* Enable fault control interrupt.
*/
for_each_drhd_unit(drhd) {
int ret;
struct intel_iommu *iommu = drhd->iommu;
for_each_iommu(iommu, drhd) {
u32 fault_status;
ret = dmar_set_interrupt(iommu);
int ret = dmar_set_interrupt(iommu);

if (ret) {
pr_err("DRHD %Lx: failed to enable fault, interrupt, ret %d\n",
Expand Down
55 changes: 12 additions & 43 deletions drivers/iommu/intel-iommu.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -628,9 +628,7 @@ static struct intel_iommu *device_to_iommu(int segment, u8 bus, u8 devfn)
struct dmar_drhd_unit *drhd = NULL;
int i;

for_each_drhd_unit(drhd) {
if (drhd->ignored)
continue;
for_each_active_drhd_unit(drhd) {
if (segment != drhd->segment)
continue;

Expand Down Expand Up @@ -2470,11 +2468,7 @@ static int __init init_dmars(void)
goto error;
}

for_each_drhd_unit(drhd) {
if (drhd->ignored)
continue;

iommu = drhd->iommu;
for_each_active_iommu(iommu, drhd) {
g_iommus[iommu->seq_id] = iommu;

ret = iommu_init_domains(iommu);
Expand All @@ -2498,12 +2492,7 @@ static int __init init_dmars(void)
/*
* Start from the sane iommu hardware state.
*/
for_each_drhd_unit(drhd) {
if (drhd->ignored)
continue;

iommu = drhd->iommu;

for_each_active_iommu(iommu, drhd) {
/*
* If the queued invalidation is already initialized by us
* (for example, while enabling interrupt-remapping) then
Expand All @@ -2523,12 +2512,7 @@ static int __init init_dmars(void)
dmar_disable_qi(iommu);
}

for_each_drhd_unit(drhd) {
if (drhd->ignored)
continue;

iommu = drhd->iommu;

for_each_active_iommu(iommu, drhd) {
if (dmar_enable_qi(iommu)) {
/*
* Queued Invalidate not enabled, use Register Based
Expand Down Expand Up @@ -2611,17 +2595,16 @@ static int __init init_dmars(void)
* global invalidate iotlb
* enable translation
*/
for_each_drhd_unit(drhd) {
for_each_iommu(iommu, drhd) {
if (drhd->ignored) {
/*
* we always have to disable PMRs or DMA may fail on
* this device
*/
if (force_on)
iommu_disable_protect_mem_regions(drhd->iommu);
iommu_disable_protect_mem_regions(iommu);
continue;
}
iommu = drhd->iommu;

iommu_flush_write_buffer(iommu);

Expand All @@ -2643,12 +2626,8 @@ static int __init init_dmars(void)

return 0;
error:
for_each_drhd_unit(drhd) {
if (drhd->ignored)
continue;
iommu = drhd->iommu;
for_each_active_iommu(iommu, drhd)
free_iommu(iommu);
}
kfree(g_iommus);
return ret;
}
Expand Down Expand Up @@ -3296,9 +3275,9 @@ static void __init init_no_remapping_devices(void)
}
}

for_each_drhd_unit(drhd) {
for_each_active_drhd_unit(drhd) {
int i;
if (drhd->ignored || drhd->include_all)
if (drhd->include_all)
continue;

for (i = 0; i < drhd->devices_cnt; i++)
Expand Down Expand Up @@ -3647,6 +3626,7 @@ int __init intel_iommu_init(void)
{
int ret = 0;
struct dmar_drhd_unit *drhd;
struct intel_iommu *iommu;

/* VT-d is required for a TXT/tboot launch, so enforce that */
force_on = tboot_force_iommu();
Expand All @@ -3660,16 +3640,9 @@ int __init intel_iommu_init(void)
/*
* Disable translation if already enabled prior to OS handover.
*/
for_each_drhd_unit(drhd) {
struct intel_iommu *iommu;

if (drhd->ignored)
continue;

iommu = drhd->iommu;
for_each_active_iommu(iommu, drhd)
if (iommu->gcmd & DMA_GCMD_TE)
iommu_disable_translation(iommu);
}

if (dmar_dev_scope_init() < 0) {
if (force_on)
Expand Down Expand Up @@ -3912,11 +3885,7 @@ static void iommu_free_vm_domain(struct dmar_domain *domain)
unsigned long i;
unsigned long ndomains;

for_each_drhd_unit(drhd) {
if (drhd->ignored)
continue;
iommu = drhd->iommu;

for_each_active_iommu(iommu, drhd) {
ndomains = cap_ndoms(iommu->cap);
for_each_set_bit(i, iommu->domain_ids, ndomains) {
if (iommu->domains[i] == domain) {
Expand Down
31 changes: 10 additions & 21 deletions drivers/iommu/intel_irq_remapping.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -520,6 +520,7 @@ static int __init dmar_x2apic_optout(void)
static int __init intel_irq_remapping_supported(void)
{
struct dmar_drhd_unit *drhd;
struct intel_iommu *iommu;

if (disable_irq_remap)
return 0;
Expand All @@ -538,19 +539,17 @@ static int __init intel_irq_remapping_supported(void)
if (!dmar_ir_support())
return 0;

for_each_drhd_unit(drhd) {
struct intel_iommu *iommu = drhd->iommu;

for_each_iommu(iommu, drhd)
if (!ecap_ir_support(iommu->ecap))
return 0;
}

return 1;
}

static int __init intel_enable_irq_remapping(void)
{
struct dmar_drhd_unit *drhd;
struct intel_iommu *iommu;
bool x2apic_present;
int setup = 0;
int eim = 0;
Expand All @@ -573,9 +572,7 @@ static int __init intel_enable_irq_remapping(void)
"Use 'intremap=no_x2apic_optout' to override BIOS request.\n");
}

for_each_drhd_unit(drhd) {
struct intel_iommu *iommu = drhd->iommu;

for_each_iommu(iommu, drhd) {
/*
* If the queued invalidation is already initialized,
* shouldn't disable it.
Expand All @@ -600,9 +597,7 @@ static int __init intel_enable_irq_remapping(void)
/*
* check for the Interrupt-remapping support
*/
for_each_drhd_unit(drhd) {
struct intel_iommu *iommu = drhd->iommu;

for_each_iommu(iommu, drhd) {
if (!ecap_ir_support(iommu->ecap))
continue;

Expand All @@ -616,10 +611,8 @@ static int __init intel_enable_irq_remapping(void)
/*
* Enable queued invalidation for all the DRHD's.
*/
for_each_drhd_unit(drhd) {
int ret;
struct intel_iommu *iommu = drhd->iommu;
ret = dmar_enable_qi(iommu);
for_each_iommu(iommu, drhd) {
int ret = dmar_enable_qi(iommu);

if (ret) {
printk(KERN_ERR "DRHD %Lx: failed to enable queued, "
Expand All @@ -632,9 +625,7 @@ static int __init intel_enable_irq_remapping(void)
/*
* Setup Interrupt-remapping for all the DRHD's now.
*/
for_each_drhd_unit(drhd) {
struct intel_iommu *iommu = drhd->iommu;

for_each_iommu(iommu, drhd) {
if (!ecap_ir_support(iommu->ecap))
continue;

Expand Down Expand Up @@ -778,19 +769,17 @@ static int ir_parse_ioapic_hpet_scope(struct acpi_dmar_header *header,
static int __init parse_ioapics_under_ir(void)
{
struct dmar_drhd_unit *drhd;
struct intel_iommu *iommu;
int ir_supported = 0;
int ioapic_idx;

for_each_drhd_unit(drhd) {
struct intel_iommu *iommu = drhd->iommu;

for_each_iommu(iommu, drhd)
if (ecap_ir_support(iommu->ecap)) {
if (ir_parse_ioapic_hpet_scope(drhd->hdr, iommu))
return -1;

ir_supported = 1;
}
}

if (!ir_supported)
return 0;
Expand Down
4 changes: 4 additions & 0 deletions include/linux/dmar.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@ extern struct list_head dmar_drhd_units;
#define for_each_drhd_unit(drhd) \
list_for_each_entry(drhd, &dmar_drhd_units, list)

#define for_each_active_drhd_unit(drhd) \
list_for_each_entry(drhd, &dmar_drhd_units, list) \
if (drhd->ignored) {} else

#define for_each_active_iommu(i, drhd) \
list_for_each_entry(drhd, &dmar_drhd_units, list) \
if (i=drhd->iommu, drhd->ignored) {} else
Expand Down

0 comments on commit 7c91977

Please sign in to comment.