Received: by 2002:ac0:bc90:0:0:0:0:0 with SMTP id a16csp403319img; Wed, 20 Mar 2019 03:09:32 -0700 (PDT) X-Google-Smtp-Source: APXvYqzcIVqcs1ZsUwV/+P8q/Wzag1H5Jvwg42L02fXQm/OI2jSY8V6LSgM7sZxdnp0/THzBNu7D X-Received: by 2002:a17:902:8303:: with SMTP id bd3mr7184903plb.10.1553076572398; Wed, 20 Mar 2019 03:09:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553076572; cv=none; d=google.com; s=arc-20160816; b=iINE5TTA5KKj49/tsPQgLeRHFVZb5okX/vxIq6GYnAy/qHwnazPgBW7lThU0XeMb9l 7NHIQvLvmfgQosmiMAPln9Ch9XHKukM2jEhF1pmKrROj7uRC6Vd4yfOhD7htgD2lhkTt tYPd/x9KPzyinbmoXwy0K4AoVqifBxe6OlijOJPwlLBuNsfJAp1RuzDfFsMBi3FIhMiC zz0s5/ybOFEypoPg+5C34JDQYuyRdpS6xoTgZSESd58Wq65krsXJx9YcmUrHSNaPDfPV ILSKMSSFaARTzYkkNHDWjg2f73t3J/WMrbFjczJaeOp1xYbKEdpFIiHKdT+6WZAACKyV P/Cg== 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=t0kkxTub/kcz/F2MguVs5Is4DUYFRq4Gpf8iL+QZExY=; b=xdnMH63OP6B4vtZ3p9E3d+alHcg2Y100NWbNlUDnu+LWFyPx4D3VeBcwIazyfB9zSj 4Cmcyrv1NhnycSbQQzL98HUQhZ29HspowpNrDx20x/BXp+XLxn84mAr/A1cBdKvNNAH+ mJbvvmZNcten14mBW93tAyux9OF7dYwOPwKjMDG9VlgfU1QyTrowrNmeb9go/gj9pnXY G44GKGUeXP+zISEJjOckkUIeVUb0gUlkLKM+5XSZ/ACTf0mKx2Vk8uIfMkTelfwhGSo4 IZz62lOcc+TlLHdEyOoNUoyv0n/j9mWzsv3uUE8AcYxqBt3y07uHeyp1gVqMtPCUQhcK n+iw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=pH6K6byf; 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 k5si1279852pgo.577.2019.03.20.03.09.16; Wed, 20 Mar 2019 03:09:32 -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=pH6K6byf; 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 S1726963AbfCTKIC (ORCPT + 99 others); Wed, 20 Mar 2019 06:08:02 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:37117 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725966AbfCTKGw (ORCPT ); Wed, 20 Mar 2019 06:06:52 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 44PQZ14spjz9vC09; Wed, 20 Mar 2019 11:06:49 +0100 (CET) Authentication-Results: localhost; dkim=pass reason="1024-bit key; insecure key" header.d=c-s.fr header.i=@c-s.fr header.b=pH6K6byf; 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 rm1OuaKwZsaW; Wed, 20 Mar 2019 11:06:49 +0100 (CET) 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 44PQZ13Qmzz9vByx; Wed, 20 Mar 2019 11:06:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c-s.fr; s=mail; t=1553076409; bh=t0kkxTub/kcz/F2MguVs5Is4DUYFRq4Gpf8iL+QZExY=; h=In-Reply-To:References:From:Subject:To:Cc:Date:From; b=pH6K6byfU8ShZCb7j0RQ+HxrE7Hz8YEPkTTpPMpLkfuWIOANCPAVKlF4JCCslq22S 45mphDoLWv1wNzmmD23TJskg8PMcPVUsljJ5GTEi+Eebv8xHBk/qHzEkhzXx177exv 9FnhoJxyeg+BYF+h3GaxbGvxpitcV7LG12fCJY6g= Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 8DC958B919; Wed, 20 Mar 2019 11:06:50 +0100 (CET) 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 qvO1rlrvClrD; Wed, 20 Mar 2019 11:06:50 +0100 (CET) Received: from po16846vm.idsi0.si.c-s.fr (unknown [172.25.231.2]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 699508B911; Wed, 20 Mar 2019 11:06:50 +0100 (CET) Received: by po16846vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 489A363AEF; Wed, 20 Mar 2019 10:06:50 +0000 (UTC) Message-Id: <3dd101cd372c13d0f1b8687f1b9553cc518af7f0.1553076180.git.christophe.leroy@c-s.fr> In-Reply-To: References: From: Christophe Leroy Subject: [PATCH v1 14/27] 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: Wed, 20 Mar 2019 10:06:50 +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 | 7 ------- arch/powerpc/include/asm/slice.h | 4 +--- arch/powerpc/platforms/Kconfig.cputype | 4 ++++ 3 files changed, 5 insertions(+), 10 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 30adfdd4afde..000000000000 --- a/arch/powerpc/include/asm/nohash/64/slice.h +++ /dev/null @@ -1,7 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _ASM_POWERPC_NOHASH_64_SLICE_H -#define _ASM_POWERPC_NOHASH_64_SLICE_H - -#define get_slice_psize(mm, addr) MMU_PAGE_4K - -#endif /* _ASM_POWERPC_NOHASH_64_SLICE_H */ diff --git a/arch/powerpc/include/asm/slice.h b/arch/powerpc/include/asm/slice.h index d85c85422fdf..49d950a14e25 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 842b2c7e156a..51ceeb046867 100644 --- a/arch/powerpc/platforms/Kconfig.cputype +++ b/arch/powerpc/platforms/Kconfig.cputype @@ -354,6 +354,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