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@xxxxxxxxxxxxx>
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@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
