Merge tag 'for-5.3/libata-20190708' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / Documentation / cputopology.txt

diff --git a/Documentation/cputopology.txt b/Documentation/cputopology.txt
index cb61277..b90dafc 100644 (file)
--- a/Documentation/cputopology.txt
+++ b/Documentation/cputopology.txt
@@ -12,6 +12,12 @@ physical_package_id:
        socket number, but the actual value is architecture and platform
        dependent.
 
+die_id:
+
+       the CPU die ID of cpuX. Typically it is the hardware platform's
+       identifier (rather than the kernel's).  The actual value is
+       architecture and platform dependent.
+
 core_id:
 
        the CPU core ID of cpuX. Typically it is the hardware platform's
@@ -30,25 +36,33 @@ drawer_id:
        identifier (rather than the kernel's).  The actual value is
        architecture and platform dependent.
 
-thread_siblings:
+core_cpus:
 
-       internal kernel map of cpuX's hardware threads within the same
-       core as cpuX.
+       internal kernel map of CPUs within the same core.
+       (deprecated name: "thread_siblings")
 
-thread_siblings_list:
+core_cpus_list:
 
-       human-readable list of cpuX's hardware threads within the same
-       core as cpuX.
+       human-readable list of CPUs within the same core.
+       (deprecated name: "thread_siblings_list");
 
-core_siblings:
+package_cpus:
 
-       internal kernel map of cpuX's hardware threads within the same
-       physical_package_id.
+       internal kernel map of the CPUs sharing the same physical_package_id.
+       (deprecated name: "core_siblings")
 
-core_siblings_list:
+package_cpus_list:
 
-       human-readable list of cpuX's hardware threads within the same
-       physical_package_id.
+       human-readable list of CPUs sharing the same physical_package_id.
+       (deprecated name: "core_siblings_list")
+
+die_cpus:
+
+       internal kernel map of CPUs within the same die.
+
+die_cpus_list:
+
+       human-readable list of CPUs within the same die.
 
 book_siblings:
 
@@ -81,11 +95,13 @@ For an architecture to support this feature, it must define some of
 these macros in include/asm-XXX/topology.h::
 
        #define topology_physical_package_id(cpu)
+       #define topology_die_id(cpu)
        #define topology_core_id(cpu)
        #define topology_book_id(cpu)
        #define topology_drawer_id(cpu)
        #define topology_sibling_cpumask(cpu)
        #define topology_core_cpumask(cpu)
+       #define topology_die_cpumask(cpu)
        #define topology_book_cpumask(cpu)
        #define topology_drawer_cpumask(cpu)
 
@@ -99,9 +115,11 @@ provides default definitions for any of the above macros that are
 not defined by include/asm-XXX/topology.h:
 
 1) topology_physical_package_id: -1
-2) topology_core_id: 0
-3) topology_sibling_cpumask: just the given CPU
-4) topology_core_cpumask: just the given CPU
+2) topology_die_id: -1
+3) topology_core_id: 0
+4) topology_sibling_cpumask: just the given CPU
+5) topology_core_cpumask: just the given CPU
+6) topology_die_cpumask: just the given CPU
 
 For architectures that don't support books (CONFIG_SCHED_BOOK) there are no
 default definitions for topology_book_id() and topology_book_cpumask().