From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755241AbcESPNP (ORCPT ); Thu, 19 May 2016 11:13:15 -0400 Received: from mail-bn1bon0060.outbound.protection.outlook.com ([157.56.111.60]:45829 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754594AbcESPLG (ORCPT ); Thu, 19 May 2016 11:11:06 -0400 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=nxp.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=nxp.com; From: =?UTF-8?q?Horia=20Geant=C4=83?= To: Herbert Xu CC: , "David S. Miller" , Arnd Bergmann , , Subject: [PATCH v3 2/8] asm-generic/io.h: add io{read,write}64 accessors Date: Thu, 19 May 2016 18:10:56 +0300 Message-ID: <1463670656-2809-1-git-send-email-horia.geanta@nxp.com> X-Mailer: git-send-email 2.4.4 In-Reply-To: <1463670405-1059-1-git-send-email-horia.geanta@nxp.com> References: <1463670405-1059-1-git-send-email-horia.geanta@nxp.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-EOPAttributedMessage: 0 X-Matching-Connectors: 131081442622831092;(91ab9b29-cfa4-454e-5278-08d120cd25b8);() X-Forefront-Antispam-Report: CIP:192.88.158.2;IPV:NLI;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(9170700003)(5008740100001)(19580395003)(19580405001)(2870700001)(33646002)(8936002)(189998001)(47776003)(105606002)(5820100001)(50986999)(92566002)(86362001)(23676002)(4326007)(2906002)(8676002)(104016004)(586003)(50226002)(6806005)(85426001)(50466002)(81166006)(87936001)(2950100001)(106466001)(77096005)(76176999)(229853001)(1220700001)(110136002)(36756003)(142933001);DIR:OUT;SFP:1101;SCL:1;SRVR:BY2PR03MB474;H:az84smr01.freescale.net;FPR:;SPF:Fail;MLV:sfv;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BN1AFFO11FD015;1:O95kW9j7BFF0UCHvOhFAxuLNgneZT5BZ162tAwb3SZ5czkn63eKABNWuCKY1g+zDOCAgQmMJLeywdzpJA1aS9WVfZaxCXxL7bEYGpUSkBeq07ltlCCp4VlA078MAafaLwHKG/duVVSHQ7r7cqpMsbI6HFDCaPawR06UubVLLvcfrDaO7YFq4Dlxs9TKLCR10IAlB2kOAIHdAHckwcq5bAPlWic76wD4NkVwD6kTA9ROiOXBYmCbiioIqD6wjx65Tkwmrj2wCq8QSvzHG+HkRPZnHV4RG+4kxxkZaD6bj5eZdzIBQ+J6IW52p2tjkbtXiSCiXl0ULH5i22MxcW/vGQGvDR41lk+KobgHSdFHbhvgr8MAvksIG94Ewt2If6+eY09lJfP+rw6pcUXQAKVBRFdD2E1N8xhjVhhC/LddRxR8qajWVC3MNNbUi3RUJm3b7Ua0MU6QKjwzkBbxcBNvu4MNwzj2M3Wr4rPDhJlimb1oDdT9Tzdj/jDFL467CN/SsfNzbTO7Jqy+VRhpH6EeBomZd6XUY8EA5IzH/dTn7N4ZmGdLkZwPGwWOx3VQSTiF2 X-MS-Office365-Filtering-Correlation-Id: 3ef37f69-6cf1-4b3a-3736-08d37ff7caa0 X-Microsoft-Exchange-Diagnostics: 1;BY2PR03MB474;2:Nv9tPzFwmiHMpPjTvAMFqO7yRsKF+aWdYrdMGirRNA9oRIfC+0ufR6GqNyB0uBgVkmYSRXpiPS3LbkLi2V/ifUw/wf7Y6SJ5cj2we3EcnGg4pJPPh8MTV7t1bn2HCBPBxzps+PLeDz/f5T1W38XA/QOno/6OvkVZnCRP9ZTeh2kou07za0OhT/CqxuY3QY5x;3:HkZ3AgWBtepA3N44A2O9cxcvpr2rJhOCWdwxjEMQyaxRvc9ytwKRhx6JMP5tfrhAG8nmIIhSIbn3llBxUE4KXm3NY9kUNpJvaU35DdIyuvENIcyVhGkv4NS+HtvFNv5Yl2go95Vt4NDj/XTFE5EYqCxHjYijynjZ7mKBvkDiTx/m3Sh+DgAQq63SY6zObx2DcPJ0uOzHhqq6D3VNFinIdvdDfM6dfUZmCoK7K6Nraoc= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR03MB474; X-Microsoft-Exchange-Diagnostics: 1;BY2PR03MB474;25:EeyR0bBvcB9LJkThyVuJO2AkcZk6IHbrZaClHyRpMbvePE3fF7q7K7kYulFTBAG8D4VSWjpEmZegTn9CwvzAPNRtOwIlMdfjzSySsZBmJZdxHF6TicLjiwPDvkbnuMHlwuNV1oLXug5CmNhpSkn2iA08ADeF8dzy0MPen5fOGXzstNQG8OXet+AVIcxiwBJasqWmr8Dj2EGMSHkgW3tUDUA2Gm7aoLw/As6UNkNPs6G7xswnsSbymk5y9oNZ30bhrqiZFZFO0UAcO06nHeJs8Ym9NJ0Po1UwYGldGWshMXTEtdenhwShBH+L2dUHvUm44O0GtXQH5s82I9xayUJ8VZSBbDqNtTwgqzuKGS531QvWe2jBe8rb67k6uuwFPkqsnJ66G7IZccbcb5T0zAYWr7Zm2apSgPKp5JoPaWrqO9wBdDnb6mFRA3yIhyAnXej1sqO6X7A6Ukmno/LR7V3cfQ8Dt6Ruma4FljSsU7dSQpo/PUSwqIK/y8/iC752xl8pk7sSxHgfe2D27iz1pvkLz8KHvZqaD0VOAGhCFhO9uLDEcv2Qfh77zjLI3d5fKnM7LbwyJ/KfuoxwofwfIAs0+PChkSGMctJI3n/H5UY8R3Uy7hk+YjHsUxDwNzRAfnHPaYVS+BIsLzFNqhMJWpa4qDks1nziRzX/cLcLLZzDttBsWLOE+T2oOAfSisJmuHX+0BtT1H+geGUQ+BDyCv2+W7Tbw2g703o5hRYL5NkK9PCDTePy7Clpm6NHB4HSU/dS X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(8121501046)(13018025)(5005006)(13015025)(13024025)(13017025)(13023025)(3002001)(10201501046)(6055026);SRVR:BY2PR03MB474;BCL:0;PCL:0;RULEID:(400006);SRVR:BY2PR03MB474; X-Microsoft-Exchange-Diagnostics: 1;BY2PR03MB474;4:0fH0Y6l617DsMOkqNVcBxDYejupt4iZUXMWijBpdOoPf4FG632hEzNhPDm+hkLLhZtdCYUvo8tyjwi+bCu7cPsQcHOfpWJq3oJr8ngolnprOzIk7UDMYVim2zqbGZzunyB+YRqJ1pA4Fqoze/2i55wxcLGu227yXrhe+20DzgobgjYl8UPAn17a6/fPAgFZ9CgNwF3u49RGuzV/3feoXX4FdjBrO+nOoUapM1oI0rXXTPiz0i019origS36CwU3se2mjpsqKzOOfncRWXxZmnRawE6lETyPVVbEyMS1Edhr5PRNn/hl0ncgNDadSLQf1/02B+DhFFdu9brfnPvpGPA4lMXh7vOrUVbLOXwCPzYn6uLbCwnW2Wb1bSXqc1saE99DQ+CCPI4RwrI50M4HRTGJECzysx200LZ2ILPB2JsK4GW9aU63lBdGEQ7XFkvEK6tILu8F2NcOedH0HBi6YEHtd8DJRkpTy15tMNCc/Pfc= X-Forefront-PRVS: 094700CA91 X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtCWTJQUjAzTUI0NzQ7MjM6eFhLWlpNQzQrdlh0aXY5dm5HZVhQQjhXU29G?= =?utf-8?B?UmtpOFBUa3JNNUl6YUVxUWNUNUw2QnV3bmFjTDl6RDcwckVNSGRnOXg0b0tW?= =?utf-8?B?TXFGUkgxSmVJUDdRSkMwbnVEdnNMckhxM01GdUFUMFdBQldNYWN0WnFKb3hm?= =?utf-8?B?Um53alNramEyVzlZSTM1R0FtZ0cxMzlwcExEb3c3NCtpZXZUUGY4UFovWWNh?= =?utf-8?B?SGhxWm0wUGloSGxrelprUUZEek5sZC81VThCRkVLMDBqVVBxN3dGd2p0dUVa?= =?utf-8?B?UVZyZkJPZFA5UFNxeEh1RVZZWnlFeGxWTFkrNHpJZ0hPak9xWWpGQStlY3Nn?= =?utf-8?B?WmdPOW1MdTBFemhyeUpsMDJhOERzUUV4Y3hFd1B4YXJPVEgwRlpIamRzUXBI?= =?utf-8?B?Zm5PUE9teWVNMGpqK3ZSNTkrSXp4TkEyUUJ4SG9nd2JNSEsrUTFaankyMFdB?= =?utf-8?B?cjFScUN2eXA3K2tBU05LZGZCaWk2SUZzT3BxU3VuZVRFYWNiVWw0L2Z1Z2Fn?= =?utf-8?B?dXN5WkpiS2V0ZjdzWHlzcmF5cXM1TXpuZmpEcWVpQXQrQVduRVRlVUdJUndr?= =?utf-8?B?Y3cza24rTm9WSkh5eFdBd1hqZTM2Z2Z0RmlhSDhBVld2aDRaam5ub1ozWEpJ?= =?utf-8?B?d0N5dmFycWxMZUhGRkNkdVZMczd0TVg3SGtFaXU4c0s3dFVjdFNQUmtIbnF3?= =?utf-8?B?ZTMyVFBwUzhTOHFBaEVrWkpzR1FzTlZrVlRDdnZCN25STUE3bjNLNkdLeG5n?= =?utf-8?B?aUIrRWxTTHExZENiWFRpNnZaRWtxN2s3ZkdwSjRqcXNVYWNQQ3lYcjF5dGJ3?= =?utf-8?B?YXFlMmRVTHhIdTZDV0dmWjJmSkRSWHh5Y2VzaVplSFU5MVYwTDJNZEl1eHc3?= =?utf-8?B?NG5Rb0hXSHlKUUhzcm9hL25TV0VLOWdUU1VtNWVBWlYrU1FOY01vY2FCTXFT?= =?utf-8?B?NldNeXpnK2QxMnVKQTdsWGxIZE5MeVpPN2RxZE9HbTk0M09uYktnMzBRekFy?= =?utf-8?B?UHU4QStObk55TW1OcXRyK3VWNnh3QWp6VEVZZ2dXaXhLUW5FQm5GSEpHNjlL?= =?utf-8?B?VzgreE9reUhKRTZmS2NSY2J5Y3pNSGVlL2dsdkhRS00zM2FqcWkvSVY0b0RV?= =?utf-8?B?Q0d0YjVCNHdoV09RUGhoaHFGeU1GUHFTV2w2OVlqZEFPdngyU3VUZjZpZ0JS?= =?utf-8?B?SEhoUi95d1A2WndFMDVkck84SUc2UUdsUGNkYlRCTzdFVzdxanhVM2hqNVZj?= =?utf-8?B?bkNYOWh5SnBiN3ZnU0VoYTNzd2YvNkR0K2JGWHg3TzhPZWRsc2llT3BLY1Ew?= =?utf-8?B?NzBmWExUN2VvQm55bjVtZVhnZDlWSVZ6R1BPUzBEQnJxS1BzUEdvVkUva3Fa?= =?utf-8?B?d2tSdUJlT0lVcVJHWFI5UWU2bFgzTVI0NGdsZ29Hd1g1cmloYnlVR0RzNURz?= =?utf-8?Q?TCBLN4Jygrenw1RojhwBteE7cl?= X-Microsoft-Exchange-Diagnostics: 1;BY2PR03MB474;5:FKy3AMPAoWogXuwzTTC7qfaQTosZ3XuyydoaL1o/ZepMUTiFpVmHeozzfRswi+zH2qXUwd/CKLiyv8gyOylk5miyCYifiQAF2naUTLnSmN+/58XfoTfw7Rt6OZ5xAX3AwdaOIHnwOnU8BAPh0bRuu1lxQyEB24W4RU+A/nqCOJ4=;24:F0VUKJYgvgeergRmbCq9jLZtiX+qo92NUaWr4+aERuvjnMeGj+ofuwoqEGlYO1B1tGVnEGkOPhTxr79ADHLq8Db3ogRaLxnVVGpfj9plbZs=;7:ualcH7IaXOWDnEWSuh45mX5yMuPzx3M/dPDPeC9foltvBYQzqK4Wcd8JmKrDL3Q0N0+2XH6P9Xo6pQSjMteTAJYWmCUS+SwE+RovYPfwDzAIuWb2Z/idLXRHcbJ036bKll/ZO9WRrTjkBiH+nqdINLmJhXIAFRj6bBGEob4s4cOkizjemrz/ldAre9e2EvAO SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2016 15:11:01.9555 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e;Ip=[192.88.158.2];Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR03MB474 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This will allow device drivers to consistently use io{read,write}XX also for 64-bit accesses. Acked-by: Arnd Bergmann Signed-off-by: Horia Geantă --- include/asm-generic/io.h | 63 +++++++++++++++++++++++++++++++++++++++++++++ include/asm-generic/iomap.h | 8 ++++++ 2 files changed, 71 insertions(+) diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h index b79fb2c248a1..2af6ea95762d 100644 --- a/include/asm-generic/io.h +++ b/include/asm-generic/io.h @@ -585,6 +585,16 @@ static inline u32 ioread32(const volatile void __iomem *addr) } #endif +#ifdef CONFIG_64BIT +#ifndef ioread64 +#define ioread64 ioread64 +static inline u64 ioread64(const volatile void __iomem *addr) +{ + return readq(addr); +} +#endif +#endif /* CONFIG_64BIT */ + #ifndef iowrite8 #define iowrite8 iowrite8 static inline void iowrite8(u8 value, volatile void __iomem *addr) @@ -609,6 +619,16 @@ static inline void iowrite32(u32 value, volatile void __iomem *addr) } #endif +#ifdef CONFIG_64BIT +#ifndef iowrite64 +#define iowrite64 iowrite64 +static inline void iowrite64(u64 value, volatile void __iomem *addr) +{ + writeq(value, addr); +} +#endif +#endif /* CONFIG_64BIT */ + #ifndef ioread16be #define ioread16be ioread16be static inline u16 ioread16be(const volatile void __iomem *addr) @@ -625,6 +645,16 @@ static inline u32 ioread32be(const volatile void __iomem *addr) } #endif +#ifdef CONFIG_64BIT +#ifndef ioread64be +#define ioread64be ioread64be +static inline u64 ioread64be(const volatile void __iomem *addr) +{ + return swab64(readq(addr)); +} +#endif +#endif /* CONFIG_64BIT */ + #ifndef iowrite16be #define iowrite16be iowrite16be static inline void iowrite16be(u16 value, void volatile __iomem *addr) @@ -641,6 +671,16 @@ static inline void iowrite32be(u32 value, volatile void __iomem *addr) } #endif +#ifdef CONFIG_64BIT +#ifndef iowrite64be +#define iowrite64be iowrite64be +static inline void iowrite64be(u64 value, volatile void __iomem *addr) +{ + writeq(swab64(value), addr); +} +#endif +#endif /* CONFIG_64BIT */ + #ifndef ioread8_rep #define ioread8_rep ioread8_rep static inline void ioread8_rep(const volatile void __iomem *addr, void *buffer, @@ -668,6 +708,17 @@ static inline void ioread32_rep(const volatile void __iomem *addr, } #endif +#ifdef CONFIG_64BIT +#ifndef ioread64_rep +#define ioread64_rep ioread64_rep +static inline void ioread64_rep(const volatile void __iomem *addr, + void *buffer, unsigned int count) +{ + readsq(addr, buffer, count); +} +#endif +#endif /* CONFIG_64BIT */ + #ifndef iowrite8_rep #define iowrite8_rep iowrite8_rep static inline void iowrite8_rep(volatile void __iomem *addr, @@ -697,6 +748,18 @@ static inline void iowrite32_rep(volatile void __iomem *addr, writesl(addr, buffer, count); } #endif + +#ifdef CONFIG_64BIT +#ifndef iowrite64_rep +#define iowrite64_rep iowrite64_rep +static inline void iowrite64_rep(volatile void __iomem *addr, + const void *buffer, + unsigned int count) +{ + writesq(addr, buffer, count); +} +#endif +#endif /* CONFIG_64BIT */ #endif /* CONFIG_GENERIC_IOMAP */ #ifdef __KERNEL__ diff --git a/include/asm-generic/iomap.h b/include/asm-generic/iomap.h index d8f8622fa044..650fede33c25 100644 --- a/include/asm-generic/iomap.h +++ b/include/asm-generic/iomap.h @@ -30,12 +30,20 @@ extern unsigned int ioread16(void __iomem *); extern unsigned int ioread16be(void __iomem *); extern unsigned int ioread32(void __iomem *); extern unsigned int ioread32be(void __iomem *); +#ifdef CONFIG_64BIT +extern u64 ioread64(void __iomem *); +extern u64 ioread64be(void __iomem *); +#endif extern void iowrite8(u8, void __iomem *); extern void iowrite16(u16, void __iomem *); extern void iowrite16be(u16, void __iomem *); extern void iowrite32(u32, void __iomem *); extern void iowrite32be(u32, void __iomem *); +#ifdef CONFIG_64BIT +extern void iowrite64(u64, void __iomem *); +extern void iowrite64be(u64, void __iomem *); +#endif /* * "string" versions of the above. Note that they -- 2.4.4