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,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 6B89AC4CEC5 for ; Fri, 13 Sep 2019 13:23:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 33280206BB for ; Fri, 13 Sep 2019 13:23:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568380998; bh=2vm8YHevuXCo4kKWe+2+Yss5Zn0lCSFJs4a64fJVIAM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=lPIZYbyqlgjlg3PbpJHBujzNDlzs1OR9YnvQbW5zk2264cXSr1HVCdncJSzeflKvg qoSo0XwRBxtZol7pVAnPBurlFkS9WcftoT4HiZO/5y+mM7UhMbqbLAjyLamKubwjlD ZuZCzFkoVefrO5BqWm5ye4Frecr1jKmPEoJiWdTI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390504AbfIMNXR (ORCPT ); Fri, 13 Sep 2019 09:23:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:51354 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390232AbfIMNVf (ORCPT ); Fri, 13 Sep 2019 09:21:35 -0400 Received: from localhost (unknown [104.132.45.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A8ABE216F4; Fri, 13 Sep 2019 13:21:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568380895; bh=2vm8YHevuXCo4kKWe+2+Yss5Zn0lCSFJs4a64fJVIAM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GNVcnDCYkJAgFNtml5l08spPDWjAcztFY05a9vlgcpB2OU8qsGG9piFvKJtF9AzUw xwP1Y37RcDCFnOFrUFD1dpr9Suq8xH19KaPfN6WSncL3sFPwnGrNGEv8zUrmJhRnh/ c6Xo7JCm66UeFStFLVLWjpsuDjjaPCX542aOWdKI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chris Packham , Christophe Leroy , Chris Packham , Michael Ellerman Subject: [PATCH 5.2 13/37] powerpc/64e: Drop stale call to smp_processor_id() which hangs SMP startup Date: Fri, 13 Sep 2019 14:07:18 +0100 Message-Id: <20190913130515.860737471@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190913130510.727515099@linuxfoundation.org> References: <20190913130510.727515099@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Archived-At: List-Archive: List-Post: From: Christophe Leroy commit b9ee5e04fd77898208c51b1395fa0b5e8536f9b6 upstream. 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 Signed-off-by: Greg Kroah-Hartman --- arch/powerpc/mm/nohash/tlb.c | 1 - 1 file changed, 1 deletion(-) --- 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 */