From patchwork Thu Jan 4 15:08:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 123435 Delivered-To: patch@linaro.org Received: by 10.80.135.92 with SMTP id 28csp6820510edv; Thu, 4 Jan 2018 07:10:15 -0800 (PST) X-Google-Smtp-Source: ACJfBovEIQmeViZSHKeFoI+t5LycLjdEtCgejq4p+4GDzsxG6sduzuBws53gBk9iFB0JE/q2ole8 X-Received: by 10.98.75.68 with SMTP id y65mr5049162pfa.78.1515078615244; Thu, 04 Jan 2018 07:10:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515078615; cv=none; d=google.com; s=arc-20160816; b=HAcIYy9ngY5E35ukPdoLQIjyYmgDI+fs0E1IVIXpDs/W640ExBMlb1uRa8CZUtraeM MJkX2BKLGB9eQ365IYZpzEOsTgmcp1phJkIhcrMVv0HyPDnPqPZW+faI68uavDghvo1o lGzBuI5Wzkbsmu8nWwJCvl7b39+9N/vd6m8KIQfjLJxBzchRRVu5VzBxI0UmO4FNo5f4 Q2AxljL6Gy3JsMAab6+0WO15bttOy8mWuu+7qIk42inxv+c9Ct+X01qAyZndRFWEOIOE iJulawFwn3GAOIcjK2qDI7YH4JhPAOJ8NpJdZ5lUnYRRvBPCJg12CVMlB7jfO267yCQ4 efag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=SUcJO51daVmvnuEkXd5ASXGrt61w8W75hcSYH5squ1c=; b=tOwii+Q6KFHBDQdbIZYME0oqFG6+N/RYJ7P5zANivTZgFKQ2tTOerhKiltRLQDSv7e 1/dstl8QvUl/xs6B7pUkNd6pRj22safmitzIjPyWJriGBoG+JL8lFPFuzb/zJDIa8I1R 7HIILPYoRbytbDM4smMUr0fw1gY0EyYJlUu4VH3q5zDrIjm7yLFqwXDAEuTmSGFbY6dk NprlWWtynNlL0UmcX8E/p24owyzb4UifD556ydD77SEHXheVV2rN/Lhmm+tjDjXCQU/p OhCAnCgdKvztOklV9fQG19YrYOlGua2AbbDC1/xwSYWFwRLcZC0wfhQvlbmpnqd3aLPC 3/Fw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o61si2399653pld.181.2018.01.04.07.10.14; Thu, 04 Jan 2018 07:10:15 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753406AbeADPIp (ORCPT + 22 others); Thu, 4 Jan 2018 10:08:45 -0500 Received: from foss.arm.com ([217.140.101.70]:33796 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753372AbeADPIk (ORCPT ); Thu, 4 Jan 2018 10:08:40 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id AC6B11610; Thu, 4 Jan 2018 07:08:40 -0800 (PST) Received: from edgewater-inn.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.72.51.249]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 7E7743F41F; Thu, 4 Jan 2018 07:08:40 -0800 (PST) Received: by edgewater-inn.cambridge.arm.com (Postfix, from userid 1000) id A3A341AE0EB6; Thu, 4 Jan 2018 15:08:40 +0000 (GMT) From: Will Deacon To: linux-arm-kernel@lists.infradead.org Cc: catalin.marinas@arm.com, ard.biesheuvel@linaro.org, marc.zyngier@arm.com, lorenzo.pieralisi@arm.com, christoffer.dall@linaro.org, linux-kernel@vger.kernel.org, Will Deacon Subject: [PATCH 04/11] arm64: cpufeature: Pass capability structure to ->enable callback Date: Thu, 4 Jan 2018 15:08:28 +0000 Message-Id: <1515078515-13723-5-git-send-email-will.deacon@arm.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1515078515-13723-1-git-send-email-will.deacon@arm.com> References: <1515078515-13723-1-git-send-email-will.deacon@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. Signed-off-by: Will Deacon --- arch/arm64/kernel/cpufeature.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.1.4 Reviewed-by: Suzuki K Poulose diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index e11c11bb5b02..6133c14b9b01 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -1151,7 +1151,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); } } } @@ -1194,7 +1194,7 @@ verify_local_cpu_features(const struct arm64_cpu_capabilities *caps) cpu_die_early(); } if (caps->enable) - caps->enable(NULL); + caps->enable((void *)caps); } }