From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753626AbbGIT5B (ORCPT ); Thu, 9 Jul 2015 15:57:01 -0400 Received: from mail-bn1bon0081.outbound.protection.outlook.com ([157.56.111.81]:35376 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753399AbbGIT4s (ORCPT ); Thu, 9 Jul 2015 15:56:48 -0400 Authentication-Results: spf=fail (sender IP is 66.35.236.236) smtp.mailfrom=opensource.altera.com; arm.linux.org.uk; dkim=none (message not signed) header.d=none; Authentication-Results: arm.linux.org.uk; dkim=none (message not signed) header.d=none; Message-ID: <559ED09F.7020704@opensource.altera.com> Date: Thu, 9 Jul 2015 14:50:55 -0500 From: Dinh Nguyen User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.0 MIME-Version: 1.0 To: Andy Shevchenko , , Sascha Hauer , "Peter De Schrijver" , Tero Kristo , Stephen Boyd , Russell King Subject: Re: [PATCH v4 3/6] clk: socfpga: switch to GENMASK() References: <1436460234-61425-1-git-send-email-andriy.shevchenko@linux.intel.com> <1436460234-61425-4-git-send-email-andriy.shevchenko@linux.intel.com> In-Reply-To: <1436460234-61425-4-git-send-email-andriy.shevchenko@linux.intel.com> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit X-Originating-IP: [64.129.157.38] X-ClientProxiedBy: BLUPR05CA0065.namprd05.prod.outlook.com (10.141.20.35) To BY1PR03MB1371.namprd03.prod.outlook.com (25.162.109.29) X-Microsoft-Exchange-Diagnostics-untrusted: 1;BY1PR03MB1371;2:p2kXptXoiC2wrljdm8Td+o+YPGRCiBmcuqKAP5H9NpxXQwxSsJAh5sCUV26eEHpu;3:EZJaZkkogfWvZR0h4QJGFKWEIdKpqQM3VBrv3RJCMEoKRO9zSkhX4yqIeXL/WlpTbBDVB9iw9n6zj7WL7fmj0i2kjE8El9Q6vtmR5DaAVvYH3nGyORJYxD83F68sq4mkfXfza45P7X3EpDqXvFj/ig==;25:wE4pzaxvAXAU3du06pIKpMHPKw6lvzds2LneQ68CYpw1WWiZJUli7wd0wr5L3i5M81tqxBa/qxffceDc/JUQT4nmQnFeVCSk70p6qz8/kprCdBb0s8yJmWGK5LJHISDikkZaos3J186Dtl/AAVfOGWinJc+ixdxJ0P1pSHjGoF9agy0FWbGEaioxK/rbnlH8LWHQa+iafLqUz5O5ouXThvhLkWu6VatislNUr+9Pw/e6H/W2KZSLe7dtlzZTG260IUiAKkoY7/xTQZ7b/OAQYA==;20:hsMtxPQOrgwvV5SOeDJQsXTYIUYlcyxR+JpaSoZIJ9dWDetrzjByINMv3vK+UCWqXplB9L4opt4rv6ROreN57sTk070Tzeshopc1vRsGdC78pnaQoxUJNpnGtC8Ql5iWNHjGsY6+YL8jvkrm/eE1Z1lnp9tZ65QA6uDBqi3T5u0= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY1PR03MB1371;UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN1PR03MB121; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:;UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(5005006)(3002001);SRVR:BY1PR03MB1371;BCL:0;PCL:0;RULEID:;SRVR:BY1PR03MB1371;BCL:0;PCL:0;RULEID:(601004)(5005006)(3002001);SRVR:BN1PR03MB121;BCL:0;PCL:0;RULEID:;SRVR:BN1PR03MB121; X-Microsoft-Exchange-Diagnostics-untrusted: 1;BY1PR03MB1371;4:4fgdxorR7b4wngXFLDoJWCJUjUsXP3iO/PkPIfFi1ADs822o0REDJp2QkmuVA3cTADvWqA3vLKLSVlIGW8jFgfXXk0D42HT4rA0iAVrGOvdsbwwH46GeX0buS6W5xuDY+d2d2btmMFVu8q6alEnr641ObYQZnTbcUBVs4p2kxo4JWC2AzYHhde/lzl6grWnpWGk3ePgf9CP3PmoLFuc+piFjPpln9lwgdo5M6+lWrEg3TIlSCi39LQmPnNpmMJPINsASjLYFTVWBFBQHYiY6CkYLAyRpXLwUMARjj9Yd49Q= X-Forefront-PRVS: 0632519F33 X-Forefront-Antispam-Report-Untrusted: SFV:NSPM;SFS:(10009020)(6049001)(6009001)(377454003)(479174004)(164054003)(51704005)(52604005)(92566002)(77156002)(86362001)(23746002)(19580395003)(62966003)(2950100001)(87266999)(54356999)(76176999)(65816999)(33656002)(50986999)(42186005)(40100003)(87976001)(122386002)(50466002)(65806001)(65956001)(66066001)(47776003)(46102003)(107886002)(189998001)(80316001)(77096005)(19580405001)(5001960100002)(64126003)(5001920100001)(4001350100001)(5001770100001);DIR:OUT;SFP:1101;SCL:1;SRVR:BY1PR03MB1371;H:[137.57.160.210];FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics-untrusted: =?Windows-1252?Q?1;BY1PR03MB1371;23:ns24++aYGm6rXHHX4rFmqNGlYKKkxFnhdcEex?= =?Windows-1252?Q?dTUPHQCM7N7rptDPc7oDrYvPY8GBbdORcP1qQ3n2NJUaGnnpqOYzP//9?= =?Windows-1252?Q?qyoowX1NmAMwqERhlH3PvA2NHbVZBz5Po3eKJiO0TcK5vSOeTC4yPfYq?= =?Windows-1252?Q?OuBdkftFdHIiqMFBWMgA8QDPmCoBAL9/D4sQoU/wfsZaC6eocQjuWGLW?= =?Windows-1252?Q?LGdaj63EDsglJxyqKqrSX2lhBGYhzD+rna5OJnEYokFaylXpzlr3PV6f?= =?Windows-1252?Q?pcGM/M5wcJOWViX5YzydlzOUzfAa2dE4TpGAX0C6tjOy348IgPHZXzFm?= =?Windows-1252?Q?AcyW+FQ/tq55kvk6EU+Nnqg472EyUHW4//jmWbbN8pwUXOA+Hbe+s6in?= =?Windows-1252?Q?xZ1wfY419P427r4HO4DLY2FHHDQCtCYAfCPqP2e+opXSNJQ+u7iLklY4?= =?Windows-1252?Q?bJP2YOwYr7YCtHlCdYXjgwN1KiT1626S0vCbq9Cl/4FihsOjqkQSAMZD?= =?Windows-1252?Q?6+UVD/vIVwNLqSGg9aoV0MaxNKokH0kswd7jHr/HrP/chjNnp8PrssLP?= =?Windows-1252?Q?tO9kStsrAF+rgXE8DTWmVulb0YBmZ8vd0iX+1+j0alpe4uvI7pb0r9CH?= =?Windows-1252?Q?pZhYJoy8PAeVtANoZK2Y8Iomu8OTuxPwB8RkVLimqk2KGf04GA3AWfEB?= =?Windows-1252?Q?tcnRla6Gmfbxzl3JGlEmzct7jlOx+cI26CNP1mmQqoQiEWEaWGzq920+?= =?Windows-1252?Q?t4sn+LL+wX5xORFsUswpeyfxP0gB1KP++At+vPqHYX2oQOPSViiPQ7fh?= =?Windows-1252?Q?IW0f/2EzuUqAbsZTVs5vO7v+W/UA7jnTtV/epBRQFKBqI/S+CVxpLrpv?= =?Windows-1252?Q?xK3HIW2BsOTJxzHPbMXXeSPKIg/sDhE6qk3k/2Nuv9YrQxpyo9IQGqMT?= =?Windows-1252?Q?wxh0yiYiq6jvEH7n7OJ4Oc5NaRjhs9W+xVwypbj2EHfKwEQTaN1HIC8y?= =?Windows-1252?Q?KHqWtybhKC7Zbr6GqHyYPnhPBU9oR+JSJkVbX4vclyG533IpCk31RDky?= =?Windows-1252?Q?gu/j772wcL8KEqHusrskxjommGY99w11nn0bSU3HdLmwLirmFCDkqAv9?= =?Windows-1252?Q?YzRjc/V+F2yAVkkJhSkOUEtHUNtnSMsFwaqkx5Zz4wH?= X-Microsoft-Exchange-Diagnostics-untrusted: 1;BY1PR03MB1371;5:wj4E3VAUc8MZGnSAbhG4vX7AvOdPWZ1IjGmh3itBO0DmVPl1onZn+pB9j0XJSk3bFrLmkD9MH9Fw2XYkgDlvEfphSgWEGYp+B5qX4wCmhH0VupSsux4CgwmReLIVvPlkZE27Z+xhOe3ULXw6cARXUg==;24:HqMPcrFqWbB4Cm+n9iS3h7pu5xnrKVLpPoDx1XWqSp2fPIVqKV4abMjck4ceQ1+BGQn6TpQxl57Km8P9iqVKw0MmWPZkygBO2Uhzldy1yPc=;20:NiRjfm2Jlk14Scx/sBr7vjH7FXTDnCHbf7dX+2cjpJb6hZ0XPBwbvBfwGj1B2fZ/ejos94ju54l0ZvjcBQfSPhdn7iiLsO9xhd1+4Qy06VZaYPUR5/rZOeUUG49OfTWJJBAOL/6ViuSZqMKTG6YjMrM/pwUp8N4LePUDG7MW43A= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR03MB1371 X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: BL2FFO11FD012.protection.gbl X-Microsoft-Exchange-Diagnostics: 1;BL2FFO11FD012;1:35TtdcJBUp8sqPr0mxAaSu7fBqn+7DoaAt4AXv1QwjXCQH3TM6ErYH/kC4TFhlEJKhCzMOW6/+c76Hw2Gl173dl0B0+3JUdQPoCej9aLQB2Eg6Z7J6TjJJ8MOK17jfMr7zctTw4TMpn6gl2acy6zEXj1v3zgTcgl4WBMjWqBfOtLa/SguiTI0d+xxP3/8TNogKPdliP78bqpxlTIDb+86+4RLIpQSKOcIIXVGJVPK8SqCMueYSAWAPPKUQ8sISujPO3PYGBZd39Jtvui1Ns6e42no3OWH+spe/09mlcU16chRqwEO0f47TqfWQO+3I9q/dhJlHbj+SDuogf+trWJA62tiooylbsDji1N7QEPdONA+Mqk7Kg877lzFNuCH/MJQx4e7u9gUyUirqHCjpNI4V38ykS07dJONyEiqa1aE6Z9ueLJjczGP2LlrF6cEIXD X-Forefront-Antispam-Report: CIP:66.35.236.236;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(2980300002)(339900001)(199003)(479174004)(189002)(51704005)(377454003)(164054003)(52604005)(107886002)(50466002)(86362001)(80316001)(19580395003)(19580405001)(92566002)(46102003)(2950100001)(77096005)(77156002)(62966003)(40100003)(23746002)(189998001)(5001960100002)(122386002)(65816999)(87266999)(50986999)(54356999)(64126003)(5001770100001)(105606002)(106466001)(4001350100001)(16796002)(76176999)(33656002)(87936001)(65956001)(66066001)(47776003)(65806001)(6806004)(90366008)(85426001)(7099028);DIR:OUT;SFP:1101;SCL:1;SRVR:BN1PR03MB121;H:sj-itexedge04.altera.priv.altera.com;FPR:;SPF:Fail;MLV:sfv;A:0;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BN1PR03MB121;2:mPDBGDvTfJCXtPNqSKelWwaZ7TJ5KOLF83xrT5rdWg8DKJWx0JyvmI56D6/4xQRW;3:5PZ7//LPeQkJHu67txTt4L6SHzcDCPwGZsYJI18Mx9pVfVK9UNieD8nAFsydTUnia26rAS+HCNHJ7d7DDMPzXFGc/J4vkzcx/LwPd4zl/aAL35dOD5y3GpqNL3PukDskclpDoldDgC5XImNC2HaI5py4IuAXYEVIJFVtnKgYXDOKKOHt0UTkwNpXqB+TS2nDk3RMf5JzPr3dfSa3M4MA8yvL2JhMMjMBzRePraKIXTQ=;25:kqi7vUX6rG6I9s+gYTsUjfCXN1zgc6PpR2kTZBm12OsS6yPwsRR+dAOPY+srqf7hXuv2/xKm66AJ5Mtw8xeGvx1nuSraNs7uog+06sH54iQIJIz0v1ECnlPaQNshP9Hg5Sb0Z+sZUi18Yd9Qva48GBIDoTJTTypeH0HLYJA//TkhaqzHHxE0a2nTU3EftK2wZIUV/5wfsJC+0X/SFGwyCQY/ymKiu9o+EKivaE8w0sEC8qE16W3hwSRrrv4NjXk7/LfzfXHn8WkYhXGnMeTVFQ==;20:mcwX4QSj6Ogp3nAqIlaKeUSFGcYjN5n/4lk4TZCsk6kM0D5uDgb5bBpTzyTqKEcoGotRAZ+6DHb1kiXOo2zjpVcpeMrVBAWl1c7uYajEodcAufAtlbEQJc+v8cT1/7XqLbbhxpZPziU++wWMXeEenIy1HrehyDpwf1r5Q/8u34Q= X-Microsoft-Exchange-Diagnostics: 1;BN1PR03MB121;4:33OV56TVNYooXb9z1w896Cim5lPey1KSU5p69Cnn2WtfdQJP+FhUW45KbqXsrUiN53He5UOoEtfjbExL4ppCu79TCaNseRUlV4ybuzFspU95mkUTMCke+jQIl0xBO4zjfvK0OjQ3Fcy+jegsc12Eq1VyyEXjKmecsTygPU1gEajIrWgT4iP9bjbZwZ/M04aQnIpFyTBE8FI9WLUjcnZl+O6rmSfejp13nSk1xonv5y2DSnqnUUo1xiJDOEF34y6KNPSf2g2YrObDBdxx7NV+kTEc/KbWxS+CELzHChawNLs= X-Forefront-PRVS: 0632519F33 X-Microsoft-Exchange-Diagnostics: =?Windows-1252?Q?1;BN1PR03MB121;23:BOEEH3I/BySxfXm8g+3gi3CwqUmMrs7MuXNWua?= =?Windows-1252?Q?gkzS4/xH2KO41hxYc6zyCRUYLtbAD433HlQFS3GtR6aggJjuTw51cz3+?= =?Windows-1252?Q?1UmPmDpKe6Iyce4D57h6d1vmpXtFfX8GBnGAxS28gh9QZOrLn8xYBXfj?= =?Windows-1252?Q?egVGZvwCV9RXysMDav5Z/uh0u3RenDJj7pTpqF02AmBNC500trqosgCX?= =?Windows-1252?Q?2d64IksZ246ypPY2K0ye0M/inyGHucSrDUwE8aI0DF8aIWPJ6vwsG23G?= =?Windows-1252?Q?CztJ6YbVEFqx7DPMJ5z2mlJTeUaLvdObyHIs+vw581SWayO5UUfXVCRQ?= =?Windows-1252?Q?RgRLoa9eH4klwFKU7jjgHf5ETKm37WozZ9tBJyvoX4Hc1BjRjKl8ZZW5?= =?Windows-1252?Q?9oS1B+YFa3WajknL06sdpnmg47BkMk4p5igHUHKtGQvcJl786J59lSMR?= =?Windows-1252?Q?zW+UDPO6uXG5PGyFeKNNCmcLkvkxzrIDL6/Cf12XUQcdmhduWp7CpdhB?= =?Windows-1252?Q?SehfKdJvqjCC6K7lG7mp36DiUXal5Wf/wAbfzU8ge/mLHU+t0bBTG+DY?= =?Windows-1252?Q?q53SOr7iajrxOpBqycgp539ymUTyXHVucWUvIUAgtU6m+mkt6NA4WsF2?= =?Windows-1252?Q?DQCMzIT8nIPwGdoxcnALnDFIdQYjrMSmFf4IItCJ6AqFQjhWOd9lklAE?= =?Windows-1252?Q?vellFuwZlgbuveHfhG/LV2Edsp4TZxmfDHvY6qi+sW8TNQxpVIKus7Xo?= =?Windows-1252?Q?h4nU/QeieCf3xOwafmsDPuoFwzTlmXY5CZgN97n6Kuh5GMpUxa7xdJaS?= =?Windows-1252?Q?CTN3ZYLHZKq7P+CVXATc0At0QjytYFMsZ0GjLkkoIXmNvyzkW8bmsVuK?= =?Windows-1252?Q?N+n0BwXoQ61yxKLnhMPZgl5YFis3fRqK+Qwk0fgmigOVA6He3EUjMy7b?= =?Windows-1252?Q?iSZy1lsyNzZUFGqxUyNXO1f4tKMQarlH8MDsHU31IV3KN8NARQ+9IcxS?= =?Windows-1252?Q?QkDy8PesH6v2MNCQAnC1SdQJPpyqgo72stuXkVJ1ePHC4VaE7qSAToOz?= =?Windows-1252?Q?c8dN7jV277ZTS3bUXfCnR/cGK62hmd+MtQOBif3F8G0Qu+WW0GloeD7r?= =?Windows-1252?Q?Ffuc2p9B+d7iWcDovu3kyiXojuLVvjnAEdEx2zvbDtcgsNcWUCpGVgeH?= =?Windows-1252?Q?+jpi2UIPpVGMGALVFmy/rUJKQBsApks/IISuWAxJ2jE7v7y1YpmNvxt6?= =?Windows-1252?Q?8Ybv7fGxY5zDD7flEu7DpKfEw0rV+FetRpUBtyErSf+wKU3f8ed+MUfr?= =?Windows-1252?Q?0Fm6CH5lV4K7GzjMJBdUsXqQ=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;BN1PR03MB121;5:ZBgKHQXSEolRZwlca8WDQs86OcaAslDSCLlA2wpgqIrGR5gGCqijD1wKIlVj5B1zAWhESnszKIGODA3+bc3AP/xBPLfQJ2JiXS//PZEd8/eEO3E2Lb8I4kc/JlXkvi2Rl44A4+8rBExLVZxBxWiIlA==;24:qpD3VlHBSJV8Ju7kEzbJLTJOcTV9yBGSx4lSD3NkEllw98HZkpZT0LDpoyNZUzDZdAI+tMYh12y12pxCvJZZhqMV/knJZn9M/3YAzAK9+Xk=;20:2KNDBgtHFbgMX2JFjMP45gUNY2MxAR5d7o/vjhVrZ94v7e2lXxdTmpHEzYTBff6LVxZF0IQ0V7MTXNi0tAgcLzCkCxTuLCPA+ryMaxHDQM6a3h9R8J2aUME2uB8wi2C1CiAb4rJDYOxezKR1/9D1Pgxru5CMrG649cL7VCqpDA8= X-OriginatorOrg: opensource.altera.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2015 19:56:45.2850 (UTC) X-MS-Exchange-CrossTenant-Id: fbd72e03-d4a5-4110-adce-614d51f2077a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=fbd72e03-d4a5-4110-adce-614d51f2077a;Ip=[66.35.236.236];Helo=[sj-itexedge04.altera.priv.altera.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN1PR03MB121 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Andy, On 07/09/2015 11:43 AM, Andy Shevchenko wrote: > Convert the code to use GENMASK() helper instead of div_mask() macro. > > Signed-off-by: Andy Shevchenko > --- > drivers/clk/socfpga/clk-gate.c | 2 +- > drivers/clk/socfpga/clk-periph.c | 2 +- > drivers/clk/socfpga/clk.h | 1 - > 3 files changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/clk/socfpga/clk-gate.c b/drivers/clk/socfpga/clk-gate.c > index dd3a78c..d61052e 100644 > --- a/drivers/clk/socfpga/clk-gate.c > +++ b/drivers/clk/socfpga/clk-gate.c > @@ -110,7 +110,7 @@ static unsigned long socfpga_clk_recalc_rate(struct clk_hw *hwclk, > div = socfpgaclk->fixed_div; > else if (socfpgaclk->div_reg) { > val = readl(socfpgaclk->div_reg) >> socfpgaclk->shift; > - val &= div_mask(socfpgaclk->width); > + val &= GENMASK(socfpgaclk->width - 1, 0); > /* Check for GPIO_DB_CLK by its offset */ > if ((int) socfpgaclk->div_reg & SOCFPGA_GPIO_DB_CLK_OFFSET) > div = val + 1; > diff --git a/drivers/clk/socfpga/clk-periph.c b/drivers/clk/socfpga/clk-periph.c > index 46531c3..fc410a4 100644 > --- a/drivers/clk/socfpga/clk-periph.c > +++ b/drivers/clk/socfpga/clk-periph.c > @@ -36,7 +36,7 @@ static unsigned long clk_periclk_recalc_rate(struct clk_hw *hwclk, > } else { > if (socfpgaclk->div_reg) { > val = readl(socfpgaclk->div_reg) >> socfpgaclk->shift; > - val &= div_mask(socfpgaclk->width); > + val &= GENMASK(socfpgaclk->width - 1, 0); > parent_rate /= (val + 1); > } > div = ((readl(socfpgaclk->hw.reg) & 0x1ff) + 1); > diff --git a/drivers/clk/socfpga/clk.h b/drivers/clk/socfpga/clk.h > index d291f60..5278156 100644 > --- a/drivers/clk/socfpga/clk.h > +++ b/drivers/clk/socfpga/clk.h > @@ -27,7 +27,6 @@ > #define CLKMGR_PERPLL_SRC 0xAC > > #define SOCFPGA_MAX_PARENTS 3 > -#define div_mask(width) ((1 << (width)) - 1) > > extern void __iomem *clk_mgr_base_addr; > > Thanks for doing this, but this patch did not apply for me on v4.2-rc1. Also, there are now socfpga/clk-gate-a10.c and socfpga/clk-periph-a10.c that would also need to use GENMASK. Can you please rebase and resend? Thanks, Dinh