From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757699AbbIVC0J (ORCPT ); Mon, 21 Sep 2015 22:26:09 -0400 Received: from mail-by2on0138.outbound.protection.outlook.com ([207.46.100.138]:32688 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1757634AbbIVC0H (ORCPT ); Mon, 21 Sep 2015 22:26:07 -0400 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=scottwood@freescale.com; Message-ID: <1442888756.19102.215.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 21:25:56 -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> 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: BN4PR15CA0041.namprd15.prod.outlook.com (25.164.54.179) To BLUPR03MB1473.namprd03.prod.outlook.com (25.163.81.158) X-Microsoft-Exchange-Diagnostics: 1;BLUPR03MB1473;2:xf/8Pzd1LbRzbFdc8gj8q6IZkntrgwoQ9/8jQ3t2t7BPL9SgpZ1OccS0SPrpCyYFCGf1lRn8NSPXCGmf/7rAy0U+/fGvNME3+CMmIZdkvTtkv48rmA4Yyev1OUibZ1pcmlD1AQ5+zGh/o3AcixhuYyMV4sOD6AVVqh2ZrOMKiDI=;3:eaRsdrnSrZrVVM55nz0AHg1Oosd7yfygmvJPMVlUplfrNRxeScYTI6IyINbEwhafMp/faLClKAJ6lZ/Po5fozlBa5wYVdu3Y4Ifko6XIy/9wTKwFKTvg9LYd2hH48we4rGFD7TAZalO1uGyXBf06Mg==;25:e1uw4kAHN3BPpqZbBzjLpJQGpxu16OeAW9siYNdzBkOk39U3l7YAS3NUkj2LsnPJRhiF/Co8JADX4z/L3m6gZIfWKwBLsDmroO/N4QAWx2wroyW7/SloGYvTT72sea1AlmttB8Fp2TG9gY/W2AWDqQDXrT2MwWI/ltEB8+uBstSgIZZHp3v5ZdsoRFYC272bo8kOrz1G8nTlA/lgwCLfLnr0nwM2ULCwZZ8vRaiqqAwa4zY1dSmWSKW6L6rc6fOdOgFIuMIKJt9dmSvnzUHxrw== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR03MB1473; X-Microsoft-Exchange-Diagnostics: 1;BLUPR03MB1473;20:nniSPz7zKcOgrw/U2+RURRUYUYSKbv6VP19+USFOv49BMqDbd3oHPm41Z2r/ErySIUF+dtG4MFQiug/cfpugmXZWVzEc0jTys0SD7gBPP1sFr8czCQUaulEagyeLmhim3HeLtWtBGSY1bKIIQ3CjqnFqaUaWkk4LlUoCaZZEXibHELyb4/MyX8LT6PIqq+sR4x/9AJwvm8Avmwc6SbB7/gveaVVrqrwB8Ukbm6t2437ddw8/BkdSTVmAqkABIEA2XhsTGjahPLGAEsTE3nrSISYvYRDfF30jzxnXThOSVp+eM4TU2MYApzQ/5Gr9OkGdCXEs0pwMn/hDse7nvOU+bt4BotLRa+ItDc4uqTM8CpNZm0PxoX+RoWxWxta5YWQqR8jHiHb7fhWfFothZgOWepsMyp/pIUmMKf0OXLyKw+wf6n3XuufrNnAXIatbvTL7eWyvlIO9azRI6LYqkOFWOVObLu8GugKRffW5bIEbjqQH+oj8HH0xRifqAzooyZfe;4:cMtBej3GOyQUhYtMJSzuAgRSMdXinbmOPJvXNi4j4vNXehhHGDXWsUA3a6cD/OYdvAU3lmq3gFSp9tbr3at4B736Pw+d0RtIvQUMs5BlSRWEQrtMs9yuKLlDnAPm4xZtRPGOTV2QFcM6PoYk7XPkajioU6pSFYdmLNg3FGIb0nBMtQ8M8+TFwmnJN/EOJTmgdc23HXQVAR1gwZSxuxKh1EgPwvz79w/61b3G74dxtBLdAsO7Df8zUUftEgM96+ui2KMvw47if7RsI20CuYV19Tf9ORz4Yz1PPI/N+zOiqX08D9i0xFmBsNyYP1S7EYGkvLl4qcScP7fXXNKfUgJ1oQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(8121501046)(5005006)(520078)(3002001);SRVR:BLUPR03MB1473;BCL:0;PCL:0;RULEID:;SRVR:BLUPR03MB1473; X-Forefront-PRVS: 0707248B64 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(6009001)(377454003)(13464003)(377424004)(199003)(189002)(24454002)(97736004)(103116003)(92566002)(42186005)(86362001)(64706001)(189998001)(47776003)(62966003)(77156002)(46102003)(50226001)(36756003)(5001960100002)(2950100001)(105586002)(50466002)(101416001)(106356001)(40100003)(19580395003)(122386002)(77096005)(68736005)(93886004)(5001830100001)(4001450100002)(19580405001)(33646002)(5820100001)(23676002)(76176999)(110136002)(5007970100001)(5004730100002)(5001920100001)(4001540100001)(50986999)(87976001)(81156007)(5001860100001)(99106002)(3826002)(5001840100002);DIR:OUT;SFP:1102;SCL:1;SRVR:BLUPR03MB1473;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?MTtCTFVQUjAzTUIxNDczOzIzOmI1ZUNsSVBya2tKZEsyOUFCRm1RTlVtUWJG?= =?utf-8?B?N2hjSU5PNG1NY29xNUdPbFRDY1pDTWpoMlZVNDgwejY2KzFnTkM3RC9UMEtQ?= =?utf-8?B?c25xczBiclVFQ3U1aW1JMTQ5cGNCUmJGTlNVQlpEN0hiaVdLNXovcklOU1pt?= =?utf-8?B?WEI3UWQ2YXlueGIwbEZFVU9YTHpQRENHQVZzSGNIM002WW84c1BhR1d0djVI?= =?utf-8?B?eUZsd3FwL2hOYTJnejhmQ1NvNkZib0daZzRWYkprN0pKeHErSmZwOHk0MkVn?= =?utf-8?B?d0hib3d1NVpRVlFUU3RhYWtoR3ZhSzBPek9EQjI2UDhNa3QxVS9LUmRhalRp?= =?utf-8?B?SUlXS2xuSUg3bnFPbm5UZ3ZCY2N6RVpOblJlWGFrb3k3VXVJdlE4cWFXM1ds?= =?utf-8?B?NUtCSXVkU0xJVEhPL2RlaE5KbUFubU1FM2NXc2pFbEgvWWYwa2E0UVdWclBm?= =?utf-8?B?TGJlcXNNS25XMUw5RmxBSVVOY0ZKYzRINWhuRmNBUCtTWGRETWtBYTlBY1h2?= =?utf-8?B?U0lBYnIxeTFwYUF3dXZGOUE5M1V2OWxpQmJUMHhKS3RPNmlmNFlMOVNNUXZz?= =?utf-8?B?Y2hHY3NYVG56ZlliWU1TQXFPeVpMcDFRZjJJVENGUnRaVGxzclU5K09aQ2RV?= =?utf-8?B?MnkzYS9ENmhwN3U5LzlMVFFhNHdKQ3hDVmpvQ1NpeDc2ZWhjZ2pDQWlFT0V2?= =?utf-8?B?UHBZNEhWTDQ4V2hkNkwweWltR0RZYkQrbGdGdFdsR2NJdGxOYm9DYmhxdDEw?= =?utf-8?B?NGI3bjRqMzE2djNpZVVmdERLNU5GY1lQdmJnY0c5dWJCUHludmNJYTY3b0FG?= =?utf-8?B?MmlrNDljNFFGd2VSbE5WZTBtaWVVUGdZNTZqdmV0RXM1N2pRZjVhejhDdi9x?= =?utf-8?B?dzNCNHhnNHlYVzNYS2lPT3lUbStFYndEVWJuakExTWYxcU9DZ25xdFVQQ29G?= =?utf-8?B?OCtOU1pZdXFVakxCQmkxdTFiWHoyaUx6cWh2MHhlK3IxanhldWNNSDVvS1Zl?= =?utf-8?B?SHlKS2V5SDdKK1RJb2tWak9OUFpWc2QrL0JZb1FwakNlUEk1M0lXUnZYelhR?= =?utf-8?B?ZzdHT2UxMnVSaXRMZVNlK2ZuSThiMGxWS3IzaUlneFMxb3dkRlIyeCtWZzFC?= =?utf-8?B?U2hSNjBkZkRubVdDbVlTRkVwaGVlVExjditvNGFNN1FwVnN5Q0VLSFpycWk1?= =?utf-8?B?L09DamE2VGZGakFQdC9uQ3Y5QTVaeUJ5Sk1sVS96SnZVYUUrQ293WVF2STBX?= =?utf-8?B?S09rS3c0b1B6VVF5MWN3Q3FGaTh6MzlyeXN6R0ljYXV5TDUwRjRkbENQekt4?= =?utf-8?B?U2tVVGUycDdiRWQ3akpzSmNqYW11MEtVTEJhMWd4TVRLaTRGWWZSUkJVemxE?= =?utf-8?B?eHdSbU1XdndaNmFwTWxzS0w3bXNPNDViR25xVnFTcHk3UFgvSlYyM2s0MDlP?= =?utf-8?B?WHZjVk1TQVFZL3dDckhZN1VacDhPUUJHeFF5NEZMakh6OUszNjlmME8zQ2Zz?= =?utf-8?B?alBsZDFFMkVqUHRlb0JzZi8wNEVJM0JKaEZYbVVNbFgvbjdhWTlvbmVJRzlY?= =?utf-8?B?MW80cDRsUkVlaVI3aExBSnRVUGhnRlB4K2ZjMTVDUWFpbXQrWHNCTDlOMDNJ?= =?utf-8?B?ckFPdmhnblFDb2oyKzNuMVlMVW1CSkN2MS9xQnROY1U4eVY1Y0UyZklzR1Fj?= =?utf-8?B?bWQ3SUE3d1EzUnJjc0IrdDJESk9UZXlaMlk3RUUvSlFyeHVNbFluTW1DT2lE?= =?utf-8?B?T09WQzM3MmFTKzVwbVhvM3JyUUdQenVGY2NROHNKUy85VzIxd3k4NmRicFFh?= =?utf-8?B?ZXMyc29WVHJYcFRRMzhZK0RwZUpLY3dzRXc4VWFOKzBabzBnT1crWXlLc05G?= =?utf-8?Q?EBC87noiriQ=3D?= X-Microsoft-Exchange-Diagnostics: 1;BLUPR03MB1473;5:uv3chgr0cIV0xt42hkQg1nR4VFvNBCykmUACM2hjx+YutrMGDaAky2gCOaLKRXXL8miGf9NPyq1/B7QnEpsVXC7j4xZr5QoRgXHfv8VArdQQXk/KyQ+mqb+t7MB62YWPp4gYq5VYhcsFDiriyopZmQ==;24:hNwgMH0f8cG8oxI+QH8BrJsu6h+DFtpIXbQ8bXj0kM1ETA7MsXYNqhuky51YkBpYQlo5vd87XbSi4+rVNWx6he8r/4Bq0JNLQzDnSPx35aE=;20:OLJMxt6ch054YIx7eFBBY+ygYNIfDO6Yn+pH6Kneke6MFy4dKjVMjfN9aXC/FU3NY8kVx/If2udTE2AEYN2i1g== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Sep 2015 02:26:03.4204 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR03MB1473 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. -Scott