From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757716AbbIVDYw (ORCPT ); Mon, 21 Sep 2015 23:24:52 -0400 Received: from mail-bn1bon0132.outbound.protection.outlook.com ([157.56.111.132]:50512 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752563AbbIVDYv (ORCPT ); Mon, 21 Sep 2015 23:24:51 -0400 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=scottwood@freescale.com; Message-ID: <1442892279.19102.218.camel@freescale.com> Subject: Re: [PATCH v10 4/5] QE/CPM: move muram management functions to qe_common From: Scott Wood To: Zhao Qiang-B45475 CC: "linux-kernel@vger.kernel.org" , "linuxppc-dev@lists.ozlabs.org" , "lauraa@codeaurora.org" , Xie Xiaobo-R63061 , "benh@kernel.crashing.org" , Li Yang-Leo-R58472 , "paulus@samba.org" Date: Mon, 21 Sep 2015 22:24:39 -0500 In-Reply-To: References: <1442560521-19354-1-git-send-email-qiang.zhao@freescale.com> <1442560521-19354-4-git-send-email-qiang.zhao@freescale.com> <20150921225405.GB12709@home.buserror.net> <1442888756.19102.215.camel@freescale.com> <1442891257.19102.216.camel@freescale.com> 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: [2601:448:8100:f9f:d59:7025:7bba:8c10] X-ClientProxiedBy: BY2PR07CA047.namprd07.prod.outlook.com (10.141.251.22) To BY1PR03MB1481.namprd03.prod.outlook.com (25.162.210.14) X-Microsoft-Exchange-Diagnostics: 1;BY1PR03MB1481;2:PjaZPELIWSMDmVPa01bqa+xdaIocYiksRXanOupEGpVB+uCeZP2KAikeVMSyhLUQLVbMKp5YCeKyO/g2D7QobndUq3F4+BISXBqcmhqTf3TQq3OaiB0jKY+W+FG6wJpMmHX9IpEXNg2cmPqiHKrhTlEUadADgkzwFjDcYibmufQ=;3:toM6R901yi+9wtXHOXUjLiYxtnlFEM6Hgurr4FoodblbFSxoNpcOnV8F1bXDP9DIEN8AOPJbJ3Zhzl1deE7AiP4fK+GE4egcw4FXD5atHKPKCjjxg0arR6qSXEh0NzbKgC71GaXehXgNWSMrructUA==;25:e33I/ScVdHdd6b8gDsbD3JuFZz962d5Q+nkCihuhVdak8wvkxmdEb0h1W+ewvCDPs7old1X1gxpbgpkatD+VcSBeEOwQ20JLdr1FoIWS1sqUgo9MqCZMRN5Br+3FjHpRU99Ug1ZITNx9q3ziZVgqLwBwd6P2s4Ixv3ifGu5QI2mgGIwFr1igcXvmxKmO8xuJmFpXD6sGTanUepHWGcQCZY23/iXDtQ9bKRVJIDygXG+1tqYA2P0yYU4XiYM9X4Npp14Qth7ODXFfonQ0URh0Vg== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY1PR03MB1481; X-Microsoft-Exchange-Diagnostics: 1;BY1PR03MB1481;20:LJuPt2xhOVCnIXw8HV3wXz8etVw3yKJBxlJxOQiNH8NyMleFiQKHamTCid7bYVB797NES2H4lH+ukYdA9CR/nSv3Ywbv0CVQSjKHbAAotWV5qf2aYQXLxSY5ECOk1a+PFrU0bbnDY1482KOLvj+j9iGyDiAShg/TbNIT8wQdRYB438z6gFChKaN7fs+erj6WUC0O/E7HUVv2E1OSITLHawNTezpHWABoe40LncuV6YaFe92tQL7d9QcyiGXf6S4X6bKXwk8go1ys9Q2h0v+yM26FsK93pmp14mSSOXTHemLKdKUpsLiyEL6+rf0+8zqOLs3zUj3KUDNHXL6WG/iqMjGHiE2y/y1xVPfNs8cY0cKP5c81TCtcFnv7an+0Hvcg6+u6cQUlTtGlhufvq4RZhrhOo942srZnXcAWQhjWyu7XUgLDFpbF1T12ifA5X7OIx3AjgX7dPQdg9J3tQbS1YISz8PxkpLpRulNEh4JcjDSqQMI7jTVmsaWeugxpe0Fk;4:u4xwt5Z74E8O+4c6GYQfacYrzxNpZMx/PmkmeBAYaUhCoF+EjxbND4QYXGcK3peXwjSNaCcKaqv6SrQnYNcjMjL6PvoGojPyHf96t9CZb90PFpcFT2K6O4AwuDMZ1ILikPIZOZccIr5p58v9A2fV7Xliqa0v7dJ20LkJ67LCyYeCY9H1kR1QRv0Ii8tIVNCFYWGE4tjwCUTuS99XVOKNKc0vcrbE29vje+E9/inw8Rb84dfEd1rxvu3szsAFaSa5E7Hry/R5oz5IvnbNEuk+nqhSK6JSRC/TXexH8uCNnLQwG+4MmZ1ZgiZAlzAzS6FyBz5ZnnK0EI9Jb4oRtkeBfQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(8121501046)(520078)(5005006)(3002001);SRVR:BY1PR03MB1481;BCL:0;PCL:0;RULEID:;SRVR:BY1PR03MB1481; X-Forefront-PRVS: 0707248B64 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(6009001)(24454002)(13464003)(377424004)(199003)(189002)(377454003)(110136002)(5820100001)(46102003)(40100003)(68736005)(103116003)(92566002)(5001960100002)(77096005)(105586002)(86362001)(4001540100001)(23676002)(33646002)(64706001)(5001860100001)(81156007)(62966003)(77156002)(87976001)(36756003)(47776003)(5001830100001)(97736004)(4001450100002)(50466002)(189998001)(93886004)(5007970100001)(5004730100002)(42186005)(2950100001)(106356001)(19580405001)(101416001)(50226001)(19580395003)(122386002)(50986999)(76176999)(99106002)(3826002)(5001840100002);DIR:OUT;SFP:1102;SCL:1;SRVR:BY1PR03MB1481;H:[IPv6:2601:448:8100:f9f:d59:7025:7bba:8c10];FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtCWTFQUjAzTUIxNDgxOzIzOjZJeFJnZllhTmozOEc5N2NHNVAvbUt6cU1p?= =?utf-8?B?QU8wTUVqVlliZ3lnSm9QendNUFowWU5FSHBwc1FUcnFreSthT3NqeE1tMU13?= =?utf-8?B?NjBkUHoyMmJRaHk2UW1QOFF5K0IyeWQvUWZUVlVVL29kUmE2VmRPaFZhenlj?= =?utf-8?B?QkNFcDlaMEU4VUtyZUpMYU1YdGFuNHNobUpRV01EaENib2lPaE1sZlFHUkFZ?= =?utf-8?B?NjA0ak40NGVHNGNOMzFMeVNEbEVGc2VzT2FVRy9OTkNlb29xQU5VR2hXQ2Yy?= =?utf-8?B?UmUycGlwSmNrQ2p3YWZYaGkrWGkwZXdOeVFiMDJWWjBIYlNGKzhJS3FRMnQy?= =?utf-8?B?MXdVWUE5ZE4zUDZ5dldGYzljaWE2UkNjSmtIZ041blc1T3VUbE85NjA0cEJK?= =?utf-8?B?elFjL1BtVUxRaTVWNzRXSDBHRll4cVArcGVOTTFZbkd6Z3FvK0IvcjdjeStC?= =?utf-8?B?bEdsVlkvbWxjZHJQVkJCeFI1VG1HZ3NQZlVYd3NWODM0ZWQ0UGg4RkwzTElS?= =?utf-8?B?MDhEV3BXYkZQa2xvL1pSRGhPbXJPV3RRVnMrMk9OUmlURlkyV1hhTWloZm5n?= =?utf-8?B?RkR1dDlGWGs4L0haUlA5Y2tlQkQ0eXIyWG1nQVVJWmVoSUgrLzNOODJHOGFG?= =?utf-8?B?RzhOcys4WVFJYWRlQ1VmWTNpYUZvZU5YUUtMQlVVdGZlbWQrWFAwa3BLMk9S?= =?utf-8?B?REI2ZDE3UUlxNVgweUlvNWRRYWlqTFg0NngvZW5CSGNPVktnaTJHZFZ6NWs3?= =?utf-8?B?M2UyQkc0YTEyOG5IVDZwclVxVkNVRzJyclVaRk5RRU4wRUhxaFNvVFJpL2xh?= =?utf-8?B?NXp4OGZJaU56WmNuLzBObHUrTXdDYWxNSTZoMTNCWUw5cmpQcTZ3Y2I4NWtP?= =?utf-8?B?MlpVK1h1c1VWLzhwWVdsQkZ3N1lLZVJSaTh5VVdmYmVHNDNmSXhvNUtQU2tM?= =?utf-8?B?S2dwc2U0UGZJU1EwWDJUTFFUcmhjZ2pHMlNEd3p2U09VejhiN2pGdTJSOFQy?= =?utf-8?B?VExWL2pGelZzL1l6amdQcHhWWG1nb1FKYk5rREpsOWpPdlJnMkUrQll2ZVhx?= =?utf-8?B?dDVXK0wzZGt5aUgrWDZLQTZGUG91ekdXTWlVcUVBSHE0ZVVTS1hhSm5YWjBD?= =?utf-8?B?LzhTVEUrdW9VWUlmbVVnMFBWKzgvbDMvV05MYWdTNXE1RTBjbTN6S2RLaGdN?= =?utf-8?B?WWo3S3k3Sm1ZQTZiM2tPRkJVZXBCS0ZWYXRJbGZyenE3V0pHR2ZVVTJNMHpj?= =?utf-8?B?SGdCRUFYT2phRnpsMzlEOGhqQ1M3LzRTRXRsclNDakM5U3Fka1g3ajZFWk1W?= =?utf-8?B?UzhCRDlVd0lvcjBjM1RnazRoS1pFRS8yNVp3YzIyaVh1NmJiZllUUEpYS1Y3?= =?utf-8?B?bGx6V2xzNXN5VnVqVzJ4cmVNdW0zVmtadkdrWVJBOXZ0QzFta3pzUitYclJV?= =?utf-8?B?cmJFTzhkZkl0SWtrRzliallMZUdEaUhCVWxrZXlPZ0ZZV0EwSDg2aU5JdGFE?= =?utf-8?B?ZXNMTUV1bWxmckErUW1jeG9JemRsR2FNNkRPNWZUTXVsY0xjL3JaYVBIdlU4?= =?utf-8?B?a1pCMEV3OU9pamIrVUlNMTFscHJmajRVTU4wUGFRUlhJaEZoRFV0dERRZ1kx?= =?utf-8?B?UFJWdERQcHRVWS9rVVpocnZISk1MakRBNm0yblpSWVFlUWRSa1VaVVBzdzRV?= =?utf-8?B?c2NNd1lta0pqZmVvTFFReVRRWGNBejVnd0IwcTFzSmUrRlJCcWcyL1ZucE4x?= =?utf-8?B?RmIwcWhEN00xblJvOVI1dEpRWVpDMkUyYTBUWHQraU9qc2s3M1J6Zy9vWXlR?= =?utf-8?Q?Z8uBStnySFuqU?= X-Microsoft-Exchange-Diagnostics: 1;BY1PR03MB1481;5:mMGgaMisi+DmjjB7F7fekszhbKGA3BkZXlEUAnp3VbvdY74v9taj+l96vgQvVJeQsuzaDXYSCwutr4g5blg3LINwj4ZkFck68bjUF85PJoZqyGyzauX7VD18jEsIjJKlnFY2eTzPy1ymVTqyMcRAdA==;24:QfkkGCL84bp1oOSZ5QIyTzdFPrY8v8GX5M9NkKOpYtdHGGhgNGbFygOonkBrXeJkviVKRY2OiNHVW30phdhXtvexgBHT/jgtT+4ICxpenwI=;20:W6z7N/grm46xghNx996ke7qq12wQN6R0BW9Rb1K53rpIgsEhS5C0Xx8yKVQ4HnU/0il3chhN8mzcLn+QwGSeWg== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Sep 2015 03:24:47.9472 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR03MB1481 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 2015-09-21 at 22:22 -0500, Zhao Qiang-B45475 wrote: > On Tue, Sep 22, 2015 at 11:08AM +0800, Wood Scott-B07421 wrote: > > > -----Original Message----- > > From: Wood Scott-B07421 > > Sent: Tuesday, September 22, 2015 11:08 AM > > To: Zhao Qiang-B45475 > > Cc: linux-kernel@vger.kernel.org; linuxppc-dev@lists.ozlabs.org; > > lauraa@codeaurora.org; Xie Xiaobo-R63061; benh@kernel.crashing.org; Li > > Yang-Leo-R58472; paulus@samba.org > > Subject: Re: [PATCH v10 4/5] QE/CPM: move muram management functions to > > qe_common > > > > On Mon, 2015-09-21 at 22:06 -0500, Zhao Qiang-B45475 wrote: > > > On Tue, Sep 22, 2015 at 10:26AM +0800, Wood Scott-B07421 wrote: > > > > > > > -----Original Message----- > > > > From: Wood Scott-B07421 > > > > Sent: Tuesday, September 22, 2015 10:26 AM > > > > To: Zhao Qiang-B45475 > > > > Cc: linux-kernel@vger.kernel.org; linuxppc-dev@lists.ozlabs.org; > > > > lauraa@codeaurora.org; Xie Xiaobo-R63061; benh@kernel.crashing.org; > > > > Li Yang-Leo-R58472; paulus@samba.org > > > > Subject: Re: [PATCH v10 4/5] QE/CPM: move muram management functions > > > > to qe_common > > > > > > > > On Mon, 2015-09-21 at 21:23 -0500, Zhao Qiang-B45475 wrote: > > > > > On Tue, Sep 22, 2015 at 06:54AM +0800, Wood Scott-B07421 wrote: > > > > > > -----Original Message----- > > > > > > From: Wood Scott-B07421 > > > > > > Sent: Tuesday, September 22, 2015 6:54 AM > > > > > > To: Zhao Qiang-B45475 > > > > > > Cc: linux-kernel@vger.kernel.org; linuxppc-dev@lists.ozlabs.org; > > > > > > lauraa@codeaurora.org; Xie Xiaobo-R63061; > > > > > > benh@kernel.crashing.org; Li Yang-Leo-R58472; paulus@samba.org > > > > > > Subject: Re: [PATCH v10 4/5] QE/CPM: move muram management > > > > > > functions to qe_common > > > > > > > > > > > > On Fri, Sep 18, 2015 at 03:15:20PM +0800, Zhao Qiang wrote: > > > > > > > QE and CPM have the same muram, they use the same management > > > > > > > functions. Now QE support both ARM and PowerPC, it is > > > > > > > necessary to move QE to "driver/soc", so move the muram > > > > > > > management functions from cpm_common to qe_common for > > > > > > > preparing to move QE code to > > > > "driver/soc" > > > > > > > > > > > > > > Signed-off-by: Zhao Qiang > > > > > > > --- > > > > > > > Changes for v2: > > > > > > > - no changes > > > > > > > Changes for v3: > > > > > > > - no changes > > > > > > > Changes for v4: > > > > > > > - no changes > > > > > > > Changes for v5: > > > > > > > - no changes > > > > > > > Changes for v6: > > > > > > > - using genalloc instead rheap to manage QE MURAM > > > > > > > - remove qe_reset from platform file, using > > > > > > > - subsys_initcall to call qe_init function. > > > > > > > > > > > > Why is the init change in the same patch as moving the muram code? > > > > > > > > > > > > > Changes for v7: > > > > > > > - move this patch from 3/3 to 2/3 > > > > > > > - convert cpm with genalloc > > > > > > > - check for gen_pool allocation failure Changes for v8: > > > > > > > - rebase > > > > > > > - move BD_SC_* macro instead of copy Changes for v9: > > > > > > > - doesn't modify CPM, add a new patch to modify. > > > > > > > - rebase > > > > > > > Changes for v10: > > > > > > > - rebase > > > > > > > > > > > > > > arch/powerpc/include/asm/cpm.h | 59 -------- > > > > > > > arch/powerpc/include/asm/qe.h | 51 ++++++- > > > > > > > arch/powerpc/platforms/83xx/km83xx.c | 2 - > > > > > > > arch/powerpc/platforms/83xx/mpc832x_mds.c | 2 - > > > > > > > arch/powerpc/platforms/83xx/mpc832x_rdb.c | 2 - > > > > > > > arch/powerpc/platforms/83xx/mpc836x_mds.c | 2 - > > > > > > > arch/powerpc/platforms/83xx/mpc836x_rdk.c | 3 - > > > > > > > arch/powerpc/platforms/85xx/common.c | 1 - > > > > > > > arch/powerpc/sysdev/cpm_common.c | 206 +------------- > > ---- > > > > ---- > > > > > > --- > > > > > > > arch/powerpc/sysdev/qe_lib/Makefile | 2 +- > > > > > > > arch/powerpc/sysdev/qe_lib/qe.c | 15 ++ > > > > > > > arch/powerpc/sysdev/qe_lib/qe_common.c | 242 > > > > > > ++++++++++++++++++++++++++++++ > > > > > > > 12 files changed, 302 insertions(+), 285 deletions(-) create > > > > > > > mode > > > > > > > 100644 arch/powerpc/sysdev/qe_lib/qe_common.c > > > > > > > > > > > > > > diff --git a/arch/powerpc/include/asm/cpm.h > > > > > > > b/arch/powerpc/include/asm/cpm.h index 4398a6c..003a736 100644 > > > > > > > --- a/arch/powerpc/include/asm/cpm.h > > > > > > > +++ b/arch/powerpc/include/asm/cpm.h > > > > > > > @@ -93,22 +93,6 @@ typedef struct cpm_buf_desc { > > > > > > > */ > > > > > > > > > > > > > > #define BD_SC_EMPTY (0x8000) /* Receive is empty > > */ > > > > > > > -#define BD_SC_READY (0x8000) /* Transmit is ready > > */ > > > > > > > -#define BD_SC_WRAP (0x2000) /* Last buffer > > descriptor > > > > */ > > > > > > > -#define BD_SC_INTRPT (0x1000) /* Interrupt on > > change */ > > > > > > > -#define BD_SC_LAST (0x0800) /* Last buffer in > > frame > > > > */ > > > > > > > -#define BD_SC_TC (0x0400) /* Transmit CRC */ > > > > > > > -#define BD_SC_CM (0x0200) /* Continuous mode */ > > > > > > > -#define BD_SC_ID (0x0100) /* Rec'd too many idles */ > > > > > > > -#define BD_SC_P (0x0100) /* xmt preamble */ > > > > > > > -#define BD_SC_BR (0x0020) /* Break received */ > > > > > > > -#define BD_SC_FR (0x0010) /* Framing error */ > > > > > > > -#define BD_SC_PR (0x0008) /* Parity error */ > > > > > > > -#define BD_SC_NAK (0x0004) /* NAK - did not > > respond > > > > */ > > > > > > > -#define BD_SC_OV (0x0002) /* Overrun */ > > > > > > > -#define BD_SC_UN (0x0002) /* Underrun */ > > > > > > > -#define BD_SC_CD (0x0001) /* */ > > > > > > > -#define BD_SC_CL (0x0001) /* Collision */ > > > > > > > > > > > > What does this have to do with muram? > > > > > > > > > > BD is Buffer Descriptors, it is in muram. > > > > > > > > What does it have to do with the muram *allocator*? > > > > > > > > > > > > > > > > I've said many times now that any changes to the code, including > > > > > > renaming functions, needs to be a separate patch from moving the > > code. > > > > > > > > > > I have split a patch to two patches, However, Maybe I > > > > > misunderstand your means. > > > > > > > > I didn't say "split it into two patches, however you like". I said > > > > to have all changes in one patch, and the other patch be nothing but > > a move. > > > > Renaming the functions counts as a change. > > > > > > > > > So if the patch just do the renaming and moving cpm_muram function > > > > > to qe_muram function, Does it ok? > > > > > > > > No. > > > > > > Why? > > > > So that I can see the changes as a diff. > > > > > Moving cpm/qe_muram functions and renaming can't be split. > > > > Why not? > > If moving cpm_muram_* to qe_muram_* without renaming, > It still is "#define qe_muram_init cpm_muram_init", > Where to find cpm_muram_*? Could you be more specific about what the actual problem is? If you're talking about the fact that, for just one commit in the history, there will be a file with "qe" in the name that has functions with "cpm" in the name, who cares? -Scott