Merge tag 'pm-5.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm (c23e744b) · Commits · 戴 / test

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

drivers/cpufreq/cpufreq-dt-platdev.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -121,6 +121,8 @@ static const struct of_device_id blacklist[] __initconst = {
		{ .compatible = "mediatek,mt8176", },
		{ .compatible = "mediatek,mt8183", },

		{ .compatible = "nvidia,tegra20", },
		{ .compatible = "nvidia,tegra30", },
		{ .compatible = "nvidia,tegra124", },
		{ .compatible = "nvidia,tegra210", },

drivers/powercap/intel_rapl_common.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -1295,6 +1295,9 @@ struct rapl_package rapl_add_package(int cpu, struct rapl_if_priv priv)
		struct cpuinfo_x86 *c = &cpu_data(cpu);
		int ret;

		if (!rapl_defaults)
		return ERR_PTR(-ENODEV);

		rp = kzalloc(sizeof(struct rapl_package), GFP_KERNEL);
		if (!rp)
		return ERR_PTR(-ENOMEM);

Admin message