On Wed, Jul 11, 2012 at 6:38 AM, Joerg Roedel <joerg.roe...@amd.com> wrote:
> Add a data structure to store information the IOMMU driver
> can use to get from a 'struct irq_cfg' to the remapping
> entry.
>
> Cc: x...@kernel.org
> Cc: Yinghai Lu <ying...@kernel.org>
> Cc: Suresh Siddha <suresh.b.sid...@intel.com>
> Signed-off-by: Joerg Roedel <joerg.roe...@amd.com>
> ---
> arch/x86/include/asm/hw_irq.h | 14 +++++++++++++-
> arch/x86/kernel/apic/io_apic.c | 2 +-
> drivers/iommu/intel_irq_remapping.c | 2 +-
> 3 files changed, 15 insertions(+), 3 deletions(-)
>
> diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h
> index eb92a6e..b6171e6 100644
> --- a/arch/x86/include/asm/hw_irq.h
> +++ b/arch/x86/include/asm/hw_irq.h
> @@ -101,6 +101,7 @@ static inline void set_io_apic_irq_attr(struct
> io_apic_irq_attr *irq_attr,
> irq_attr->polarity = polarity;
> }
>
> +/* Intel specific interrupt remapping information */
> struct irq_2_iommu {
> struct intel_iommu *iommu;
> u16 irte_index;
> @@ -108,6 +109,17 @@ struct irq_2_iommu {
> u8 irte_mask;
> };
>
> +/* AMD specific interrupt remapping information */
> +struct irq_2_irte {
> + u16 devid; /* Device ID for IRTE table */
> + u16 index; /* Index into IRTE table*/
> +};
> +
> +union irq_remap_info {
> + struct irq_2_iommu irq_2_iommu;
> + struct irq_2_irte irq_2_irte;
> +};
> +
> /*
> * This is performance-critical, we want to do it O(1)
> *
> @@ -120,7 +132,7 @@ struct irq_cfg {
> u8 vector;
> u8 move_in_progress : 1;
> #ifdef CONFIG_IRQ_REMAP
> - struct irq_2_iommu irq_2_iommu;
> + union irq_remap_info irq_remap_info;
how about
+union {
+ struct irq_2_iommu irq_2_iommu;
+ struct irq_2_irte irq_2_irte;
+};
instead?
> #endif
> };
>
> diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
> index 5f0ff59..08f666c 100644
> --- a/arch/x86/kernel/apic/io_apic.c
> +++ b/arch/x86/kernel/apic/io_apic.c
> @@ -72,7 +72,7 @@
> static void irq_remap_modify_chip_defaults(struct irq_chip *chip);
> static inline bool irq_remapped(struct irq_cfg *cfg)
> {
> - return cfg->irq_2_iommu.iommu != NULL;
> + return cfg->irq_remap_info.irq_2_iommu.iommu != NULL;
> }
> #else
> static inline bool irq_remapped(struct irq_cfg *cfg)
> diff --git a/drivers/iommu/intel_irq_remapping.c
> b/drivers/iommu/intel_irq_remapping.c
> index 6d34706..e4e4334 100644
> --- a/drivers/iommu/intel_irq_remapping.c
> +++ b/drivers/iommu/intel_irq_remapping.c
> @@ -43,7 +43,7 @@ static DEFINE_RAW_SPINLOCK(irq_2_ir_lock);
> static struct irq_2_iommu *irq_2_iommu(unsigned int irq)
> {
> struct irq_cfg *cfg = irq_get_chip_data(irq);
> - return cfg ? &cfg->irq_2_iommu : NULL;
> + return cfg ? &cfg->irq_remap_info.irq_2_iommu : NULL;
> }
>
> int get_irte(int irq, struct irte *entry)
> --
> 1.7.9.5
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
