lkml.org 
[lkml]   [2019]   [May]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 05/18] x86 topology: Create topology_max_die_per_package()
    Date
    From: Len Brown <len.brown@intel.com>

    topology_max_packages() is available to size resources to
    cover all packages in the system.

    But now we have multi-die/package systems, and some
    resources are per-die.

    Create topology_max_die_per_package(), for detecting
    multi-die/package systems, and sizing any per-die resources.

    Signed-off-by: Len Brown <len.brown@intel.com>
    ---
    arch/x86/include/asm/processor.h | 1 -
    arch/x86/include/asm/topology.h | 10 ++++++++++
    arch/x86/kernel/cpu/topology.c | 5 ++++-
    3 files changed, 14 insertions(+), 2 deletions(-)

    diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
    index 2507edc30cc2..5f45488b1a9d 100644
    --- a/arch/x86/include/asm/processor.h
    +++ b/arch/x86/include/asm/processor.h
    @@ -106,7 +106,6 @@ struct cpuinfo_x86 {
    unsigned long loops_per_jiffy;
    /* cpuid returned max cores value: */
    u16 x86_max_cores;
    - u16 x86_max_dies;
    u16 apicid;
    u16 initial_apicid;
    u16 x86_clflush_size;
    diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h
    index 453cf38a1c33..e0232f7042c3 100644
    --- a/arch/x86/include/asm/topology.h
    +++ b/arch/x86/include/asm/topology.h
    @@ -115,6 +115,13 @@ extern const struct cpumask *cpu_coregroup_mask(int cpu);
    extern unsigned int __max_logical_packages;
    #define topology_max_packages() (__max_logical_packages)

    +extern unsigned int __max_die_per_package;
    +
    +static inline int topology_max_die_per_package(void)
    +{
    + return __max_die_per_package;
    +}
    +
    extern int __max_smt_threads;

    static inline int topology_max_smt_threads(void)
    @@ -131,6 +138,9 @@ bool topology_smt_supported(void);
    static inline int
    topology_update_package_map(unsigned int apicid, unsigned int cpu) { return 0; }
    static inline int topology_phys_to_logical_pkg(unsigned int pkg) { return 0; }
    +static inline int topology_phys_to_logical_die(unsigned int die,
    + unsigned int cpu) { return 0; }
    +static inline int topology_max_die_per_package(void) { return 1; }
    static inline int topology_max_smt_threads(void) { return 1; }
    static inline bool topology_is_primary_thread(unsigned int cpu) { return true; }
    static inline bool topology_smt_supported(void) { return false; }
    diff --git a/arch/x86/kernel/cpu/topology.c b/arch/x86/kernel/cpu/topology.c
    index 4d17e699657d..ee48c3fc8a65 100644
    --- a/arch/x86/kernel/cpu/topology.c
    +++ b/arch/x86/kernel/cpu/topology.c
    @@ -26,6 +26,9 @@
    #define LEVEL_MAX_SIBLINGS(ebx) ((ebx) & 0xffff)

    #ifdef CONFIG_SMP
    +unsigned int __max_die_per_package __read_mostly = 1;
    +EXPORT_SYMBOL(__max_die_per_package);
    +
    /*
    * Check if given CPUID extended toplogy "leaf" is implemented
    */
    @@ -146,7 +149,7 @@ int detect_extended_topology(struct cpuinfo_x86 *c)
    c->apicid = apic->phys_pkg_id(c->initial_apicid, 0);

    c->x86_max_cores = (core_level_siblings / smp_num_siblings);
    - c->x86_max_dies = (die_level_siblings / core_level_siblings);
    + __max_die_per_package = (die_level_siblings / core_level_siblings);
    #endif
    return 0;
    }
    --
    2.18.0-rc0
    \
     
     \ /
      Last update: 2019-05-01 06:26    [W:4.538 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site