Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

hwmon/coretemp: Support multi-die/package

Package temperature sensors are actually implemented in hardware per-die.

Update coretemp to be "die-aware", so it can expose mulitple sensors per
package, instead of just one. No change to single-die/package systems.

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Guenter Roeck <linux@roeck-us.net>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: linux-pm@vger.kernel.org
Cc: linux-hwmon@vger.kernel.org
Link: https://lkml.kernel.org/r/ec2868f35113a01ff72d9041e0b97fc6a1c7df84.1557769318.git.len.brown@intel.com

authored by

Zhang Rui and committed by
Thomas Gleixner
cfcd82e6 9ea7612c

+4 -4
+4 -4
drivers/hwmon/coretemp.c
··· 435 435 436 436 static struct platform_device *coretemp_get_pdev(unsigned int cpu) 437 437 { 438 - int pkgid = topology_logical_package_id(cpu); 438 + int pkgid = topology_logical_die_id(cpu); 439 439 440 440 if (pkgid >= 0 && pkgid < max_packages) 441 441 return pkg_devices[pkgid]; ··· 579 579 580 580 static struct platform_device *coretemp_device_add(unsigned int cpu) 581 581 { 582 - int err, pkgid = topology_logical_package_id(cpu); 582 + int err, pkgid = topology_logical_die_id(cpu); 583 583 struct platform_device *pdev; 584 584 585 585 if (pkgid < 0) ··· 703 703 * the rest. 704 704 */ 705 705 if (cpumask_empty(&pd->cpumask)) { 706 - pkg_devices[topology_logical_package_id(cpu)] = NULL; 706 + pkg_devices[topology_logical_die_id(cpu)] = NULL; 707 707 platform_device_unregister(pdev); 708 708 return 0; 709 709 } ··· 741 741 if (!x86_match_cpu(coretemp_ids)) 742 742 return -ENODEV; 743 743 744 - max_packages = topology_max_packages(); 744 + max_packages = topology_max_packages() * topology_max_die_per_package(); 745 745 pkg_devices = kcalloc(max_packages, sizeof(struct platform_device *), 746 746 GFP_KERNEL); 747 747 if (!pkg_devices)