From patchwork Thu Dec 24 00:39:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: chenhui zhao X-Patchwork-Id: 560771 X-Patchwork-Delegate: scottwood@freescale.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id C86C5140BA2 for ; Thu, 24 Dec 2015 11:41:00 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id ABE091A0666 for ; Thu, 24 Dec 2015 11:41:00 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from na01-by2-obe.outbound.protection.outlook.com (mail-by2on0137.outbound.protection.outlook.com [207.46.100.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 35C5F1A0163 for ; Thu, 24 Dec 2015 11:40:03 +1100 (AEDT) Received: from BY2PR03CA047.namprd03.prod.outlook.com (10.141.249.20) by BN3PR03MB1479.namprd03.prod.outlook.com (10.163.35.142) with Microsoft SMTP Server (TLS) id 15.1.361.13; Thu, 24 Dec 2015 00:39:57 +0000 Received: from BY2FFO11OLC008.protection.gbl (2a01:111:f400:7c0c::125) by BY2PR03CA047.outlook.office365.com (2a01:111:e400:2c5d::20) with Microsoft SMTP Server (TLS) id 15.1.361.13 via Frontend Transport; Thu, 24 Dec 2015 00:39:57 +0000 Authentication-Results: spf=permerror (sender IP is 192.88.158.2) smtp.mailfrom=freescale.com; freescale.mail.onmicrosoft.com; dkim=none (message not signed) header.d=none; freescale.mail.onmicrosoft.com; dmarc=none action=none header.from=freescale.com; Received-SPF: PermError (protection.outlook.com: domain of freescale.com used an invalid SPF mechanism) Received: from az84smr01.freescale.net (192.88.158.2) by BY2FFO11OLC008.mail.protection.outlook.com (10.1.14.255) with Microsoft SMTP Server (TLS) id 15.1.355.15 via Frontend Transport; Thu, 24 Dec 2015 00:39:57 +0000 Received: from localhost.localdomain ([10.193.20.174]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id tBO0drvq010286; Wed, 23 Dec 2015 17:39:54 -0700 From: Chenhui Zhao To: , , Subject: [PATCH v4 1/6] powerpc/mm: any thread in one core can be the first to setup TLB1 Date: Thu, 24 Dec 2015 08:39:57 +0800 Message-ID: <1450917597-29171-1-git-send-email-chenhui.zhao@freescale.com> X-Mailer: git-send-email 1.9.1 X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11OLC008; 1:5Gso65D32o9/MSzm/LqS9Xcviz83Uy2S/1jhN25CVeyE3Qy87g4UmXQsTIHYUg1ZON7znu1L7y8HPe5JUqENK4KX2ncvz0BoHtUmVRoElpHqUUlq4cf+wA92tf8PqQjS/s47x6WiOYqAgJpAqEO7mqYlscxgSNr5f1ApZLw9i+IePs+Em5Nt61xe7QvZqLDxzwi+kbvp1+HqMUyT2sD8mdtChGDe7pzkeJ14QW38gPxUdgkixv/5h+3JPYq0B1eyS+xSoGGwVGCXKcxym/ADgGRKtkxchbF9lBQw8Khic1GmV8GYhzTKNohx4AT2l4o/uG5TmtVhRErm2OnCnOQ+x4PmCfyXU5ZzfbUS1ucFSi3Na/4qA+0VD8SrczwmrxvVO5Cy2qCYF9I/pFF/aTDMx0t77z8eBbW5Ip+ki0we3j3YUr28jEeyvnuTqrlqDMUf X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(448002)(3190300001)(189002)(199003)(5003940100001)(87936001)(49486002)(77096005)(86362001)(92566002)(97736004)(5001960100002)(81156007)(229853001)(5001770100001)(2201001)(50986999)(36756003)(85326001)(189998001)(106466001)(50226001)(104016004)(33646002)(47776003)(11100500001)(50466002)(19580405001)(1096002)(19580395003)(69596002)(48376002)(6806005)(586003)(5008740100001)(1220700001); DIR:OUT; SFP:1102; SCL:1; SRVR:BN3PR03MB1479; H:az84smr01.freescale.net; FPR:; SPF:PermError; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB1479; 2:bfS2VT8T5td/Gpj7n03H9JvOfuwL76PPq/Fe6RGqe/kMzEB7Kr8DkU9fJdFmOA3m6XF9R3UsDj7XxvZZRsdpy2s+6GItGwT+omkp4CImEQPRCzhH52v4OZ4ZTg8aDAytvEPFiv4CkTwVjs01bmb2oA==; 3:nUWcqaSC33MI/rvIH+C3tfYcOj7Xo8cZlSTTLmLSMnQJB1qwalIYiE9sFGDDt3yegzDjTIZ6LK8Di/PI/bnJZTVD51UJpAGKLw3hMntT4xS8a6zS08d7CwYnrbIYR6CbVUwyQjng7qDZKPeiON58MF+BX3Dg4Boo3udCXloF9Q0EBGSgGwg8/HKiw5SnSfJo/MslpXg7LXO6XQyJCdjLJfpMJvYcvkJJnW0dozqkoeo=; 25:10iUwFsyjbIN2wSykmAhD5poPEAqlOW/VC1dFQG532EIKacSrCNLS7Em5RgI22PyD/UDwFZtgf72Zl1PRB4LE/0hAT2J6WwtFRutR1uZ91UT78PFfVu5G3fMWHn23hNW0PGjD3xtxvReUw/jF3fQV9bu53ChhfxCFXbNdeiw/i9GROC7+S4QqMUOUlw793ZnopHY4c08lp1YVgfegAtMkd6dGh7lBPPrhwwXHtYmoASOL3UUSjrlELcdTwIfluG6XvvFEFwGq9VUG7RjvaNpUQ== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN3PR03MB1479; X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB1479; 20:EDTlp0Sd6QEoNU266F/GgukZs/vn0qT/NeiPoVRGAVitNLyG9LS9HS1mF8pxeEdaCfbhBUs9pdprSmRHv1TgFkQPs9M/26HpkSUCue9d2p1UC0uyCrfFAu3djn+b9TFDiAhQV+WEZUmiei2L5u3i/xH3Tj7RcqVzmYEUsmXXfEEnqlLkivphQ73+Jrhw48xfI5xPSQGyRECPVzjzWYqkAz2JEfD7Hkm4JHusiR9SzU89N/S+0KffvQHvlu0zW7JtzO/K6fjvULMc4jC2nZuaXtYWnX7knFrK5hqhAgL7pXSaMkuTtc139BiFMIChZY6VF5pX/2eodZiMU049bmti+Oe6rSpzNZLYvmzTs2NRnuM=; 4:B7O3et11QK83jbkff1P3TbrOaG+7bsR2r0l4yqiXB4Ve8VYWK4UaCxUnvIlnS8Mt0a+BT3L3sxPbXaVGcN48SiIeDBSxyzEZ3ZpFys/xaW9s/ztyF0mf78fmSRLT2r9/ig507/h9/NQftahtuTP1k/nbwIkgH8XQyJxoUicUAIvRZFO+EZD5dPxt2QDxnSVBjbP90nWS+bRnOutJUqFSGgC9rWnCNkRHJx3h3knOsU54zpcfdlk0Y67nrDGHd2BheJVVHdqzZSl08N3OAwonVwkgb58MeoaOWZZoC77VIdjfzxSGg9rGPTzdJjb1kwwfN+AjF1EO8t+v8RcE8qFVf4nHB7hqU7pKipCD0tw8P+GUbxmWyb/nFYjje48u8zjvYnScTH9Yp3BdrGq03d4T/vRBwZe0hLXOTiWJX2lt4wTpQAqJ3mILMC0WVIzrMNs8 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(101931422205132); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(520078)(8121501046)(10201501046)(3002001); SRVR:BN3PR03MB1479; BCL:0; PCL:0; RULEID:; SRVR:BN3PR03MB1479; X-Forefront-PRVS: 0800C0C167 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN3PR03MB1479; 23:vfnX5dlytMMbYVNzasr52ZJ8up6lC7YocwjR55n4M?= =?us-ascii?Q?Tx+6z8YHhXAPKUIr45nxXmYI1HmNJdLLmuifKk/CMWRba9jtr4UBA8uLVQlr?= =?us-ascii?Q?3JnnEPGvO90qNTHR8jlFq+DyQR6lEv7QqKFKYcMw3kuVSpwEU9RF/dN/856h?= =?us-ascii?Q?8pi5TtIB2iJbmnNsb430OxepR5TJJ9OCTmIKb8FXbwXhF/tMawBlk8ZLZU15?= =?us-ascii?Q?LT3iHV0VjtBpFEH3d8cPvJA/4UqB0a0sAocEX69S2VJHtmmda4fxAkJ2EtTF?= =?us-ascii?Q?1A3OmSw30xNEJ/jhRJA7YXHcbaXzj6APXzO9MlzQrXM8xW6CnTPeAIWVK5uM?= =?us-ascii?Q?qeA2q+J4YNrtDdNoqosAQscWgBSbZGRicFnRetsTLoNvLVC+rOx9Ey4nl3RI?= =?us-ascii?Q?jspRA9woo9ryhs/doWSORKy8so0UzlvEkuBqvCAOORYYZicVIFolwj2mfuiu?= =?us-ascii?Q?4XFA5Ij4NxlGhI5Bhego43HEhfjz1Z9zs3ckLUFnisMWP9mlOJ8Vec2tlTw9?= =?us-ascii?Q?R24tSeWD851bbk5Q10fiWq8eYGQFg3sEr2fd5mX2eTmryfMBLe8+RgEdLc3D?= =?us-ascii?Q?EClVl9qIM+6SSB7NcOjr2gzfBb4JJOadCcBcO3jSajjWMDEKT95wAGsHX1Il?= =?us-ascii?Q?9OtOKlVYtKvvibpiAZEK3spSXy0Vept0LJG2E/bwTLC2FVDj9Sjmwx0RaDWC?= =?us-ascii?Q?/o6P++q/iZ1X87kP4NdJ2q6iCyqSxjGBnEWgl7egkzTNEZenXGYlf9ETF5Ci?= =?us-ascii?Q?bR9J+vP+WOCl/7juaAwOMun+/qz7IKoKEVSUg+2Sdt/YUwDziUW3sUDPGidf?= =?us-ascii?Q?mIrO7RvNTt99wIMHMNV1FaIYB5Lz0mLZRSgxd1CBjsxa4Jj34VnrbfWjPV8a?= =?us-ascii?Q?Qxo3bYqHULrmpY9/hGaGw2a4UmERtMr4XUIUzBn0d5c/qj8kWVQzldz3pMFI?= =?us-ascii?Q?td9yNEr/1NYrzaPMUu0Xb1Zgpl7vk96V/hpPWIb6PZxyZxloMyVN0tTU+2r4?= =?us-ascii?Q?2/i8pfIzqpSkk9OLG/R4C9cpvVjzpK8WjqZUN8OnvQvcQ=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB1479; 5:Q2J/GxGS/acozlUZiZficBxZkyuPRvITIZNe5F02rPQWqCJeBpJoRUUBe2AnRXlQ5RtbgitYz0kALiwrx3yuOsgi39VHeOOkFHSgozlzsPicRhabp7U1l/jH4uC8Vhn2g52nQggmaXzFIR8a6nmmfg==; 24:zBhJ0S8wjOjdqqhiQ65I7rBo6lZBFUJHPcFhVGedLGmg9oevkCIeBzyvszmFY3GSIFX4kFsbL9wGAOHscAdyU9LpqklDvpVouGDV/34iChk= X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Dec 2015 00:39:57.0634 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[192.88.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR03MB1479 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" On e6500, in the case of cpu hotplug, either thread in one core may be the first thread initilzing the TLB1. The subsequent threads must not setup it again. The code is derived from the comment of Scott Wood. Signed-off-by: Chenhui Zhao --- Changes for v4: * added CONFIG_BOOKE arch/powerpc/include/asm/cputhreads.h | 8 ++++++++ arch/powerpc/mm/tlb_nohash.c | 4 +--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/include/asm/cputhreads.h b/arch/powerpc/include/asm/cputhreads.h index ba42e46..ea96231 100644 --- a/arch/powerpc/include/asm/cputhreads.h +++ b/arch/powerpc/include/asm/cputhreads.h @@ -94,6 +94,14 @@ static inline int cpu_last_thread_sibling(int cpu) return cpu | (threads_per_core - 1); } +static inline u32 get_tensr(void) +{ +#ifdef CONFIG_BOOKE + if (cpu_has_feature(CPU_FTR_SMT)) + return mfspr(SPRN_TENSR); +#endif + return 1; +} #endif /* _ASM_POWERPC_CPUTHREADS_H */ diff --git a/arch/powerpc/mm/tlb_nohash.c b/arch/powerpc/mm/tlb_nohash.c index bb04e4d..f466848 100644 --- a/arch/powerpc/mm/tlb_nohash.c +++ b/arch/powerpc/mm/tlb_nohash.c @@ -640,9 +640,7 @@ static void early_init_this_mmu(void) * transient mapping would cause problems. */ #ifdef CONFIG_SMP - if (cpu != boot_cpuid && - (cpu != cpu_first_thread_sibling(cpu) || - cpu == cpu_first_thread_sibling(boot_cpuid))) + if (hweight32(get_tensr()) > 1) map = false; #endif