From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932986AbbIUWyS (ORCPT ); Mon, 21 Sep 2015 18:54:18 -0400 Received: from mail-bn1bon0135.outbound.protection.outlook.com ([157.56.111.135]:7368 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932422AbbIUWyQ (ORCPT ); Mon, 21 Sep 2015 18:54:16 -0400 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=scottwood@freescale.com; Date: Mon, 21 Sep 2015 17:54:05 -0500 From: Scott Wood To: Zhao Qiang CC: , , , , , , Subject: Re: [PATCH v10 4/5] QE/CPM: move muram management functions to qe_common Message-ID: <20150921225405.GB12709@home.buserror.net> References: <1442560521-19354-1-git-send-email-qiang.zhao@freescale.com> <1442560521-19354-4-git-send-email-qiang.zhao@freescale.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: <1442560521-19354-4-git-send-email-qiang.zhao@freescale.com> User-Agent: Mutt/1.5.23 (2014-03-12) X-Originating-IP: [2601:448:8100:f9f:d59:7025:7bba:8c10] X-ClientProxiedBy: BLUPR01CA045.prod.exchangelabs.com (25.160.23.35) To BY1PR03MB1483.namprd03.prod.outlook.com (25.162.210.141) X-Microsoft-Exchange-Diagnostics: 1;BY1PR03MB1483;2:nm0UFCnPFwDBkL/EM2zCWqFEEffjZpA5b+oyWonlWArmqa6Fbrvld+CGmkIRk9BsnGtg2QbsWzaeYt/9I1hdcaCqKNnm5RZlU8CRKOT0uczksVxNWURKO2wHGztyYscTJM4NMy+bDqVc5mTLGR2qcZNpytcfsCDOrQdBai1y0qg=;3:/7laaEaqeDDxpveIu0mJboKnDYzMgiSQcU2VBxEy7bU7r1m5JGN95oEm8wckWhbVBz07vrR7SPl0Ze6ONjpt+n2D0Jn4n7hipd5oeYEs6HQBB/Pi9bYQFy4zx4LQ1gI9EP252TZd5jMkR9BuT6M8Kg==;25:ySHy8FmsPll4rtbBRw8k6OYDXMLCy0g7QqAB+stbmCH7Z6WkQcZbYe14ff7IBDBxkP7CaZjWpJYhin/LC/lGANM7BPY2LUgVeZudaylip+X0eUKtmMPxrAjC09n6ce9JBSu29BW2To/KmAByOyF5kqGLVwNn/uOkCFJt8Lhqt/iXuo47QTJssIEYuMZCa66AnVx0vKPI6eSsnYj0tutHhjkyO4Jf/1i2NS9DT+dAhNp3eiP5w78biSQoEHU8F3tMfvZdXwlzHYk0MULzeNePXw== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY1PR03MB1483; X-Microsoft-Exchange-Diagnostics: 1;BY1PR03MB1483;20:uFG9FaeltuzCWMDbMptslbWTvedMrntJ+BJUieqbqCPUN9NrDn3gtX+Fs8h6dCZGdyT7cnMCrP2fyHcRq2ywi94VNIqbt7YzA7p7RKhMdBr3T+Q1y2E2AcyuPe6QvXxhhNY9BTnw+xuq2mzdlzmmOmp5mBHiljxBUjVrGsET+AWOKIfbBx68uKgI0GoIZb+6ynpaZxeVE6isWN6/0sFeVIIA82ZLvhqc+bSS/D5GtWlyECz767feQWhiXz9vF+cvM9enB2zAreZryRnSnDI/A06urpVCb/DPqirU1SzAeiZ/nmCMMypjT4JFdrYKOoB4VzaWR6s6yovfhSZ8L4Th2QBgwXJxTIrdz+AePP3BkBGC5zGlW3b0XGr0340kmMQYNU6h8/CmhwdlUIzdg3W+QQjZIQ85RqMeb5zvBDHto4flEfMOAZ3u22+vjulv8Fbb6MUCvldOOgXuvEn8mZx9NNNMEacD41eJzLqq14aDnR7yzLozfvdjK+pTZUsGtnyz;4:ZZQ9YnDLiwMVq7sI3vBVmSunyUIrrnNtN6JS9WDNwgtP9J6Aw0nPfZniHmif18bzMkxI2b6UVmQD6wq8T2+ifaGYM7H0W/awaxoPK/ii6JVEZ89dIh3/pBVb6R2cJNOsyAONkgdeepqxTCy6OBG7SeDCVb6hO6Rynjqh0fq2rCe/mjWEoWR5nylgbnW6zyBHUD+kKK5NVdgQjmbYrT4Obi9Q5DId01i45LrRIUtGgx3jU/PWnmMFhKZPLgzvbMKq X-Exchange-Antispam-Report-CFA: BCL:0;PCL:0;RULEID:;SRVR:BY1PR03MB1483;BCL:0;PCL:0;RULEID:;SRVR:BY1PR03MB1483; X-Forefront-PRVS: 07063A0A30 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(6009001)(199003)(24454002)(189002)(50986999)(92566002)(46406003)(76176999)(97756001)(46102003)(54356999)(2950100001)(122386002)(33656002)(86362001)(47776003)(77156002)(53416004)(42186005)(69596002)(189998001)(77096005)(106356001)(83506001)(105586002)(68736005)(64706001)(87976001)(62966003)(19580405001)(19580395003)(110136002)(101416001)(50466002)(23726002)(81156007)(5004730100002)(40100003)(4001350100001)(4001540100001)(97736004)(5001860100001)(5001830100001)(4001450100002)(3826002);DIR:OUT;SFP:1102;SCL:1;SRVR:BY1PR03MB1483;H:home.buserror.net;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BY1PR03MB1483;23:bOaoWmy2neqoGUFuGWVCuyePHP2hH0bImIAEzImPC?= =?us-ascii?Q?doKxpAwV32HR4DdjmA21DT7cdysUu7QlSFNZFxhJQbmbMaU2u7uWjYkESho1?= =?us-ascii?Q?QASTY6XZtZPAJ5Hu2StnIoGAIEsNPJgWhEzR2DpbQMAXPUsKRkvhg65tOtFu?= =?us-ascii?Q?axrglzGzU9QN1jV6ZUFxZIV4Bdz06SpL1I42Zs0NUxtYbNO2YucjL2uB80Af?= =?us-ascii?Q?Pl9SY5DzEp+1sfJE/X7XfW0pFLpZpvS1yVRcyLjlKIyJQ2gmwBR1PK5J+y1d?= =?us-ascii?Q?l7a6IxVZxZ/j6+obj/uxDD0qWXFjXCJFLeUmxHa6n2uGv4anpOaY8JHV/VED?= =?us-ascii?Q?yGyd4yOAAKqh8JA5Jcl128GkevrRxzyQFRDX3kv+6QlJNqhBQwOGgVywd7DV?= =?us-ascii?Q?i7+b+Oyau29SWJhf9BEwcj5xBdhosaD7TDauIu34iVPT9OloOncG5GiF8Axh?= =?us-ascii?Q?b+p5l4piuoNKNnGHv74j2x+Aj2O8PyD6mjCVB7+ShZUGiTpfwRl/fATv/Z96?= =?us-ascii?Q?Vpf2CBmlLwwkES+Rru0MQn4OffWdQGRRGgnYcTgXVrpcauOJ0X1zOJQzou5u?= =?us-ascii?Q?JLKJi2rWbu5wr/rtqnGmVdt3hDOvAL8C0fOZ2guMH5lVTQbO3XRNBR8k1z1P?= =?us-ascii?Q?jUk7MVg1taofCNV0whaUDRAstyvx7Rir3bmXg2iHsgbe9MhKDjCg04Pl+8vL?= =?us-ascii?Q?n2Da+XyC0rVg5BTduSEFGmC+UIpM61qkTP1zlHykolWGMitPKdD9Y97gFr6Z?= =?us-ascii?Q?VlbQ2/uq8nser2ZKbFKo8vADVBvVvKfRE9QZ3q1EtsdS4DJWQk/CZ+a+rx8r?= =?us-ascii?Q?isWfn6t7xh8tvvQ02KzosuYOPHmFOOwE0Z1mjvjO/JOi1Vu0nADX2YzEK8pT?= =?us-ascii?Q?c5B0FqCQ7DP7boT5NhL1EuF7MBVys1NthQjEEguz8q4PIyhyQjElr9KvhgEA?= =?us-ascii?Q?QvXyy2QQCBHA/3d4EnMB7CPYgPuq88kXx5tYU0jw5rYCIxOTs20Ej5aPy9tZ?= =?us-ascii?Q?6W99PgDBG/QT/Y/Yp4BljmpayUh/e2rCiyvIwhGgZC6Qg/NPwOUICHfRupQa?= =?us-ascii?Q?hsRN4uAJEg7AKNXTvS2Umfu7g/vO0MBiRhmHoendGhCTnO2xQTU6WgThrRnH?= =?us-ascii?Q?tSG8aEH+wXXpCzbXOtfiO4ObpLAV7BgHhWHydBOqHwZR+5KT3UCAj1NPl45q?= =?us-ascii?Q?rZLH28UIRxnG2ltUyVawM/VELzfA2T9xI/p?= X-Microsoft-Exchange-Diagnostics: 1;BY1PR03MB1483;5:kOZ2fL2H1Qr8o8JB31rS1Y36UoNe5aOokeNs2bURv+I9rKhEc3wg3oa7GkRRmGOtFa/X6ZXrVRrDDkwUKUhF5B+KnjTxrm7MZ2wWtJM8UrFurSDhKgj3vq2iAaVOywmup9FwUL82WhhYdh6rKFxCUw==;24:rDlhdNlPSzMCXCL/1yO/8maArPES5aXmiF74SBCu3Vte/L/av1p4bEj2psvOwfWL4IN477BJHsWtFqZ/GwvU1PvdRkHTlv0wH3gpcV42tAM=;20:UeVHBf+kP42+OPuuc16hAMFTvwB29EMGT4i9Bf8n4h2KKkxjzct5ot7vhFoA4zw29NfC/9u+UjvVIi67YCc8tQ== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2015 22:54:13.1486 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR03MB1483 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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? > -/* we actually use cpm_muram implementation, define this for convenience */ > -#define qe_muram_init cpm_muram_init > -#define qe_muram_alloc cpm_muram_alloc > -#define qe_muram_alloc_fixed cpm_muram_alloc_fixed > -#define qe_muram_free cpm_muram_free > -#define qe_muram_addr cpm_muram_addr > -#define qe_muram_offset cpm_muram_offset > +/* we actually use qe_muram implementation, define this for convenience */ > +#define cpm_muram_init qe_muram_init > +#define cpm_muram_alloc qe_muram_alloc > +#define cpm_muram_alloc_fixed qe_muram_alloc_fixed > +#define cpm_muram_free qe_muram_free > +#define cpm_muram_addr qe_muram_addr > +#define cpm_muram_offset qe_muram_offset 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. -Scott