From: Marc Zyngier <marc.zyngier@arm.com> To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Mark Rutland <mark.rutland@arm.com>, Catalin Marinas <catalin.marinas@arm.com>, Daniel Lezcano <daniel.lezcano@linaro.org>, Will Deacon <will.deacon@arm.com>, Scott Wood <oss@buserror.net>, Hanjun Guo <hanjun.guo@linaro.org>, Ding Tianhong <dingtianhong@huawei.com>, dann frazier <dann.frazier@canonical.com> Subject: [PATCH v2 08/18] arm64: arch_timer: Add erratum handler for CPU-specific capability Date: Mon, 20 Mar 2017 17:48:19 +0000 [thread overview] Message-ID: <20170320174829.28182-9-marc.zyngier@arm.com> (raw) In-Reply-To: <20170320174829.28182-1-marc.zyngier@arm.com> 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. Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> --- arch/arm64/include/asm/arch_timer.h | 1 + drivers/clocksource/arm_arch_timer.c | 28 ++++++++++++++++++++++++---- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/arch/arm64/include/asm/arch_timer.h b/arch/arm64/include/asm/arch_timer.h index 48bd730d568f..e5325299aa6d 100644 --- a/arch/arm64/include/asm/arch_timer.h +++ b/arch/arm64/include/asm/arch_timer.h @@ -40,6 +40,7 @@ extern struct static_key_false arch_timer_read_ool_enabled; enum arch_timer_erratum_match_type { ate_match_dt, ate_match_global_cap_id, + 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 a0b1108a4a24..5069cb3d4326 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -221,6 +221,13 @@ bool arch_timer_check_global_cap_erratum(const struct arch_timer_erratum_workaro return cpus_have_cap((uintptr_t)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, @@ -251,9 +258,7 @@ 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: @@ -262,14 +267,27 @@ static void arch_timer_check_ool_workaround(enum arch_timer_erratum_match_type t case ate_match_global_cap_id: match_fn = arch_timer_check_global_cap_erratum; break; + case ate_match_local_cap_id: + match_fn = arch_timer_check_local_cap_erratum; + local = true; + break; } wa = arch_timer_iterate_errata(type, match_fn, arg); if (!wa) return; + if (static_branch_unlikely(&arch_timer_read_ool_enabled)) { + 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 @@ -529,6 +547,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; -- 2.11.0
WARNING: multiple messages have this Message-ID (diff)
From: marc.zyngier@arm.com (Marc Zyngier) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 08/18] arm64: arch_timer: Add erratum handler for CPU-specific capability Date: Mon, 20 Mar 2017 17:48:19 +0000 [thread overview] Message-ID: <20170320174829.28182-9-marc.zyngier@arm.com> (raw) In-Reply-To: <20170320174829.28182-1-marc.zyngier@arm.com> 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. Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> --- arch/arm64/include/asm/arch_timer.h | 1 + drivers/clocksource/arm_arch_timer.c | 28 ++++++++++++++++++++++++---- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/arch/arm64/include/asm/arch_timer.h b/arch/arm64/include/asm/arch_timer.h index 48bd730d568f..e5325299aa6d 100644 --- a/arch/arm64/include/asm/arch_timer.h +++ b/arch/arm64/include/asm/arch_timer.h @@ -40,6 +40,7 @@ extern struct static_key_false arch_timer_read_ool_enabled; enum arch_timer_erratum_match_type { ate_match_dt, ate_match_global_cap_id, + 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 a0b1108a4a24..5069cb3d4326 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -221,6 +221,13 @@ bool arch_timer_check_global_cap_erratum(const struct arch_timer_erratum_workaro return cpus_have_cap((uintptr_t)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, @@ -251,9 +258,7 @@ 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: @@ -262,14 +267,27 @@ static void arch_timer_check_ool_workaround(enum arch_timer_erratum_match_type t case ate_match_global_cap_id: match_fn = arch_timer_check_global_cap_erratum; break; + case ate_match_local_cap_id: + match_fn = arch_timer_check_local_cap_erratum; + local = true; + break; } wa = arch_timer_iterate_errata(type, match_fn, arg); if (!wa) return; + if (static_branch_unlikely(&arch_timer_read_ool_enabled)) { + 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 @@ -529,6 +547,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; -- 2.11.0
next prev parent reply other threads:[~2017-03-20 17:50 UTC|newest] Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-03-20 17:48 [PATCH v2 00/18] clocksource/arch_timer: Errata workaround infrastructure rework Marc Zyngier 2017-03-20 17:48 ` Marc Zyngier 2017-03-20 17:48 ` [PATCH v2 01/18] arm64: Allow checking of a CPU-local erratum Marc Zyngier 2017-03-20 17:48 ` Marc Zyngier 2017-03-22 9:22 ` Daniel Lezcano 2017-03-22 9:22 ` Daniel Lezcano 2017-03-20 17:48 ` [PATCH v2 02/18] arm64: Add CNTVCT_EL0 trap handler Marc Zyngier 2017-03-20 17:48 ` Marc Zyngier 2017-03-20 17:48 ` [PATCH v2 03/18] arm64: Define Cortex-A73 MIDR Marc Zyngier 2017-03-20 17:48 ` Marc Zyngier 2017-03-20 17:48 ` [PATCH v2 04/18] arm64: cpu_errata: Allow an erratum to be match for all revisions of a core Marc Zyngier 2017-03-20 17:48 ` Marc Zyngier 2017-03-22 14:57 ` Daniel Lezcano 2017-03-22 14:57 ` Daniel Lezcano 2017-03-20 17:48 ` [PATCH v2 05/18] arm64: cpu_errata: Add capability to advertise Cortex-A73 erratum 858921 Marc Zyngier 2017-03-20 17:48 ` Marc Zyngier 2017-03-22 15:01 ` Daniel Lezcano 2017-03-22 15:01 ` Daniel Lezcano 2017-03-20 17:48 ` [PATCH v2 06/18] arm64: arch_timer: Add infrastructure for multiple erratum detection methods Marc Zyngier 2017-03-20 17:48 ` Marc Zyngier 2017-03-22 15:41 ` Daniel Lezcano 2017-03-22 15:41 ` Daniel Lezcano 2017-03-22 15:53 ` Marc Zyngier 2017-03-22 15:53 ` Marc Zyngier 2017-03-22 15:59 ` Marc Zyngier 2017-03-22 15:59 ` Marc Zyngier 2017-03-22 16:52 ` Daniel Lezcano 2017-03-22 16:52 ` Daniel Lezcano 2017-03-23 17:30 ` Daniel Lezcano 2017-03-23 17:30 ` Daniel Lezcano 2017-03-24 13:51 ` Marc Zyngier 2017-03-24 13:51 ` Marc Zyngier 2017-03-27 7:56 ` Daniel Lezcano 2017-03-27 7:56 ` Daniel Lezcano 2017-03-28 13:07 ` Marc Zyngier 2017-03-28 13:07 ` Marc Zyngier 2017-03-28 13:34 ` Daniel Lezcano 2017-03-28 13:34 ` Daniel Lezcano 2017-03-28 14:07 ` Marc Zyngier 2017-03-28 14:07 ` Marc Zyngier 2017-03-28 14:36 ` Daniel Lezcano 2017-03-28 14:36 ` Daniel Lezcano 2017-03-28 14:48 ` Marc Zyngier 2017-03-28 14:48 ` Marc Zyngier 2017-03-28 14:55 ` Daniel Lezcano 2017-03-28 14:55 ` Daniel Lezcano 2017-03-28 15:38 ` Marc Zyngier 2017-03-28 15:38 ` Marc Zyngier 2017-03-29 14:27 ` Daniel Lezcano 2017-03-29 14:27 ` Daniel Lezcano 2017-03-29 14:56 ` Marc Zyngier 2017-03-29 14:56 ` Marc Zyngier 2017-03-29 15:12 ` Daniel Lezcano 2017-03-29 15:12 ` Daniel Lezcano 2017-03-24 17:48 ` dann frazier 2017-03-24 17:48 ` dann frazier 2017-03-24 18:00 ` Marc Zyngier 2017-03-24 18:00 ` Marc Zyngier 2017-03-30 9:28 ` Daniel Lezcano 2017-03-30 9:28 ` Daniel Lezcano 2017-03-20 17:48 ` [PATCH v2 07/18] arm64: arch_timer: Add erratum handler for globally defined capability Marc Zyngier 2017-03-20 17:48 ` Marc Zyngier 2017-03-20 17:48 ` Marc Zyngier [this message] 2017-03-20 17:48 ` [PATCH v2 08/18] arm64: arch_timer: Add erratum handler for CPU-specific capability Marc Zyngier 2017-03-20 17:48 ` [PATCH v2 09/18] arm64: arch_timer: Move arch_timer_reg_read/write around Marc Zyngier 2017-03-20 17:48 ` Marc Zyngier 2017-03-22 15:47 ` Daniel Lezcano 2017-03-22 15:47 ` Daniel Lezcano 2017-03-20 17:48 ` [PATCH v2 10/18] arm64: arch_timer: Get rid of erratum_workaround_set_sne Marc Zyngier 2017-03-20 17:48 ` Marc Zyngier 2017-03-20 17:48 ` [PATCH v2 11/18] arm64: arch_timer: Rework the set_next_event workarounds Marc Zyngier 2017-03-20 17:48 ` Marc Zyngier 2017-03-20 17:48 ` [PATCH v2 12/18] arm64: arch_timer: Make workaround methods optional Marc Zyngier 2017-03-20 17:48 ` Marc Zyngier 2017-03-20 17:48 ` [PATCH v2 13/18] arm64: arch_timer: Allows a CPU-specific erratum to only affect a subset of CPUs Marc Zyngier 2017-03-20 17:48 ` Marc Zyngier 2017-03-20 17:48 ` [PATCH v2 14/18] arm64: arch_timer: Move clocksource_counter and co around Marc Zyngier 2017-03-20 17:48 ` Marc Zyngier 2017-03-20 17:48 ` [PATCH v2 15/18] arm64: arch_timer: Enable CNTVCT_EL0 trap if workaround is enabled Marc Zyngier 2017-03-20 17:48 ` Marc Zyngier 2017-03-20 17:48 ` [PATCH v2 16/18] arm64: arch_timer: Workaround for Cortex-A73 erratum 858921 Marc Zyngier 2017-03-20 17:48 ` Marc Zyngier 2017-03-20 17:48 ` [PATCH v2 17/18] arm64: arch_timer: Allow erratum matching with ACPI OEM information Marc Zyngier 2017-03-20 17:48 ` Marc Zyngier 2017-03-20 17:48 ` [PATCH v2 18/18] arm64: arch_timer: Add HISILICON_ERRATUM_161010101 ACPI matching data Marc Zyngier 2017-03-20 17:48 ` Marc Zyngier 2017-03-22 13:56 ` [PATCH v2 00/18] clocksource/arch_timer: Errata workaround infrastructure rework Ding Tianhong 2017-03-22 13:56 ` Ding Tianhong
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20170320174829.28182-9-marc.zyngier@arm.com \ --to=marc.zyngier@arm.com \ --cc=catalin.marinas@arm.com \ --cc=daniel.lezcano@linaro.org \ --cc=dann.frazier@canonical.com \ --cc=dingtianhong@huawei.com \ --cc=hanjun.guo@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mark.rutland@arm.com \ --cc=oss@buserror.net \ --cc=will.deacon@arm.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.