Received: by 2002:a05:6a10:6744:0:0:0:0 with SMTP id w4csp3805083pxu; Mon, 12 Oct 2020 01:18:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzF2ukIE4sSNudS69G+6/kRjMlwhy0Vijnn+DgVNl6xWPfoSIHF1LT91ldKZDH5RmWQED48 X-Received: by 2002:a17:906:2c41:: with SMTP id f1mr26545810ejh.524.1602490734659; Mon, 12 Oct 2020 01:18:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602490734; cv=none; d=google.com; s=arc-20160816; b=gSQZPxEEnP3g7bQmEe/RLp9aQ4epZ9Y/aytbG7KeT/Q1LurgwPf+ndAj49txcdGqXd hMKg3jRpzVdOJujY61ppCYRS7t+Lj6mGKGCJiocF/OAQXfFKmktdAkcqNk5HPkJq/1WG QuQDjQ9KZCLuP98C0jgtVghwF2TgS8YJuwbncxf000PjbVKMg/3ZZ3LGhWDJlB1Ur3Xs pDb5WceHRtND/YpgUaLnIS0ugVPFw1PzTertAtA29bEZR01yAbhdpV8G30io3GeZ7k8H l+5HGTbocG1cIYM98rZCiMm0hjnA4C2QGn8d79ziUuLpyUo48UZX4MLUtsQiqWVrrDKO N2Nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:date:cc:to:subject:from:message-id; bh=kz4Myr1Sst8nScWrzAweZqZA6OIMkEMmXYsGiFqizK0=; b=qnUJyYEtoLBhNbKQBeqGaK2XfPd5kpSB8nBPCvxgMYf0+lAL7q3yb7LqaTKcMq9fPF KH75hr4aSybV8bpHV8R4QpjASWjE17FLo3+3bEYt88hBC5HOyGy4mXzJMg9O5o86xTyh CzpE5bEa0xPGmPkH7i5li7eQ/DIBfiQZgimPm2OQel5wqrHKg/vyD+p00pybEEEFfmdD zhzVbzKY8IEpVorRdxTfC0uZpA9Lc+qq9kfLzMViwudt1u7SWB2OLNmInZ4MU108x46F uadpstTbOD4h+9qbRWriymHrtjLn1NFnMKIeYOcmB5XUmDSyLbruxnmD0XHySt73OZrV 7i8g== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id cq6si11378952edb.454.2020.10.12.01.18.31; Mon, 12 Oct 2020 01:18:54 -0700 (PDT) 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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727218AbgJLICP (ORCPT + 99 others); Mon, 12 Oct 2020 04:02:15 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:55122 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726495AbgJLICP (ORCPT ); Mon, 12 Oct 2020 04:02:15 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 4C8rk81j5Vz9typn; Mon, 12 Oct 2020 10:02:08 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id yGs_MeSOporz; Mon, 12 Oct 2020 10:02:08 +0200 (CEST) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 4C8rk80xmxz9typb; Mon, 12 Oct 2020 10:02:08 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 3D1888B784; Mon, 12 Oct 2020 10:02:13 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id D0bZjZdqHzga; Mon, 12 Oct 2020 10:02:13 +0200 (CEST) Received: from po17688vm.idsi0.si.c-s.fr (po15451.idsi0.si.c-s.fr [172.25.230.100]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 1A6038B783; Mon, 12 Oct 2020 10:02:13 +0200 (CEST) Received: by po17688vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 0B24966441; Mon, 12 Oct 2020 08:02:13 +0000 (UTC) Message-Id: <39a530ee41d83f49747ab3af8e39c056450b9b4d.1602489653.git.christophe.leroy@csgroup.eu> From: Christophe Leroy Subject: [PATCH] powerpc/feature: Add CPU_FTR_NOEXECUTE to G2_LE To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Mon, 12 Oct 2020 08:02:13 +0000 (UTC) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- arch/powerpc/include/asm/cputable.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/include/asm/cputable.h b/arch/powerpc/include/asm/cputable.h index c596bab134e2..9780c55f9811 100644 --- 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(void) { } 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) -- 2.25.0