Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp2838005imu; Thu, 29 Nov 2018 11:02:09 -0800 (PST) X-Google-Smtp-Source: AFSGD/XlLJ4UDORr5THsCHV5Ekaia+6+U70WuIGlose3yHgsnIOx2MPcjwIU5nP1atxEgZLmHvpE X-Received: by 2002:a17:902:1008:: with SMTP id b8mr2554302pla.252.1543518129237; Thu, 29 Nov 2018 11:02:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543518129; cv=none; d=google.com; s=arc-20160816; b=sjf01mxgZu0akaKswsCkFRSgN8QuS4jOx/EcEBYEEK6iddAOTN9h5rPdGRtHSa5di8 DrcBGJFDCayo2fcEhFdyd1oEIIMqV4TYM3gzxvEnnPjCg/rN2+AvggFW75e1KLXQJnSs GYt5TlaYCHgvxy0RVt+xu3VDSAxzoqYQNLF+PLDy5PoXtoPVJs2QYr8180SU1pheKymJ XB1pNJs3vTxDgREaq9f+YQ8YtGzu8DgNCHI9bjHchJZ1jrWqecunAUMgBDZM0RJpKQ9S F0gxKfAjmI9Dfr6k7hcPrn+PYh4IrArV9/ahbIlunhzPI4ONchxMVp9q5EfHHycGmjwa dH0Q== 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; bh=c13iA6mHo4VrFu1Co95VU8K4yje2vnsapnFZ2fEz9Oo=; b=gK8avon6S+PKHvyfdwZ9JqSwmzCYqSyfsBWiamslcsEF+ZYOYFzDhZN/fz36OMXO6u H9oVj+dtaKBfyG81rb7MPTtMWsrlXYL2JElAh342trBPFvc2KGbv0MzYRJRq6lRDOChy unqIo0uxCgm1xWFWEQAMdYwK7h9u+K3yTjaot3OFKsiS3EeHs6jNyMPOGSEYgkGKkwiR tqbkcKgqwP7fxjrMJkr9hoGdfRNqNwBjGJiHUBE08sMKlh+bjCW1IiFrmY5lcPO6ClPt N16y1HrGSEtGjzA5oKzpEDrG9KddD/2ilotUQ6SX5SIKjP8WQuL4pJSAcrSQaAlz8MN7 D86w== ARC-Authentication-Results: i=1; mx.google.com; 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 e2si2550457pgs.94.2018.11.29.11.01.53; Thu, 29 Nov 2018 11:02:09 -0800 (PST) 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; 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 S1727047AbeK3GHF (ORCPT + 99 others); Fri, 30 Nov 2018 01:07:05 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:6925 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726456AbeK3GHE (ORCPT ); Fri, 30 Nov 2018 01:07:04 -0500 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 435RgD4rFQz9v12B; Thu, 29 Nov 2018 20:00:40 +0100 (CET) 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 s4NYWwp9a0v2; Thu, 29 Nov 2018 20:00:40 +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 435RgD4LWRz9v129; Thu, 29 Nov 2018 20:00:40 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 390408B8F7; Thu, 29 Nov 2018 20:00:39 +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 pTOUuH5my4zZ; Thu, 29 Nov 2018 20:00:39 +0100 (CET) Received: from po14163vm.idsi0.si.c-s.fr (unknown [192.168.232.3]) by messagerie.si.c-s.fr (Postfix) with ESMTP id B169D8B8C6; Thu, 29 Nov 2018 20:00:30 +0100 (CET) Received: by po14163vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 8558769B59; Thu, 29 Nov 2018 19:00:30 +0000 (UTC) Message-Id: <2d30492ee923bd1e8513d374e13c58ad72f481d2.1543517818.git.christophe.leroy@c-s.fr> In-Reply-To: References: From: Christophe Leroy Subject: [PATCH v1 10/13] powerpc/kconfig: define PAGE_SHIFT inside Kconfig To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , j.neuschaefer@gmx.net Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Thu, 29 Nov 2018 19:00:30 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Christophe Leroy --- arch/powerpc/Kconfig | 7 +++++++ arch/powerpc/include/asm/page.h | 13 ++----------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 8be31261aec8..4a81a80d0635 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -711,6 +711,13 @@ config PPC_256K_PAGES endchoice +config PPC_PAGE_SHIFT + int + default 18 if PPC_256K_PAGES + default 16 if PPC_64K_PAGES + default 14 if PPC_16K_PAGES + default 12 + config THREAD_SHIFT int "Thread shift" if EXPERT range 13 15 diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h index 9ea903221a9f..d12a55441629 100644 --- a/arch/powerpc/include/asm/page.h +++ b/arch/powerpc/include/asm/page.h @@ -20,20 +20,11 @@ /* * On regular PPC32 page size is 4K (but we support 4K/16K/64K/256K pages - * on PPC44x). For PPC64 we support either 4K or 64K software + * on PPC44x and 4K/16K on 8xx). For PPC64 we support either 4K or 64K software * page size. When using 64K pages however, whether we are really supporting * 64K pages in HW or not is irrelevant to those definitions. */ -#if defined(CONFIG_PPC_256K_PAGES) -#define PAGE_SHIFT 18 -#elif defined(CONFIG_PPC_64K_PAGES) -#define PAGE_SHIFT 16 -#elif defined(CONFIG_PPC_16K_PAGES) -#define PAGE_SHIFT 14 -#else -#define PAGE_SHIFT 12 -#endif - +#define PAGE_SHIFT CONFIG_PPC_PAGE_SHIFT #define PAGE_SIZE (ASM_CONST(1) << PAGE_SHIFT) #ifndef __ASSEMBLY__ -- 2.13.3