Skip to content

Commit

Permalink
iommu, x86: Setup Posted-Interrupts capability for Intel iommu
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Feng Wu authored and Thomas Gleixner committed Jun 12, 2015
1 parent 07c0978 commit 3d9b98f
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 0 deletions.
30 changes: 30 additions & 0 deletions drivers/iommu/intel_irq_remapping.c
Original file line number Diff line number Diff line change
Expand Up @@ -581,6 +581,26 @@ static int __init intel_prepare_irq_remapping(void)
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)
{
struct dmar_drhd_unit *drhd;
Expand Down Expand Up @@ -656,6 +676,8 @@ static int __init intel_enable_irq_remapping(void)

irq_remapping_enabled = 1;

set_irq_posting_cap();

pr_info("Enabled IRQ remapping in %s mode\n", eim ? "x2apic" : "xapic");

return eim ? IRQ_REMAP_X2APIC_MODE : IRQ_REMAP_XAPIC_MODE;
Expand Down Expand Up @@ -856,6 +878,12 @@ static void disable_irq_remapping(void)

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)
Expand Down Expand Up @@ -883,6 +911,8 @@ static int reenable_irq_remapping(int eim)
if (!setup)
goto error;

set_irq_posting_cap();

return 0;

error:
Expand Down
2 changes: 2 additions & 0 deletions drivers/iommu/irq_remapping.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ int irq_remap_broken;
int disable_sourceid_checking;
int no_x2apic_optout;

int disable_irq_post = 1;

static int disable_irq_remap;
static struct irq_remap_ops *remap_ops;

Expand Down
3 changes: 3 additions & 0 deletions drivers/iommu/irq_remapping.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ extern int disable_sourceid_checking;
extern int no_x2apic_optout;
extern int irq_remapping_enabled;

extern int disable_irq_post;

struct irq_remap_ops {
/* The supported capabilities */
int capability;
Expand Down Expand Up @@ -69,6 +71,7 @@ extern void ir_ack_apic_edge(struct irq_data *data);

#define irq_remapping_enabled 0
#define irq_remap_broken 0
#define disable_irq_post 1

#endif /* CONFIG_IRQ_REMAP */

Expand Down

0 comments on commit 3d9b98f

Please sign in to comment.