From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753905AbbI1XrM (ORCPT ); Mon, 28 Sep 2015 19:47:12 -0400 Received: from mail-bn1bon0119.outbound.protection.outlook.com ([157.56.111.119]:1354 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752984AbbI1XrK (ORCPT ); Mon, 28 Sep 2015 19:47:10 -0400 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=scottwood@freescale.com; Date: Mon, 28 Sep 2015 18:47:02 -0500 From: Scott Wood To: Christophe Leroy CC: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , , Subject: Re: [PATCH v2 07/25] powerpc32: refactor x_mapped_by_bats() and x_mapped_by_tlbcam() together Message-ID: <20150928234702.GD6161@home.buserror.net> References: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) X-Originating-IP: [2601:448:8100:f9f:50d6:efef:9d58:181b] X-ClientProxiedBy: BLUPR05CA0055.namprd05.prod.outlook.com (10.141.20.25) To BLUPR03MB1476.namprd03.prod.outlook.com (25.163.81.18) X-Microsoft-Exchange-Diagnostics: 1;BLUPR03MB1476;2:UkQhTB/0t71BaxW16MrHgxxKPv9J8fpaVA//quG91LNfGHZfC2tK35dVUIZSBNX8d/e/DS6ckBuR+KDsSDnrt5ElT8PrwSYD3NezJWtfN6Ac09Akk3jLvKRZRL2h4o8XF7OMHlkejevhTG4xy+gkXgdWlAM1+CEU0re+rskwLCs=;3:vYFOPy3Eo+Edc2H++kG81dwskEpJIwFaNgsBv3+cocVlGQtja0IlBpJkd7DS/okWSPPmWF8xAGeglPZLKZvTY/S4ToKor2fe7nkw65iKt60WE1yi8kOCV9HzISS1tudlKer+cuEhoOh2xV3Ol3Bt7Q==;25:glkF5MUX2wsgsxveqmXRvmD2ofSigy2pl//1+bZAakmZ4usAywYA0KTRqlky4XW015/quLGQfPnokDMWLBZWE9gOf1begsHtXU1fYHotbK0gjd3ayizcBhONR7pSnboZmlxGiRXuh8Wm3riPrkZGbA/L/EQeTD/E1lhSisYSGZAwDnp7kxrZ3Hn0IUMqUkk+5R5Hrz9XNIZBmaee0wVzYgXMdkPeNQq/2vvEp6Pw9XnSYz1WGzBlEQMZUGJUMegK X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR03MB1476; X-Microsoft-Exchange-Diagnostics: 1;BLUPR03MB1476;20:RxNPSw7ymD8HoVgzUt9snJ87E0U/5pOPEHnjPLr2iRTLZQAbUVM8maBwoqfoI6rl1SveUB9NBMKbiWj8Fouey5shhX7nT9cr9RlmLV+4+/E77aR+/cvE8E3ZT7bl7PEAcBVja2fQalAA6ML9hOxqkmscSmKjJ69JRDF8AMQh4DZdGpNFSxqacGT1icX8Q/4hs2+K0N92ifHmF0GnBGz2+zTxMUQgwsmNLJCmvTQHzJ8CRcNtfkKhhnzIgUd6vSZpAerY1RuQBA+a5Tc7bOoMfMukXP7dr+M0IZpT7uo9v3o4jSdeE42BH7+lucQ7P/wPIyAOJ1G4YmXl8WwGXrRFhZSM4GqhCvZPeIMDptjLSYnuf4JN7++MDr1dkbCJfnxcJWJ3taueZ+f2g+fZv3Z5RtiWi6l9zyvFC4zX/hzmPhcx3pvoloiiE4qF3JQIhbjPFWhQu7dlO++gNal4TuAC/S63Cpv8IBZY6aIbTSYg1ckXyHmUopyGu+WBKcuJ/CDR;4:3yaLYGQSNDFQ1WSmfrjYIr2cJkozhS4xeEJOvd7rqp8Th3/I1gSNADyLzON5Gt4TzeLJtiALO8B1A2s7/Wifd3zh+5QDH6gyZ/Z4yo9Bvc78rae+0XkXZnD4oXvTwXZQB2EeE148OzlLnkUbA7V5jGnZCRbpCV7D16t3MQd42OLNP6/vggmKebo7Eq3wnpvIab0vR/jn8+tqIUgZIz+7n/u2Wxq/wDgxiZgDZkhHMEVvqGB1ar04ETglwMUC0ncQiYKI/Cs5S5GdnsYRhqXat+nJrEowKE7rL0Y6LJkssnEqH8FbHF5zohQwHNfkRsJZWrf0f7Ym2apBIfroocAq5bDFNQqMI4jb66pxuyeSm18= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(8121501046)(520078)(5005006)(3002001);SRVR:BLUPR03MB1476;BCL:0;PCL:0;RULEID:;SRVR:BLUPR03MB1476; X-Forefront-PRVS: 0713BC207F X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(6009001)(199003)(189002)(24454002)(110136002)(42186005)(33656002)(76176999)(54356999)(53416004)(50986999)(47776003)(64706001)(81156007)(97756001)(4001350100001)(97736004)(5001830100001)(5001860100001)(86362001)(46102003)(92566002)(87976001)(2950100001)(5001960100002)(4001540100001)(189998001)(69596002)(83506001)(19580405001)(101416001)(62966003)(77156002)(105586002)(5004730100002)(122386002)(5007970100001)(23726002)(46406003)(50466002)(68736005)(77096005)(106356001)(40100003)(3826002);DIR:OUT;SFP:1102;SCL:1;SRVR:BLUPR03MB1476;H:home.buserror.net;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BLUPR03MB1476;23:usf6UiLjJwneNPYvQCzAEfIl4gVLKAsd63nBURJL0?= =?us-ascii?Q?+7XYo1ItsRgzijdHGLQWiS2tuyI1zb0G7w3BAOo1jWw2W91L+vEbvYwggMgr?= =?us-ascii?Q?F9VvpU9+MhwwrNI65pWx9IbJPNJyiIgS71cV02mk2qP4H6RC/1ZYTPToOTeO?= =?us-ascii?Q?V46Q5MtzDYOwhJ1p3qw3SEvNu+jTQ7Wcff22TBC+0jrsgqttVOl1AigwygjN?= =?us-ascii?Q?MysmV50C4ezidnKYeGslYD3kgMaQJutD79FwOqSKdtsW2PDwuzZlqTFZ0FKv?= =?us-ascii?Q?kFodrLd0xDiGmNvhm/+UmPILe6Navwe8/95jEoaSbOxZzc4etsxtb3HZnd2X?= =?us-ascii?Q?nG0FE7BUBLhs9IUCoweuB7BGyJzDm4O2+Jfx7j/Naswo1Tz3Cs7akqjHgANi?= =?us-ascii?Q?DKTglrdsyNuGYbSwsV6JgdItJCAQGn1nncD7wQ6JqDxK4PAe+SABM5bVC3rN?= =?us-ascii?Q?qP2sKWM7uZA6pHAyrRuE+W3H9s42nlWUag0s4gh1RKOIuDEjNI8EPJOeG9Ri?= =?us-ascii?Q?8vaW38ZgmSP6wqvMIK6z98bslnX+nNg0AlweHLnLu9yWwBd5jWOH5QkwYLwh?= =?us-ascii?Q?i2EJGvfKJoNQKBbELmDQ73pOg4bMI6S6b2c97eRrPfMvIyzJmO1pbN/RpoqZ?= =?us-ascii?Q?uFpmuNCQXXfm2rNmRxXGJASzlNR+4squ+dKAC+QuBOcsUJUD9Mh5/FDpy0hh?= =?us-ascii?Q?SNpjAaHv9pq3m5RPuyJVXk5RTn4AW5mQtq+c04RC5CqY2vkBarTppJepjyN7?= =?us-ascii?Q?d9lB3ywkiTPdS7raXGjx/i0EkuciQ8X+6oYa+bYiJ8NU+9z/3PL4lYN1/AJq?= =?us-ascii?Q?ZUF/HBZUzGBcEMacgqDJXsGwGximLHElhMqK+h6gggZ/0oWa1bibS0AZBeE8?= =?us-ascii?Q?qdtxeeFBHBhgZLnf5HMIDe3BLfC0UP8J/ENuk0Couc+Rll9c/wjzlzRNnGDf?= =?us-ascii?Q?LeeWg7qYdvSOpAvopXl5uHGQ5G9WyMI3vqy5UYIx9SqgKM4cD1y70AiMYGqw?= =?us-ascii?Q?SbkI3HZySsB9MFWfmHzVBGHEzRVonhPSO+MU0AaKp6nekakHQG/WnUaQ4+c+?= =?us-ascii?Q?svkvC1eXUoD36ZHCYjlfs/ImtO1MmHMmoo5J5mgPzf33WFg9MvpuYFD/LiQ3?= =?us-ascii?Q?U8b2x+sP/NAvaSI8TQCRdROIaScB+iwzQbG9/M60o2jBty1VrcW/Y/VCsZLo?= =?us-ascii?Q?MCF4BcxzZGG2CRnsOF9SsoS4Ju3Uhk7CGcB?= X-Microsoft-Exchange-Diagnostics: 1;BLUPR03MB1476;5:GADhmcZYWSgjh2hCZglHX7eKkDggqxHDw/THxWXd0xP+UyvCCY2zCiR7JZXYc9hqy0irJk4LDvVvKsjUa7jwbHMzJ/vofdYFIGwQQyfqxXyBz46NClqp3zOfk6MT3KAgE7jj9yfMXmmnLQa3ncx1Cw==;24:bSSZBYRLdL5Xb5GOQWzOvgiNnehQqXD4azMddQ1cl8sEjfy+/B5Jumfn3P/01IEepEc6/qgMy6vgX5S28LQUT6x8iNKIbXKUl7AiQ4HFiAc=;20:GSj8ORxaMdHnVbiAW7AGrPCwE1LBRKzWdnrRt5Tr1LGv3Yzw9/VXc+2M+vBLoMBPAjAyHNut0q0B3MAEOFqsaw== SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2015 23:47:06.8920 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR03MB1476 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Sep 22, 2015 at 06:50:42PM +0200, Christophe Leroy wrote: > x_mapped_by_bats() and x_mapped_by_tlbcam() serve the same kind of > purpose, so lets group them into a single function. > > Signed-off-by: Christophe Leroy > --- > No change in v2 > > arch/powerpc/mm/pgtable_32.c | 33 ++++++++++++++++++++++++++------- > 1 file changed, 26 insertions(+), 7 deletions(-) > > diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c > index 03a073a..3fd9083 100644 > --- a/arch/powerpc/mm/pgtable_32.c > +++ b/arch/powerpc/mm/pgtable_32.c > @@ -67,6 +67,28 @@ extern unsigned long p_mapped_by_tlbcam(phys_addr_t pa); > #define p_mapped_by_tlbcam(x) (0UL) > #endif /* HAVE_TLBCAM */ > > +static inline unsigned long p_mapped_by_other(phys_addr_t pa) > +{ > + unsigned long v; > + > + v = p_mapped_by_bats(pa); > + if (v /*&& p_mapped_by_bats(p+size-1)*/) > + return v; > + > + return p_mapped_by_tlbcam(pa); > +} Did you forget to remove that comment? -Scott