diff mbox

CONFIG_INTR_REMAP and CONFIG_DMAR dependencies?

Message ID CAE9FiQVUA2bWycDNmKDysPV6SQ1tcniJHUvbSDXpufC75cFVjg@mail.gmail.com (mailing list archive)
State Not Applicable, archived
Headers show

Commit Message

Yinghai Lu July 18, 2011, 11:16 p.m. UTC 
On Mon, Jul 18, 2011 at 2:32 PM, Yinghai Lu <yinghai@kernel.org> wrote:
> On Mon, Jul 18, 2011 at 2:16 PM, Andrew Vasquez
> <andrew.vasquez@qlogic.com> wrote:
>> Suresh,
>>
>> Any thoughts/ideas on this?  Could you help with the INTR-REMAP
>> messages?
>>
>> Thanks,
>> Andrew Vasquez
>>
>> ----
>>
>> All,
>>
>> We've seen a few reports logged with upstream kernels where qla2xxx is
>> unable to initialize HW due to what appears to be a lack of
>> interrupt routing:
>>
>>        [ 1137.271156] qla2xxx 0000:18:00.0: Found an ISP2532, irq 52, iobase 0xffffc90000028000
>>        [ 1137.271438] qla2xxx 0000:18:00.0: irq 96 for MSI/MSI-X
>>        [ 1137.271447] qla2xxx 0000:18:00.0: irq 97 for MSI/MSI-X
>>        [ 1137.271706] qla2xxx 0000:18:00.0: Configuring PCI space...
>>        [ 1137.271725] qla2xxx 0000:18:00.0: setting latency timer to 64
>>        [ 1137.271732] qla2xxx 0000:18:00.0: enabling Mem-Wr-Inval
>>        [ 1137.278705] DRHD: handling fault status reg 2
>>        [ 1137.278715] INTR-REMAP: Request device [[18:00.0] fault index 20
>>        [ 1137.278717] INTR-REMAP:[fault reason 34] Present field in the IRTE entry is clear
>>        [ 1159.389099] qla2xxx 0000:0c:07.0: Cable is unplugged...
>>        [ 1167.218478] qla2xxx 0000:18:00.0: Mailbox command timeout occurred. Scheduling ISP abort. eeh_busy: 0x0
>>        [ 1167.218490] qla2xxx 0000:18:00.0: Unable to burst-read optrom segment (100/7ff50400/18389b000).
>>        [ 1167.218496] qla2xxx 0000:18:00.0: Reverting to slow-read.
>>        [ 1197.174623] qla2xxx 0000:18:00.0: Unable to burst-read optrom segment (100/7ff50000/18389b000).
>>        [ 1197.174632] qla2xxx 0000:18:00.0: Reverting to slow-read.
>>        [ 1197.190613] qla2xxx 0000:18:00.0: Configure NVRAM parameters...
>>        [ 1197.198582] qla2xxx 0000:18:00.0: Verifying loaded RISC code...
>>        [ 1227.142951] qla2xxx 0000:18:00.0: Failed mailbox send register test
>>        [ 1227.142959] qla2xxx 0000:18:00.0: Failed to initialize adapter

please check attached patch, it should fix that configuration.

Thanks

Yinghai

Comments

Andrew Vasquez July 18, 2011, 11:50 p.m. UTC | #1 
On Mon, 18 Jul 2011, Yinghai Lu wrote:

> On Mon, Jul 18, 2011 at 2:32 PM, Yinghai Lu <yinghai@kernel.org> wrote:
> > On Mon, Jul 18, 2011 at 2:16 PM, Andrew Vasquez
> > <andrew.vasquez@qlogic.com> wrote:
> >> Suresh,
> >>
> >> Any thoughts/ideas on this? ?Could you help with the INTR-REMAP
> >> messages?
> >>
> >> Thanks,
> >> Andrew Vasquez
> >>
> >> ----
> >>
> >> All,
> >>
> >> We've seen a few reports logged with upstream kernels where qla2xxx is
> >> unable to initialize HW due to what appears to be a lack of
> >> interrupt routing:
> >>
> >> ? ? ? ?[ 1137.271156] qla2xxx 0000:18:00.0: Found an ISP2532, irq 52, iobase 0xffffc90000028000
> >> ? ? ? ?[ 1137.271438] qla2xxx 0000:18:00.0: irq 96 for MSI/MSI-X
> >> ? ? ? ?[ 1137.271447] qla2xxx 0000:18:00.0: irq 97 for MSI/MSI-X
> >> ? ? ? ?[ 1137.271706] qla2xxx 0000:18:00.0: Configuring PCI space...
> >> ? ? ? ?[ 1137.271725] qla2xxx 0000:18:00.0: setting latency timer to 64
> >> ? ? ? ?[ 1137.271732] qla2xxx 0000:18:00.0: enabling Mem-Wr-Inval
> >> ? ? ? ?[ 1137.278705] DRHD: handling fault status reg 2
> >> ? ? ? ?[ 1137.278715] INTR-REMAP: Request device [[18:00.0] fault index 20
> >> ? ? ? ?[ 1137.278717] INTR-REMAP:[fault reason 34] Present field in the IRTE entry is clear
> >> ? ? ? ?[ 1159.389099] qla2xxx 0000:0c:07.0: Cable is unplugged...
> >> ? ? ? ?[ 1167.218478] qla2xxx 0000:18:00.0: Mailbox command timeout occurred. Scheduling ISP abort. eeh_busy: 0x0
> >> ? ? ? ?[ 1167.218490] qla2xxx 0000:18:00.0: Unable to burst-read optrom segment (100/7ff50400/18389b000).
> >> ? ? ? ?[ 1167.218496] qla2xxx 0000:18:00.0: Reverting to slow-read.
> >> ? ? ? ?[ 1197.174623] qla2xxx 0000:18:00.0: Unable to burst-read optrom segment (100/7ff50000/18389b000).
> >> ? ? ? ?[ 1197.174632] qla2xxx 0000:18:00.0: Reverting to slow-read.
> >> ? ? ? ?[ 1197.190613] qla2xxx 0000:18:00.0: Configure NVRAM parameters...
> >> ? ? ? ?[ 1197.198582] qla2xxx 0000:18:00.0: Verifying loaded RISC code...
> >> ? ? ? ?[ 1227.142951] qla2xxx 0000:18:00.0: Failed mailbox send register test
> >> ? ? ? ?[ 1227.142959] qla2xxx 0000:18:00.0: Failed to initialize adapter
> 
> please check attached patch, it should fix that configuration.
> 
> Thanks

Yinghai,

Yes, this patch seems to help. With CONFIG_INTR_REMAP=y,
CONFIG_DMAR=n, and this patch, I no longer see the
'DRHD...INTR-REMAP...' warnings, and hardware interrupts appear to be
routing normally.

One small fixup I had to do was change the path for dmar.c in your
patch file.  On upstream kernels dmar.c is in drivers/pci/, not
drivers/iommu/.

Let me know if there's something else you need from our side.  Hope
this patch makes 3.0.

Thanks, AV

> ---
>  drivers/iommu/dmar.c |   11 +++++++++++
>  include/linux/dmar.h |    4 +---
>  2 files changed, 12 insertions(+), 3 deletions(-)
> 
> Index: linux-2.6/include/linux/dmar.h
> ===================================================================
> --- linux-2.6.orig/include/linux/dmar.h
> +++ linux-2.6/include/linux/dmar.h
> @@ -232,9 +232,7 @@ struct dmar_atsr_unit {
>  #define for_each_atsr_unit(atsr) \
>  	list_for_each_entry(atsr, &dmar_atsr_units, list)
>  
> -extern int intel_iommu_init(void);
> -#else /* !CONFIG_DMAR: */
> -static inline int intel_iommu_init(void) { return -ENODEV; }
>  #endif /* CONFIG_DMAR */
> +extern int intel_iommu_init(void);
>  
>  #endif /* __DMAR_H__ */
> Index: linux-2.6/drivers/iommu/dmar.c
> ===================================================================
> --- linux-2.6.orig/drivers/iommu/dmar.c
> +++ linux-2.6/drivers/iommu/dmar.c
> @@ -722,6 +722,17 @@ int __init detect_intel_iommu(void)
>  	return ret ? 1 : -ENODEV;
>  }
>  
> +#ifndef CONFIG_DMAR
> +int __init intel_iommu_init(void)
> +{
> +        if (dmar_table_init()) {
> +                return  -ENODEV;
> +        }
> +
> +        dmar_dev_scope_init();
> +        return  -ENODEV;
> +}
> +#endif
>  
>  int alloc_iommu(struct dmar_drhd_unit *drhd)
>  {

--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Yinghai Lu July 19, 2011, 3:18 a.m. UTC | #2 
On Mon, Jul 18, 2011 at 4:50 PM, Andrew Vasquez
<andrew.vasquez@qlogic.com> wrote:
> On Mon, 18 Jul 2011, Yinghai Lu wrote:
>
>> On Mon, Jul 18, 2011 at 2:32 PM, Yinghai Lu <yinghai@kernel.org> wrote:
>> > On Mon, Jul 18, 2011 at 2:16 PM, Andrew Vasquez
>> > <andrew.vasquez@qlogic.com> wrote:
>> >> Suresh,
>> >>
>> >> Any thoughts/ideas on this? ?Could you help with the INTR-REMAP
>> >> messages?
>> >>
>> >> Thanks,
>> >> Andrew Vasquez
>> >>
>> >> ----
>> >>
>> >> All,
>> >>
>> >> We've seen a few reports logged with upstream kernels where qla2xxx is
>> >> unable to initialize HW due to what appears to be a lack of
>> >> interrupt routing:
>> >>
>> >> ? ? ? ?[ 1137.271156] qla2xxx 0000:18:00.0: Found an ISP2532, irq 52, iobase 0xffffc90000028000
>> >> ? ? ? ?[ 1137.271438] qla2xxx 0000:18:00.0: irq 96 for MSI/MSI-X
>> >> ? ? ? ?[ 1137.271447] qla2xxx 0000:18:00.0: irq 97 for MSI/MSI-X
>> >> ? ? ? ?[ 1137.271706] qla2xxx 0000:18:00.0: Configuring PCI space...
>> >> ? ? ? ?[ 1137.271725] qla2xxx 0000:18:00.0: setting latency timer to 64
>> >> ? ? ? ?[ 1137.271732] qla2xxx 0000:18:00.0: enabling Mem-Wr-Inval
>> >> ? ? ? ?[ 1137.278705] DRHD: handling fault status reg 2
>> >> ? ? ? ?[ 1137.278715] INTR-REMAP: Request device [[18:00.0] fault index 20
>> >> ? ? ? ?[ 1137.278717] INTR-REMAP:[fault reason 34] Present field in the IRTE entry is clear
>> >> ? ? ? ?[ 1159.389099] qla2xxx 0000:0c:07.0: Cable is unplugged...
>> >> ? ? ? ?[ 1167.218478] qla2xxx 0000:18:00.0: Mailbox command timeout occurred. Scheduling ISP abort. eeh_busy: 0x0
>> >> ? ? ? ?[ 1167.218490] qla2xxx 0000:18:00.0: Unable to burst-read optrom segment (100/7ff50400/18389b000).
>> >> ? ? ? ?[ 1167.218496] qla2xxx 0000:18:00.0: Reverting to slow-read.
>> >> ? ? ? ?[ 1197.174623] qla2xxx 0000:18:00.0: Unable to burst-read optrom segment (100/7ff50000/18389b000).
>> >> ? ? ? ?[ 1197.174632] qla2xxx 0000:18:00.0: Reverting to slow-read.
>> >> ? ? ? ?[ 1197.190613] qla2xxx 0000:18:00.0: Configure NVRAM parameters...
>> >> ? ? ? ?[ 1197.198582] qla2xxx 0000:18:00.0: Verifying loaded RISC code...
>> >> ? ? ? ?[ 1227.142951] qla2xxx 0000:18:00.0: Failed mailbox send register test
>> >> ? ? ? ?[ 1227.142959] qla2xxx 0000:18:00.0: Failed to initialize adapter
>>
>> please check attached patch, it should fix that configuration.
>>
>> Thanks
>
> Yinghai,
>
> Yes, this patch seems to help. With CONFIG_INTR_REMAP=y,
> CONFIG_DMAR=n, and this patch, I no longer see the
> 'DRHD...INTR-REMAP...' warnings, and hardware interrupts appear to be
> routing normally.
>
> One small fixup I had to do was change the path for dmar.c in your
> patch file.  On upstream kernels dmar.c is in drivers/pci/, not
> drivers/iommu/.

in -tip, those iommu code already get moved to drivers/iommu/

>
> Let me know if there's something else you need from our side.  Hope
> this patch makes 3.0.

Not sure. should be for 3.1 instead.

Thanks

>
> Thanks, AV
>
>> ---
>>  drivers/iommu/dmar.c |   11 +++++++++++
>>  include/linux/dmar.h |    4 +---
>>  2 files changed, 12 insertions(+), 3 deletions(-)
>>
>> Index: linux-2.6/include/linux/dmar.h
>> ===================================================================
>> --- linux-2.6.orig/include/linux/dmar.h
>> +++ linux-2.6/include/linux/dmar.h
>> @@ -232,9 +232,7 @@ struct dmar_atsr_unit {
>>  #define for_each_atsr_unit(atsr) \
>>       list_for_each_entry(atsr, &dmar_atsr_units, list)
>>
>> -extern int intel_iommu_init(void);
>> -#else /* !CONFIG_DMAR: */
>> -static inline int intel_iommu_init(void) { return -ENODEV; }
>>  #endif /* CONFIG_DMAR */
>> +extern int intel_iommu_init(void);
>>
>>  #endif /* __DMAR_H__ */
>> Index: linux-2.6/drivers/iommu/dmar.c
>> ===================================================================
>> --- linux-2.6.orig/drivers/iommu/dmar.c
>> +++ linux-2.6/drivers/iommu/dmar.c
>> @@ -722,6 +722,17 @@ int __init detect_intel_iommu(void)
>>       return ret ? 1 : -ENODEV;
>>  }
>>
>> +#ifndef CONFIG_DMAR
>> +int __init intel_iommu_init(void)
>> +{
>> +        if (dmar_table_init()) {
>> +                return  -ENODEV;
>> +        }
>> +
>> +        dmar_dev_scope_init();
>> +        return  -ENODEV;
>> +}
>> +#endif
>>
>>  int alloc_iommu(struct dmar_drhd_unit *drhd)
>>  {
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Suresh Siddha July 19, 2011, 4:50 a.m. UTC | #3 
On Mon, 2011-07-18 at 16:16 -0700, Yinghai Lu wrote:
> ---
>  drivers/iommu/dmar.c |   11 +++++++++++
>  include/linux/dmar.h |    4 +---
>  2 files changed, 12 insertions(+), 3 deletions(-)

Yinghai, Thanks for looking at this.

This issue is caused by this commit:

commit 9d5ce73a64be2be8112147a3e0b551ad9cd1247b
Author: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date:   Tue Nov 10 19:46:16 2009 +0900

    x86: intel-iommu: Convert detect_intel_iommu to use iommu_init hook

So this is a regression. Also,

> 
> Index: linux-2.6/include/linux/dmar.h
> ===================================================================
> --- linux-2.6.orig/include/linux/dmar.h
> +++ linux-2.6/include/linux/dmar.h
> @@ -232,9 +232,7 @@ struct dmar_atsr_unit {
>  #define for_each_atsr_unit(atsr) \
>         list_for_each_entry(atsr, &dmar_atsr_units, list)
>  
> -extern int intel_iommu_init(void);
> -#else /* !CONFIG_DMAR: */
> -static inline int intel_iommu_init(void) { return -ENODEV; }
>  #endif /* CONFIG_DMAR */
> +extern int intel_iommu_init(void);
>  
>  #endif /* __DMAR_H__ */
> Index: linux-2.6/drivers/iommu/dmar.c
> ===================================================================
> --- linux-2.6.orig/drivers/iommu/dmar.c
> +++ linux-2.6/drivers/iommu/dmar.c
> @@ -722,6 +722,17 @@ int __init detect_intel_iommu(void)
>         return ret ? 1 : -ENODEV;
>  }
>  
> +#ifndef CONFIG_DMAR
> +int __init intel_iommu_init(void)
> +{
> +        if (dmar_table_init()) {
> +                return  -ENODEV;
> +        }
> +
> +        dmar_dev_scope_init();
> +        return  -ENODEV;

I think this should be return dmar_dev_scope_init();

thanks!

> +}
> +#endif
>  
>  int alloc_iommu(struct dmar_drhd_unit *drhd)
>  { 



--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Ingo Molnar July 21, 2011, 9:10 a.m. UTC | #4 
* Yinghai Lu <yinghai@kernel.org> wrote:

> > Let me know if there's something else you need from our side.  Hope
> > this patch makes 3.0.
> 
> Not sure. should be for 3.1 instead.

Yes - the bug was introduced in 2009 and the 3.0 will be later today.

Also, the fix should be done in a (much) cleaner fashion, 
restructuring the whole DMAR mess if needed.

Thanks,

	Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

---
 drivers/iommu/dmar.c |   11 +++++++++++
 include/linux/dmar.h |    4 +---
 2 files changed, 12 insertions(+), 3 deletions(-)

Index: linux-2.6/include/linux/dmar.h
===================================================================
--- linux-2.6.orig/include/linux/dmar.h
+++ linux-2.6/include/linux/dmar.h
@@ -232,9 +232,7 @@  struct dmar_atsr_unit {
 #define for_each_atsr_unit(atsr) \
 	list_for_each_entry(atsr, &dmar_atsr_units, list)
 
-extern int intel_iommu_init(void);
-#else /* !CONFIG_DMAR: */
-static inline int intel_iommu_init(void) { return -ENODEV; }
 #endif /* CONFIG_DMAR */
+extern int intel_iommu_init(void);
 
 #endif /* __DMAR_H__ */
Index: linux-2.6/drivers/iommu/dmar.c
===================================================================
--- linux-2.6.orig/drivers/iommu/dmar.c
+++ linux-2.6/drivers/iommu/dmar.c
@@ -722,6 +722,17 @@  int __init detect_intel_iommu(void)
 	return ret ? 1 : -ENODEV;
 }
 
+#ifndef CONFIG_DMAR
+int __init intel_iommu_init(void)
+{
+        if (dmar_table_init()) {
+                return  -ENODEV;
+        }
+
+        dmar_dev_scope_init();
+        return  -ENODEV;
+}
+#endif
 
 int alloc_iommu(struct dmar_drhd_unit *drhd)
 {