From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2D74AC43219 for ; Fri, 26 Apr 2019 06:45:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0E66A206DD for ; Fri, 26 Apr 2019 06:45:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725983AbfDZGpc (ORCPT ); Fri, 26 Apr 2019 02:45:32 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:52322 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725893AbfDZGp3 (ORCPT ); Fri, 26 Apr 2019 02:45:29 -0400 Received: from pps.filterd (m0098396.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x3Q6cjLX069830 for ; Fri, 26 Apr 2019 02:45:28 -0400 Received: from e06smtp02.uk.ibm.com (e06smtp02.uk.ibm.com [195.75.94.98]) by mx0a-001b2d01.pphosted.com with ESMTP id 2s3sa58n5x-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 26 Apr 2019 02:45:28 -0400 Received: from localhost by e06smtp02.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 26 Apr 2019 07:45:26 +0100 Received: from b06cxnps4075.portsmouth.uk.ibm.com (9.149.109.197) by e06smtp02.uk.ibm.com (192.168.101.132) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Fri, 26 Apr 2019 07:45:23 +0100 Received: from d06av22.portsmouth.uk.ibm.com (d06av22.portsmouth.uk.ibm.com [9.149.105.58]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x3Q6jMEW33816600 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 26 Apr 2019 06:45:22 GMT Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9BD144C058; Fri, 26 Apr 2019 06:45:22 +0000 (GMT) Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2356F4C044; Fri, 26 Apr 2019 06:45:21 +0000 (GMT) Received: from skywalker.linux.ibm.com (unknown [9.193.89.254]) by d06av22.portsmouth.uk.ibm.com (Postfix) with ESMTP; Fri, 26 Apr 2019 06:45:20 +0000 (GMT) X-Mailer: emacs 26.1 (via feedmail 11-beta-1 Q) From: "Aneesh Kumar K.V" To: Christophe Leroy , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 02/11] powerpc/mm: no slice for nohash/64 In-Reply-To: <97938d4257ac4b7b5690fdaf38c31c4e12f0a73c.1556202029.git.christophe.leroy@c-s.fr> References: <97938d4257ac4b7b5690fdaf38c31c4e12f0a73c.1556202029.git.christophe.leroy@c-s.fr> Date: Fri, 26 Apr 2019 12:03:54 +0530 MIME-Version: 1.0 Content-Type: text/plain X-TM-AS-GCONF: 00 x-cbid: 19042606-0008-0000-0000-000002E05ECA X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19042606-0009-0000-0000-0000224CBB19 Message-Id: <875zr1b7hp.fsf@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-04-26_04:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=996 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1904260048 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Christophe Leroy writes: > Only nohash/32 and book3s/64 support mm slices. > Reviewed-by: Aneesh Kumar K.V > 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