From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752449AbbJWD0u (ORCPT ); Thu, 22 Oct 2015 23:26:50 -0400 Received: from mail-bl2on0107.outbound.protection.outlook.com ([65.55.169.107]:56306 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752145AbbJWD0q (ORCPT ); Thu, 22 Oct 2015 23:26:46 -0400 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=scottwood@freescale.com; Message-ID: <1445570793.701.147.camel@freescale.com> Subject: Re: [PATCH 3/9] powerpc32: checksum_wrappers_64 becomes checksum_wrappers From: Scott Wood To: Christophe Leroy CC: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , , , , Date: Thu, 22 Oct 2015 22:26:33 -0500 In-Reply-To: <91ebacbbd631ec02ad00e0a824b6cad0dac532a0.1442876807.git.christophe.leroy@c-s.fr> References: <91ebacbbd631ec02ad00e0a824b6cad0dac532a0.1442876807.git.christophe.leroy@c-s.fr> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.16.0-fta1 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Originating-IP: [50.157.106.250] X-ClientProxiedBy: CY1PR0801CA0021.namprd08.prod.outlook.com (25.163.136.159) To BN3PR03MB1480.namprd03.prod.outlook.com (25.163.35.143) X-Microsoft-Exchange-Diagnostics: 1;BN3PR03MB1480;2:CfP/YrriV39IUO8cNzlgwzS/Wg6lNAUE70GQoeU97WspYMYQ+TYC5jR9B4fdTFzY9ZmAxXfyROiZeSp6qtEaJr4MXCxxku0yPMyMGucQ/JgKtcXGl49yM2xS+1UXmB6euNNxI7PRHeRfsNTo2oGG+xHuB4AjJbvMbFE6wb+PN54=;3:sBBCh3XjVWwWbXmLIQOgmRJpscJVUY0dhGe6qdR7e7n6uAmFKWjm95XhoyLSTGd+sHTY+7f+AZiIPVs6dC3geNtgkCXJY4YAFxjREaS+hDwHPSsPnB9HH2JWlGurRivE3kY65z0C1SZUDx1Qn6STkg==;25:3dXdqi113j8RXoc0whuP271PLpV9mH6p++CIKfGUfZsuXDh8mG7nqdCjqactKkAoremxajIL6gh/DNCCNGdpuiZk6OA6A/ZDBQXI/XojPnySEwl+A6EV5rrzhAx34zCNa335vhsmYwYydzlatKWjQRbvPVGONhDDzl77x0WxEdgx4kBsTK2JycI907ryGn2SHjNq5T/AeVflbQUUKhYy4Cpp76wNPzyRYI+FqnYrM/jOvy5l/A1V5XuYgwF5rBgM X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN3PR03MB1480; X-Microsoft-Exchange-Diagnostics: 1;BN3PR03MB1480;20:ZfF0HBzZIt8Tk9WOJhcETBBKEUGHWf2wf2uq3zK198scmbrEAwVXGDnc+w2jZau0zKH5zbcEV0UxCqVdv3sZx+DOrvjJ24DbNyY4UyOmm0SO+8vSx9a29GR3TNy3vF+Z01coiyDutHDoo8kq6kMrYQyO+vMtqrr6kVMLRZrAmU5SJwfvOnACOV7W5Gbs7O5AmgzzmxrKAf1V0Tawj3mR7JQcDEj0yGQP8bNaZ4BDnEaNmC3w3U058M4DKNy2/NefFocnjNfvWJBavi8UoR//ZKkpKnGigguHsaboervZyOIY3/ISJWzCfElLFah3ScGdifX4DHhbxlUjbg+8Xy4XOGkdJchRDQcnL7qYhMDcKLdVLK75IUGgKKF+k8KtHY6hqsSb2Q4IQQjKhhH1PiJY46Wr2FGTqoWB30ZUN2NFVvpDpEHP6FsvrUV5QwcIu9NaNOVngtElNCxhqVJXx7DLLuJ+Wzve/sd1S10f9Vzq8gJ6EdOgZwDEQsc2SwGznnoK;4:JvBFZR5Mb17gFmpOd8wr0Ebj89spoKk5pBxuEvqwrHCe04CjYpQMivQudx8s55lH8wFUjUTAzEZJMRwowyhqEQK4hg80t/C03BCv63t0Ep8t2aAixoasKsQte/GIQv2p2SCc6z3Sr1X18w7V4OmX7frCqsps1/1MgOZ7fra3D5J89HBBB+TZOzu8cJ0J7U/tVJRFlZcmTnnZI5eEvElN8ozK3ccB/edtfsYwg7mJhwXANlT5rZ4dCEVLQ53+5HEcF/2VW+ju+3liFSyeuQkFx9UFcW4ySZO/ldbD6J+H3esAeD/wSxFay9WMb4Ratsx8TL4q4b/pevfUhn5m/XYez5pCuMOBVT2hBcQj4/pKiizCf0yOkkbtlnKjlwnbmPM/ X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(8121501046)(520078)(5005006)(3002001)(102215026);SRVR:BN3PR03MB1480;BCL:0;PCL:0;RULEID:;SRVR:BN3PR03MB1480; X-Forefront-PRVS: 0738AF4208 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(6009001)(377424004)(189002)(199003)(24454002)(50466002)(97736004)(101416001)(50986999)(106356001)(5007970100001)(5004730100002)(92566002)(103116003)(189998001)(5820100001)(23676002)(105586002)(86362001)(110136002)(66066001)(36756003)(76176999)(77096005)(19580405001)(50226001)(33646002)(5008740100001)(40100003)(42186005)(2950100001)(47776003)(122386002)(5001960100002)(87976001)(81156007)(99106002);DIR:OUT;SFP:1102;SCL:1;SRVR:BN3PR03MB1480;H:snotra.local;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtCTjNQUjAzTUIxNDgwOzIzOk9remx5S05UVEdNbGZVTWdDRDF6M0JVMmF3?= =?utf-8?B?Y0ZZQjBlcFNtc25lQ2dPT2k3WEo1bVdOakZBOE80SnZLNVhEYjYrQm1TMEE3?= =?utf-8?B?NmlGdTRLNHBOZXViTVVoeWhydHZvd2JOcHkzNEc1aDFqSm5wUkJueVlyNVl4?= =?utf-8?B?ME1TaTJwb1ZkUmlESmVrUVcxWVNWWkc1T1pqaGk0YlYzTlI2V2xnaTZMWE1z?= =?utf-8?B?NEVEWHRDbWtIWVAwVWhYcmpTbkxFUHkrMFhCYUhCYkRxUHN2clZIQkQwL09T?= =?utf-8?B?UEFIOStEN3RjMGg0ZEFWVUMxWjIrajZyeXdDL2xjRlRGY1NNT2dEaWQvalg2?= =?utf-8?B?N2ZyaUwvLzB2UVVXTHNZMGRQMVZmc3BEQ2JzWXFTNTcyVmJuVG5jci9HdFA5?= =?utf-8?B?bDFpamVvMWxHbWZOampabGU2clc4WlJGeE5mTWhkSUd6cDNmaW9mSElaSHB1?= =?utf-8?B?TXJZL01SdHBUanFINzhaTWlRbEZnMnpCMDZYUmRNT3RJVTZXNmFNODhiVVJG?= =?utf-8?B?MnNEK2p5ejZ2V3pveHhHRThoOWNpL1dvejBXMGFsK0JxeFgvMGhSWnRSU2gv?= =?utf-8?B?NG43NHlZSDBIT2ZUQU9NTWMwdnVwTjJNYzdiYUluS3RGY2lDSDE4Y2g1aVlJ?= =?utf-8?B?ZGpVc3N0bkhnU05vbDZhUU5QNEFrcWlJYnBGZG5OSE15aGpLb3AvRTF6VnZn?= =?utf-8?B?TThCZHRmRUEvSWhXQW5nd2MrZ2FNVjJ3ZmRYSXkyQ1RmaUtvYnF5WmgxVWgz?= =?utf-8?B?dFdpTUk4VGZDQlVIL0FsVWtCRHdZNERNR0dXaGNQYjRoaGtFaDA3TkUwZEEx?= =?utf-8?B?b1RoZ3NHOFdLWC80cWhDSXFsS2MzSU9PWVQ3cUVmc09FL0R5WjhTbkRiSnNt?= =?utf-8?B?MWVZRDhCQ2RSQ3JKazJNSFh3N05jSUU4QU5qMndqNzllYXdsd29iQXRiVzBD?= =?utf-8?B?bCtxZnlvYmxYMmo1UkF6aXRKZEhBZlBPYUtwdEJSeGhRYlpRSEcxbU5zSkVW?= =?utf-8?B?M2dPWDB0c2tEbDZNb2VhUVFMVnZZdWVhTkNLa1pZTnBqaGorcUlHc2FXbnVQ?= =?utf-8?B?SnE2MEE1N01DamovYmNNb3BkN0VnTkl6dzRZTGlMVXNGS2U2UEhHWmpKRGl5?= =?utf-8?B?UlRSR1NJYi9IWHNUWDk0dVkwNzRidjVHNitONWZhcWhvdTNIZ2hLZUlRWU9L?= =?utf-8?B?K1JRVG9OYWlpMFFYUnNSSjRPT3dHcXFsYkJrVyt6N1RZVjNhM1ZVd0QrelRS?= =?utf-8?B?VlVWYW1vR3k2ZFFuay9ybE1SdGZzRHgrRi9XS3Z5aEZTMkJMNDdqOGx1a3Jt?= =?utf-8?B?OUxkd2RMeXRUYVJST25PVXFjcWZLNnlyanhlbXVEVTJwTlRZaGZJUVBtcW50?= =?utf-8?Q?t+d1UWS1?= X-Microsoft-Exchange-Diagnostics: 1;BN3PR03MB1480;5:fWEww9uB7dvjAWmTAEJ1vxM6ZUkJVKLIVSkl/O0b4qc0U1CwAMxny6nRIhF7DOfUh0lRedtqaxqjrSjXX8in2xMyAHwwOAugnLxAkgXVuHn2ZaOTqV+csgmyKcZtqjaXKKuHVbWXP9vJibI4DWXH4g==;24:xapnaPxEwoJi6rxc2LKUNqOAT9Z7ezTPmwvmjuPVyuHdpAU0c8uxWZf04pjKVMfhnve3vu9UaGNG7kKBu0P0gi9DI/PZMZZfkb50QtbYLAQ=;20:DI2iJHe+oJT+7iUL0M+nQy1SF2G3DSUzcwrc66PEHJFqNx3S6dK4gQnjDws8dhOK5SDdCsNXX6NPttJMZwhZnA== SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Oct 2015 03:26:43.0136 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR03MB1480 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 2015-09-22 at 16:34 +0200, Christophe Leroy wrote: > The powerpc64 checksum wrapper functions adds csum_and_copy_to_user() > which otherwise is implemented in include/net/checksum.h by using > csum_partial() then copy_to_user() > > Those two wrapper fonctions are also applicable to powerpc32 as it is > based on the use of csum_partial_copy_generic() which also > exists on powerpc32 > > This patch renames arch/powerpc/lib/checksum_wrappers_64.c to > arch/powerpc/lib/checksum_wrappers.c and > makes it non-conditional to CONFIG_WORD_SIZE > > Signed-off-by: Christophe Leroy > --- > arch/powerpc/include/asm/checksum.h | 9 ------ > --- > arch/powerpc/lib/Makefile | 3 +-- > arch/powerpc/lib/{checksum_wrappers_64.c => checksum_wrappers.c} | 0 > 3 files changed, 1 insertion(+), 11 deletions(-) > rename arch/powerpc/lib/{checksum_wrappers_64.c => checksum_wrappers.c} > (100%) I wonder why it was 64-bit specific in the first place. CCing Anton Blanchard. -Scott > > diff --git a/arch/powerpc/include/asm/checksum.h > b/arch/powerpc/include/asm/checksum.h > index d2ca07b..afa6722 100644 > --- a/arch/powerpc/include/asm/checksum.h > +++ b/arch/powerpc/include/asm/checksum.h > @@ -47,21 +47,12 @@ extern __wsum csum_partial_copy_generic(const void > *src, void *dst, > int len, __wsum sum, > int *src_err, int *dst_err); > > -#ifdef __powerpc64__ > #define _HAVE_ARCH_COPY_AND_CSUM_FROM_USER > extern __wsum csum_and_copy_from_user(const void __user *src, void *dst, > int len, __wsum sum, int *err_ptr); > #define HAVE_CSUM_COPY_USER > extern __wsum csum_and_copy_to_user(const void *src, void __user *dst, > int len, __wsum sum, int *err_ptr); > -#else > -/* > - * the same as csum_partial, but copies from src to dst while it > - * checksums. > - */ > -#define csum_partial_copy_from_user(src, dst, len, sum, errp) \ > - csum_partial_copy_generic((__force const void *)(src), (dst), > (len), (sum), (errp), NULL) > -#endif > > #define csum_partial_copy_nocheck(src, dst, len, sum) \ > csum_partial_copy_generic((src), (dst), (len), (sum), NULL, NULL) > diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile > index a47e142..e46b068 100644 > --- a/arch/powerpc/lib/Makefile > +++ b/arch/powerpc/lib/Makefile > @@ -22,8 +22,7 @@ obj64-$(CONFIG_SMP) += locks.o > obj64-$(CONFIG_ALTIVEC) += vmx-helper.o > > ifeq ($(CONFIG_GENERIC_CSUM),) > -obj-y += checksum_$(CONFIG_WORD_SIZE).o > -obj-$(CONFIG_PPC64) += checksum_wrappers_64.o > +obj-y += checksum_$(CONFIG_WORD_SIZE).o checksum_wrappers.o > endif > > obj-$(CONFIG_PPC_EMULATE_SSTEP) += sstep.o ldstfp.o > diff --git a/arch/powerpc/lib/checksum_wrappers_64.c > b/arch/powerpc/lib/checksum_wrappers.c > similarity index 100% > rename from arch/powerpc/lib/checksum_wrappers_64.c > rename to arch/powerpc/lib/checksum_wrappers.c