iommu, x86: Setup Posted-Interrupts capability for Intel iommu
Set Posted-Interrupts capability for Intel iommu when Interrupt Remapping is enabled, clear it when disabled. Signed-off-by: Feng Wu <feng.wu@intel.com> Reviewed-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Joerg Roedel <joro@8bytes.org> Cc: jiang.liu@linux.intel.com Cc: iommu@lists.linux-foundation.org Cc: dwmw2@infradead.org Link: http://lkml.kernel.org/r/1433827237-3382-9-git-send-email-feng.wu@intel.com Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
@@ -581,6 +581,26 @@ error:
|
|||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Set Posted-Interrupts capability.
|
||||||
|
*/
|
||||||
|
static inline void set_irq_posting_cap(void)
|
||||||
|
{
|
||||||
|
struct dmar_drhd_unit *drhd;
|
||||||
|
struct intel_iommu *iommu;
|
||||||
|
|
||||||
|
if (!disable_irq_post) {
|
||||||
|
intel_irq_remap_ops.capability |= 1 << IRQ_POSTING_CAP;
|
||||||
|
|
||||||
|
for_each_iommu(iommu, drhd)
|
||||||
|
if (!cap_pi_support(iommu->cap)) {
|
||||||
|
intel_irq_remap_ops.capability &=
|
||||||
|
~(1 << IRQ_POSTING_CAP);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
static int __init intel_enable_irq_remapping(void)
|
static int __init intel_enable_irq_remapping(void)
|
||||||
{
|
{
|
||||||
struct dmar_drhd_unit *drhd;
|
struct dmar_drhd_unit *drhd;
|
||||||
@@ -656,6 +676,8 @@ static int __init intel_enable_irq_remapping(void)
|
|||||||
|
|
||||||
irq_remapping_enabled = 1;
|
irq_remapping_enabled = 1;
|
||||||
|
|
||||||
|
set_irq_posting_cap();
|
||||||
|
|
||||||
pr_info("Enabled IRQ remapping in %s mode\n", eim ? "x2apic" : "xapic");
|
pr_info("Enabled IRQ remapping in %s mode\n", eim ? "x2apic" : "xapic");
|
||||||
|
|
||||||
return eim ? IRQ_REMAP_X2APIC_MODE : IRQ_REMAP_XAPIC_MODE;
|
return eim ? IRQ_REMAP_X2APIC_MODE : IRQ_REMAP_XAPIC_MODE;
|
||||||
@@ -856,6 +878,12 @@ static void disable_irq_remapping(void)
|
|||||||
|
|
||||||
iommu_disable_irq_remapping(iommu);
|
iommu_disable_irq_remapping(iommu);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Clear Posted-Interrupts capability.
|
||||||
|
*/
|
||||||
|
if (!disable_irq_post)
|
||||||
|
intel_irq_remap_ops.capability &= ~(1 << IRQ_POSTING_CAP);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int reenable_irq_remapping(int eim)
|
static int reenable_irq_remapping(int eim)
|
||||||
@@ -883,6 +911,8 @@ static int reenable_irq_remapping(int eim)
|
|||||||
if (!setup)
|
if (!setup)
|
||||||
goto error;
|
goto error;
|
||||||
|
|
||||||
|
set_irq_posting_cap();
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
error:
|
error:
|
||||||
|
|||||||
@@ -22,6 +22,8 @@ int irq_remap_broken;
|
|||||||
int disable_sourceid_checking;
|
int disable_sourceid_checking;
|
||||||
int no_x2apic_optout;
|
int no_x2apic_optout;
|
||||||
|
|
||||||
|
int disable_irq_post = 1;
|
||||||
|
|
||||||
static int disable_irq_remap;
|
static int disable_irq_remap;
|
||||||
static struct irq_remap_ops *remap_ops;
|
static struct irq_remap_ops *remap_ops;
|
||||||
|
|
||||||
|
|||||||
@@ -34,6 +34,8 @@ extern int disable_sourceid_checking;
|
|||||||
extern int no_x2apic_optout;
|
extern int no_x2apic_optout;
|
||||||
extern int irq_remapping_enabled;
|
extern int irq_remapping_enabled;
|
||||||
|
|
||||||
|
extern int disable_irq_post;
|
||||||
|
|
||||||
struct irq_remap_ops {
|
struct irq_remap_ops {
|
||||||
/* The supported capabilities */
|
/* The supported capabilities */
|
||||||
int capability;
|
int capability;
|
||||||
@@ -69,6 +71,7 @@ extern void ir_ack_apic_edge(struct irq_data *data);
|
|||||||
|
|
||||||
#define irq_remapping_enabled 0
|
#define irq_remapping_enabled 0
|
||||||
#define irq_remap_broken 0
|
#define irq_remap_broken 0
|
||||||
|
#define disable_irq_post 1
|
||||||
|
|
||||||
#endif /* CONFIG_IRQ_REMAP */
|
#endif /* CONFIG_IRQ_REMAP */
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user