korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-26 21:54:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

- Fix build error with clang and some kernel configuration on the

Browse Source 
arm64 architected timer by inlining the
   erratum_set_next_event_generic() function (Marc Zyngier)
 
 - Fix probe error on the dw_apb_timer_of driver by fixing the
   incorrect condition previously introduced (Alexey Sheplyakov)
 -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCAAdFiEEGn3N4YVz0WNVyHskqDIjiipP6E8FAmGzhKoACgkQqDIjiipP
 6E9Uhwf+JghVaO+4RBIlFrJ+K07yc9tMH2WpuRfObWK2KZ6OgDYSFsM9Ocv3QALd
 3nA0/WtdAvOZ0Tywi9HN+Pgv8dyX+MJEljaYTq1FXmgzX8/5hqpvjUmwwuDsba4Y
 qJRbymK7nAyjMC7MIob1F8xyExCs1d/9uO8YTMbiDCoNo7H4fE5P1Xy9tYKFcnqS
 zhRbRL2vFYUH7zJvD/jnrr8jdldDpk2UGFl7Qx/hX3GC2x5JwemP6zQydvqMrPcC
 Ou5enP2nFxP+MSDyVmyOcjh03y+VtZGWjG4x3zfCbCGYk8AxV4ejSSP/VUo+3fme
 8GdPaHKowQgvlbjEjAoKgKr/QIavcQ==
 =Wm5a
 -----END PGP SIGNATURE-----

Merge tag 'timers-v5.16-rc4' of https://git.linaro.org/people/daniel.lezcano/linux into timers/urgent

Pull timer fixes from Daniel Lezcano:

  - Fix build error with clang and some kernel configuration on the
    arm64 architected timer by inlining the
    erratum_set_next_event_generic() function (Marc Zyngier)

  - Fix probe error on the dw_apb_timer_of driver by fixing the
    incorrect condition previously introduced (Alexey Sheplyakov)

Link: https://lore.kernel.org/r/429b796d-9395-4ca8-81f3-30911f80a9a9@linaro.org
This commit is contained in:
Thomas Gleixner 2021-12-11 13:56:30 +01:00
commit aa073d8b2a
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/clocksource/arm_arch_timer.c
View File

@ -394,8 +394,13 @@ EXPORT_SYMBOL_GPL(timer_unstable_counter_workaround);
static atomic_t timer_unstable_counter_workaround_in_use = ATOMIC_INIT(0);
static void erratum_set_next_event_generic(const int access, unsigned long evt,
struct clock_event_device *clk)
/*
* Force the inlining of this function so that the register accesses
* can be themselves correctly inlined.
*/
static __always_inline
void erratum_set_next_event_generic(const int access, unsigned long evt,
struct clock_event_device *clk)
{
unsigned long ctrl;
u64 cval;

2
drivers/clocksource/dw_apb_timer_of.c
View File

@ -47,7 +47,7 @@ static int __init timer_get_base_and_rate(struct device_node *np,
pr_warn("pclk for %pOFn is present, but could not be activated\n",
np);
if (!of_property_read_u32(np, "clock-freq", rate) &&
if (!of_property_read_u32(np, "clock-freq", rate) ||
!of_property_read_u32(np, "clock-frequency", rate))
return 0;