• Dmitry Osipenko's avatar
    ARM: tegra: Re-add removed SoC id macro to tegra_resume() · e4a68009
    Dmitry Osipenko authored
    Commit d127e9c5 ("ARM: tegra: make tegra_resume can work with current and later
    chips") removed tegra_get_soc_id macro leaving used cpu register corrupted after
    branching to v7_invalidate_l1() and as result causing execution of unintended
    code on tegra20. Possibly it was expected that r6 would be SoC id func argument
    since common cpu reset handler is setting r6 before branching to tegra_resume(),
    but neither tegra20_lp1_reset() nor tegra30_lp1_reset() aren't setting r6
    register before jumping to resume function. Fix it by re-adding macro.
    
    Fixes: d127e9c5 (ARM: tegra: make tegra_resume can work with current and later chips)
    Cc: <stable@vger.kernel.org> # v3.13+
    Reviewed-by: default avatarFelipe Balbi <balbi@ti.com>
    Signed-off-by: default avatarDmitry Osipenko <digetx@gmail.com>
    Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
    e4a68009
reset-handler.S 6.76 KB