lkml.org 
[lkml]   [2020]   [Mar]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 96/99] ARM: 8957/1: VDSO: Match ARMv8 timer in cntvct_functional()
    Date
    From: Florian Fainelli <f.fainelli@gmail.com>

    commit 45939ce292b4b11159719faaf60aba7d58d5fe33 upstream.

    It is possible for a system with an ARMv8 timer to run a 32-bit kernel.
    When this happens we will unconditionally have the vDSO code remove the
    __vdso_gettimeofday and __vdso_clock_gettime symbols because
    cntvct_functional() returns false since it does not match that
    compatibility string.

    Fixes: ecf99a439105 ("ARM: 8331/1: VDSO initialization, mapping, and synchronization")
    Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
    Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/arm/kernel/vdso.c | 2 ++
    1 file changed, 2 insertions(+)

    --- a/arch/arm/kernel/vdso.c
    +++ b/arch/arm/kernel/vdso.c
    @@ -104,6 +104,8 @@ static bool __init cntvct_functional(voi
    */
    np = of_find_compatible_node(NULL, NULL, "arm,armv7-timer");
    if (!np)
    + np = of_find_compatible_node(NULL, NULL, "arm,armv8-timer");
    + if (!np)
    goto out_put;

    if (of_property_read_bool(np, "arm,cpu-registers-not-fw-configured"))

    \
     
     \ /
      Last update: 2020-03-19 14:32    [W:4.083 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site