[PATCH] ARM: Tegra: Make tegra_dma_init a postcore_initcall

Colin Cross ccross at android.com
Wed Feb 23 12:35:50 EST 2011


On Wed, Feb 23, 2011 at 9:11 AM, Stephen Warren <swarren at nvidia.com> wrote:
> The following commit makes the Tegra APB DMA engine fail to initialize
> correctly: 0cf6230af909a86f81907455eca2a5c9b8f68fe6
> ARM: tegra: Move tegra_common_init to tegra_init_early
>
> The reason is that tegra_init_early_ calls tegra_dma_init which calls
> request_threaded_irq, which fails since the IRQ hasn't yet been marked
> valid; that only happens in tegra_init_irq, which gets called after
> tegra_init_early.
>
> This used to work OK, since tegra_init_early was tegra_common_init, which
> got called after tegra_init_irq, basically from the beginning of
> tegra_harmony_init.
>
> Solve this by converting tegra_dma_init to a postcore_initcall. This makes
> it execute late enough that IRQs are marked valid, and avoids having to
> add it back to every machine's init function.
>
> Signed-off-by: Stephen Warren <swarren at nvidia.com>
> ---
>  arch/arm/mach-tegra/common.c |    3 ---
>  arch/arm/mach-tegra/dma.c    |    1 +
>  2 files changed, 1 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mach-tegra/common.c b/arch/arm/mach-tegra/common.c
> index 516e100..b6ab3f8 100644
> --- a/arch/arm/mach-tegra/common.c
> +++ b/arch/arm/mach-tegra/common.c
> @@ -81,7 +81,4 @@ void __init tegra_init_early(void)
>        tegra_init_clock();
>        tegra_clk_init_from_table(common_clk_init_table);
>        tegra_init_cache();
> -#ifdef CONFIG_TEGRA_SYSTEM_DMA
> -       tegra_dma_init();
> -#endif
>  }

Can you also drop the #include <mach/dma.h> from common.c?



More information about the linux-arm-kernel mailing list