From patchwork Sat Jul 18 20:08:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Wood X-Patchwork-Id: 497418 X-Patchwork-Delegate: scottwood@freescale.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 1BF4A1409BB for ; Sun, 19 Jul 2015 06:28:28 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id F40C81A2E0E for ; Sun, 19 Jul 2015 06:28:27 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1on0130.outbound.protection.outlook.com [157.56.110.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 7DBC41A1967 for ; Sun, 19 Jul 2015 06:09:39 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=none (message not signed) header.d=none; Received: from snotra.am.freescale.net (192.88.168.49) by CY1PR03MB1486.namprd03.prod.outlook.com (10.163.17.16) with Microsoft SMTP Server (TLS) id 15.1.213.14; Sat, 18 Jul 2015 20:09:32 +0000 From: Scott Wood To: Subject: [RFC PATCH 15/17] powerpc/booke: Only use VIRT_PHYS_OFFSET on booke32 Date: Sat, 18 Jul 2015 15:08:52 -0500 Message-ID: <1437250134-307-16-git-send-email-scottwood@freescale.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1437250134-307-1-git-send-email-scottwood@freescale.com> References: <1437250134-307-1-git-send-email-scottwood@freescale.com> MIME-Version: 1.0 X-Originating-IP: [192.88.168.49] X-ClientProxiedBy: BY2PR21CA0002.namprd21.prod.outlook.com (25.162.74.140) To CY1PR03MB1486.namprd03.prod.outlook.com (25.163.17.16) X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB1486; 2:ZZZ5bAm3Wi2MXX0qct/cT6E34JzfxVIhf6kFiuEqfnZz06rO2q+pIbDDyF0EZLwp; 3:wW2dUaQvtMtWzCbkYIaSgyJriQPVcVitwMDJHaVW86g1fo6jnedzTx/45NA5e6cYCN2AgA/uPGqvZSniZVtDkBPqR6yUPaEU1OUtyxG+IL+bDCiJqUZKYuLfnHfMTlaiOct4hrm7urp06oAT0sqCjA==; 25:18vbrm6dz+NrwMI6PDLUCAw0nM626Y6yo1MB3bRqLlpV94cHiqiVcril8gzIQyZf/T+kfjBjSZp4bO/8n0OXkr6lAOMsSjLI5g1Lvkg7BkXfofSl2R5cFr8IzLXWDrGb091QOtFphux020KtSYr+fTV7kiqVVtKen8/wREEhPydWIVAYE2AZTVJ3dhQHaaPzVbCvQ6KnGbg3vqkyOtHhEljVdp6FMBHN5R8FwTKWxvOnGem7TsHog+7EL16uBR9nvTBYG4nxUXXsszFuLOtLBw== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR03MB1486; X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB1486; 20:tenTCxsOruaGUh393fcMLmrD71PXEUUt7UVNvjZawfIkVQJ1ClEjISpa81rIbtkZl2XJO/MK0L3AUHJgnwpc6u/Xxaimd2HnHUvVCgkqb02BnHg++IT6mQayFbHq/jMrZ5YATVVeaBwkyv9+i6vQa5neVugF7zS/HglmHC3yOkZ0kleXia4qNKsm6V4Jde1fCWELmIaJcADjDxmXGtKR68+fJ775AdtuF2w7qEeo9ciH4oNgTbWbYQfl2Ymk0TO7lrsUcjPmTtReNCNyw44rB44dskdCsjX15xkIaGG/2z37Xu0MEbYXEXeiKgk/QjU/eURo6V0+mFoFHsLRks8oHu8R2FjdTpNKGpvGYbtA1DtPrYy+z8VgVr08mPEIHIOCBs2Em9EApYC+ptxqrE2RBBLtnTiKDx1g/QPlVZeKpqRKbKQvTYpRqnA/xNm3gpzbDQloFYl/UyWTl/kkY5TCHPBWfcOK8sXLc/nzw+yMfEBq49RGhi77IA8yPpxZLIgw; 4:VI0+Xd9Xkai6kjH6J/nQkYiqzTS+ea01xYachxqkKiSO/NGyoIwXhkNUT8IbwwRys1kve2Lm6WjocP2s7CTAIVCpwjkqbY/95G+Ch7k6EeK6UczKf8jViQHMgRzNOUAEXiITOrlas1tKj2jzBMSfCsCaSM2QIaNtVRBQuZhkfKy1AQeTKHDizsygFyoQjMJpui2UBIxMoS5aiBa0e8EGwCBNqXcOCs7+hxIJDYn1kqYNrVW0vRS4j9H5ZXLybOCWj1CDXmPxh/Ir7jFwRVZOuQKlRJdk7ZikrzGlvsqSpxw= CY1PR03MB1486: X-MS-Exchange-Organization-RulesExecuted X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(3002001); SRVR:CY1PR03MB1486; BCL:0; PCL:0; RULEID:; SRVR:CY1PR03MB1486; X-Forefront-PRVS: 0641678E68 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(19580395003)(50466002)(19580405001)(229853001)(36756003)(46102003)(2351001)(42186005)(40100003)(87976001)(122386002)(33646002)(86362001)(62966003)(5001960100002)(5001920100001)(92566002)(2950100001)(110136002)(77096005)(107886002)(48376002)(77156002)(50986999)(76176999)(66066001)(47776003)(50226001)(5003940100001)(189998001)(217873001)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:CY1PR03MB1486; H:snotra.am.freescale.net; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB1486; 23:mClu3+e9SXHRH6U55WDolxjX2hodVz+dhQ0RumtzA+qsRzxz0eyOZ9F8h126mKDcyP1czmUqjKZsIWnH/pbP1BcFbWfDtOp58DKo9i+D76/GcWjyi0lUv1pqKWxuLehQTeCcEF1nTzsQxOevGw5UPdVni3w/ypNzUriMmg5VIhbST1HYre3X+YQ6bY6aY/EkQEYwcfchtrBOQLGFt/uIjEVWERTgk9rYczkplXQ6Q4wdafsD6W13YPHRZE313S7LXnpiD6HBIxnRbSmnJqkogytxoCJmCxWFVWrPbbH1+1cn4jdFHDqug9nzbikYyagWgMoqZF5OqGaUSBe4s9b3R3/6JjAwWEwOaIFshw+Zd8MNofq3ntX+zxUXsQvCHIyWIB5UYb3ANtUuy6qRFCEvUU28iRZqomV9n0K6rXos61M95Cg1BE+Qya5EQyszeqaGPgFNPDmgirHpqe/Us3xjOsnR7oKdWRwFW9hkjdgsCLoxyI8ZkEzUyLFsbjt5y+bjWGUiPV3Z5h3CvVa6uMQ9uFPrd1voZubt5ws175WObNDlWhMc6s3cQepnTR/mCMioecEnKCCEdpPgG8NlCyYBpZ3G8E9Pzhzm01JuvJ+C6NxqKdrymOc8UKXX1rz2KqHCkVKiskue17FNRMELvbTyoSg4Zn1NFcmPzjygTqtsQVLmaTyz/Z4uEclAScavX3Ohchi1qRgr3ideb8R02IGt5UBFuoMXnVIsuymznxSVTS6wKde65f9LGY6KukpAxIL0YdUdGWXmBGKZS9YnVbjEWhqE3cJtzFetVyLwHH0b0TCcKBIZX+Kt8hFlugX4zbXkcJ2ixYclfKvtydOzDPVcmBcaJRI7SjTTGDZ+D7MXvs//LErMY3eEB4qPAG35teAwxIB0InRvjKcAdje8sz9FxoTxeyzx3/jguTgfZYWXGyk= X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB1486; 5:3MrxjZlA3KuyNYfPGe+UqASGEkl2efeahYy+kjrq1MtDrKrpkqMU1NMsi/7BDXOAX3AzR8TsaOdAH10YGUMwgMXY840BKFoPBt9DFSev1iKy7xCu0iAaW4D/xJrM2Ah9Hi6jVDalCDaZ4+FUvdniXw==; 24:BzOZSLFOVrO1vW3Zv256SDir5n7FkNEJqFbYDQDXk6bnfGph0G3xt/oHlMdd24X3QuNxwp3auSdfs1OeymUml5Tea51I63Joq+VLWvYkWQw=; 20:L4iNzdoAXinbr+mLqhOITsOa7NXemqJe8fdolSF2aQQMAqiDU7ztNNnZQcV7ZCuZR4gxKNjZqK0Af9J3nIS39A== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jul 2015 20:09:32.9570 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR03MB1486 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Scott Wood , Tiejun Chen , kexec@lists.infradead.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" The way VIRT_PHYS_OFFSET is not correct on book3e-64, because it does not account for CONFIG_RELOCATABLE other than via the 32-bit-only virt_phys_offset. book3e-64 can (and if the comment about a GCC miscompilation is still relevant, should) use the normal ppc64 __va/__pa. At this point, only booke-32 will use VIRT_PHYS_OFFSET, so given the issues with its calculation, restrict its definition to booke-32. Signed-off-by: Scott Wood --- arch/powerpc/include/asm/page.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h index 71294a6..11889d8 100644 --- a/arch/powerpc/include/asm/page.h +++ b/arch/powerpc/include/asm/page.h @@ -107,12 +107,13 @@ extern long long virt_phys_offset; #endif /* See Description below for VIRT_PHYS_OFFSET */ -#ifdef CONFIG_RELOCATABLE_PPC32 +#if defined(CONFIG_PPC32) && defined(CONFIG_BOOKE) +#ifdef CONFIG_RELOCATABLE #define VIRT_PHYS_OFFSET virt_phys_offset #else #define VIRT_PHYS_OFFSET (KERNELBASE - PHYSICAL_START) #endif - +#endif #ifdef CONFIG_PPC64 #define MEMORY_START 0UL @@ -204,7 +205,7 @@ extern long long virt_phys_offset; * On non-Book-E PPC64 PAGE_OFFSET and MEMORY_START are constants so use * the other definitions for __va & __pa. */ -#ifdef CONFIG_BOOKE +#if defined(CONFIG_PPC32) && defined(CONFIG_BOOKE) #define __va(x) ((void *)(unsigned long)((phys_addr_t)(x) + VIRT_PHYS_OFFSET)) #define __pa(x) ((unsigned long)(x) - VIRT_PHYS_OFFSET) #else