From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757674AbbIVDHt (ORCPT ); Mon, 21 Sep 2015 23:07:49 -0400 Received: from mail-by2on0134.outbound.protection.outlook.com ([207.46.100.134]:13216 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1757487AbbIVDHr (ORCPT ); Mon, 21 Sep 2015 23:07:47 -0400 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=scottwood@freescale.com; Message-ID: <1442891257.19102.216.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:07:37 -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> 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: BY2PR07CA053.namprd07.prod.outlook.com (10.141.251.28) To BLUPR03MB1475.namprd03.prod.outlook.com (25.163.81.17) X-Microsoft-Exchange-Diagnostics: 1;BLUPR03MB1475;2:4nQraMs6BSZYsELckKGUnsVXyhTL4OHoV44Bjxn18skWdKZ013O/HR+hAzsW9qeGmhiMMLr0cMToydXT13bX72tfepWyFlkUilzS+9T9Q7CpWjb4eihGSSi051PjnSO1wxLMdxyYSPf5ijgEnQAlmDGaOsP1Jn0t6QLkWrtW6IY=;3:o9c40pu7Eg9ckoQkFZKUnDCgxunKqVNiMgOcX099t+z9mnV3NAhHjV8Htp18z7pG9cg2b/6w+bAdIfqL9/gYGzaCD/BJD5OXD/wIZjXCvCdLx4B6mbvpoxCxcjeJuaUaDUlB9UJYwhQ08D9QE9Ee3A==;25:LCZJXMXi+sc5HBJFdunQHcc/Hb9X6CzQIY1wvFaAZioB1pmpJxrWJPo/9G/d7M6zX/883eo6dlbFpAxWz3V2RN6LMXdCa2b1xxpgxf/N7krYtQaCr4nMrvCEjP05lKv7RG2CBwyfZWTg651IN1/qRINy8hJoNAWni6gU8BT6cDv/kphtlmQnQy5VOu6A25ejR6XEyRsCPPVISU35xE1CWD0X+Xpx2XFqzIaL75fORS8ahorNbh5jFtNViCy7LqZJQuolQYUxuWDz1dYQeg/Oyg== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR03MB1475; X-Microsoft-Exchange-Diagnostics: 1;BLUPR03MB1475;20:Ol83X9WEeeP91xupIULXRHgKPTkqzdEJpiiDv8/0/qeO08oojJ+4RWVObKYsvDBs4uCtm8k7mtgZJOjuN2lkxWhXP/1r1qz5GCV7pN3RAyeeQ2W3lqNIaj2xIUq9l7B8wsqEKhEc3LhdYXBIuFCjK2IGolOoAI4nJy9C89LqlOb8i2MWG6uSr4Y565l8QxvxTOLuc5R0nYiF2zZxaYpGqrFGsgva4WId+PSlGTA43f9OPhNJFPJING76y8fItCu+J1zjpbgD8bTw3NgN3eCM/BcGkLGCS0jggP0WRQTuMduEBfAi/WRduQunN56y46iZCCNoM1sfeluHay+m9seUnxR2jJc2XFnCM7we2RqU/iApWTW53dal4jWU5anZj5CJO6iLUFFNEKxWJRBo0N3/ZvNND3/S0ec1+mOslV5Xp6b2EWOuDxPF98s0iNUuR9WSEiCjSEUTzHM0N/yEz/R9v3SWftnwpwkwKLhFP3Xii3BvFvV23ssDN9U0Y3BE9ak8;4:s7bOil6zd5UlUrD4zEztrvFVxEOz7ZPM3K5CWWZzg6eAL+TL6WQoPpMBK2bg0RVHgnwLfo6cEpJDrMtRIKPvNPYiEg0lL/TYbFKWHTe6lQywZ+7njM81gTuRBU/aOYAIxX0DQ9aSTAcpG1tOcnHJrFUUgZUP609dpFaPGmhc1RO/xKEFLiPho90XBiOGa0ZCDvvTUeDlZN3IAkqiDDBNwzo1rdBMhs6OG6MZJcxAE7kTauJTzBn37RQ4hS9Tu+8/Tow4tjYVO6ZG3qV3qPdyTSRAAfuA37R721GmCIZtVPhJ2KGcll5kirwLllru7LUkRedw8NOE3a6OBJfMiECNkg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(520078)(5005006)(8121501046)(3002001);SRVR:BLUPR03MB1475;BCL:0;PCL:0;RULEID:;SRVR:BLUPR03MB1475; X-Forefront-PRVS: 0707248B64 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(6009001)(13464003)(199003)(189002)(24454002)(377424004)(377454003)(46102003)(19580395003)(87976001)(50466002)(5001860100001)(92566002)(110136002)(50986999)(33646002)(5001960100002)(77156002)(62966003)(97736004)(5001830100001)(50226001)(76176999)(122386002)(5004730100002)(42186005)(19580405001)(106356001)(5007970100001)(81156007)(4001540100001)(189998001)(5820100001)(23676002)(40100003)(77096005)(93886004)(36756003)(2950100001)(101416001)(68736005)(4001450100002)(86362001)(64706001)(47776003)(103116003)(105586002)(99106002)(3826002)(5001840100002);DIR:OUT;SFP:1102;SCL:1;SRVR:BLUPR03MB1475;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?MTtCTFVQUjAzTUIxNDc1OzIzOjU1T01ZNUVrNjJwUXNnQ1VhU1dkYTJaSW9u?= =?utf-8?B?d2RpWnhPQ2xHazNKSTF5cW42QzR3Y3VKbmp3eENQS3loSG8ydEpMNTdSdUZO?= =?utf-8?B?bjZFZkJHc1FnSCtZdkE2N3VPZS9vSURtbzg4MnJCN1dmbkprd0h2ZVFReTNa?= =?utf-8?B?djdESzkzc2cySnVsQUtXMHNwZ0IvNUVhd0lMR1c2Sk5odEhFRDdTSDlUNFEv?= =?utf-8?B?T2N3Ty9MVzF2VkZyMnQzNEs5UDM3eWQzNkVOVVdZNGdPai84UUs2TUFHTWFL?= =?utf-8?B?dDVvRGJJVVhxZVNEdkhPcUFiSVUrbE1lYW8vQldnbWpYU3ljcWJxZGF5RVhl?= =?utf-8?B?SjMvLzdMQmlpak9xTUxBM0taTmQzM1lyZ29lUjhXSEFFbWs5c0V2UFc2d1Iz?= =?utf-8?B?WGtMUGFGYk03aWwvR0JJNGwwQlY1NWxtK3pHcjFQUEtFVHIreldWS08zUCsz?= =?utf-8?B?SEdRR1JiTVZLMlJrTm9DVEJUaGdNSEtUS096RCtkeWdTa2pjM1djMnhnOVZp?= =?utf-8?B?ZHZyS2FXeU4reERKNUg5MzFaa1lpVXI0cGo2NllPMVdoZE5RMmZQNENOd0E2?= =?utf-8?B?UllybVB2NVpudlg5SXhZZitjQVBYUkxZQWgrcCsrN1NULzBmdE1IZkpuUUc2?= =?utf-8?B?NDEyMnl1SlljemFtbURQV1N4cFhZTnZoYTVnVjJ0MVBCSHNGaEhXM0hKNWI3?= =?utf-8?B?cnp5RzdEc2lmYkxEQ3p4d3JLZmRqZ083dE9JMnJMZWJWbzhHMnJvS2I0Tkht?= =?utf-8?B?aGZTS2ZFWDdQT0VSbkRPV09lUVhIOWFRVDJGU2dRSzI0VW0waGQwaU9VcmVU?= =?utf-8?B?b01QRG9ad2hwSzhFTHNDTFJLTmxSVzB2bVU5NUczTTZWNCs2UzRDNDJReVhH?= =?utf-8?B?REFUSHZGcGVCOWxNcldDWTNUNGV6Nks5VlR2NXhPZ3UwMC9jMEQzVWhrbGhI?= =?utf-8?B?dXRML3IrZE4wTmt1ZkpVYk56NGNvdFBIMk5KRjBxUHNGU0lRUHYvRzFLOWNX?= =?utf-8?B?SEY5VTNvUU1MUE1BL2NhTGVmZ25sOUx2c3BVYzg2WEIrU3lUK3ZWZEcyZFhx?= =?utf-8?B?dXNpWm1tQ2YyNFVZbzlHek1IMzdHUnR0RkozUnhIK0lyNmlyemQ5U09oeHM0?= =?utf-8?B?QmJaWk1IREgxSHBiaWpzZExLTEFZOVJUWWJkKys2aytSNUUzdnhQQ0pRRVlt?= =?utf-8?B?MmhMTk4yemZrNCtCMDVjZXkwWUtVRDc3dHpnZnVtYXdORTdxdWtvTmRnM2Zk?= =?utf-8?B?NWlDQUJUajFOYzR1KytIU1hmQ1VBWmF0Nk5YTDc4bUFmZm1DTjFMckFQbzly?= =?utf-8?B?N01QRThPVVhocGlObWV6NXdYbThSNEtsbVJCVWlDUS9ZQzBseUhQZXNjMGlN?= =?utf-8?B?NTFmdmFkN2Jkc3ZlVHQvNDZaR0ZVS3ZvZWJoQTdKVjAydWo0UnZlNm5TRkNj?= =?utf-8?B?M01sb2pxbk9wY0VtRDV1ZEphSXhqV3B2SFNvZFhxK2pxaFNiZDF2U1IwcUxh?= =?utf-8?B?R3ZvVHV4dDl0dXFOdFUyTGw3bFVLMWJDTzRPSjhRZ1JjNWJXb29sMEpTb09B?= =?utf-8?B?VFhHWXdxaExzRFI0YlRGNzBYTHc3aGgvRFRVYnk4cTJzUEN2a3Z6VkNISHhl?= =?utf-8?B?NjVVbUFaVTZWcFpPdWIxOVh6U2RmK1pwS08zUEc1UzVBTno1NVlCdkVaZEFL?= =?utf-8?B?S0RmQU4vbThHWTBETldwYXM3MmFBanFXWWszV1U1Rjg3OHY5ZXI4VUl6NEJS?= =?utf-8?B?cElRZjBuQ0x1dDcydGY2QnVrdjJkd2dLWXg5UkJuQUpOZjJJMnY0Ym5Hb1VZ?= =?utf-8?Q?VN79aBw8iIJx1?= X-Microsoft-Exchange-Diagnostics: 1;BLUPR03MB1475;5:hg5aZs/6MPOkJevR0WFA+8H2klxsjVyw/ZA5pxOT7evQM7Uj9Q72nwDDzlBcrbFjQr2Kvl15TUvDHmzH6BOx/rIjPDpT5quTaYdR/p/dxp7wdWu9+JwFTPtd4F0S8xNObxiSZaudhoR4NzIsKFt1jA==;24:2vBx3ZNKJnt33mW2sxsvByVsHI8+mL/Mmc0ksNFwVPgy+6ar161QTkfS3+ELgXJc0I8spOqwj2HA5DZfwFV9iwsUkHbK/UHbVnZyURQI68Y=;20:xe93VkznyFRmY/ckFZX8ksC2zOrGqL80nWPZadLKixkq2yc/IgIZ/3vNS5ePrLR/ObF5yDPn/VCCnfHcEQoWNQ== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Sep 2015 03:07:43.6120 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR03MB1475 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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? -Scott