Re: [Fwd: Commit 555c45fe0d0 ("int340X/processor_thermal_device: add support for MMIO RAPL") boot failure]

[Zhang Rui <rui.zhang@intel.com>]

On 五, 2019-07-19 at 06:03 -0700, Kenneth R. Crudup wrote:
> On Fri, 19 Jul 2019, Rafael J. Wysocki wrote:
> 
> > 
> > So can you disable PROC_THERMAL_MMIO_RAPL in Kconfig and retest?
> It can't be manually disabled, as it's auto-selected:
> 
> 	Depends on: THERMAL [=y] && (X86 [=y] || X86_INTEL_QUARK [=n]
> ||
> 	COMPILE_TEST [=n]) && INT340X_THERMAL [=y] && 64BIT [=y] &&
> POWERCAP [=y]
> 
> so I just reverted the commit to get going again,
> 
> 	-Kenny
> 
please try the patch below and confirm if it helps or not.

From: Zhang Rui <rui.zhang@intel.com>
Date: Fri, 19 Jul 2019 23:25:14 +0800
Subject: [PATCH] powercap: adjust init order

The MMIO RAPL interface driver depends on both powercap subsystem and
the intel_rapl_common code.
But when all of the are built in, the MMIO RAPL interface driver is loaded
before the later two and this breaks the system during boot.

Fix this by adjusting the init order of powercap subsystem and the
intel_rapl_common code, so that it can be loaded first.

Fixes: 555c45fe0d04 ("int340X/processor_thermal_device: add support for MMIO RAPL")
Reported-by: Kenneth R. Crudup <kenny@panix.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
---
 drivers/powercap/intel_rapl_common.c | 2 +-
 drivers/powercap/powercap_sys.c      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c
index 9fd6dd3..6df4818 100644
--- a/drivers/powercap/intel_rapl_common.c
+++ b/drivers/powercap/intel_rapl_common.c
@@ -1454,7 +1454,7 @@ static void __exit rapl_exit(void)
 	unregister_pm_notifier(&rapl_pm_notifier);
 }
 
-module_init(rapl_init);
+fs_initcall(rapl_init);
 module_exit(rapl_exit);
 
 MODULE_DESCRIPTION("Intel Runtime Average Power Limit (RAPL) common code");
diff --git a/drivers/powercap/powercap_sys.c b/drivers/powercap/powercap_sys.c
index 540e8aa..f808c5f 100644
--- a/drivers/powercap/powercap_sys.c
+++ b/drivers/powercap/powercap_sys.c
@@ -671,7 +671,7 @@ static int __init powercap_init(void)
 	return class_register(&powercap_class);
 }
 
-device_initcall(powercap_init);
+fs_initcall(powercap_init);
 
 MODULE_DESCRIPTION("PowerCap sysfs Driver");
 MODULE_AUTHOR("Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>");
-- 
2.7.4