From: Feng Wu <feng.wu@intel.com>
To: joro@8bytes.org, dwmw2@infradead.org
Cc: tglx@linutronix.de, jiang.liu@linux.intel.com,
iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org,
Feng Wu <feng.wu@intel.com>
Subject: [v5 4/9] iommu, x86: Implement irq_set_vcpu_affinity for intel_ir_chip
Date: Wed, 20 May 2015 13:15:32 +0800 [thread overview]
Message-ID: <1432098937-19527-5-git-send-email-feng.wu@intel.com> (raw)
In-Reply-To: <1432098937-19527-1-git-send-email-feng.wu@intel.com>
Implement irq_set_vcpu_affinity for intel_ir_chip.
Signed-off-by: Feng Wu <feng.wu@intel.com>
Reviewed-by: Jiang Liu <jiang.liu@linux.intel.com>
Acked-by: David Woodhouse <David.Woodhouse@intel.com>
---
arch/x86/include/asm/irq_remapping.h | 5 +++++
drivers/iommu/intel_irq_remapping.c | 35 +++++++++++++++++++++++++++++++++++
2 files changed, 40 insertions(+)
diff --git a/arch/x86/include/asm/irq_remapping.h b/arch/x86/include/asm/irq_remapping.h
index 0953723..202e040 100644
--- a/arch/x86/include/asm/irq_remapping.h
+++ b/arch/x86/include/asm/irq_remapping.h
@@ -57,6 +57,11 @@ static inline struct irq_domain *arch_get_ir_parent_domain(void)
return x86_vector_domain;
}
+struct vcpu_data {
+ u64 pi_desc_addr; /* Physical address of PI Descriptor */
+ u32 vector; /* Guest vector of the interrupt */
+};
+
#else /* CONFIG_IRQ_REMAP */
static inline void set_irq_remapping_broken(void) { }
diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c
index 1575b9e..741896e 100644
--- a/drivers/iommu/intel_irq_remapping.c
+++ b/drivers/iommu/intel_irq_remapping.c
@@ -42,6 +42,7 @@ struct irq_2_iommu {
struct intel_ir_data {
struct irq_2_iommu irq_2_iommu;
struct irte irte_entry;
+ struct irte_pi irte_pi_entry;
union {
struct msi_msg msi_entry;
};
@@ -1013,10 +1014,44 @@ static void intel_ir_compose_msi_msg(struct irq_data *irq_data,
*msg = ir_data->msi_entry;
}
+static int intel_ir_set_vcpu_affinity(struct irq_data *data, void *vcpu_info)
+{
+ struct intel_ir_data *ir_data = data->chip_data;
+ struct irte_pi *irte_pi = &ir_data->irte_pi_entry;
+ struct vcpu_data *vcpu_pi_info;
+
+ /* stop posting interrupts, back to remapping mode */
+ if (!vcpu_info)
+ modify_irte(&ir_data->irq_2_iommu, &ir_data->irte_entry);
+ else {
+ vcpu_pi_info = (struct vcpu_data *)vcpu_info;
+ memcpy(irte_pi, &ir_data->irte_entry, sizeof(struct irte));
+
+ irte_pi->urg = 0;
+ irte_pi->vector = vcpu_pi_info->vector;
+ irte_pi->pda_l = (vcpu_pi_info->pi_desc_addr >>
+ (32 - PDA_LOW_BIT)) & ~(-1UL << PDA_LOW_BIT);
+ irte_pi->pda_h = (vcpu_pi_info->pi_desc_addr >> 32) &
+ ~(-1UL << PDA_HIGH_BIT);
+
+ irte_pi->__reserved_1 = 0;
+ irte_pi->__reserved_2 = 0;
+ irte_pi->__reserved_3 = 0;
+ irte_pi->__reserved_4 = 0;
+
+ irte_pi->pst = 1;
+
+ modify_irte(&ir_data->irq_2_iommu, irte_pi);
+ }
+
+ return 0;
+}
+
static struct irq_chip intel_ir_chip = {
.irq_ack = ir_ack_apic_edge,
.irq_set_affinity = intel_ir_set_affinity,
.irq_compose_msi_msg = intel_ir_compose_msi_msg,
+ .irq_set_vcpu_affinity = intel_ir_set_vcpu_affinity,
};
static void intel_irq_remapping_prepare_irte(struct intel_ir_data *data,
--
2.1.0
next prev parent reply other threads:[~2015-05-20 5:24 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-20 5:15 [v5 0/9] Add VT-d Posted-Interrupts support - IOMMU part Feng Wu
2015-05-20 5:15 ` [v5 1/9] iommu: Add new member capability to struct irq_remap_ops Feng Wu
2015-05-20 5:15 ` [v5 2/9] iommu, x86: Define new irte structure for VT-d Posted-Interrupts Feng Wu
2015-05-20 5:15 ` [v5 3/9] iommu, x86: Abstract modify_irte() to accept two format of irte Feng Wu
2015-05-20 11:46 ` Thomas Gleixner
2015-05-21 7:01 ` Wu, Feng
2015-05-20 5:15 ` Feng Wu [this message]
2015-05-20 5:15 ` [v5 5/9] iommu, x86: No need to migrating irq for VT-d Posted-Interrupts Feng Wu
2015-05-20 5:15 ` [v5 6/9] iommu, x86: Add cap_pi_support() to detect VT-d PI capability Feng Wu
2015-05-20 5:15 ` [v5 7/9] iommu, x86: Setup Posted-Interrupts capability for Intel iommu Feng Wu
2015-05-20 5:15 ` [v5 8/9] iommu, x86: define irq_remapping_cap() Feng Wu
2015-05-20 5:15 ` [v5 9/9] iommu, x86: Properly handler PI for IOMMU hotplug Feng Wu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1432098937-19527-5-git-send-email-feng.wu@intel.com \
--to=feng.wu@intel.com \
--cc=dwmw2@infradead.org \
--cc=iommu@lists.linux-foundation.org \
--cc=jiang.liu@linux.intel.com \
--cc=joro@8bytes.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).