lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 365/717] powerpc/pseries/hibernation: remove redundant cacheinfo update
    Date
    From: Nathan Lynch <nathanl@linux.ibm.com>

    [ Upstream commit b866459489fe8ef0e92cde3cbd6bbb1af6c4e99b ]

    Partitions with cache nodes in the device tree can encounter the
    following warning on resume:

    CPU 0 already accounted in PowerPC,POWER9@0(Data)
    WARNING: CPU: 0 PID: 3177 at arch/powerpc/kernel/cacheinfo.c:197 cacheinfo_cpu_online+0x640/0x820

    These calls to cacheinfo_cpu_offline/online have been redundant since
    commit e610a466d16a ("powerpc/pseries/mobility: rebuild cacheinfo
    hierarchy post-migration").

    Fixes: e610a466d16a ("powerpc/pseries/mobility: rebuild cacheinfo hierarchy post-migration")
    Signed-off-by: Nathan Lynch <nathanl@linux.ibm.com>
    Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
    Link: https://lore.kernel.org/r/20201207215200.1785968-25-nathanl@linux.ibm.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/powerpc/platforms/pseries/suspend.c | 3 ---
    1 file changed, 3 deletions(-)

    diff --git a/arch/powerpc/platforms/pseries/suspend.c b/arch/powerpc/platforms/pseries/suspend.c
    index 3eaa9d59dc7ab..64b36a93c33a6 100644
    --- a/arch/powerpc/platforms/pseries/suspend.c
    +++ b/arch/powerpc/platforms/pseries/suspend.c
    @@ -13,7 +13,6 @@
    #include <asm/mmu.h>
    #include <asm/rtas.h>
    #include <asm/topology.h>
    -#include "../../kernel/cacheinfo.h"

    static u64 stream_id;
    static struct device suspend_dev;
    @@ -78,9 +77,7 @@ static void pseries_suspend_enable_irqs(void)
    * Update configuration which can be modified based on device tree
    * changes during resume.
    */
    - cacheinfo_cpu_offline(smp_processor_id());
    post_mobility_fixup();
    - cacheinfo_cpu_online(smp_processor_id());
    }

    /**
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-28 15:19    [W:3.652 / U:0.472 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site