Received: by 2002:a05:6a10:6744:0:0:0:0 with SMTP id w4csp3805598pxu; Mon, 12 Oct 2020 01:20:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxHEsULUjPRbqC6ddSnz24lE6vw1dyjx+fxEp6ptJvfiOIc6XCwC0TRvz7cp10kTY5PQhBP X-Received: by 2002:a17:907:4301:: with SMTP id nh1mr25388192ejb.397.1602490803443; Mon, 12 Oct 2020 01:20:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602490803; cv=none; d=google.com; s=arc-20160816; b=dXwNJIii6KwssRysDDZwDiaZLLiFQPJB1OO3bNVbYbitDko3F0YwWbFhGeTe4fAm6T pfZZGcCRH0rWGiGo+nrKffT8VeSPdzvyJlxI5y35t+S7rh5sSE4e55Ngzed3Z6QgNfXM 6AdAMoztS3685283ls4dkI+ILaaJ9q2sEG0q4/ATxZ9HQ5EPF15lL5ss5UNbVAmpLXZ2 stPZyFDbUcRoT7maVa8+/iL79WUtXaTsdv1W28L/CAZ6EK1HN/DPRVIogcHGBXfB9LGC kIZwt8/NEtDTEwq/LadTkOGsa3BcLLn+EMTrUeJBQI6GxzhS96h2b8EMbZbXmGtbc/iJ HWRQ== 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=WLLU1duOQuR5QfC2yUZuwEv7OJ3ApyOEYXYPddElbzU=; b=YymDqCC7yH5ejdCEYitKltJ75yZ2w7tIuD/NjlIur5P6qixdL2vnVEv4+h2h52FRXy FOixAgEOrDJggbLer6/C6g3XR2zr/6Uq/MPlaI9NAyfUYHaGQUDlkHSa2dBdX4f7fgBh /rUnFl/ywRVwI0wwOh0eFXnUz7iedSNTIsxWze8Ef5c5b7uwgNZcRsnVL9eNZqBJMuow +reB3kVbEnz64QbueCSKRbI1S0uhpGpmkTUotPklRWh+WxgsS5bsOytBlZWF+d4e8WQq 7pdl/ZmwOnErOXUv7nKx5iLd4lhDGfCmxIRRTryETqQCp+l+GRx1wAbstLLbds53rt8F wqfg== 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 bd5si10334618edb.451.2020.10.12.01.19.40; Mon, 12 Oct 2020 01:20:03 -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 S1726720AbgJLIE2 (ORCPT + 99 others); Mon, 12 Oct 2020 04:04:28 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:31387 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726342AbgJLIE2 (ORCPT ); Mon, 12 Oct 2020 04:04:28 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 4C8rmh0Xlpz9typT; Mon, 12 Oct 2020 10:04:20 +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 ry--GPNevYkn; Mon, 12 Oct 2020 10:04:20 +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 4C8rmg6mw4z9typR; Mon, 12 Oct 2020 10:04:19 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 12D5C8B783; Mon, 12 Oct 2020 10:04:25 +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 daA5CPWgaEmW; Mon, 12 Oct 2020 10:04:25 +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 ACFCF8B787; Mon, 12 Oct 2020 10:04:24 +0200 (CEST) Received: by po17688vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 8E0F466441; Mon, 12 Oct 2020 08:04:24 +0000 (UTC) Message-Id: <829ae1aed1d2fc6b5fc5818362e573dee5d6ecde.1602489852.git.christophe.leroy@csgroup.eu> From: Christophe Leroy Subject: [PATCH] powerpc/mm: Desintegrate MMU_FTR_PPCAS_ARCH_V2 To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Mon, 12 Oct 2020 08:04:24 +0000 (UTC) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org MMU_FTR_PPCAS_ARCH_V2 is defined in cpu_table.h as MMU_FTR_TLBIEL | MMU_FTR_16M_PAGE. MMU_FTR_TLBIEL and MMU_FTR_16M_PAGE are defined in mmu.h MMU_FTR_PPCAS_ARCH_V2 is used only in mmu.h and it is used only once. Remove MMU_FTR_PPCAS_ARCH_V2 and use directly MMU_FTR_TLBIEL | MMU_FTR_16M_PAGE Signed-off-by: Christophe Leroy --- arch/powerpc/include/asm/cputable.h | 2 -- arch/powerpc/include/asm/mmu.h | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/arch/powerpc/include/asm/cputable.h b/arch/powerpc/include/asm/cputable.h index accdc1286f37..d88bcb79f16d 100644 --- a/arch/powerpc/include/asm/cputable.h +++ b/arch/powerpc/include/asm/cputable.h @@ -220,8 +220,6 @@ static inline void cpu_feature_keys_init(void) { } #define CPU_FTR_PPCAS_ARCH_V2 (CPU_FTR_NOEXECUTE) -#define MMU_FTR_PPCAS_ARCH_V2 (MMU_FTR_TLBIEL | MMU_FTR_16M_PAGE) - /* We only set the altivec features if the kernel was compiled with altivec * support */ diff --git a/arch/powerpc/include/asm/mmu.h b/arch/powerpc/include/asm/mmu.h index 255a1837e9f7..b4367fd0b477 100644 --- a/arch/powerpc/include/asm/mmu.h +++ b/arch/powerpc/include/asm/mmu.h @@ -126,8 +126,7 @@ #define MMU_FTR_RADIX_KUAP ASM_CONST(0x80000000) /* MMU feature bit sets for various CPUs */ -#define MMU_FTRS_DEFAULT_HPTE_ARCH_V2 \ - MMU_FTR_HPTE_TABLE | MMU_FTR_PPCAS_ARCH_V2 +#define MMU_FTRS_DEFAULT_HPTE_ARCH_V2 (MMU_FTR_HPTE_TABLE | MMU_FTR_TLBIEL | MMU_FTR_16M_PAGE) #define MMU_FTRS_POWER MMU_FTRS_DEFAULT_HPTE_ARCH_V2 #define MMU_FTRS_PPC970 MMU_FTRS_POWER | MMU_FTR_TLBIE_CROP_VA #define MMU_FTRS_POWER5 MMU_FTRS_POWER | MMU_FTR_LOCKLESS_TLBIE -- 2.25.0