From: Len Brown <lenb@kernel.org>
To: x86@kernel.org
Cc: linux-kernel@vger.kernel.org, Len Brown <len.brown@intel.com>,
linux-doc@vger.kernel.org
Subject: [PATCH 05/14] cpu topology: Export die_id
Date: Tue, 30 Apr 2019 16:55:50 -0400 [thread overview]
Message-ID: <425994cdcd48297aaeacc086766f39503556c0ac.1553624867.git.len.brown@intel.com> (raw)
In-Reply-To: <75386dff62ee869eb7357dff1e60dfd9b3e68023.1553624867.git.len.brown@intel.com>
From: Len Brown <len.brown@intel.com>
Export die_id in cpu topology, for the benefit of hardware that
has multiple-die/package.
Signed-off-by: Len Brown <len.brown@intel.com>
Cc: linux-doc@vger.kernel.org
---
Documentation/cputopology.txt | 15 ++++++++++++---
drivers/base/topology.c | 4 ++++
include/linux/topology.h | 3 +++
3 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/Documentation/cputopology.txt b/Documentation/cputopology.txt
index cb61277e2308..2ff8a1e9a2db 100644
--- 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
@@ -81,6 +87,7 @@ 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)
@@ -99,9 +106,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().
diff --git a/drivers/base/topology.c b/drivers/base/topology.c
index 5fd9f167ecc1..50352cf96f85 100644
--- a/drivers/base/topology.c
+++ b/drivers/base/topology.c
@@ -43,6 +43,9 @@ static ssize_t name##_list_show(struct device *dev, \
define_id_show_func(physical_package_id);
static DEVICE_ATTR_RO(physical_package_id);
+define_id_show_func(die_id);
+static DEVICE_ATTR_RO(die_id);
+
define_id_show_func(core_id);
static DEVICE_ATTR_RO(core_id);
@@ -72,6 +75,7 @@ static DEVICE_ATTR_RO(drawer_siblings_list);
static struct attribute *default_attrs[] = {
&dev_attr_physical_package_id.attr,
+ &dev_attr_die_id.attr,
&dev_attr_core_id.attr,
&dev_attr_thread_siblings.attr,
&dev_attr_thread_siblings_list.attr,
diff --git a/include/linux/topology.h b/include/linux/topology.h
index cb0775e1ee4b..5cc8595dd0e4 100644
--- a/include/linux/topology.h
+++ b/include/linux/topology.h
@@ -184,6 +184,9 @@ static inline int cpu_to_mem(int cpu)
#ifndef topology_physical_package_id
#define topology_physical_package_id(cpu) ((void)(cpu), -1)
#endif
+#ifndef topology_die_id
+#define topology_die_id(cpu) ((void)(cpu), -1)
+#endif
#ifndef topology_core_id
#define topology_core_id(cpu) ((void)(cpu), 0)
#endif
--
2.18.0-rc0
next prev parent reply other threads:[~2019-04-30 20:57 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-30 20:55 [PATCH 0/18] v3 multi-die/package topology support Len Brown
2019-04-30 20:55 ` [PATCH 01/14] x86 topology: Fix doc typo Len Brown
2019-04-30 20:55 ` [PATCH 02/14] topolgy: Simplify cputopology.txt formatting and wording Len Brown
2019-04-30 20:55 ` [PATCH 03/14] x86 smpboot: Rename match_die() to match_pkg() Len Brown
2019-04-30 20:55 ` [PATCH 04/14] x86 topology: Add CPUID.1F multi-die/package support Len Brown
2019-04-30 20:55 ` Len Brown [this message]
2019-04-30 20:55 ` [PATCH 06/14] x86 topology: Define topology_die_id() Len Brown
2019-04-30 20:55 ` [PATCH 07/14] x86 topology: Define topology_logical_die_id() Len Brown
2019-04-30 20:55 ` [PATCH 08/14] powercap/intel_rapl: Simplify rapl_find_package() Len Brown
2019-04-30 20:55 ` [PATCH 09/14] powercap/intel_rapl: Support multi-die/package Len Brown
2019-04-30 20:55 ` [PATCH 10/14] thermal/x86_pkg_temp_thermal: " Len Brown
2019-04-30 20:55 ` [PATCH 11/14] powercap/intel_rapl: update rapl domain name and debug messages Len Brown
2019-04-30 20:55 ` [PATCH 12/14] hwmon/coretemp: Support multi-die/package Len Brown
2019-04-30 20:55 ` [PATCH 13/14] topology: Create package_threads sysfs attribute Len Brown
2019-04-30 20:55 ` [PATCH 14/14] topology: Create core_threads " Len Brown
-- strict thread matches above, loose matches on Subject: below --
2019-02-26 6:19 [PATCH 01/14] x86 topology: Fix doc typo Len Brown
2019-02-26 6:20 ` [PATCH 05/14] cpu topology: Export die_id Len Brown
2019-03-07 14:45 ` Morten Rasmussen
2019-03-26 18:18 ` Len Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=425994cdcd48297aaeacc086766f39503556c0ac.1553624867.git.len.brown@intel.com \
--to=lenb@kernel.org \
--cc=len.brown@intel.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).