| Message ID | 1344372489-14087-1-git-send-email-seth.forshee@canonical.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, 2012-08-07 at 15:48 -0500, Seth Forshee wrote: > The ACPI tables in the Macbook Air 5,1 define a single IOAPIC with id 2, > but the only remapping unit described in the DMAR table matches id 0. > Interrupt remapping fails as a result, and the kernel panics with the > message "timer doesn't work through Interrupt-remapped IO-APIC." > > To fix this, check each IOAPIC for a corresponding IOMMU. If an IOMMU is > not found, do not allow IRQ remapping to be enabled. > > Signed-off-by: Seth Forshee <seth.forshee@canonical.com> > --- > drivers/iommu/intel_irq_remapping.c | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c > index e0b18f3..ce2c0c6 100644 > --- a/drivers/iommu/intel_irq_remapping.c > +++ b/drivers/iommu/intel_irq_remapping.c > @@ -526,6 +526,7 @@ static int __init intel_irq_remapping_supported(void) > static int __init intel_enable_irq_remapping(void) > { > struct dmar_drhd_unit *drhd; > + int ioapic_idx; > int setup = 0; > int eim = 0; > > @@ -534,6 +535,16 @@ static int __init intel_enable_irq_remapping(void) > return -1; > } > > + for (ioapic_idx = 0; ioapic_idx < nr_ioapics; ioapic_idx++) { > + int ioapic_id = mpc_ioapic_id(ioapic_idx); > + if (!map_ioapic_to_ir(ioapic_id)) { > + pr_info("ioapic %d has no mapping iommu, " > + "interrupt remapping will be disabled\n", > + ioapic_id); > + return -1; > + } > + } It will be cleaner to move this to parse_ioapics_under_ir(). Other than that feel free to add my "Acked-by: Suresh Siddha <suresh.b.siddha@intel.com" thanks, suresh > + > if (x2apic_supported()) { > eim = !dmar_x2apic_optout(); > WARN(!eim, KERN_WARNING -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Aug 07, 2012 at 03:48:09PM -0500, Seth Forshee wrote: > The ACPI tables in the Macbook Air 5,1 define a single IOAPIC with id 2, > but the only remapping unit described in the DMAR table matches id 0. > Interrupt remapping fails as a result, and the kernel panics with the > message "timer doesn't work through Interrupt-remapped IO-APIC." > > To fix this, check each IOAPIC for a corresponding IOMMU. If an IOMMU is > not found, do not allow IRQ remapping to be enabled. > > Signed-off-by: Seth Forshee <seth.forshee@canonical.com> > --- > drivers/iommu/intel_irq_remapping.c | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c > index e0b18f3..ce2c0c6 100644 > --- a/drivers/iommu/intel_irq_remapping.c > +++ b/drivers/iommu/intel_irq_remapping.c > @@ -526,6 +526,7 @@ static int __init intel_irq_remapping_supported(void) > static int __init intel_enable_irq_remapping(void) > { > struct dmar_drhd_unit *drhd; > + int ioapic_idx; > int setup = 0; > int eim = 0; > > @@ -534,6 +535,16 @@ static int __init intel_enable_irq_remapping(void) > return -1; > } > > + for (ioapic_idx = 0; ioapic_idx < nr_ioapics; ioapic_idx++) { > + int ioapic_id = mpc_ioapic_id(ioapic_idx); > + if (!map_ioapic_to_ir(ioapic_id)) { > + pr_info("ioapic %d has no mapping iommu, " > + "interrupt remapping will be disabled\n", > + ioapic_id); > + return -1; > + } > + } > + I would change this to pr_err() and add FW_BUG to make clear that this is an error caused by a firmware bug. Joerg -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c index e0b18f3..ce2c0c6 100644 --- a/drivers/iommu/intel_irq_remapping.c +++ b/drivers/iommu/intel_irq_remapping.c @@ -526,6 +526,7 @@ static int __init intel_irq_remapping_supported(void) static int __init intel_enable_irq_remapping(void) { struct dmar_drhd_unit *drhd; + int ioapic_idx; int setup = 0; int eim = 0; @@ -534,6 +535,16 @@ static int __init intel_enable_irq_remapping(void) return -1; } + for (ioapic_idx = 0; ioapic_idx < nr_ioapics; ioapic_idx++) { + int ioapic_id = mpc_ioapic_id(ioapic_idx); + if (!map_ioapic_to_ir(ioapic_id)) { + pr_info("ioapic %d has no mapping iommu, " + "interrupt remapping will be disabled\n", + ioapic_id); + return -1; + } + } + if (x2apic_supported()) { eim = !dmar_x2apic_optout(); WARN(!eim, KERN_WARNING
The ACPI tables in the Macbook Air 5,1 define a single IOAPIC with id 2, but the only remapping unit described in the DMAR table matches id 0. Interrupt remapping fails as a result, and the kernel panics with the message "timer doesn't work through Interrupt-remapped IO-APIC." To fix this, check each IOAPIC for a corresponding IOMMU. If an IOMMU is not found, do not allow IRQ remapping to be enabled. Signed-off-by: Seth Forshee <seth.forshee@canonical.com> --- drivers/iommu/intel_irq_remapping.c | 11 +++++++++++ 1 file changed, 11 insertions(+)