Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp9095955pxu; Mon, 28 Dec 2020 06:32:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJy5ixQeKt/NZwzJOgXAcNbewgQOQZmAParuMOxb3LcavEaDlQF+GYeray3n6yL7VoaaujRs X-Received: by 2002:a05:6402:1041:: with SMTP id e1mr44036660edu.54.1609165941388; Mon, 28 Dec 2020 06:32:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609165941; cv=none; d=google.com; s=arc-20160816; b=Ta4iUwioI1RnYIAYgZCwy3UINnjH6itnTDXYiuJI39NJjBD0HJRNRuGkP0TlpZ676j Z1dY50ppDxuDDX3q467noBikIPpDMK2GokIc6kwCzEY7/iXaF8uNuAfL88G+H0RwzZ13 rT6RObbK1ZCUY4aMS9DOz5mNd3ttgyB7QPxeocI4M9OqLWvU2OribFzBboHYyn1FsbiD zVUh4kJbxbSEj0PrJaG84RCnI7t72Zi2j+cIMQfIAiLvjzt50PeYqj2B6BMGQsmAEZEl jtUzpO3gN+rBNe2sqi2/Ea2xGKZzsq+TKpv7+n3IcrRK1qZL+31OCRrVLfPkIbVEZmdC qjWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=X7jkoU0oPHFn3AhV6QgWyxuI1zwwO2QGxTnmhHhwXto=; b=vi+3lg2d/rKeJBeCAPD0/o0k+3oicSEBx4CZOWJlh3Oiw3FUp3yCJtUxA2ztdakZ9x fH+C2DwJLU3fg7E81WLQu3syhWFcgPscOxCry6pmM4r7JKOXJXwKZJ6avi1BpFaS0yMj HH2iCQF3EDx2zG5K2nATVtj5dUa6dvG5GFb1QqFWRpKeloiCRcRL79wEbS5ITXG13gw6 l0gJytAftAt/D8Y7FGwd+LXxpRxAnCoQh3uFlqHLnczoE9zEFGfkNjRllaNCCRiFQ9dF p9mXKWfznS49srMREbxMSUNbtAJ+xv2XZThCt7321hrbVLC1596QH8JX7p/91DGyU3/M JQDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=J+kGFfXJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g9si17502184ejj.456.2020.12.28.06.31.58; Mon, 28 Dec 2020 06:32:21 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=J+kGFfXJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2503481AbgL1O3u (ORCPT + 99 others); Mon, 28 Dec 2020 09:29:50 -0500 Received: from mail.kernel.org ([198.145.29.99]:37682 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2503408AbgL1O3l (ORCPT ); Mon, 28 Dec 2020 09:29:41 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 032572245C; Mon, 28 Dec 2020 14:29:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1609165741; bh=WROAuKAvITckqHaZIK0oZSmdCLFJGc8TMKsDsMiIe8M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J+kGFfXJMRinKVmneUOJeT5X7Ck/4R0q8axX3khHqEVSBINCvabcFSiNXOuql7QML PQ9dZgszej87BrViHdM0n21tyhLcEZDPgI1Yz0CI0zD38VbP3Q5t5Z1YROFTOq42tn 4IGKCgohoZ4ocCWlxfYJ85QStmL08yIeU1Q0Hihk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christophe Leroy , Michael Ellerman Subject: [PATCH 5.10 611/717] powerpc/feature: Add CPU_FTR_NOEXECUTE to G2_LE Date: Mon, 28 Dec 2020 13:50:09 +0100 Message-Id: <20201228125050.184583720@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228125020.963311703@linuxfoundation.org> References: <20201228125020.963311703@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Christophe Leroy commit 197493af414ee22427be3343637ac290a791925a upstream. G2_LE has a 603 core, add CPU_FTR_NOEXECUTE. Fixes: 385e89d5b20f ("powerpc/mm: add exec protection on powerpc 603") Cc: stable@vger.kernel.org Signed-off-by: Christophe Leroy Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/39a530ee41d83f49747ab3af8e39c056450b9b4d.1602489653.git.christophe.leroy@csgroup.eu Signed-off-by: Greg Kroah-Hartman --- arch/powerpc/include/asm/cputable.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/powerpc/include/asm/cputable.h +++ b/arch/powerpc/include/asm/cputable.h @@ -369,7 +369,7 @@ static inline void cpu_feature_keys_init CPU_FTR_PPC_LE | CPU_FTR_NEED_PAIRED_STWCX) #define CPU_FTRS_82XX (CPU_FTR_COMMON | CPU_FTR_MAYBE_CAN_DOZE | CPU_FTR_NOEXECUTE) #define CPU_FTRS_G2_LE (CPU_FTR_COMMON | CPU_FTR_MAYBE_CAN_DOZE | \ - CPU_FTR_MAYBE_CAN_NAP) + CPU_FTR_MAYBE_CAN_NAP | CPU_FTR_NOEXECUTE) #define CPU_FTRS_E300 (CPU_FTR_MAYBE_CAN_DOZE | \ CPU_FTR_MAYBE_CAN_NAP | \ CPU_FTR_COMMON | CPU_FTR_NOEXECUTE)