Re: [PATCH 1/2] MIPS: Hibernate: flush TLB entries earlier

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi, Ralf,

Can these two patches be merged in 4.0?

Huacai

On Thu, Jan 22, 2015 at 10:59 PM, 陈华才 <chenhc@xxxxxxxxxx> wrote:
> Hi, Ralf,
>
> Can these two patches be merged in 3.19?
>
> Huacai
>
> ------------------ Original ------------------
> From:  "Huacai Chen"<chenhc@xxxxxxxxxx>;
> Date:  Mon, Dec 22, 2014 10:30 AM
> To:  "Ralf Baechle"<ralf@xxxxxxxxxxxxxx>;
> Cc:  "John Crispin"<john@xxxxxxxxxxx>; "Steven J. Hill"<Steven.Hill@xxxxxxxxxx>; "linux-mips"<linux-mips@xxxxxxxxxxxxxx>; "Fuxin Zhang"<zhangfx@xxxxxxxxxx>; "wuzhangjin"<wuzhangjin@xxxxxxxxx>; "Huacai Chen"<chenhc@xxxxxxxxxx>; "stable"<stable@xxxxxxxxxxxxxxx>;
> Subject:  [PATCH 1/2] MIPS: Hibernate: flush TLB entries earlier
>
> We found that TLB mismatch not only happens after kernel resume, but
> also happens during snapshot restore. So move it to the beginning of
> swsusp_arch_suspend().
>
> Cc: <stable@xxxxxxxxxxxxxxx>
> Signed-off-by: Huacai Chen <chenhc@xxxxxxxxxx>
> ---
>  arch/mips/power/hibernate.S |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/arch/mips/power/hibernate.S b/arch/mips/power/hibernate.S
> index 32a7c82..e7567c8 100644
> --- a/arch/mips/power/hibernate.S
> +++ b/arch/mips/power/hibernate.S
> @@ -30,6 +30,8 @@ LEAF(swsusp_arch_suspend)
>  END(swsusp_arch_suspend)
>
>  LEAF(swsusp_arch_resume)
> +       /* Avoid TLB mismatch during and after kernel resume */
> +       jal local_flush_tlb_all
>         PTR_L t0, restore_pblist
>  0:
>         PTR_L t1, PBE_ADDRESS(t0)   /* source */
> @@ -43,7 +45,6 @@ LEAF(swsusp_arch_resume)
>         bne t1, t3, 1b
>         PTR_L t0, PBE_NEXT(t0)
>         bnez t0, 0b
> -       jal local_flush_tlb_all /* Avoid TLB mismatch after kernel resume */
>         PTR_LA t0, saved_regs
>         PTR_L ra, PT_R31(t0)
>         PTR_L sp, PT_R29(t0)
> --
> 1.7.7.3





[Index of Archives]     [Linux MIPS Home]     [LKML Archive]     [Linux ARM Kernel]     [Linux ARM]     [Linux]     [Git]     [Yosemite News]     [Linux SCSI]     [Linux Hams]

  Powered by Linux