Commit f6239c2a authored by Andrew Cooper's avatar Andrew Cooper

IOMMU: add crash_shutdown iommu_op

The kdump kernel has problems booting with interrupt/dma
remapping enabled, so we need a new iommu_ops called
crash_shutdown which is basically suspend but doesn't
need to bother saving state.

Make sure that crash_shutdown is called on the kexec
path.
Signed-off-by: default avatarAndrew Cooper <andrew.cooper3@citrix.com>
parent 46f39125
......@@ -77,6 +77,10 @@ static void nmi_shootdown_cpus(void)
msecs--;
}
/* Crash shutdown any IOMMU functionality as the crashdump kernel is not
* happy when booting if interrupt/dma remapping is still enabled */
iommu_crash_shutdown();
__stop_this_cpu();
disable_IO_APIC();
}
......
......@@ -456,4 +456,5 @@ const struct iommu_ops amd_iommu_ops = {
.suspend = amd_iommu_suspend,
.resume = amd_iommu_resume,
.share_p2m = amd_iommu_share_p2m,
.crash_shutdown = amd_iommu_suspend,
};
......@@ -432,6 +432,14 @@ void iommu_share_p2m_table(struct domain* d)
ops->share_p2m(d);
}
void iommu_crash_shutdown(void)
{
const struct iommu_ops *ops = iommu_get_ops();
if ( iommu_enabled )
ops->crash_shutdown();
iommu_enabled = 0;
}
/*
* Local variables:
* mode: C
......
......@@ -2235,6 +2235,25 @@ static void vtd_suspend(void)
}
}
static void vtd_crash_shutdown(void)
{
struct acpi_drhd_unit *drhd;
struct iommu *iommu;
if ( !iommu_enabled )
return;
iommu_flush_all();
for_each_drhd_unit ( drhd )
{
iommu = drhd->iommu;
iommu_disable_translation(iommu);
disable_intremap(drhd->iommu);
disable_qinval(drhd->iommu);
}
}
static void vtd_resume(void)
{
struct acpi_drhd_unit *drhd;
......@@ -2286,6 +2305,7 @@ const struct iommu_ops intel_iommu_ops = {
.suspend = vtd_suspend,
.resume = vtd_resume,
.share_p2m = iommu_set_pgd,
.crash_shutdown = vtd_crash_shutdown,
};
/*
......
......@@ -102,6 +102,7 @@ extern void *shared_intremap_table;
/* power management support */
void amd_iommu_resume(void);
void amd_iommu_suspend(void);
void amd_iommu_crash_shutdown(void);
static inline u32 get_field_from_reg_u32(u32 reg_value, u32 mask, u32 shift)
{
......
......@@ -133,6 +133,7 @@ struct iommu_ops {
void (*suspend)(void);
void (*resume)(void);
void (*share_p2m)(struct domain *d);
void (*crash_shutdown)(void);
};
void iommu_update_ire_from_apic(unsigned int apic, unsigned int reg, unsigned int value);
......@@ -142,6 +143,7 @@ unsigned int iommu_read_apic_from_ire(unsigned int apic, unsigned int reg);
void iommu_suspend(void);
void iommu_resume(void);
void iommu_crash_shutdown(void);
void iommu_set_dom0_mapping(struct domain *d);
void iommu_share_p2m_table(struct domain *d);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment