All of lore.kernel.org
 help / color / mirror / Atom feed
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, 26 Feb 2019 01:20:03 -0500	[thread overview]
Message-ID: <43f15c3d7b5e0fd7e3f257d4c0736200f6198971.1551160674.git.len.brown@intel.com> (raw)
In-Reply-To: <e2810a5317d3a109a98204e883fd1461f77b9339.1551160674.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   | 6 ++++++
 arch/x86/include/asm/topology.h | 1 +
 drivers/base/topology.c         | 4 ++++
 include/linux/topology.h        | 3 +++
 4 files changed, 14 insertions(+)

diff --git a/Documentation/cputopology.txt b/Documentation/cputopology.txt
index cb61277e2308..4e6be7f68fd8 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
diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h
index 453cf38a1c33..281be6bbc80d 100644
--- a/arch/x86/include/asm/topology.h
+++ b/arch/x86/include/asm/topology.h
@@ -106,6 +106,7 @@ extern const struct cpumask *cpu_coregroup_mask(int cpu);
 
 #define topology_logical_package_id(cpu)	(cpu_data(cpu).logical_proc_id)
 #define topology_physical_package_id(cpu)	(cpu_data(cpu).phys_proc_id)
+#define topology_die_id(cpu)			(cpu_data(cpu).cpu_die_id)
 #define topology_core_id(cpu)			(cpu_data(cpu).cpu_core_id)
 
 #ifdef CONFIG_SMP
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


  parent reply	other threads:[~2019-02-26  6:20 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-26  6:19 [PATCH 0/14] v2 multi-die/package topology support Len Brown
2019-02-26  6:19 ` [PATCH 01/14] x86 topology: Fix doc typo Len Brown
2019-02-26  6:20   ` [PATCH 02/14] topolgy: Simplify cputopology.txt formatting and wording Len Brown
2019-02-26  6:20   ` [PATCH 03/14] x86 smpboot: Rename match_die() to match_pkg() Len Brown
2019-02-26  6:20   ` [PATCH 04/14] x86 topology: Add CPUID.1F multi-die/package support Len Brown
2019-02-26 19:46     ` Dave Hansen
2019-02-28 15:43       ` Len Brown
2019-04-05 18:16         ` Thomas Gleixner
2019-02-26  6:20   ` Len Brown [this message]
2019-03-07 14:45     ` [PATCH 05/14] cpu topology: Export die_id Morten Rasmussen
2019-03-26 18:18       ` Len Brown
2019-02-26  6:20   ` [PATCH 06/14] x86 topology: Define topology_logical_die_id() Len Brown
2019-02-26  6:20   ` [PATCH 07/14] powercap/intel_rapl: Simplify rapl_find_package() Len Brown
2019-02-26 19:06     ` Peter Zijlstra
2019-03-26 18:27       ` Len Brown
2019-02-26  6:20   ` [PATCH 08/14] powercap/intel_rapl: Support multi-die/package Len Brown
2019-04-05 18:27     ` Thomas Gleixner
2019-04-08  1:35       ` Zhang Rui
2019-02-26  6:20   ` [PATCH 09/14] thermal/x86_pkg_temp_thermal: " Len Brown
2019-04-05 18:29     ` Thomas Gleixner
2019-04-05 18:39       ` Brown, Len
2019-04-05 18:50         ` Thomas Gleixner
2019-02-26  6:20   ` [PATCH 10/14] powercap/intel_rapl: update rapl domain name and debug messages Len Brown
2019-02-26  6:20   ` [PATCH 11/14] hwmon/coretemp: Support multi-die/package Len Brown
2019-02-26  6:20   ` [PATCH 12/14] topology: Create package_threads sysfs attribute Len Brown
2019-02-26  6:20   ` [PATCH 13/14] topology: Create core_threads " Len Brown
2019-02-26  6:20   ` [PATCH 14/14] topology: Create die_threads " Len Brown
2019-02-26 18:51 ` [PATCH 0/14] v2 multi-die/package topology support Peter Zijlstra
2019-04-12 19:32   ` Len Brown
2019-02-26 18:53 ` Peter Zijlstra
2019-03-07 14:59   ` Morten Rasmussen
2019-04-05 18:33     ` Thomas Gleixner
2019-04-12 19:52       ` Len Brown
2019-04-12 20:40         ` Brice Goglin
2019-02-26 19:05 ` Peter Zijlstra
2019-04-30  6:50   ` Len Brown
2019-04-30  9:33     ` Borislav Petkov
2019-04-30 18:46       ` Len Brown
2019-04-05 18:33 ` Thomas Gleixner
2019-04-30 20:55 [PATCH 01/14] x86 topology: Fix doc typo Len Brown
2019-04-30 20:55 ` [PATCH 05/14] cpu topology: Export die_id 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=43f15c3d7b5e0fd7e3f257d4c0736200f6198971.1551160674.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.