All of lore.kernel.org
 help / color / mirror / Atom feed
From: Yinghai Lu <yinghai@kernel.org>
To: Joerg Roedel <joerg.roedel@amd.com>
Cc: iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org,
	x86@kernel.org, Suresh Siddha <suresh.b.siddha@intel.com>
Subject: Re: [PATCH 01/27] x86/irq: Add data structure to keep AMD specific irq remapping information
Date: Wed, 11 Jul 2012 14:42:03 -0700	[thread overview]
Message-ID: <CAE9FiQUEYVMi46WYfLDDUO=PuTHYbmqXreZnCWLRdUjBH2iH4Q@mail.gmail.com> (raw)
In-Reply-To: <1342013952-10174-2-git-send-email-joerg.roedel@amd.com>

On Wed, Jul 11, 2012 at 6:38 AM, Joerg Roedel <joerg.roedel@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: x86@kernel.org
> Cc: Yinghai Lu <yinghai@kernel.org>
> Cc: Suresh Siddha <suresh.b.siddha@intel.com>
> Signed-off-by: Joerg Roedel <joerg.roedel@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
>
>

WARNING: multiple messages have this Message-ID
From: Yinghai Lu <yinghai-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
To: Joerg Roedel <joerg.roedel-5C7GfCeVMHo@public.gmane.org>
Cc: iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org,
	x86-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	Suresh Siddha
	<suresh.b.siddha-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
Subject: Re: [PATCH 01/27] x86/irq: Add data structure to keep AMD specific irq remapping information
Date: Wed, 11 Jul 2012 14:42:03 -0700	[thread overview]
Message-ID: <CAE9FiQUEYVMi46WYfLDDUO=PuTHYbmqXreZnCWLRdUjBH2iH4Q@mail.gmail.com> (raw)
In-Reply-To: <1342013952-10174-2-git-send-email-joerg.roedel-5C7GfCeVMHo@public.gmane.org>

On Wed, Jul 11, 2012 at 6:38 AM, Joerg Roedel <joerg.roedel-5C7GfCeVMHo@public.gmane.org> 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: x86-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org
> Cc: Yinghai Lu <yinghai-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
> Cc: Suresh Siddha <suresh.b.siddha-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
> Signed-off-by: Joerg Roedel <joerg.roedel-5C7GfCeVMHo@public.gmane.org>
> ---
>  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
>
>

  reply	other threads:[~2012-07-11 21:42 UTC|newest]

Thread overview: 62+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-07-11 13:38 [PATCH 0/27] AMD IOMMU interrupt remapping support v2 Joerg Roedel
2012-07-11 13:38 ` Joerg Roedel
2012-07-11 13:38 ` [PATCH 01/27] x86/irq: Add data structure to keep AMD specific irq remapping information Joerg Roedel
2012-07-11 13:38   ` Joerg Roedel
2012-07-11 21:42   ` Yinghai Lu [this message]
2012-07-11 21:42     ` Yinghai Lu
2012-07-12 15:40     ` Joerg Roedel
2012-07-12 15:40       ` Joerg Roedel
2012-07-11 13:38 ` [PATCH 02/27] x86/irq: Introduce irq_cfg->remapped Joerg Roedel
2012-07-11 13:38   ` Joerg Roedel
2012-07-11 13:38 ` [PATCH 03/27] iommu/amd: Fix sparse warnings Joerg Roedel
2012-07-11 13:38   ` Joerg Roedel
2012-07-17 10:44   ` Joerg Roedel
2012-07-17 10:44     ` Joerg Roedel
2012-07-11 13:38 ` [PATCH 04/27] iommu/amd: Use acpi_get_table instead of acpi_table_parse Joerg Roedel
2012-07-11 13:38   ` Joerg Roedel
2012-07-11 13:38 ` [PATCH 05/27] iommu/amd: Split out PCI related parts of IOMMU initialization Joerg Roedel
2012-07-11 13:38   ` Joerg Roedel
2012-07-11 13:38 ` [PATCH 06/27] iommu/amd: Move informational prinks out of iommu_enable Joerg Roedel
2012-07-11 13:38   ` Joerg Roedel
2012-07-11 13:38 ` [PATCH 07/27] iommu/amd: Introduce early_amd_iommu_init routine Joerg Roedel
2012-07-11 13:38   ` Joerg Roedel
2012-07-11 13:38 ` [PATCH 08/27] iommu/amd: Split enable_iommus() routine Joerg Roedel
2012-07-11 13:38   ` Joerg Roedel
2012-07-11 13:38 ` [PATCH 09/27] iommu/amd: Move unmap_flush message to amd_iommu_init_dma_ops() Joerg Roedel
2012-07-11 13:38   ` Joerg Roedel
2012-07-11 13:38 ` [PATCH 10/27] iommu/amd: Introduce amd_iommu_init_dma routine Joerg Roedel
2012-07-11 13:38   ` Joerg Roedel
2012-07-11 13:38 ` [PATCH 11/27] iommu/amd: Convert iommu initialization to state machine Joerg Roedel
2012-07-11 13:38   ` Joerg Roedel
2012-07-11 13:38 ` [PATCH 12/27] iommu/amd: Keep track of HPET and IOAPIC device ids Joerg Roedel
2012-07-11 13:38   ` Joerg Roedel
2012-07-11 13:38 ` [PATCH 13/27] iommu/amd: Add slab-cache for irq remapping tables Joerg Roedel
2012-07-11 13:38   ` Joerg Roedel
2012-07-11 13:38 ` [PATCH 14/27] iommu/amd: Allocate data structures to keep track of " Joerg Roedel
2012-07-11 13:38   ` Joerg Roedel
2012-07-11 13:39 ` [PATCH 15/27] iommu/amd: Check if IOAPIC information is correct Joerg Roedel
2012-07-11 13:39   ` Joerg Roedel
2012-07-11 13:39 ` [PATCH 16/27] iommu/amd: Split device table initialization into irq and dma part Joerg Roedel
2012-07-11 13:39   ` Joerg Roedel
2012-07-11 13:39 ` [PATCH 17/27] iommu/amd: Make sure IOMMU is not considered to translate itself Joerg Roedel
2012-07-11 13:39   ` Joerg Roedel
2012-07-11 13:39 ` [PATCH 18/27] iommu/amd: Add IRTE invalidation routine Joerg Roedel
2012-07-11 13:39   ` Joerg Roedel
2012-07-11 13:39 ` [PATCH 19/27] iommu/amd: Add routines to manage irq remapping tables Joerg Roedel
2012-07-11 13:39   ` Joerg Roedel
2012-07-11 13:39 ` [PATCH 20/27] iommu/amd: Add IOAPIC remapping routines Joerg Roedel
2012-07-11 13:39   ` Joerg Roedel
2012-07-11 13:39 ` [PATCH 21/27] iommu/amd: Implement MSI routines for interrupt remapping Joerg Roedel
2012-07-11 13:39   ` Joerg Roedel
2012-07-11 13:39 ` [PATCH 22/27] iommu/amd: Add call-back routine for HPET MSI Joerg Roedel
2012-07-11 13:39   ` Joerg Roedel
2012-07-11 13:39 ` [PATCH 23/27] iommu/amd: Add initialization routines for AMD interrupt remapping Joerg Roedel
2012-07-11 13:39   ` Joerg Roedel
2012-07-11 13:39 ` [PATCH 24/27] iommu/amd: Make sure irq remapping still works on dma init failure Joerg Roedel
2012-07-11 13:39   ` Joerg Roedel
2012-07-11 13:39 ` [PATCH 25/27] iommu/irq: Use amd_iommu_irq_ops if supported Joerg Roedel
2012-07-11 13:39   ` Joerg Roedel
2012-07-11 13:39 ` [PATCH 26/27] iommu/amd: Print message to system log when irq remapping is enabled Joerg Roedel
2012-07-11 13:39   ` Joerg Roedel
2012-07-11 13:39 ` [PATCH 27/27] iommu/amd: Report irq remapping through IOMMU-API Joerg Roedel
2012-07-11 13:39   ` Joerg Roedel

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='CAE9FiQUEYVMi46WYfLDDUO=PuTHYbmqXreZnCWLRdUjBH2iH4Q@mail.gmail.com' \
    --to=yinghai@kernel.org \
    --cc=iommu@lists.linux-foundation.org \
    --cc=joerg.roedel@amd.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=suresh.b.siddha@intel.com \
    --cc=x86@kernel.org \
    --subject='Re: [PATCH 01/27] x86/irq: Add data structure to keep AMD specific irq remapping information' \
    /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

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.