Skip to content

Commit 1306074

Browse files
Kuppuswamy Sathyanarayananrafaeljw
authored andcommitted
powercap: intel_rapl: Add a symbol namespace for intel_rapl exports
Cleanup of the intel_rapl common driver requires introducing additional exported helper and lifecycle functions. Before adding new exports, create a dedicated symbol namespace for intel_rapl and update the relevant interface drivers to explicitly import it. This makes the intended usage of these symbols explicit, avoids polluting the global namespace, and prepares the codebase for the ongoing RAPL refactoring. No functional changes are intended. Signed-off-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com> Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> Link: https://patch.msgid.link/20260212233044.329790-2-sathyanarayanan.kuppuswamy@linux.intel.com Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent 11439c4 commit 1306074

4 files changed

Lines changed: 13 additions & 10 deletions

File tree

drivers/powercap/intel_rapl_common.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2083,15 +2083,15 @@ int rapl_package_add_pmu_locked(struct rapl_package *rp)
20832083

20842084
return rapl_pmu_update(rp);
20852085
}
2086-
EXPORT_SYMBOL_GPL(rapl_package_add_pmu_locked);
2086+
EXPORT_SYMBOL_NS_GPL(rapl_package_add_pmu_locked, "INTEL_RAPL");
20872087

20882088
int rapl_package_add_pmu(struct rapl_package *rp)
20892089
{
20902090
guard(cpus_read_lock)();
20912091

20922092
return rapl_package_add_pmu_locked(rp);
20932093
}
2094-
EXPORT_SYMBOL_GPL(rapl_package_add_pmu);
2094+
EXPORT_SYMBOL_NS_GPL(rapl_package_add_pmu, "INTEL_RAPL");
20952095

20962096
void rapl_package_remove_pmu_locked(struct rapl_package *rp)
20972097
{
@@ -2109,15 +2109,15 @@ void rapl_package_remove_pmu_locked(struct rapl_package *rp)
21092109
perf_pmu_unregister(&rapl_pmu.pmu);
21102110
memset(&rapl_pmu, 0, sizeof(struct rapl_pmu));
21112111
}
2112-
EXPORT_SYMBOL_GPL(rapl_package_remove_pmu_locked);
2112+
EXPORT_SYMBOL_NS_GPL(rapl_package_remove_pmu_locked, "INTEL_RAPL");
21132113

21142114
void rapl_package_remove_pmu(struct rapl_package *rp)
21152115
{
21162116
guard(cpus_read_lock)();
21172117

21182118
rapl_package_remove_pmu_locked(rp);
21192119
}
2120-
EXPORT_SYMBOL_GPL(rapl_package_remove_pmu);
2120+
EXPORT_SYMBOL_NS_GPL(rapl_package_remove_pmu, "INTEL_RAPL");
21212121
#endif
21222122

21232123
/* called from CPU hotplug notifier, hotplug lock held */
@@ -2150,14 +2150,14 @@ void rapl_remove_package_cpuslocked(struct rapl_package *rp)
21502150
list_del(&rp->plist);
21512151
kfree(rp);
21522152
}
2153-
EXPORT_SYMBOL_GPL(rapl_remove_package_cpuslocked);
2153+
EXPORT_SYMBOL_NS_GPL(rapl_remove_package_cpuslocked, "INTEL_RAPL");
21542154

21552155
void rapl_remove_package(struct rapl_package *rp)
21562156
{
21572157
guard(cpus_read_lock)();
21582158
rapl_remove_package_cpuslocked(rp);
21592159
}
2160-
EXPORT_SYMBOL_GPL(rapl_remove_package);
2160+
EXPORT_SYMBOL_NS_GPL(rapl_remove_package, "INTEL_RAPL");
21612161

21622162
/*
21632163
* RAPL Package energy counter scope:
@@ -2200,14 +2200,14 @@ struct rapl_package *rapl_find_package_domain_cpuslocked(int id, struct rapl_if_
22002200

22012201
return NULL;
22022202
}
2203-
EXPORT_SYMBOL_GPL(rapl_find_package_domain_cpuslocked);
2203+
EXPORT_SYMBOL_NS_GPL(rapl_find_package_domain_cpuslocked, "INTEL_RAPL");
22042204

22052205
struct rapl_package *rapl_find_package_domain(int id, struct rapl_if_priv *priv, bool id_is_cpu)
22062206
{
22072207
guard(cpus_read_lock)();
22082208
return rapl_find_package_domain_cpuslocked(id, priv, id_is_cpu);
22092209
}
2210-
EXPORT_SYMBOL_GPL(rapl_find_package_domain);
2210+
EXPORT_SYMBOL_NS_GPL(rapl_find_package_domain, "INTEL_RAPL");
22112211

22122212
/* called from CPU hotplug notifier, hotplug lock held */
22132213
struct rapl_package *rapl_add_package_cpuslocked(int id, struct rapl_if_priv *priv, bool id_is_cpu)
@@ -2261,14 +2261,14 @@ struct rapl_package *rapl_add_package_cpuslocked(int id, struct rapl_if_priv *pr
22612261
kfree(rp);
22622262
return ERR_PTR(ret);
22632263
}
2264-
EXPORT_SYMBOL_GPL(rapl_add_package_cpuslocked);
2264+
EXPORT_SYMBOL_NS_GPL(rapl_add_package_cpuslocked, "INTEL_RAPL");
22652265

22662266
struct rapl_package *rapl_add_package(int id, struct rapl_if_priv *priv, bool id_is_cpu)
22672267
{
22682268
guard(cpus_read_lock)();
22692269
return rapl_add_package_cpuslocked(id, priv, id_is_cpu);
22702270
}
2271-
EXPORT_SYMBOL_GPL(rapl_add_package);
2271+
EXPORT_SYMBOL_NS_GPL(rapl_add_package, "INTEL_RAPL");
22722272

22732273
static void power_limit_state_save(void)
22742274
{

drivers/powercap/intel_rapl_msr.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,3 +263,4 @@ module_platform_driver(intel_rapl_msr_driver);
263263
MODULE_DESCRIPTION("Driver for Intel RAPL (Running Average Power Limit) control via MSR interface");
264264
MODULE_AUTHOR("Zhang Rui <rui.zhang@intel.com>");
265265
MODULE_LICENSE("GPL v2");
266+
MODULE_IMPORT_NS("INTEL_RAPL");

drivers/powercap/intel_rapl_tpmi.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,7 @@ static struct auxiliary_driver intel_rapl_tpmi_driver = {
348348

349349
module_auxiliary_driver(intel_rapl_tpmi_driver)
350350

351+
MODULE_IMPORT_NS("INTEL_RAPL");
351352
MODULE_IMPORT_NS("INTEL_TPMI");
352353

353354
MODULE_DESCRIPTION("Intel RAPL TPMI Driver");

drivers/thermal/intel/int340x_thermal/processor_thermal_rapl.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,4 +111,5 @@ void proc_thermal_rapl_remove(void)
111111
EXPORT_SYMBOL_GPL(proc_thermal_rapl_remove);
112112

113113
MODULE_LICENSE("GPL v2");
114+
MODULE_IMPORT_NS("INTEL_RAPL");
114115
MODULE_DESCRIPTION("RAPL interface using MMIO");

0 commit comments

Comments
 (0)