From patchwork Wed Sep 9 08:45:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gong Qianyu X-Patchwork-Id: 515766 X-Patchwork-Delegate: albert.aribaud@free.fr Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 524781402AB for ; Wed, 9 Sep 2015 19:03:32 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 294F64B853; Wed, 9 Sep 2015 11:03:26 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1oN0k3A3SxbJ; Wed, 9 Sep 2015 11:03:25 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 58E354B81B; Wed, 9 Sep 2015 11:03:13 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B61784B737 for ; Wed, 9 Sep 2015 10:51:20 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9nJ4n8h2rPcv for ; Wed, 9 Sep 2015 10:51:20 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from na01-bl2-obe.outbound.protection.outlook.com (mail-bl2on0138.outbound.protection.outlook.com [65.55.169.138]) by theia.denx.de (Postfix) with ESMTPS id 2AEA44B727 for ; Wed, 9 Sep 2015 10:51:16 +0200 (CEST) Received: from BLUPR03CA008.namprd03.prod.outlook.com (10.255.124.25) by BL2PR03MB500.namprd03.prod.outlook.com (10.141.93.152) with Microsoft SMTP Server (TLS) id 15.1.262.15; Wed, 9 Sep 2015 08:51:14 +0000 Received: from BL2FFO11FD006.protection.gbl (10.255.124.4) by BLUPR03CA008.outlook.office365.com (10.255.124.25) with Microsoft SMTP Server (TLS) id 15.1.262.15 via Frontend Transport; Wed, 9 Sep 2015 08:51:14 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=freescale.com; freescale.mail.onmicrosoft.com; dkim=none (message not signed) header.d=none; freescale.mail.onmicrosoft.com; dmarc=none action=none header.from=freescale.com; Received-SPF: Fail (protection.outlook.com: domain of freescale.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BL2FFO11FD006.mail.protection.outlook.com (10.173.161.2) with Microsoft SMTP Server (TLS) id 15.1.262.18 via Frontend Transport; Wed, 9 Sep 2015 08:51:14 +0000 Received: from titan.ap.freescale.net ([10.192.208.233]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id t898pBFO010456; Wed, 9 Sep 2015 01:51:12 -0700 From: Gong Qianyu To: Date: Wed, 9 Sep 2015 16:45:25 +0800 Message-ID: <1441788325-43524-1-git-send-email-Qianyu.Gong@freescale.com> X-Mailer: git-send-email 2.1.0.27.g96db324 X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD006; 1:Xrf8uvvqV+rZk73fQC8O2NCoMehvCOATCeseypV99D2znO69eN00h1Ac5dAox9dOZEZr41AX04D3an3JjOzvJgiuRr/sxs0AnmX5JUStojooHvD/gDOj/5UXBrPsgxaedQ5ojNQ5JzJnIOkUcYTy40fx89uiK84vJVm3ZL5Vl185tA6aHkcS+BzIRJoglTC5rmx4YvUfJ2vMKDv+Jrl2GhSXrlyi5WZjYcRrzhHz5Lqo3/g1QITkEhNNwpRgDfZOks0rK4N/3RA/Zbp4EoXm+hLH6IKy2VKOvmvLr8ZcmCSK1gz7noRlS95FrfFasy6bqg/k0YCd54F3CiAOXXFclNOmtkw5Qt4RDvBRT0yc8b2PEreXFneF0Q4q3WjPA0PI+dBc4oMYpPC6h124fqou8w== X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(50466002)(85426001)(104016003)(50226001)(105606002)(106466001)(229853001)(2351001)(575784001)(68736005)(107886002)(189998001)(110136002)(86362001)(5001960100002)(64706001)(97736004)(19580405001)(48376002)(77096005)(92566002)(6806004)(69596002)(87936001)(4001540100001)(81156007)(47776003)(19580395003)(5001860100001)(46102003)(5001920100001)(62966003)(5007970100001)(5003940100001)(50986999)(77156002)(5001830100001)(450100001)(36756003)(11100500001)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:BL2PR03MB500; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; BL2PR03MB500; 2:/fdV4Hswmv/P8A7q6znjId7FuacA5X43jOGiMIlJ12XUZj6JMXB8At8lTRgB5mDQkr3DqWskdCeLMYHS/vghkqBE1QEWPm9y12ZtL7wAVtM/sqMwRTwn+QfOf7xT2O5ysVZjN1rzeaEWr6QBhsRv8pcq46yOQTfUR403c8jF89Q=; 3:KTa9I5jt/SEtcd/eJ5tgUMv2e5Zgo/ICwrwhU+PANXVJvotgZFeKszyMAa1TQEWeSsKgtx7azi6DOkdWvElyxfQbVxMdtwFeWaSjh2nQoDAM048vUvWk1+LKHNX+WJoZOUeBa5jrOKhPAmd6so74/5PQsXxPbX+DocVuq9WK9huecuzduoDgeAbBPQ/7jqaIZjmAmplXApBatiOZ8eJy9FZ8iMXRGEEB/V1vH5xPRg4=; 25:IP+rE1nfmT9B+vvYa1IoH+2DjYMnkbqf1c1Mgp3evDSZFusGvBylhgFpzUwC8JVZewBaXMEWMBPPXV9zdEr+UPc9K9aIPb46rYo7IHaOLB67NPLsopQ/zT9hUiMlPw6hMfnd/6WGvlcIyWVuUczgg+/T+uoxW1aAGW46J76fiev8whpwGhCqG6CoXDdLKlXCicNOwt6xSOPXog6T/F+U0t+ih7C3c5tGBw8WqtlGoOOgasHw+Gy2SWSR0/Z50D3Yl2BL8hllje9/77iO/FrUEQ== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BL2PR03MB500; X-Microsoft-Exchange-Diagnostics: 1; BL2PR03MB500; 20:voSwRdncNWNR86KGFy5h6vcVBcwmiebfoVu1GnvbFVGnVMbrlmQ5VtIFAnr7JdwJBeWk8LDJGtxh1GpQXQvmTYV5NVaOdGSnKmI4A3agEMkPhABFXfDXMoD8rVnby0BEkSEHva7p/sklmwSicHfiYNgOauomA2AhldvyWMOCVweWD4BsqbReEsksXMaRlEBeQac4K4ZvVLLsxkM3brhVbWeEOlyvpKv98LGRs3PfTk+K2sP8T8XFRMqomSsbbo8ahFWiwh0RhBn7lhpP8H7x6wDj6WPSJu+RVvPP6Ke5i9mjQKct1nEQMgvVQV5JDkrr1UFFJUut0dcXmNPYTQ8ErUC5Vrydz1Mrj9fFLQFNDa8=; 4:hlWMVMG29WfNqAEGNq+bnzok0qeON7z8ncWAF9DZRnItSoCqOjle/TpXNZgCGobKXXGt8DNZCRDss9QoIslneFj7iPoCsMUnszS4SjsxsES1gmmKXdwggRvy6UdSokqHDD731kyA7hdRrLbe/sIOhWQD3lt2Uvpe45K1cv1zyxi0ZJqAh2MnFOY3xWpGW51mSDOZ7ig/vrvrgULdfiSfwT8yjAZ+vxvlg7lO+BLD1jhiRGIii+7JSiKpEll0oonq8lOofiF8PE+R3//xD81Ct7NT/zmxGEmJIOYXxqZf7gpl+K9VjJ3wOehkYiHEs6q4 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(8121501046)(5005006)(3002001); SRVR:BL2PR03MB500; BCL:0; PCL:0; RULEID:; SRVR:BL2PR03MB500; X-Forefront-PRVS: 0694C54398 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BL2PR03MB500; 23:7vfsFTwEnP43F7lOpziEbpxAhYgf9m5TIjpg2pU01H?= =?us-ascii?Q?j3v5aoer9j5nJC5iqk0/Lb2hWtrJucw0UHoLAbDLfJs+P3eo/YnnIvAcZDaF?= =?us-ascii?Q?nDnoMZA8fP09/RXmBcNsOnXPJPEkpzt8WXBYea6RRruYhHiCjZXrM0YnON+A?= =?us-ascii?Q?xbx9Q433ieO1xRb80cwXhiyCYWe5e3X81tZZfkCnx66DQGFotjx/k5SqntW2?= =?us-ascii?Q?pjBGFY8rMWeKtGAmYQLvhPFhup82tLd1aFDZ67YbmEeBxZZYyFeIIv1Lge4D?= =?us-ascii?Q?n5atY59Em6592tYBc2MafBa7RKl93TWeGLYlE91J88RgUss/c+RxT1cpURbR?= =?us-ascii?Q?NlKfrA0exQuJlme9fcUS2MBwarCXF2h7M+XNctD+8jlDt/EMJASJNPY/m4sX?= =?us-ascii?Q?ZA08ANX1Bp23q6+o52avzvDYPnQr+0sjuhE5cQuHENrA21revLf/XUxYS7+D?= =?us-ascii?Q?G37d55tZSXxqFUSiINrG1W6iNQBIXSkkOOwx3/lBDh4JfpxxENxeNTHuDDCK?= =?us-ascii?Q?AVjS5ww/OQloDMfUo8bynYuuX6cZjA41H4ayZiczg04+6AaOI+jm3fUJNA4K?= =?us-ascii?Q?XpSXLcLvDu2AU1m4t57YCODVLlD86V9EhsmWXnC914Nm9ptQasTqqwpVfHRA?= =?us-ascii?Q?GajIwRww4HdII3xUYHSTCmHn7GotsW73Is6s4dRNJcUHm8EXpykvjzxGlQn/?= =?us-ascii?Q?2yqlWX+mAHKtV2Zw1tNO8e5p0JIbNLpTWxPZLfsLRw3FzJzp+sPhgsQ1b4xZ?= =?us-ascii?Q?02A/liwwLxPHAKTp+OO2oBflA+mGJ8TlZlBaf6WALPbeHgoFNEv2tc1+yOJk?= =?us-ascii?Q?8cqHBWBh86Z56Bhhc9XTtEnqNNgB4H7BNGivwpjO5X/rxH6JWmiKc5zPSOlL?= =?us-ascii?Q?l4EjGfb8h+CwuFdJjpDlytcs8iWWDY2QBkEoC0QSUKvQR8yrbGHUlc7DwtgJ?= =?us-ascii?Q?A3Zvyd3ZkHQ7AHhdAs3v/jBFJekY9W75v8whge/tlWS2iYjl4J/RRRtb5xLh?= =?us-ascii?Q?9mVOeYYYMELGffos2PNr3TgLvMLMNNOZYxXmEPeBBnQPeiyusHtUwEqC6oJo?= =?us-ascii?Q?uRJeerdp6wLj+TiJHuxEZTBMma6x+oX5ma3Psg620Tn7yDZW+ezqP8mIGo35?= =?us-ascii?Q?gwY0cil4pQJPNpItD9jXo+Sl1SY60b75SK3dKZp0mTRBVI2hPs5V6vS+LKFe?= =?us-ascii?Q?EchlC7KDR4xR0rxM1+jj4YaUEwMvioiKzmNtR6V1weYmEf3PQO97Gx/ceE3n?= =?us-ascii?Q?HTbUMc5Hj6b8VVEcX8I1TgrftFXwwJe6Mhbz8WLiggTFsqLxNuQaRnVi6ITA?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BL2PR03MB500; 5:/Hk0JeAhC4InKEVyTky+s/zYLaTRYoOTWa6JdtkllAzRKROTu4lrrc9sYJr3alCgN6qmTtRStbsiHiEs3cumX2U+P5uY8pSZ7Ws5TXSqejTdx3lrl12mU6TAQMv8y8p8KOGra1t8kyzmuv8DcMc30w==; 24:HVIvBljLYw3zg8FU9yLoMcNLauKXivuxEWOHylZboUrp+QF/LLrNo+Wq9bjikw4rOckihESJZ6uLehzLIvyrjQ/1wKwDI0KKYhTIgXfenM0=; 20:99l+WzeOkxVfAsh65gPG5oSOSa7dU/NdhwtJZFVFVG83rmtVZuOZIYL0SUkYBt7KcA59eJh+HthGB/ugJSVGBQ== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Sep 2015 08:51:14.4704 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[192.88.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL2PR03MB500 X-Mailman-Approved-At: Wed, 09 Sep 2015 11:03:06 +0200 Cc: Gong Qianyu , b21284@freescale.com Subject: [U-Boot] [PATCH] arm/asm: Data types defined for 64 bit Physical Address X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Aneesh Bansal Data types and I/O functions have been defined for 64 bit addresses in ARM. Signed-off-by: Aneesh Bansal Signed-off-by: Gong Qianyu --- arch/arm/include/asm/io.h | 4 +++- arch/arm/include/asm/types.h | 13 ++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h index bfbe0a0..44fd273 100644 --- a/arch/arm/include/asm/io.h +++ b/arch/arm/include/asm/io.h @@ -59,7 +59,7 @@ static inline void unmap_physmem(void *vaddr, unsigned long flags) static inline phys_addr_t virt_to_phys(void * vaddr) { - return (phys_addr_t)(vaddr); + return (phys_addr_t)((unsigned long)vaddr); } /* @@ -183,9 +183,11 @@ static inline void __raw_readsl(unsigned long addr, void *data, int longlen) #define in_le32(a) in_arch(l,le32,a) #define in_le16(a) in_arch(w,le16,a) +#define out_be64(a,v) out_arch(q,be64,a,v) #define out_be32(a,v) out_arch(l,be32,a,v) #define out_be16(a,v) out_arch(w,be16,a,v) +#define in_be64(a) in_arch(q,be64,a) #define in_be32(a) in_arch(l,be32,a) #define in_be16(a) in_arch(w,be16,a) diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h index ee77c41..d87f955 100644 --- a/arch/arm/include/asm/types.h +++ b/arch/arm/include/asm/types.h @@ -45,12 +45,15 @@ typedef unsigned long long u64; #define BITS_PER_LONG 32 #endif /* CONFIG_ARM64 */ -/* Dma addresses are 32-bits wide. */ - +#ifdef CONFIG_PHYS_64BIT +typedef u64 dma_addr_t; +typedef u64 phys_addr_t; +typedef u64 phys_size_t; +#else typedef u32 dma_addr_t; - -typedef unsigned long phys_addr_t; -typedef unsigned long phys_size_t; +typedef u32 phys_addr_t; +typedef u32 phys_size_t; +#endif #endif /* __KERNEL__ */