mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-07-16 14:30:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'platform-drivers-x86-v7.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86

Browse Source 
Pull x86 platform driver fixes from Ilpo Järvinen:

 - amd/pmc:
    - Use correct IP block table for AMD 1Ah M80H SoC
    - Avoid logging "(null)" for missing DMI values

 - asus-armoury: update power limits for G614PR

 - bitland-mifs-wmi: Fix NULL pointer dereference during suspend/resume

* tag 'platform-drivers-x86-v7.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86:
  platform/x86: amd-pmc: Use correct IP block table for AMD 1Ah M80H SoC
  platform/x86: asus-armoury: update power limits for G614PR
  platform/x86: bitland-mifs-wmi: Fix NULL pointer dereference during suspend/resume
  platform/x86/amd/pmc: Avoid logging "(null)" for DMI values
This commit is contained in:
Linus Torvalds
2026-07-10 09:51:45 -07:00
parent f827c27e57 2726b5758f
commit 1f0fe3220f
3 changed files with 42 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/platform/x86/amd/pmc/pmc.c
View File

@@ -33,6 +33,28 @@
#include "pmc.h"
static const struct amd_pmc_bit_map soc15_ip_blk_v3[] = {
{"VDDCR", BIT(0)},
{"VDDCR_LP", BIT(1)},
{"LSOCV", BIT(2)},
{"DISPLAY", BIT(3)},
{"VCN", BIT(4)},
{"JPEG", BIT(5)},
{"UMSCH", BIT(6)},
{"VPE", BIT(7)},
{"MPM", BIT(8)},
{"NPU", BIT(9)},
{"USB_HC0", BIT(10)},
{"eUSB_HC0", BIT(11)},
{"RT0_ADP_HC1", BIT(12)},
{"RT1_ADP_HC1", BIT(13)},
{"RT2_ADP_HC2", BIT(14)},
{"USB4_RT0", BIT(15)},
{"USB4_RT1", BIT(16)},
{"USB4-RT2", BIT(17)},
{"LAPIC", BIT(18)},
};
static const struct amd_pmc_bit_map soc15_ip_blk_v2[] = {
{"DISPLAY", BIT(0)},
{"CPU", BIT(1)},
@@ -159,9 +181,9 @@ static const struct amd_pmc_cpu_info amd_1ah_m80_cpu_info = {
.smu_msg = AMD_PMC_REGISTER_MSG_1AH_80H,
.smu_arg = AMD_PMC_REGISTER_ARG_1AH_80H,
.smu_rsp = AMD_PMC_REGISTER_RSP_1AH_80H,
.num_ips = ARRAY_SIZE(soc15_ip_blk),
.num_ips = ARRAY_SIZE(soc15_ip_blk_v3),
.scratch_reg = AMD_PMC_SCRATCH_REG_1AH,
.ips_ptr = soc15_ip_blk,
.ips_ptr = soc15_ip_blk_v3,
.os_hint = MSG_OS_HINT_RN,
};
@@ -735,11 +757,11 @@ static bool amd_pmc_want_suspend_delay(struct amd_pmc_dev *pdev)
} else if (delay_suspend == 1) {
if (!intermediate_wakeup)
dev_info(pdev->dev, "Delaying suspend by 2.5s because delay_suspend=1. If this solves problems on your machine, please report this whole line to: platform-driver-x86@vger.kernel.org so it can be automatically detected as affected in the future. System Vendor: \"%s\" Product Name: \"%s\" Product Family: \"%s\" Board Vendor: \"%s\" Board Name: \"%s\"\n",
dmi_get_system_info(DMI_SYS_VENDOR),
dmi_get_system_info(DMI_PRODUCT_NAME),
dmi_get_system_info(DMI_PRODUCT_FAMILY),
dmi_get_system_info(DMI_BOARD_VENDOR),
dmi_get_system_info(DMI_BOARD_NAME));
dmi_get_system_info(DMI_SYS_VENDOR) ?: "(Unknown)",
dmi_get_system_info(DMI_PRODUCT_NAME) ?: "(Unknown)",
dmi_get_system_info(DMI_PRODUCT_FAMILY) ?: "(Unknown)",
dmi_get_system_info(DMI_BOARD_VENDOR) ?: "(Unknown)",
dmi_get_system_info(DMI_BOARD_NAME) ?: "(Unknown)");
return true;
}
return false;

10
drivers/platform/x86/asus-armoury.h
View File

@@ -1997,13 +1997,13 @@ static const struct dmi_system_id power_limits[] = {
.driver_data = &(struct power_data) {
.ac_data = &(struct power_limits) {
.ppt_pl1_spl_min = 30,
.ppt_pl1_spl_max = 90,
.ppt_pl1_spl_max = 120,
.ppt_pl2_sppt_min = 65,
.ppt_pl2_sppt_def = 110,
.ppt_pl2_sppt_max = 125,
.ppt_pl2_sppt_def = 140,
.ppt_pl2_sppt_max = 145,
.ppt_pl3_fppt_min = 65,
.ppt_pl3_fppt_def = 110,
.ppt_pl3_fppt_max = 125,
.ppt_pl3_fppt_def = 140,
.ppt_pl3_fppt_max = 145,
.nv_temp_target_min = 75,
.nv_temp_target_max = 87,
.nv_dynamic_boost_min = 5,

8
drivers/platform/x86/bitland-mifs-wmi.c
View File

@@ -300,6 +300,10 @@ static int bitland_mifs_wmi_suspend(struct device *dev)
enum platform_profile_option profile;
int ret;
/* Skip event device */
if (!data->pp_dev)
return 0;
ret = laptop_profile_get(data->pp_dev, &profile);
if (ret == 0)
data->saved_profile = profile;
@@ -311,6 +315,10 @@ static int bitland_mifs_wmi_resume(struct device *dev)
{
struct bitland_mifs_wmi_data *data = dev_get_drvdata(dev);
/* Skip event device */
if (!data->pp_dev)
return 0;
dev_dbg(dev, "Resuming, restoring profile %d\n", data->saved_profile);
return laptop_profile_set(dev, data->saved_profile);
}