From patchwork Sun Apr 16 20:26:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 97464 Delivered-To: patch@linaro.org Received: by 10.140.109.52 with SMTP id k49csp1086843qgf; Sun, 16 Apr 2017 13:28:26 -0700 (PDT) X-Received: by 10.84.194.195 with SMTP id h61mr11435884pld.182.1492374506071; Sun, 16 Apr 2017 13:28:26 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m188si8929486pfc.145.2017.04.16.13.28.25; Sun, 16 Apr 2017 13:28:26 -0700 (PDT) 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; dkim=pass header.i=@linaro.org; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756847AbdDPU2M (ORCPT + 15 others); Sun, 16 Apr 2017 16:28:12 -0400 Received: from mail-wm0-f41.google.com ([74.125.82.41]:38531 "EHLO mail-wm0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756710AbdDPU2G (ORCPT ); Sun, 16 Apr 2017 16:28:06 -0400 Received: by mail-wm0-f41.google.com with SMTP id t189so22463362wmt.1 for ; Sun, 16 Apr 2017 13:28:06 -0700 (PDT) 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=4QOm71Yr5SYXErKN5RRFrviUU7JnkhtxJ3hgHuyetr0=; b=bHt33ny7IMlU7iihTf7mp7W3vWtnWLwYRpuyfvLhdI/96X2kO0eSQGhvvuIrVvukT5 ZNd/6YJmMtgPWCzY45x/zRoY+6hJ7KupABSjl8NOjIWwlSA4ffl0XI0pcgaMpEccpbXd f3RB8JKORSBswBEVeb1eJWVLC2WCASJDKbV18= 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=4QOm71Yr5SYXErKN5RRFrviUU7JnkhtxJ3hgHuyetr0=; b=JNOY/hc5SgIp5+0majEaYoFlTwd0byJ69OLBiFV5V/DIZ/obmCFObxJO8HEyuQZfHi ug5izDw+1W4h3Ic5RMa5PbDFJSuggZ/CXw3p3uvnPTj37832jEjTu8UhzI74Qgui+NUr aO9QyMO0tqZ/1tazgmdUC/b2c4ULFudT9rpvIeU5JoBr6nHdD0ttVsBfn8qWXkRaEz7G y1ksK4MtxMNI+Y6npC32h83L0AiimWrMZbnEmwNYX/Bn664IED+7j+RPwTztp432KpcX P3iBHl5Mk2Z8NKrFlN840yIq7I6BVu7lu3i7UvQjHgxtBVBeW97G4DXwrV5cJrxHqmwd PrTQ== X-Gm-Message-State: AN3rC/4+L9D6hYWaLpbT6T5YVrVV2HgzCDmKPb8GGueY0REgdISuXApc ps66ufpO0O+C+L68y2rzWw== X-Received: by 10.28.218.197 with SMTP id r188mr6373275wmg.0.1492374485290; Sun, 16 Apr 2017 13:28:05 -0700 (PDT) Received: from mai.lan ([2001:41d0:fe90:b800:20c0:6248:a385:db35]) by smtp.gmail.com with ESMTPSA id 81sm7732196wmj.9.2017.04.16.13.28.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 16 Apr 2017 13:28:04 -0700 (PDT) From: Daniel Lezcano To: tglx@linutronix.de Cc: linux-kernel@vger.kernel.org, Marc Zyngier , Mark Rutland , Catalin Marinas , Will Deacon , linux-arm-kernel@lists.infradead.org (moderated list:ARM ARCHITECTED TIMER DRIVER) Subject: [PATCH 07/29] arm64: arch_timer: Add erratum handler for CPU-specific capability Date: Sun, 16 Apr 2017 22:26:57 +0200 Message-Id: <1492374441-23336-7-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1492374441-23336-1-git-send-email-daniel.lezcano@linaro.org> References: <20170416202542.GV2078@mai> <1492374441-23336-1-git-send-email-daniel.lezcano@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Marc Zyngier Should we ever have a workaround for an erratum that is detected using a capability and affecting a particular CPU, it'd be nice to have a way to probe them directly. Acked-by: Thomas Gleixner Signed-off-by: Marc Zyngier --- arch/arm64/include/asm/arch_timer.h | 1 + drivers/clocksource/arm_arch_timer.c | 28 ++++++++++++++++++++++++---- 2 files changed, 25 insertions(+), 4 deletions(-) -- 2.7.4 diff --git a/arch/arm64/include/asm/arch_timer.h b/arch/arm64/include/asm/arch_timer.h index 5cd964e..1b0d7e9 100644 --- a/arch/arm64/include/asm/arch_timer.h +++ b/arch/arm64/include/asm/arch_timer.h @@ -39,6 +39,7 @@ extern struct static_key_false arch_timer_read_ool_enabled; enum arch_timer_erratum_match_type { ate_match_dt, + ate_match_local_cap_id, }; struct arch_timer_erratum_workaround { diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index 5c5c2af..532e47fa 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -214,6 +214,13 @@ bool arch_timer_check_dt_erratum(const struct arch_timer_erratum_workaround *wa, return of_property_read_bool(np, wa->id); } +static +bool arch_timer_check_local_cap_erratum(const struct arch_timer_erratum_workaround *wa, + const void *arg) +{ + return this_cpu_has_cap((uintptr_t)wa->id); +} + static const struct arch_timer_erratum_workaround * arch_timer_iterate_errata(enum arch_timer_erratum_match_type type, ate_match_fn_t match_fn, @@ -244,14 +251,16 @@ static void arch_timer_check_ool_workaround(enum arch_timer_erratum_match_type t { const struct arch_timer_erratum_workaround *wa; ate_match_fn_t match_fn = NULL; - - if (static_branch_unlikely(&arch_timer_read_ool_enabled)) - return; + bool local = false; switch (type) { case ate_match_dt: match_fn = arch_timer_check_dt_erratum; break; + case ate_match_local_cap_id: + match_fn = arch_timer_check_local_cap_erratum; + local = true; + break; default: WARN_ON(1); return; @@ -261,8 +270,17 @@ static void arch_timer_check_ool_workaround(enum arch_timer_erratum_match_type t if (!wa) return; + if (needs_unstable_timer_counter_workaround()) { + if (wa != timer_unstable_counter_workaround) + pr_warn("Can't enable workaround for %s (clashes with %s\n)", + wa->desc, + timer_unstable_counter_workaround->desc); + return; + } + arch_timer_enable_workaround(wa); - pr_info("Enabling global workaround for %s\n", wa->desc); + pr_info("Enabling %s workaround for %s\n", + local ? "local" : "global", wa->desc); } #else @@ -522,6 +540,8 @@ static void __arch_timer_setup(unsigned type, BUG(); } + arch_timer_check_ool_workaround(ate_match_local_cap_id, NULL); + erratum_workaround_set_sne(clk); } else { clk->features |= CLOCK_EVT_FEAT_DYNIRQ;