From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753212AbbJFPRD (ORCPT ); Tue, 6 Oct 2015 11:17:03 -0400 Received: from mail-by2on0144.outbound.protection.outlook.com ([207.46.100.144]:57152 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752735AbbJFPRA (ORCPT ); Tue, 6 Oct 2015 11:17:00 -0400 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=scottwood@freescale.com; Message-ID: <1444144611.5336.269.camel@freescale.com> Subject: Re: [PATCH v2 07/25] powerpc32: refactor x_mapped_by_bats() and x_mapped_by_tlbcam() together From: Scott Wood To: Christophe Leroy CC: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , , Date: Tue, 6 Oct 2015 10:16:51 -0500 In-Reply-To: <5613D490.9060704@c-s.fr> References: <20150928234702.GD6161@home.buserror.net> <5613D490.9060704@c-s.fr> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.16.0-fta1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Originating-IP: [50.157.106.250] X-ClientProxiedBy: BY2PR02CA0008.namprd02.prod.outlook.com (25.163.44.146) To BY1PR03MB1482.namprd03.prod.outlook.com (25.162.210.140) X-Microsoft-Exchange-Diagnostics: 1;BY1PR03MB1482;2:UsJwhM8KeRg1SU7/BXm2pNpbaPd5HVkRto9xX2YubeEenYzerHtlx9vUsBIVBYfSYn37eGGC+WkM71kzI2dYRAxmrYDJT6qpPf+sJGOAnub6m6JOaFRgWTqzge9NFufVnfJbeolUHGhvpzxgx6IgGOVvXZbaWLUCvJjJbrdvZXc=;3:NWcOT5VaEIjKdP/eLuj5IN2EfWuLZrz0tmaaLGtCi58lfi/umMVnO2BG2N2cpQBX1a97XciBg4gFgefAF0tvFH4NbrVEQhlMfIJFipV7d587I7PNcMBsNYMtP4S/U8JO+whHYG0IJftNl4emWT37HA==;25:rfwElGY1bESAUJKe35aC5J+HJeXxVyQSJ4pdCVyjd4W2ZeoIhw3opICeVS5cxPZR9VW/oVG0nMGvjE13DbaqJ2l6g8uejsrml8UH21SDzWD9EKOmk/EToC762oBxyKyx2ih8G+B794iiK5AfsN0QbKqN0O8Su4yMi0/az1Sc24Rg9WtHxYUNWT7HKn22UkvdCMMK62+v/FWtJ84ektRtUvI3X/LprwuNfkXuRMc0IzWoASV0mTvCdx+W3eHRfT5f X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY1PR03MB1482; X-Microsoft-Exchange-Diagnostics: 1;BY1PR03MB1482;20:yHXpjLp9FyPdSDUtt7bRpCePh4L9358p5fCwOZi2nXwV1isFq+fn+AIkfr2fyFIndJbd2T0cckkj9X3i5/TROGPsFQJC7Br0R7knC/RKFGEhjQ+v7CeeqU3jVqUn0/j4As2S8R2tfyOR2bdVIzngl3FdX8ezCD5Mg087jxJlXQ+zbiic/FcxATq7hIIlCVCMt/50IGv9LL5F3PH6v+XOcIyBlYdJJYCdPKldeEj7CHXqkicUxtMKg4qctWS4f0CT1h4blvCSyOYN9cxFb98+tVFvkP1k9938S8omTlZ4leBvq8D2ioHHV6CEe+ZgVsVZwP7C5+KneI5NHE58UQmaWM4GuFdyJxJ5v31OCYpYerwvM4FMRMkDUblYNloiSEx68D2QyQrd4VafT7C+kh8EZ3Egg2ra/33Alnqi22q6COetgNS6PG3zn7KDZE+HkJ4CyYRgqvdTNJaLd1tjSK3FjYAlcFLddB1bdZkbDS/WS+5bPST22OyLTYbPmjaiSYUo;4:AhOwroNZzE4dJb/EDujfdyUnzpOHl5/t2TivyDO9J/mxotShJsFJ7eA0ov2JMzD391j9ugNMVoqC612x1tr96wDQrVMUeMwNaOozGKlCcmADX9shJ51VkTlnwIMgfRaVSaEL33mhgAPQzknpaUvgYGsP471l+CTeeVgI39jVrT8TDb7ciKwWCyXggvAM0iroIE5WloD4nztPNZCO02yDnTnNk4B/tGyu9nTklsugU/phrGdp+SJGuQziG7LOOHqxQ7UwvUCYtUvJi7ISvRdCB5GfgabrfLVeN1aSH3IHTEcuBphqSfs/rkNIvmnn/PvWmr2QsnydrLFZDCbWtlf1FtNn/mrbHScVXfqYwGousnQ= 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:BY1PR03MB1482;BCL:0;PCL:0;RULEID:;SRVR:BY1PR03MB1482; X-Forefront-PRVS: 07215D0470 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(6009001)(24454002)(377424004)(479174004)(199003)(189002)(81156007)(97736004)(50986999)(46102003)(19580405001)(86362001)(5007970100001)(50466002)(66066001)(33646002)(5820100001)(64706001)(47776003)(5004730100002)(87976001)(36756003)(77096005)(50226001)(93886004)(76176999)(106356001)(5008740100001)(189998001)(23676002)(92566002)(101416001)(2950100001)(122386002)(105586002)(5001960100002)(103116003)(42186005)(110136002)(40100003)(99106002);DIR:OUT;SFP:1102;SCL:1;SRVR:BY1PR03MB1482;H:snotra.local;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtCWTFQUjAzTUIxNDgyOzIzOmxJeUQraXpaUm5CMnlVY2hieUZSOEZmenYy?= =?utf-8?B?YWtxV0IzWE4vbk4xOVVtUUo0K2xVRkpLYVBnOWtzUmxISCsvNVFIWmhMTWJ1?= =?utf-8?B?aTA0SCtwWmY5VXhxRytvQ3ovQ2t2QUpFelk5L0d1ckVaQzErQURGQWU1dGxx?= =?utf-8?B?Q3NYdjZLZnZNcGZFQ2NlcFFzN2lJaFpOakEvd0xORlBRK2VOUWRqUENLSlpM?= =?utf-8?B?K2x2K0YwU3VDZDMyVU1McG9JOVRYRkpWVzMrN2JPUlVjaWlUN0UzMy9ITnZH?= =?utf-8?B?V2xNcXZ2eW9zM0oyOEpZWDdQcU84dWlBckNETVRaaHoxaTFLVmhtekpIaFNI?= =?utf-8?B?R2tta3BUODA5cTlHUmMwZDZmTjhCaVAyWHlNaEtKSTVFOXZ6WFcvbHpLVTdu?= =?utf-8?B?bm55RFM5am5BUHY4dVZDRUtjK0hGY1dFSkFHdTZuK0trRWFSTElYaXBzallx?= =?utf-8?B?aytUcXpDNTFuM0lyZGhBOTcrNGxNTzIwUUNGK1BheXByOG5OUDZBMzhJSko3?= =?utf-8?B?VklJSUNyaUNlSkJHZzVQZGc4SnJ6YzhWZjBPOTF6N2NicUdRV0M4SS9sTEhD?= =?utf-8?B?bWlRMmJ1TW1nWWhZR0ZZazU3dUZZQys0bWdRMVoyV0JER2RRcmEzTFNRdmk4?= =?utf-8?B?MVRCcEY0ZlJJaU1LWkxCeXQ2OVdvVDNSbHU4b1Z4MXBicEJSeVJkY1Ezc0cw?= =?utf-8?B?RzRQbUM0azhJcURmM2dUZk94aXlULzNXUDNkd1BsSi9JV2lDY1d1VTR2T2Yy?= =?utf-8?B?NmI5UkNYMU03WDdMeDdlUlJnRW1DSzlaNnQxUGZKR1M5QkFjaXJLY2FwcVFM?= =?utf-8?B?K2JXTHFzeTF1RHV5SzA5ZVdvYVdwYzBKRGJNdlVHbGNYSmQ5QmJNNUMxRTli?= =?utf-8?B?SjVtOUo1bWZ1OURjaUhlR3F4WE1leGYveUwvN2NVV1d4R3pVSmxzbVJldVdW?= =?utf-8?B?cFpFZHliaTI1SEJHUVBOZFJOeTh1VnJUbVNPek5zUEtUSjJuNHJEamxEVkpo?= =?utf-8?B?QnNva0h5VEJuUUFYQzFtTklobHN4Wk82ZTVGUG1kLzZtVzJsbU1XZmlNMWJ4?= =?utf-8?B?WkRFYUxEcHZSek1lWCsvTHZ6TmNTNVhJM2ZYZ0hNZW9iOEJhWEtrQ3ZwRjhY?= =?utf-8?B?YWV3cDFzNXRlanVRWGszVHpYUUR5cWF4elh1TkFJQzJlaDRuSmRIU3BYd1ly?= =?utf-8?B?WnJCVWs1am5IbmgrRUUvTVNBZlRoYitETkJseGxnZ1FpY1FhclJTQnJlSFU4?= =?utf-8?B?MjdTRzhCL1JHbGF4SWcvU3NQQTF2eE12UmlvckxkelhJZUlJRFRwbnpVUmhB?= =?utf-8?B?Q1F2anB6cFh6QUNJS2ZiaXN5VlVyUVNQaWd1TGxpekl0ZmUxTWtLazNGdStD?= =?utf-8?B?c3VRQURuanltNXlHN0ZRaG9aTWlFVGVNMTl4dlRIYWVNV2ZUWm4yOGtPTTBr?= =?utf-8?B?RXFWcTdKU3VWbHF6MlBEWCtEWlc0c3BZZXpDM04wa0VrbmhLazh6Y3B4MklR?= =?utf-8?B?MXNtZz09?= X-Microsoft-Exchange-Diagnostics: 1;BY1PR03MB1482;5:A1yz0+pK387qlHqPx1M69PXbu5GgLYQs/dDlhZRta/84JSBAv3MGZ5XRLB6wVLQfIscE+GbK9AdaKO9J5QexCPLfjqr/TMVCYJ32JetXcN6c1oUGvWc7PbhztEc/uj0ryLu230V6rGJP2k0uWrUC3w==;24:yKAbuZgY53aLZq10/lmhkXfqc+VANobvnCjGojVUNMSG+MqhTjXtjPSWIzzF6R0uZs3VfMyrLrxF0GdQSmJ6T0bKT9yEuIs4mJl6XIbj4Ic=;20:6XZo5HTLpuxlDL9pkVj5OO6/mNE+dcvfYfBqxZpIzW3lqj/xo+mWO0M9+jc6mxo4TsIyCFFnXLv8xhlu9a7anA== SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Oct 2015 15:16:58.1913 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR03MB1482 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 2015-10-06 at 16:02 +0200, Christophe Leroy wrote: > Le 29/09/2015 01:47, Scott Wood a écrit : > > 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? > > > > > No I didn't, I though it was there for a reason, it has been there since > 2005. > Do you think I should remove it ? Oh, you took it from __ioremap_caller. Commented-out code is generally frowned upon, and it makes even less sense now because there's no "size" in p_mapped_by_other. -Scott