Skip to content

Commit c23e744

Browse files
committed
Merge tag 'pm-5.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management fixes from Rafael Wysocki: "Prevent the cpufreq-dt driver from probing Tegra20/30 (Dmitry Osipenko) and prevent the Intel RAPL power capping driver from crashing during CPU initialization due to a NULL pointer dereference if the processor model in use is not known to it (Harry Pan)" * tag 'pm-5.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: powercap: intel_rapl: add NULL pointer check to rapl_mmio_cpu_online() cpufreq: dt-platdev: Blacklist NVIDIA Tegra20 and Tegra30 SoCs
2 parents bef1d88 + 10674d9 commit c23e744

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

drivers/cpufreq/cpufreq-dt-platdev.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,8 @@ static const struct of_device_id blacklist[] __initconst = {
121121
{ .compatible = "mediatek,mt8176", },
122122
{ .compatible = "mediatek,mt8183", },
123123

124+
{ .compatible = "nvidia,tegra20", },
125+
{ .compatible = "nvidia,tegra30", },
124126
{ .compatible = "nvidia,tegra124", },
125127
{ .compatible = "nvidia,tegra210", },
126128

drivers/powercap/intel_rapl_common.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1295,6 +1295,9 @@ struct rapl_package *rapl_add_package(int cpu, struct rapl_if_priv *priv)
12951295
struct cpuinfo_x86 *c = &cpu_data(cpu);
12961296
int ret;
12971297

1298+
if (!rapl_defaults)
1299+
return ERR_PTR(-ENODEV);
1300+
12981301
rp = kzalloc(sizeof(struct rapl_package), GFP_KERNEL);
12991302
if (!rp)
13001303
return ERR_PTR(-ENOMEM);

0 commit comments

Comments
 (0)