Hi, Sasha,
This patch should only be added to 4.2+.
Huacai
On Tue, Jul 12, 2016 at 10:55 AM, Sasha Levin <sasha.levin@xxxxxxxxxx> wrote:
> From: Huacai Chen <chenhc@xxxxxxxxxx>
>
> This patch has been added to the 4.1 stable tree. If you have any
> objections, please let us know.
>
> ===============
>
> [ Upstream commit a95d069204e178f18476f5499abab0d0d9cbc32c ]
>
> After commit 92923ca3aacef63c92d ("mm: meminit: only set page reserved
> in the memblock region"), the MIPS hibernation is broken. Because pages
> in nosave data section should be "reserved", but currently they aren't
> set to "reserved" at initialization. This patch makes hibernation work
> again.
>
> Signed-off-by: Huacai Chen <chenhc@xxxxxxxxxx>
> Cc: Aurelien Jarno <aurelien@xxxxxxxxxxx>
> Cc: Steven J . Hill <sjhill@xxxxxxxxxxxxxxxxxx>
> Cc: Fuxin Zhang <zhangfx@xxxxxxxxxx>
> Cc: Zhangjin Wu <wuzhangjin@xxxxxxxxx>
> Cc: linux-mips@xxxxxxxxxxxxxx
> Cc: stable@xxxxxxxxxxxxxxx
> Patchwork: https://patchwork.linux-mips.org/patch/12888/
> Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
> Signed-off-by: Sasha Levin <sasha.levin@xxxxxxxxxx>
> ---
> arch/mips/kernel/setup.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
> index be73c49..49b5203 100644
> --- a/arch/mips/kernel/setup.c
> +++ b/arch/mips/kernel/setup.c
> @@ -686,6 +686,9 @@ static void __init arch_mem_init(char **cmdline_p)
> for_each_memblock(reserved, reg)
> if (reg->size != 0)
> reserve_bootmem(reg->base, reg->size, BOOTMEM_DEFAULT);
> +
> + reserve_bootmem_region(__pa_symbol(&__nosave_begin),
> + __pa_symbol(&__nosave_end)); /* Reserve for hibernation */
> }
>
> static void __init resource_init(void)
> --
> 2.5.0
>
>
