lkml.org 
[lkml]   [2018]   [Apr]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v8 07/13] drivers: base cacheinfo: Add support for ACPI based firmware tables
    Date
    Call ACPI cache parsing routines from base cacheinfo code if ACPI
    is enable. Also stub out cache_setup_acpi() so that individual
    architectures can enable ACPI topology parsing.

    Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
    ---
    drivers/base/cacheinfo.c | 14 ++++++++++----
    include/linux/cacheinfo.h | 10 ++++++++++
    2 files changed, 20 insertions(+), 4 deletions(-)

    diff --git a/drivers/base/cacheinfo.c b/drivers/base/cacheinfo.c
    index 597aacb233fc..2880e2ab01f5 100644
    --- a/drivers/base/cacheinfo.c
    +++ b/drivers/base/cacheinfo.c
    @@ -206,7 +206,7 @@ static inline bool cache_leaves_are_shared(struct cacheinfo *this_leaf,
    struct cacheinfo *sib_leaf)
    {
    /*
    - * For non-DT systems, assume unique level 1 cache, system-wide
    + * For non-DT/ACPI systems, assume unique level 1 caches, system-wide
    * shared caches for all other levels. This will be used only if
    * arch specific code has not populated shared_cpu_map
    */
    @@ -214,6 +214,11 @@ static inline bool cache_leaves_are_shared(struct cacheinfo *this_leaf,
    }
    #endif

    +int __weak cache_setup_acpi(unsigned int cpu)
    +{
    + return -ENOTSUPP;
    +}
    +
    static int cache_shared_cpu_map_setup(unsigned int cpu)
    {
    struct cpu_cacheinfo *this_cpu_ci = get_cpu_cacheinfo(cpu);
    @@ -227,8 +232,8 @@ static int cache_shared_cpu_map_setup(unsigned int cpu)
    if (of_have_populated_dt())
    ret = cache_setup_of_node(cpu);
    else if (!acpi_disabled)
    - /* No cache property/hierarchy support yet in ACPI */
    - ret = -ENOTSUPP;
    + ret = cache_setup_acpi(cpu);
    +
    if (ret)
    return ret;

    @@ -279,7 +284,8 @@ static void cache_shared_cpu_map_remove(unsigned int cpu)
    cpumask_clear_cpu(cpu, &sib_leaf->shared_cpu_map);
    cpumask_clear_cpu(sibling, &this_leaf->shared_cpu_map);
    }
    - of_node_put(this_leaf->fw_token);
    + if (of_have_populated_dt())
    + of_node_put(this_leaf->fw_token);
    }
    }

    diff --git a/include/linux/cacheinfo.h b/include/linux/cacheinfo.h
    index 0c6f658054d2..70ef44669fa3 100644
    --- a/include/linux/cacheinfo.h
    +++ b/include/linux/cacheinfo.h
    @@ -97,6 +97,16 @@ int func(unsigned int cpu) \
    struct cpu_cacheinfo *get_cpu_cacheinfo(unsigned int cpu);
    int init_cache_level(unsigned int cpu);
    int populate_cache_leaves(unsigned int cpu);
    +int cache_setup_acpi(unsigned int cpu);
    +#ifndef CONFIG_ACPI
    +static inline int acpi_find_last_cache_level(unsigned int cpu)
    +{
    + /* ACPI kernels should be built with PPTT support */
    + return 0;
    +}
    +#else
    +int acpi_find_last_cache_level(unsigned int cpu);
    +#endif

    const struct attribute_group *cache_get_priv_group(struct cacheinfo *this_leaf);

    --
    2.13.6
    \
     
     \ /
      Last update: 2018-04-26 02:34    [W:4.318 / U:0.392 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site