From patchwork Thu Nov 3 18:50:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timur Tabi X-Patchwork-Id: 123493 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id EF6DDB7478 for ; Fri, 4 Nov 2011 05:50:32 +1100 (EST) Received: by ozlabs.org (Postfix) id 8FB6CB6F85; Fri, 4 Nov 2011 05:50:24 +1100 (EST) Delivered-To: linuxppc-dev@ozlabs.org Received: from VA3EHSOBE001.bigfish.com (va3ehsobe001.messaging.microsoft.com [216.32.180.11]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (Client CN "mail.global.frontbridge.com", Issuer "Microsoft Secure Server Authority" (verified OK)) by ozlabs.org (Postfix) with ESMTPS id 1D2E1B6F76 for ; Fri, 4 Nov 2011 05:50:22 +1100 (EST) Received: from mail25-va3-R.bigfish.com (10.7.14.251) by VA3EHSOBE001.bigfish.com (10.7.40.21) with Microsoft SMTP Server id 14.1.225.22; Thu, 3 Nov 2011 18:50:01 +0000 Received: from mail25-va3 (localhost [127.0.0.1]) by mail25-va3-R.bigfish.com (Postfix) with ESMTP id 4E3E11E04CD for ; Thu, 3 Nov 2011 18:52:01 +0000 (UTC) X-SpamScore: 0 X-BigFish: VS0(zzzz1202hzz8275bhz2dh2a8h668h839h62h) X-Spam-TCS-SCL: 1:0 X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI Received: from mail25-va3 (localhost.localdomain [127.0.0.1]) by mail25-va3 (MessageSwitch) id 1320346321108481_9713; Thu, 3 Nov 2011 18:52:01 +0000 (UTC) Received: from VA3EHSMHS024.bigfish.com (unknown [10.7.14.254]) by mail25-va3.bigfish.com (Postfix) with ESMTP id 140FC1C0043 for ; Thu, 3 Nov 2011 18:52:01 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by VA3EHSMHS024.bigfish.com (10.7.99.34) with Microsoft SMTP Server (TLS) id 14.1.225.22; Thu, 3 Nov 2011 18:50:01 +0000 Received: from az33smr02.freescale.net (10.64.34.200) by 039-SN1MMR1-002.039d.mgd.msft.net (10.84.1.15) with Microsoft SMTP Server id 14.1.339.2; Thu, 3 Nov 2011 13:50:16 -0500 Received: from efes.am.freescale.net (efes.am.freescale.net [10.82.123.3]) by az33smr02.freescale.net (8.13.1/8.13.0) with ESMTP id pA3IoFi7020297; Thu, 3 Nov 2011 13:50:15 -0500 (CDT) From: Timur Tabi To: , Subject: [PATCH] powerpc/85xx: do not force PHYS_64BIT on Freescale reference boards Date: Thu, 3 Nov 2011 13:50:15 -0500 Message-ID: <1320346215-21024-1-git-send-email-timur@freescale.com> X-Mailer: git-send-email 1.7.3.4 MIME-Version: 1.0 X-OriginatorOrg: freescale.com X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Kconfig option PHYS_64BIT sets the size of phys_addr_t to 64 bits, which allows support for a 36-bit physical address space. With this option, the kernel can support more than 2GB of RAM, but the larger address size impacts performance slightly. By including "select PHYS_64BIT" in the Kconfig for a particular board, that option is forced enabled, and it becomes impossible to create a 32-bit kernel. Instead, we should depend on the defconfig to enable this option. We still build a 36-bit kernel by default, and we also allow users to build 32-bit kernels if they really want. Signed-off-by: Timur Tabi --- arch/powerpc/configs/corenet32_smp_defconfig | 1 + arch/powerpc/platforms/85xx/Kconfig | 5 ----- 2 files changed, 1 insertions(+), 5 deletions(-) diff --git a/arch/powerpc/configs/corenet32_smp_defconfig b/arch/powerpc/configs/corenet32_smp_defconfig index 4311d02..819c06e 100644 --- a/arch/powerpc/configs/corenet32_smp_defconfig +++ b/arch/powerpc/configs/corenet32_smp_defconfig @@ -1,4 +1,5 @@ CONFIG_PPC_85xx=y +CONFIG_PHYS_64BIT=y CONFIG_SMP=y CONFIG_NR_CPUS=8 CONFIG_EXPERIMENTAL=y diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig index 12f5932..6dba779 100644 --- a/arch/powerpc/platforms/85xx/Kconfig +++ b/arch/powerpc/platforms/85xx/Kconfig @@ -80,7 +80,6 @@ config P1010_RDB config P1022_DS bool "Freescale P1022 DS" select DEFAULT_UIMAGE - select PHYS_64BIT # The DTS has 36-bit addresses select SWIOTLB help This option enables support for the Freescale P1022DS reference board. @@ -175,7 +174,6 @@ config P2040_RDB bool "Freescale P2040 RDB" select DEFAULT_UIMAGE select PPC_E500MC - select PHYS_64BIT select SWIOTLB select MPC8xxx_GPIO select HAS_RAPIDIO @@ -187,7 +185,6 @@ config P3041_DS bool "Freescale P3041 DS" select DEFAULT_UIMAGE select PPC_E500MC - select PHYS_64BIT select SWIOTLB select MPC8xxx_GPIO select HAS_RAPIDIO @@ -199,7 +196,6 @@ config P4080_DS bool "Freescale P4080 DS" select DEFAULT_UIMAGE select PPC_E500MC - select PHYS_64BIT select SWIOTLB select MPC8xxx_GPIO select HAS_RAPIDIO @@ -214,7 +210,6 @@ config P5020_DS select DEFAULT_UIMAGE select E500 select PPC_E500MC - select PHYS_64BIT select SWIOTLB select MPC8xxx_GPIO select HAS_RAPIDIO