Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp2034580imu; Thu, 10 Jan 2019 07:14:27 -0800 (PST) X-Google-Smtp-Source: ALg8bN7yjOjXn2dt/W/HuQ+KvYaQka+7o9b4ovz5mGaTe312HsPBRitmFDGqjiaTm/5WZu4X7jwI X-Received: by 2002:a63:6cc:: with SMTP id 195mr9761802pgg.401.1547133267184; Thu, 10 Jan 2019 07:14:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547133267; cv=none; d=google.com; s=arc-20160816; b=lOJwnBlozKZ4LGNHTtdMjAUGY703JC2rayl6Swt+tlyoPYh3q4Ne2yEj47VLCXiKP9 jt4NPY8vbZ0OB7q4LtkkkD3WLa4TyTkTwtsUd0OcD6gekMZ/KwWedUtx4Tv9vRWqaKt3 5GO8/l1chxCkqYPS+ERSVHQSlo87oM582igq0dfJfzLnzXMbfOhjjcHtHSDodXeXIt5o 7jN+bCGiDsHjO4Is8JK3XVuGzjBxdRbLTbDLwf7RZV7DW1jfl5yjmEY1OAfxFcyi4liL DIWW5MjHCrWXzSu+Nch4+60FHX36XK6oBu3vXWP9h1PkB7cg0GdjA2QdVY8OGBBvU9ku pGtw== 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=2UWUvZVAyrXCLJvQxGreFDaj9f3Voc3vi8J8BTrkchw=; b=egIYZyLxRu988lvFeJSiZFn2I8tzcvExc9zECmUJNVN+6UKwILJ9OCjTbJsWngDXxt xJXa60M1ohIWxzRT2rbisIoJvaQEWdkvTaJ908iJ/61LYx9ztiBhnYUg6sLPsrFCqdlS mIuzhohQMA+7h8xZpYFCaklgMCJ1jAhxYywtQSLawkupYTGU+nP4uGc9jB4iu/LmqMA5 QcTo2S3aQnHh/S5ppkQy586zeHkvIdzucxKmkW2IG8e4bO7NAQBjI5fzJXuEQc/svCve KNdHXi6CZLljisEE2IqEeapQcbeGDQ4EQYFmuSIqnyoxrrCRTrHrFLOG1llZyK3k6+aD 75hA== 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 v8si68573442plp.215.2019.01.10.07.14.11; Thu, 10 Jan 2019 07:14:27 -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 S1729770AbfAJPMh (ORCPT + 99 others); Thu, 10 Jan 2019 10:12:37 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:53603 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729635AbfAJPMA (ORCPT ); Thu, 10 Jan 2019 10:12:00 -0500 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 43b8by0q09z9v0fF; Thu, 10 Jan 2019 16:11:58 +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 DyrC6OKltPuD; Thu, 10 Jan 2019 16:11:58 +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 43b8by0Jv2z9v0f8; Thu, 10 Jan 2019 16:11:58 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 81A528B8A0; Thu, 10 Jan 2019 16:11:59 +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 2IoUKUxNZvhK; Thu, 10 Jan 2019 16:11:59 +0100 (CET) Received: from po16846vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 5186D8B89F; Thu, 10 Jan 2019 16:11:59 +0100 (CET) Received: by po16846vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 127E26BF21; Thu, 10 Jan 2019 15:11:59 +0000 (UTC) Message-Id: In-Reply-To: References: From: Christophe Leroy Subject: [PATCH v2 10/15] 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, 10 Jan 2019 15:11:59 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch defined CONFIG_PPC_PAGE_SHIFT in order to be able to use PAGE_SHIFT value inside Kconfig. 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 2890d36eb531..d72caed57f2c 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -714,6 +714,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 5c5ea2413413..bc4bb6c6efce 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