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=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,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 6693BC04E84 for ; Wed, 15 May 2019 12:17:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 32CD62082E for ; Wed, 15 May 2019 12:17:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557922652; bh=eps0wC4V8dUVTWuAxqEzfJG8jA45lfAepcQRQ4nX61c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=PHftywXpXyMoqdhRC8RRw+32EUIL1sep0O6S8rhSQfrl1w0yBkFmUanNOycAI5rw3 WIqi1aPX/gXQcCzUGOch6tsg0bMd8Jvuwfw9HJteM4U6XCBJfn90dBUUZgzrinTVJ4 HwViErNqP1BXwP3q3JGaSvi2almI/W9ijS81Wb6g= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727274AbfEOLCF (ORCPT ); Wed, 15 May 2019 07:02:05 -0400 Received: from mail.kernel.org ([198.145.29.99]:59208 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727839AbfEOLCE (ORCPT ); Wed, 15 May 2019 07:02:04 -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 6738F20881; Wed, 15 May 2019 11:02:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557918123; bh=eps0wC4V8dUVTWuAxqEzfJG8jA45lfAepcQRQ4nX61c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eHnhlJZskNwUNuLkgxEiGNupBIKUYA+yX6MKfw8Fjv7x7n+WpdQwhuUvYbW6G4jPL tGeG5YvvcJ95wmWW27V9+h38CcLs32FUNqQ/rAd2Ugpp+6fnbUYzTQK+0Kqikl3NMZ 0cPJ9myV1LRBq8lvGxq2euCmYbw6A67IlUWoQFJg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Michael Ellerman Subject: [PATCH 4.4 015/266] powerpc/pseries: Support firmware disable of RFI flush Date: Wed, 15 May 2019 12:52:02 +0200 Message-Id: <20190515090723.143583801@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190515090722.696531131@linuxfoundation.org> References: <20190515090722.696531131@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 From: Michael Ellerman commit 582605a429e20ae68fd0b041b2e840af296edd08 upstream. Some versions of firmware will have a setting that can be configured to disable the RFI flush, add support for it. Fixes: 8989d56878a7 ("powerpc/pseries: Query hypervisor for RFI flush settings") Signed-off-by: Michael Ellerman Signed-off-by: Greg Kroah-Hartman --- arch/powerpc/platforms/pseries/setup.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/arch/powerpc/platforms/pseries/setup.c +++ b/arch/powerpc/platforms/pseries/setup.c @@ -522,7 +522,8 @@ static void pseries_setup_rfi_flush(void if (types == L1D_FLUSH_NONE) types = L1D_FLUSH_FALLBACK; - if (!(result.behaviour & H_CPU_BEHAV_L1D_FLUSH_PR)) + if ((!(result.behaviour & H_CPU_BEHAV_L1D_FLUSH_PR)) || + (!(result.behaviour & H_CPU_BEHAV_FAVOUR_SECURITY))) enable = false; } else { /* Default to fallback if case hcall is not available */