From patchwork Thu Mar 1 12:53:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Shi X-Patchwork-Id: 10251467 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 DF0F860211 for ; Thu, 1 Mar 2018 13:43:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CB058200DF for ; Thu, 1 Mar 2018 13:43:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BC1422018F; Thu, 1 Mar 2018 13:43:31 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 71FA3200DF for ; Thu, 1 Mar 2018 13:43:31 +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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To: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:List-Owner; bh=jgRNVHYMFrN7AJlE3ewy2j1PEsX7/prOwhQgltB8hIg=; b=qEgmlMtotUGZzAQJNv7BWl+wzF 797MpFJMSjOWic++TqLI/k1CaRWZ4hHGcBRyzsHNccwql9PdEMwsbN5axxTjJn3bnlCIxmSloPBEf OZQZnTAJPYFSRit+JJjCCjImLBrya92S83KYNNvFzE2R4y/yseneByrimR6AkWc54RqSAnnC9k0lp gmDjr0EZ3zM1LC2TkMA1yy+fo6PJBp0Iunj9hoXU05VN5ZXRX0CexYvIQsUagCNiX9Ez8ij2AwOu8 rMIYoDBEZQBcfhleIlGSnOm8JqeyWwR0v6AvTD1HBeDVlO3S4naNH4DRpPygdIQX2JVRTM5fcDB7U f/+Y70MQ==; 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 1erOUZ-0005Ur-G1; Thu, 01 Mar 2018 13:43:27 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1erO0W-0005gV-CE for linux-arm-kernel@bombadil.infradead.org; Thu, 01 Mar 2018 13:12:24 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=mp5ELbwEmYRLHeQ3bnHDHxexdMKPPHMhOHF8S+YF3Ac=; b=VX6QG1WvTDTnwfgtqJ3aOSHW/ p0zOiCa6Pwf7g8WJCGGH1Q6wswiM8FPVwc2Swy9ftNwr+My7XUAMw2/UqTJBAnWWuM2HD3Ome2Xy+ 8Ey+Ydo//1XM/irNOJa6EOBVtNrC9669n65702402rrK2MKHhQJsVIgfboeBZSM46vJ7g5TNhUAFD KP64JXr6EJtd6n26OLBq7n8IjSksr9ONAGPZRTlq3h357IC9esAMd/fxjFt3RQHyi/HqsmjuYIFcm QJtcBilMZfvAnKYRNISuTX/XfxotHVIMLdaosOldBA3o4VeTWyM0D4bN5TTa8f2xvuo8AOHaCFhZ3 yuGZxnnKw==; Received: from mail-pf0-x244.google.com ([2607:f8b0:400e:c00::244]) by casper.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1erNmc-00055R-KY for linux-arm-kernel@lists.infradead.org; Thu, 01 Mar 2018 12:58:04 +0000 Received: by mail-pf0-x244.google.com with SMTP id j20so2407717pfi.1 for ; Thu, 01 Mar 2018 04:57:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=mp5ELbwEmYRLHeQ3bnHDHxexdMKPPHMhOHF8S+YF3Ac=; b=c3I9UT93a9gl4iZ5XmQ52VlxvjAEr/8R2RbP1GwsMm1BMHfJStTzlh3Nhgh2vRA0tm nXzXLXeT2lRrvjbdBcHQIgqM0iJMPBQL0B7dZpAcokZBrKfo2w/E5h4JAc2xc0iekS+q OOUiUBIDTU3jYUa3THNcMd/SvhIsCW1TP/APg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=mp5ELbwEmYRLHeQ3bnHDHxexdMKPPHMhOHF8S+YF3Ac=; b=SajzRg7lbi3De9AfxzpeLlhqMMZmg7BVN062S/pDLmY3oFOpryJGid35ZUb+Q5asir N7X3i3i6EQ9NFhvxlZRbqwGiqzb8xq9kc2Gra8jyXonRIQVq6o3GSOw233d1WfKRBGY9 9Fe/h1NvJPO0GGtQ7FQ1kPZymoEupuNs9ue9fN0UBkmpN53/635EQL4S5Efm1HMizaC4 dSCFYN7mKOtQtbzmR6yto2cb8wcf5qok38h9+QZ6r6IJGrxLo/V17nSwDQ0M8jSu+miW NXyt87BpzDqrga6A6kgjwGnyjFeopKFTbR2iJMKOgqhuYKfvU1UaJUyQt0XCisOWMdBa FIvw== X-Gm-Message-State: APf1xPA2stBMAKS+S6pq4ZzixwUk1ro7KveWCInXKlzcy4jeeDUvWHGY gomjYS513KD7NsPRTx4Faj7WV6/BcRI= X-Google-Smtp-Source: AG47ELs7YgzLn5cLVoeInqjpEZ1Co7epUq33LCDgtESGwVzk2sUQ6xDr4XwW8lij/bU7bD5Db59Tpw== X-Received: by 10.101.77.69 with SMTP id j5mr1490545pgt.352.1519909077807; Thu, 01 Mar 2018 04:57:57 -0800 (PST) Received: from localhost.localdomain (176.122.172.82.16clouds.com. [176.122.172.82]) by smtp.gmail.com with ESMTPSA id x4sm2289655pfb.46.2018.03.01.04.57.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 01 Mar 2018 04:57:57 -0800 (PST) From: Alex Shi To: Marc Zyngier , Will Deacon , Ard Biesheuvel , Catalin Marinas , stable@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 21/45] arm64: cpufeature: Pass capability structure to ->enable callback Date: Thu, 1 Mar 2018 20:53:58 +0800 Message-Id: <1519908862-11425-22-git-send-email-alex.shi@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519908862-11425-1-git-send-email-alex.shi@linaro.org> References: <1519908862-11425-1-git-send-email-alex.shi@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180301_125802_670004_D42C8740 X-CRM114-Status: GOOD ( 15.19 ) 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: Alex Shi MIME-Version: 1.0 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 From: Will Deacon commit 0a0d111d40fd upstream. In order to invoke the CPU capability ->matches callback from the ->enable callback for applying local-CPU workarounds, we need a handle on the capability structure. This patch passes a pointer to the capability structure to the ->enable callback. Reviewed-by: Suzuki K Poulose Signed-off-by: Will Deacon Signed-off-by: Alex Shi --- arch/arm64/kernel/cpufeature.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index fcb67e0..5c41ef6 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -949,7 +949,7 @@ void __init enable_cpu_capabilities(const struct arm64_cpu_capabilities *caps) * uses an IPI, giving us a PSTATE that disappears when * we return. */ - stop_machine(caps->enable, NULL, cpu_online_mask); + stop_machine(caps->enable, (void *)caps, cpu_online_mask); } /* @@ -1005,7 +1005,7 @@ verify_local_cpu_features(const struct arm64_cpu_capabilities *caps) cpu_die_early(); } if (caps->enable) - caps->enable(NULL); + caps->enable((void *)caps); } }