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=-9.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_PASS,USER_AGENT_GIT autolearn=unavailable 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 2B3DAC282DD for ; Mon, 15 Apr 2019 18:50:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E3CC22087C for ; Mon, 15 Apr 2019 18:50:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555354255; bh=GqacdbbgpNQ4mS1hYtHfnHKJiMJqbmFVFFLz56Fi1mM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=HsZ7GQ/ekGkG2eLkbIOFUipyn7yM3HbnKX2ZIDyktxjeZxO38xfShjjGaKS8TRvTs 0ZVBt+HBV1QAlQ/DO9jyq2prYgM+tS+ESpNk7hjKQaqyeHHNHKNb7hN63T2XAgzlbk a0qy6B6vRcJZCbIn1HACNWM3nWDYgQ+NqkNMP7iE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728565AbfDOSqS (ORCPT ); Mon, 15 Apr 2019 14:46:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:49006 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728532AbfDOSqR (ORCPT ); Mon, 15 Apr 2019 14:46:17 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 6B8922087C; Mon, 15 Apr 2019 18:46:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555353976; bh=GqacdbbgpNQ4mS1hYtHfnHKJiMJqbmFVFFLz56Fi1mM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=X7cu3VAzuDvGyFjqrVek3MB58a4/+Sz8vazseSSge/RHPY0nDacqt1que6yew/L2W 5xb3fKZqfWyVjOkWHzAK441OsLs3kyON8yUVrPG9/cXXP3a88pAvE5fS5ZSElEn2OQ w8DmMXgIJllBxBnUW39pr9Dr0ODUI4s8xL0MtnJM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Diana Craciun , Michael Ellerman , Sasha Levin Subject: [PATCH 4.9 40/76] powerpc/fsl: Enable runtime patching if nospectre_v2 boot arg is used Date: Mon, 15 Apr 2019 20:44:04 +0200 Message-Id: <20190415183717.917308685@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190415183707.712011689@linuxfoundation.org> References: <20190415183707.712011689@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org commit 3bc8ea8603ae4c1e09aca8de229ad38b8091fcb3 upstream. If the user choses not to use the mitigations, replace the code sequence with nops. Signed-off-by: Diana Craciun Signed-off-by: Michael Ellerman Signed-off-by: Sasha Levin --- arch/powerpc/kernel/setup-common.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c index d5a128f54537..5e7d70c5d065 100644 --- a/arch/powerpc/kernel/setup-common.c +++ b/arch/powerpc/kernel/setup-common.c @@ -919,6 +919,7 @@ void __init setup_arch(char **cmdline_p) ppc_md.setup_arch(); setup_barrier_nospec(); + setup_spectre_v2(); paging_init(); -- 2.19.1