From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F165AC3A5A2 for ; Tue, 10 Sep 2019 11:27:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C7F0620872 for ; Tue, 10 Sep 2019 11:27:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568114824; bh=S5C7gDavnBupr4RKXMfi28USfWfuhYrMM0nZAzT0HjY=; h=Subject:To:Cc:From:Date:List-ID:From; b=a4dPqPJkHGzwT7EmPAmtFUyXFjQPYjKGZZ6sHIPpYUsNVZuUSk3Sn0MHosTi4tsKP nViQuvs7pPj2GjJOxy2zAFEVbdHWQnZRVqSAyLLyzob0fmFfnhlBf81ljUWlb6WdaP BV4V6vWVK9QZNz3M9CjIa4wTCOYanuXn8VG9SVwc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728180AbfIJL1E (ORCPT ); Tue, 10 Sep 2019 07:27:04 -0400 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:36827 "EHLO wout2-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726527AbfIJL1E (ORCPT ); Tue, 10 Sep 2019 07:27:04 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 6DCF160D; Tue, 10 Sep 2019 07:27:03 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Tue, 10 Sep 2019 07:27:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=Jut87w iHf2Vzg8FkJJWwS41rKGC64oYRGVdIfiUiYqs=; b=zgHNueuoGSNzGspa0P3eQA v/D8dS1Bl6hJIsWoPAqsyxL+jzTIXT3NeCTbVpjByEQ1YeqwKIwUR0EF4EUIxraL DOAijXr3KQK1vbH4Y7AABRYsPcunp2AVGm6tXzJBnjSl6+uaV0t30kXrWlrb8L3F w2UmrEH3gpMycOxIm/rNceNVylWNAnRphpv55rSrKLpG2nro6fW6GQUR8vkBQRAt 4NkfjvArKFeJdkt+tdz8a9YJooaR66aSMMjglbJtpc1FUEsTMZZQMZ8Mj4zwmeuO jx/AHF7bQVAWQtB7l8IYAL5GoZCjvqmXlfotR1xG4dCFyUIKXnIuX3P3w+cw6whg == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedufedrtddtgddujecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhepuffvhfffkfggtgfgsehtkeertddttd flnecuhfhrohhmpeeoghhrvghgkhhhsehlihhnuhigfhhouhhnuggrthhiohhnrdhorhhg qeenucffohhmrghinhepkhgvrhhnvghlrdhorhhgnecukfhppedvudefrdeftddrkedrud dutdenucfrrghrrghmpehmrghilhhfrhhomhepghhrvghgsehkrhhorghhrdgtohhmnecu vehluhhsthgvrhfuihiivgepvd X-ME-Proxy: Received: from localhost (110.8.30.213.rev.vodafone.pt [213.30.8.110]) by mail.messagingengine.com (Postfix) with ESMTPA id 8A5F8D6005A; Tue, 10 Sep 2019 07:27:02 -0400 (EDT) Subject: FAILED: patch "[PATCH] powerpc/64e: Drop stale call to smp_processor_id() which" failed to apply to 4.9-stable tree To: christophe.leroy@c-s.fr, Chris.Packham@alliedtelesis.co.nz, chris.packham@alliedtelesis.co.nz, mpe@ellerman.id.au Cc: From: Date: Tue, 10 Sep 2019 12:26:58 +0100 Message-ID: <156811481811893@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 4.9-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From b9ee5e04fd77898208c51b1395fa0b5e8536f9b6 Mon Sep 17 00:00:00 2001 From: Christophe Leroy Date: Thu, 8 Aug 2019 12:48:26 +0000 Subject: [PATCH] powerpc/64e: Drop stale call to smp_processor_id() which hangs SMP startup Commit ebb9d30a6a74 ("powerpc/mm: any thread in one core can be the first to setup TLB1") removed the need to know the cpu_id in early_init_this_mmu(), but the call to smp_processor_id() which was marked __maybe_used remained. Since commit ed1cd6deb013 ("powerpc: Activate CONFIG_THREAD_INFO_IN_TASK") thread_info cannot be reached before MMU is properly set up. Drop this stale call to smp_processor_id() which makes SMP hang when CONFIG_PREEMPT is set. Fixes: ebb9d30a6a74 ("powerpc/mm: any thread in one core can be the first to setup TLB1") Fixes: ed1cd6deb013 ("powerpc: Activate CONFIG_THREAD_INFO_IN_TASK") Cc: stable@vger.kernel.org # v5.1+ Reported-by: Chris Packham Signed-off-by: Christophe Leroy Tested-by: Chris Packham Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/bef479514f4c08329fa649f67735df8918bc0976.1565268248.git.christophe.leroy@c-s.fr diff --git a/arch/powerpc/mm/nohash/tlb.c b/arch/powerpc/mm/nohash/tlb.c index d4acf6fa0596..bf60983a58c7 100644 --- a/arch/powerpc/mm/nohash/tlb.c +++ b/arch/powerpc/mm/nohash/tlb.c @@ -630,7 +630,6 @@ static void early_init_this_mmu(void) #ifdef CONFIG_PPC_FSL_BOOK3E if (mmu_has_feature(MMU_FTR_TYPE_FSL_E)) { unsigned int num_cams; - int __maybe_unused cpu = smp_processor_id(); bool map = true; /* use a quarter of the TLBCAM for bolted linear map */