Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit e40cc4bdfd4b89813f072f72bd9c7055814d3f0f

Authored by Jan Beulich
Committed by Guenter Roeck
1 parent f6aeccdb96
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

x86/hwmon: register alternate sibling upon CPU removal 

Just like pkgtemp registers another core of the same package when one
gets removed, coretemp should register another hyperthread (if
available) in that situation.

As pointed out in the patch fixing the respective code in pkgtemp, the
list protectng mutex must be dropped before calling
coretemp_device_add(), and due to the restructured loop (including an
explicit return) the "safe" variant of the list iterator isn't needed
anymore.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Cc: Rudolf Marek <r.marek@assembler.cz>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>

Showing 1 changed file with 15 additions and 7 deletions Side-by-side Diff

drivers/hwmon/coretemp.c
Diff comments   View file @ e40cc4b
... ... @@ -491,14 +491,22 @@
491 491  
492 492 static void coretemp_device_remove(unsigned int cpu)
493 493 {
494   - struct pdev_entry *p, *n;
  494 + struct pdev_entry *p;
  495 + unsigned int i;
  496 +
495 497 mutex_lock(&pdev_list_mutex);
496   - list_for_each_entry_safe(p, n, &pdev_list, list) {
497   - if (p->cpu == cpu) {
498   - platform_device_unregister(p->pdev);
499   - list_del(&p->list);
500   - kfree(p);
501   - }
  498 + list_for_each_entry(p, &pdev_list, list) {
  499 + if (p->cpu != cpu)
  500 + continue;
  501 +
  502 + platform_device_unregister(p->pdev);
  503 + list_del(&p->list);
  504 + mutex_unlock(&pdev_list_mutex);
  505 + kfree(p);
  506 + for_each_cpu(i, cpu_sibling_mask(cpu))
  507 + if (i != cpu && !coretemp_device_add(i))
  508 + break;
  509 + return;
502 510 }
503 511 mutex_unlock(&pdev_list_mutex);
504 512 }