Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 12:42:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Power management fixes for 5.5-rc6

Browse Source 
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).
 -----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCAAwFiEE4fcc61cGeeHD/fCwgsRv/nhiVHEFAl4YTSYSHHJqd0Byand5
 c29ja2kubmV0AAoJEILEb/54YlRxq24P/jp+USaA5yvzfKxg1WSdJZ3rdmferh/9
 VHHm8Utz7UHAOouDEWdsNQ2zKYkCm9sPBQT/xedqHpuAeaQfSS55xK6DJrKiwImQ
 CITuiiTGGQDtNz+wJY943CsRxM2Q79KUhZqHKOJIqvlmI6tm3knLvEA0ZdCc+kDv
 +nyS0saIq8LAJ+/eEH77fGrgzjWwf2VlO3UIX1mZqPIF4Mpf/JjSCtrRYypDn7VK
 qcuMLL23YlLjVciY6n/THhgbK/Rf9EhZTg/0h63pRCnJCYLFxgKYgHZTUdSkRYUO
 mdQmXft08hSiXk91sRxSBzDGVd8FyzO5KvIhjgoNLew6DTxMSLLCAlzA3d4FFNB/
 LP1O8An+jx6GUgEjA6zm4uYClArGHC794GvLtWUQCtWme/PPhJXLNBd31fT63jDz
 nr2SBnXSM22Usb5fZYRbEKvIxG1bRDorw5NO7hrxHZoyT8Ha7Dar4kPA21roF+NG
 dFw3pl3uDMkcB17GmjwY1qcYirF2aF7tKgha46kWYUZ5vCcwJQLs7lmuOTNmawRv
 E9s+3bCNNzh03G9sUayFfS8Fqhs10Qob2lXCTbnCIeN0eynXdfaSqEFiQ1PsCgPk
 mexEQDZDnSwvYz4be28nXVrqU3CAUt6/3ICa/kDa8mMDmKA0ctOVpat2svI0GKjq
 D/aD1hvL3dha
 =ukHp
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2020-01-10 11:46:59 -08:00
commit c23e744b59
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/cpufreq/cpufreq-dt-platdev.c
View File

@ -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", },

3
drivers/powercap/intel_rapl_common.c
View File

@ -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);