From patchwork Tue Jan 9 15:19:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 10152529 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 549C2601A1 for ; Tue, 9 Jan 2018 15:19:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2CFFB204BA for ; Tue, 9 Jan 2018 15:19:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2081128477; Tue, 9 Jan 2018 15:19:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, DKIM_VALID, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1D857204BA for ; Tue, 9 Jan 2018 15:19:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=77Pab4CKl0nMF/aJPmdojobWlvaX+QuTemGLzVhWxKM=; b=rsN7z+C6AJBcJQ 4djzxUUUZOg9FtTo59O6xaaBM5bDMHzpMK/GAlQWi75aDAplAhIiMM8NgLGJPuKOKV1qFABIaptKQ Xvm4eQJU/sTgdihhmXtFtNgy2sW5LhWLVvKGCOdZ/0VgE4uqrNA3vFiow6X0lSeZHiqE/o8D5xJVb mP/1xPu4ejOOoXmoOLVcOsiFkzMFN52OYRq1gKtEHS8rxLV7+uZTIwQRiWSLj/DQqrxWqCDYwf578 47VenNYk+TfE/rPMyhVG2oG5ZTdp2a/YSXiOsfgWpQUuaYOVg0iJmba4d7KmMKZjNEBV+nStm11zK zY5v7Mgzv+DG6puwk7UA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1eYvgu-0008HP-Sl; Tue, 09 Jan 2018 15:19:52 +0000 Received: from mail-sn1nam01on0055.outbound.protection.outlook.com ([104.47.32.55] helo=NAM01-SN1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eYvgq-0008Eo-Mp for linux-arm-kernel@lists.infradead.org; Tue, 09 Jan 2018 15:19:50 +0000 Received: from BN3PR03CA0070.namprd03.prod.outlook.com (2a01:111:e400:7a4d::30) by BN1PR0301MB0721.namprd03.prod.outlook.com (2a01:111:e400:4c::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.386.5; Tue, 9 Jan 2018 15:19:33 +0000 Received: from BN1BFFO11FD014.protection.gbl (2a01:111:f400:7c10::1:135) by BN3PR03CA0070.outlook.office365.com (2a01:111:e400:7a4d::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.386.5 via Frontend Transport; Tue, 9 Jan 2018 15:19:33 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; vger.kernel.org; dkim=none (message not signed) header.d=none; vger.kernel.org; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1BFFO11FD014.mail.protection.outlook.com (10.58.144.77) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.345.12 via Frontend Transport; Tue, 9 Jan 2018 15:19:02 +0000 Received: from fabio-Latitude-E5450.am.freescale.net (fabio-Latitude-E5450.am.freescale.net [10.29.244.155]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id w09FJUr8008992; Tue, 9 Jan 2018 08:19:30 -0700 From: Fabio Estevam To: Subject: [PATCH] ARM: vfp: Go back to using vfp_current_hw_state() Date: Tue, 9 Jan 2018 13:19:04 -0200 Message-ID: <1515511144-23644-1-git-send-email-fabio.estevam@nxp.com> X-Mailer: git-send-email 2.7.4 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131599847426199167; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(346002)(39380400002)(396003)(39860400002)(376002)(2980300002)(1109001)(1110001)(339900001)(189003)(199004)(68736007)(2351001)(4326008)(305945005)(86362001)(356003)(104016004)(47776003)(106466001)(50466002)(8676002)(81156014)(48376002)(50226002)(8656006)(498600001)(81166006)(59450400001)(51416003)(8936002)(97736004)(85426001)(5660300001)(105606002)(6666003)(54906003)(16586007)(53936002)(316002)(77096006)(36756003)(6916009)(2906002); DIR:OUT; SFP:1101; SCL:1; SRVR:BN1PR0301MB0721; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD014; 1:f66xbUIK+G91grZOUVZCaIuJt/Tof7AdNv0tTJF8YvsMfnm631Ass/MNDjFs+orJa3BIW/rsFseBqoh1siBbpaRhZe2XMxbqc+TWJ1sxb5nHm2PW6TH1h7hH7kQOr7dx MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 99272d3a-5eb5-44f5-8e7f-08d5577450cc X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4628075)(201703131517081)(5600026)(4604075)(2017052603307); SRVR:BN1PR0301MB0721; X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0721; 3:0apptoHfXlaLsSexnjDQZyJYcQcS5PwylaqJvK3e8bSt1Od2cGfvN5lKBAy1KOqShNFwf/lB6w4mAl93SKgz+48G9hwgPR4ZQHAg5D6GoYj+6uhrWyd/dx3KZV5lev0Lfd8MhIa5DQiRhC1ImRk9hStqkHCxBSkP8cCIIadjyQk4n1UKmtq38fyNp6txdckcFpwxtib8Q4H9o5pNgY+XRxu4HODYbG2c1Q1QcbvmLZKNG1Xaxo6kMLbr9mGs+hbAn3YN2ijH4O/8VSmU2CouqSlHCVCgSZLLv1XZ11/SbFQ12ZEQZEJiF8/ro0bmMcbg67aZDMcIQ57ScICg/ZTnP9JEwfEDp7Es8/51kX1wvBk=; 25:MQAYwhoKL49twh3E5rr+nJadLr0kSnzL/SeYgDv8aQ+dO6YqeXqIktc86b2d4lRcL+CmdreoiQklLiXSPKmtEgf1mBe3HuZIXXJnQimv3JlUfzwYPJRkpfR3O6IQOppA3TNn5lSofZSsQKgXIQRfavGpl8L1t9oc2x+KijmnzVRkxSAfV/t1fIMvl71QOY4w9opSU81KS2ZzEQcCM8ZXY1ukSoVLxdwzwsnX20mMOtGl+1sYN6VGwmbiNs1OSwyqo6jOmhxlr2psplov2m8jNeFSaVWo88ZeBifLuxShM/wHmQitlJAjwrgMjxrvSTu4DkRHBgfEOO7jhJfLRcxnNg== X-MS-TrafficTypeDiagnostic: BN1PR0301MB0721: X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0721; 31:JwWU6KGAmw78K7NV6mpJTYhD+rtaB4pTvPEpUtob0+/CI7knR5HxfsoyR3qxbljwYDySK++JYeT02WrdTD7Sj0bMbbESed/Va+zHHgR/7i6qVUkkdaXImxUCTiem2YZWNSaOyxxDxpoe/69Yml/FqwyE6yNFMgv+0KfnnbguoGZ8Nqw8fmGOrKwd8U9ybeW1OmXxs/oewk2M9aw8fPRxG6i9f0b+xZzhPskzjTuyRuQ=; 4:tqzwRqS86Fn0bbzkFnNbpFXfviXU1Fp9ezACh3bT+ux/VYmtN2nMxrjH55+SEWkzcbSK9AVm59ZWl/cmogOBC6qREpJu9wu2zhQemlfXQTt5Syf19hBSMJfYe/ngiyjx3OVxxKGoajMFzRYdVLujOISXMXVDnsfLtjK6jjUKgm/IpHoK4qu007L42ZMzQ3ncsQMq87A3QXdSkDQEmA/lYGvmh249+nrQGb5dzW7xlucPgFPDRwR/X99cmzEXo2VUT4kmKhyXlxHgRcNvsHYh0sJ9qlBz3QDYW8C8U7j06wtRY2pEn+OJjgQn8gOSX9VI7QaqgkSGC8+tgo4uXSqdNXhq5OVfhVKrxEQRlFR/M7jt3MH33Bszgj+ZJu8/gQJB X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(204937193903977)(9452136761055)(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095135)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3002001)(3231023)(944510075)(944921075)(946801075)(946901075)(6055026)(6096035)(20161123565025)(20161123556025)(20161123563025)(20161123561025)(201703131430075)(201703131448075)(201703131433075)(201703161259150)(201703151042153)(20161123559100)(201708071742011); SRVR:BN1PR0301MB0721; BCL:0; PCL:0; RULEID:(100000803101)(100110400095)(400006); SRVR:BN1PR0301MB0721; X-Forefront-PRVS: 0547116B72 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN1PR0301MB0721; 23:wv/sqMigmxCQVUik/iR39tFFiZrnkkj1gZxk1oy?= =?us-ascii?Q?kMT1AwaHELxWJi9kDkR0Sw3IN+7GoXAVLyEKFKnTnBOOTwq45Hq/7yrxEwz3?= =?us-ascii?Q?faJRqnxoRx3JKW848bf+9qTrzIQXv4UnZAShXMjBZh053fOmEOPgL4FekYq5?= =?us-ascii?Q?RPkWSaTK3V66/eosHrXBCk3A2ohdC8AJNf/VtrR3+BpiHRwXA9oc/adb3Tqv?= =?us-ascii?Q?N/7KaRTD0fgj07da4QCpIBU71EP1WNZwF7mGKqjVOW5oUHmaavG9+uPsI2vY?= =?us-ascii?Q?bqc3sdl+jxkZLr9g7zkscISMmcPM5LCDZBg4EofXSWIBwjxQhOaR3hZNdnDL?= =?us-ascii?Q?DjenYBiE/RMzAk4Heelb15Njats+SVFvIVgtuvcOfnQoQ1fxOlUI3gETBrXg?= =?us-ascii?Q?Y5dsadKtfnryFbumurjRpJxPZQULd9rtxk1L9i21qOLijdOiqHXswSvAFw99?= =?us-ascii?Q?tmDn3xtdSOdH9AHCgMBpWDF74IBjMi0/ZAbCHxdW70/NMV0djKaJShNnSh0L?= =?us-ascii?Q?U6eC/IRbx4B/BCNqJ7U04W2/NZtyywqjfASDooUOL4ipSjo64QL5KeWlnHb+?= =?us-ascii?Q?IB+wbiXjZ8OgeDrK/WLsWo7dOx4G6XfiaqBPn99DmFeQJCYOqqPCR/RbYmW0?= =?us-ascii?Q?vtuJSKbKAS17MspkdHLx8/wChmL5p5jr8NTlUVvoakmbnecFDR+zxGlk4V2f?= =?us-ascii?Q?LcRLRLnHPOOUFFbT2x6E3KbxkEELUwJFK2iSixlpfJf0t66ujB9spboXFGPF?= =?us-ascii?Q?F/EWRX3fwPLvJq3LHHWUi9c8Ng2Kh3sWiYqFgOungsLm+8ETVXqc43MAWQnc?= =?us-ascii?Q?SHVInWsArjvuCys+NOXYaCJ1O29wp8hYAVToHs1rBb2HLOVM68xqzRjHYYPT?= =?us-ascii?Q?X/AAUGqec/UqLpvwBhIyN9D2GCDflUXZ/DJLqsft/1hUOuLvF1zHwjZqWKf/?= =?us-ascii?Q?RBSxvvyLJXHLId6Pue2HA+D/JENehwijHGIubinJHrTPHJGGHPY1y/SpQwgS?= =?us-ascii?Q?o/dDgIPxupwfuk9h5G/vcI4l/A8x5erDyV+ZvRR2lGBq+QoONKGyi1idU82U?= =?us-ascii?Q?bzzeSwt4=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0721; 6:ByIKNjTWTnwB9aHCLR3hsXi2jDYYVQh7yGFiJnrsW3/wVe76viKgk26rpwxfvMHLVvXP2vYbFy39P1knIYBnTgAdpqTMBmw8wf6UOvgky4IKIuE5PC3xyCgnXEQUf6lmayhpQ7Uf1N/ANqijl7RvcrvGc0vnVKhti5lNDzFIrQmEvol+wU9uYIHY3Nd1Cdmky8AZsYOkncwvrb3oXkKOTb8TO4Tx20C9rkH0t/IfsKQ6Y4aYmQHwKf9bw3JDtl2f/5LNeT9ycjHF5QgcpuRwdgu6x4OQP1d2KWCzHs8H0EzUxs6pNWsUBHWwcdsjyo3M6axptmUMo1Wwp95dxEVQe2K+tuULozWK7d6Yk6UhiWI=; 5:dV/ChFEDYhLz6xNLqmicB+w2vMHu9FkgCo4a9bPIdRqLrmJS7l9PbQVSv3rCSZlQK0gq6zwMPeCDWBjY2niY4eLcfs1iUiJ7qebTZL0alKLmsSWJN1xlO9YgIkvc5qoYqc7wUSSwMTWQprL77N8Z9t7xPad8NYtaiUkdQnUX4Z4=; 24:MAO8lXmQvTzNXCiNSlJQPUNFvJoB+t/p4SD2OalOd5C8I4hRioRCCBqztrHng3pcjCNq7WgPxjV5nPvBiKz8ObuBPQZ/La6YfXlW4ISWUL8=; 7:bPe8aWqKaB+8tVrRLgHWYGY0Ti+ypbacBlrudGe26d3mq0zNOwN5j6qQAzvLA89BKmQs8iBNwUc8QEM3b3jY25xyVQXA85+SRmurjmroB5yQeNzgvputZcorC0bdJ6CITJz/z+C9sU66BSJEo0B5dYJhx9AD4QIH/zjsqsS6Dt9OUjwZzgVW6vBwP62dkwpPXIiqGaHrhkjkBnUN2JwpFIH1JkIldeFMfq8rsF1Be4/x5KR0ZzsTsYdVNwy1LO+R SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jan 2018 15:19:02.4483 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 99272d3a-5eb5-44f5-8e7f-08d5577450cc X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN1PR0301MB0721 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180109_071948_787409_68DF7F8A X-CRM114-Status: GOOD ( 12.47 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabio Estevam , tglx@linutronix.de, okuno.kohji@jp.panasonic.com, linux-stable , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Commit 384b38b66947 ("ARM: 7873/1: vfp: clear vfp_current_hw_state for dying cpu") fixed the cpu dying notifier by using vfp_current_hw_state(). However commit e5b61bafe704 ("arm: Convert VFP hotplug notifiers to state machine") incorrectly used the original vfp_force_reload() function in the cpu dying notifier. Fix it by going back to the correct vfp_current_hw_state() usage. Fixes: e5b61bafe704 ("arm: Convert VFP hotplug notifiers to state machine") Cc: linux-stable Reported-by: Kohji Okuno Signed-off-by: Fabio Estevam --- arch/arm/vfp/vfpmodule.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c index a71a48e..aa7496b 100644 --- a/arch/arm/vfp/vfpmodule.c +++ b/arch/arm/vfp/vfpmodule.c @@ -648,7 +648,7 @@ int vfp_restore_user_hwstate(struct user_vfp __user *ufp, */ static int vfp_dying_cpu(unsigned int cpu) { - vfp_force_reload(cpu, current_thread_info()); + vfp_current_hw_state[cpu] = NULL; return 0; }