Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp1904060yba; Thu, 25 Apr 2019 07:33:56 -0700 (PDT) X-Google-Smtp-Source: APXvYqzVldaBPXS8A3Oi9J3CV09Dffk5uHQOxWIaADf0WNg3Vtt3nB/ofG83R2l4TUt20tFIwoEt X-Received: by 2002:a17:902:7b8e:: with SMTP id w14mr21869506pll.202.1556202836632; Thu, 25 Apr 2019 07:33:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556202836; cv=none; d=google.com; s=arc-20160816; b=nA7MZ34v6uulmvwBT7Lf3X15UE7kIJ/h2czsycuNelgrqyQ3me71vgx5oPfXbq2mXw YxVWvem++okPL4zKpi9i+6/BVZ5nC0i98GJ05AejDg2rCjC/lO8xO4s+1zVoxDnd1VyL aVgawE4u4rzziqg+TgDksfFgCBsI2XJ6HH9nPe9M1Zkeskve3oXyxRBYAMYBCqJQgWVr 6kBNmlco7nrrBjr6MnTORp1Ag+Gic8sV3vcALI3cdGvyA+Ums3lI//5LrmsjgwIVv4zc HvvazkXlk+VKG8ytl9phwt8Z9Ua3XP1oDfkA12BL3Vb1y5uKrey6gvOeeHXrg3M4BEv6 dd6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:date:cc:to:subject:from:references :in-reply-to:message-id:dkim-signature; bh=Qhx8/SU8t6fwdaGfhg4qR3CfzF0RJnLZe1YqN9ckqjc=; b=kbrECn3vSCBAWju9OVkRgAd9QCHmU6J/5UKUmYnC6V/u65I59N5VpEEgw0cjNqec1p 1+jim50TzSGZr8SzG9UnJj7aRF1WeVNxcjY7J3+02MaZa6cg3qYX04/Zg+ZS0BxlEwXN ZJpGRU6nMBbNGkpGcen4xCoOR8F8N+brwQQIKDcV3di7MxMiGXyvucNjiu+E80c3Wmh7 J1jAUtOoXe71G0hxBvoBAc5AZ75s4EfxUwAyEf3fBa1cIgewSEupK4ZzBfXQcknrZMt1 5z5NirLnjVh24yU7lDutoJyXxk/rkT2VMTGV5+ZbpkCse3gyvqq0uu0unNSkQS7S7UTQ B2fQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=DGjRY1gx; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f18si21679725pgj.188.2019.04.25.07.33.39; Thu, 25 Apr 2019 07:33:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=DGjRY1gx; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726957AbfDYO3b (ORCPT + 99 others); Thu, 25 Apr 2019 10:29:31 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:34283 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725937AbfDYO3a (ORCPT ); Thu, 25 Apr 2019 10:29:30 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 44qfhR4HD4z9v06g; Thu, 25 Apr 2019 16:29:27 +0200 (CEST) Authentication-Results: localhost; dkim=pass reason="1024-bit key; insecure key" header.d=c-s.fr header.i=@c-s.fr header.b=DGjRY1gx; dkim-adsp=pass; dkim-atps=neutral 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 uO3-pXg7tSn6; Thu, 25 Apr 2019 16:29:27 +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 44qfhR3BMXz9v06V; Thu, 25 Apr 2019 16:29:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c-s.fr; s=mail; t=1556202567; bh=Qhx8/SU8t6fwdaGfhg4qR3CfzF0RJnLZe1YqN9ckqjc=; h=In-Reply-To:References:From:Subject:To:Cc:Date:From; b=DGjRY1gxHE3SQ6yDxwK0QpLSFh/k6ZDxROWx26KukYvZsb2q7/G2fr/qrSIk0STgo oXr+QVq/vLxWkAN6C2a8+BEE5Krj3yZtTlA4ClEypSuc1M9iMJI0MeqRRmiwnCKUH+ xLfPjlB+2t+BNXD1ULwU58k635TcGuiahwKxrS6I= Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id EC3298B931; Thu, 25 Apr 2019 16:29:28 +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 Xv7Of_l3GwBZ; Thu, 25 Apr 2019 16:29:28 +0200 (CEST) Received: from po16846vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id C45B28B923; Thu, 25 Apr 2019 16:29:28 +0200 (CEST) Received: by po16846vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 9814A66276; Thu, 25 Apr 2019 14:29:28 +0000 (UTC) Message-Id: <97938d4257ac4b7b5690fdaf38c31c4e12f0a73c.1556202029.git.christophe.leroy@c-s.fr> In-Reply-To: References: From: Christophe Leroy Subject: [PATCH v2 02/11] powerpc/mm: no slice for nohash/64 To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , aneesh.kumar@linux.ibm.com Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Thu, 25 Apr 2019 14:29:28 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Only nohash/32 and book3s/64 support mm slices. Signed-off-by: Christophe Leroy --- arch/powerpc/include/asm/nohash/64/slice.h | 12 ------------ arch/powerpc/include/asm/slice.h | 4 +--- arch/powerpc/platforms/Kconfig.cputype | 4 ++++ 3 files changed, 5 insertions(+), 15 deletions(-) delete mode 100644 arch/powerpc/include/asm/nohash/64/slice.h diff --git a/arch/powerpc/include/asm/nohash/64/slice.h b/arch/powerpc/include/asm/nohash/64/slice.h deleted file mode 100644 index ad0d6e3cc1c5..000000000000 --- a/arch/powerpc/include/asm/nohash/64/slice.h +++ /dev/null @@ -1,12 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _ASM_POWERPC_NOHASH_64_SLICE_H -#define _ASM_POWERPC_NOHASH_64_SLICE_H - -#ifdef CONFIG_PPC_64K_PAGES -#define get_slice_psize(mm, addr) MMU_PAGE_64K -#else /* CONFIG_PPC_64K_PAGES */ -#define get_slice_psize(mm, addr) MMU_PAGE_4K -#endif /* !CONFIG_PPC_64K_PAGES */ -#define slice_set_user_psize(mm, psize) do { BUG(); } while (0) - -#endif /* _ASM_POWERPC_NOHASH_64_SLICE_H */ diff --git a/arch/powerpc/include/asm/slice.h b/arch/powerpc/include/asm/slice.h index 44816cbc4198..be8af667098f 100644 --- a/arch/powerpc/include/asm/slice.h +++ b/arch/powerpc/include/asm/slice.h @@ -4,9 +4,7 @@ #ifdef CONFIG_PPC_BOOK3S_64 #include -#elif defined(CONFIG_PPC64) -#include -#elif defined(CONFIG_PPC_MMU_NOHASH) +#elif defined(CONFIG_PPC_MMU_NOHASH_32) #include #endif diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype index 00b2bb536c74..04915f51f447 100644 --- a/arch/powerpc/platforms/Kconfig.cputype +++ b/arch/powerpc/platforms/Kconfig.cputype @@ -391,6 +391,10 @@ config PPC_MMU_NOHASH def_bool y depends on !PPC_BOOK3S +config PPC_MMU_NOHASH_32 + def_bool y + depends on PPC_MMU_NOHASH && PPC32 + config PPC_BOOK3E_MMU def_bool y depends on FSL_BOOKE || PPC_BOOK3E -- 2.13.3