Commit b226d019 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'platform-drivers-x86-v6.12-4' of... 

Merge tag 'platform-drivers-x86-v6.12-4' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86

Pull x86 platform driver fixes from Hans de Goede:

 - AMD PMF: Add new hardware id

 - AMD PMC: Fix crash when loaded with enable_stb=1 on devices without STB

 - Dell: Add Alienware hwid for Alienware systems with Dell WMI interface

 - thinkpad_acpi: Quirk to fix wrong fan speed readings on L480

 - New hotkey mappings for Dell and Lenovo laptops

* tag 'platform-drivers-x86-v6.12-4' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86:
  platform/x86: thinkpad_acpi: Fix for ThinkPad's with ECFW showing incorrect fan speed
  platform/x86: ideapad-laptop: add missing Ideapad Pro 5 fn keys
  platform/x86: dell-wmi-base: Handle META key Lock/Unlock events
  platform/x86: dell-smbios-base: Extends support to Alienware products
  platform/x86/amd/pmc: Detect when STB is not available
  platform/x86/amd/pmf: Add SMU metrics table support for 1Ah family 60h model
parents 9e23acf0 1be765b2

drivers/platform/x86/amd/pmc/pmc.c

+5 −0
Original line number Diff line number Diff line
@@ -998,6 +998,11 @@ static int amd_pmc_s2d_init(struct amd_pmc_dev *dev) 
	amd_pmc_send_cmd(dev, S2D_PHYS_ADDR_LOW, &phys_addr_low, dev->s2d_msg_id, true);

	amd_pmc_send_cmd(dev, S2D_PHYS_ADDR_HIGH, &phys_addr_hi, dev->s2d_msg_id, true);



	if (!phys_addr_hi && !phys_addr_low) {

		dev_err(dev->dev, "STB is not enabled on the system; disable enable_stb or contact system vendor\n");

		return -EINVAL;

	}



	stb_phys_addr = ((u64)phys_addr_hi << 32 | phys_addr_low);



	/* Clear msg_port for other SMU operation */

drivers/platform/x86/amd/pmf/core.c

+1 −0
Original line number Diff line number Diff line
@@ -261,6 +261,7 @@ int amd_pmf_set_dram_addr(struct amd_pmf_dev *dev, bool alloc_buffer) 
			dev->mtable_size = sizeof(dev->m_table);

			break;

		case PCI_DEVICE_ID_AMD_1AH_M20H_ROOT:

		case PCI_DEVICE_ID_AMD_1AH_M60H_ROOT:

			dev->mtable_size = sizeof(dev->m_table_v2);

			break;

		default:

drivers/platform/x86/amd/pmf/spc.c

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ static void amd_pmf_get_smu_info(struct amd_pmf_dev *dev, struct ta_pmf_enact_ta 
					 ARRAY_SIZE(dev->m_table.avg_core_c0residency), in);

		break;

	case PCI_DEVICE_ID_AMD_1AH_M20H_ROOT:

	case PCI_DEVICE_ID_AMD_1AH_M60H_ROOT:

		memcpy(&dev->m_table_v2, dev->buf, dev->mtable_size);

		in->ev_info.socket_power = dev->m_table_v2.apu_power + dev->m_table_v2.dgpu_power;

		in->ev_info.skin_temperature = dev->m_table_v2.skin_temp;

drivers/platform/x86/dell/dell-smbios-base.c

+1 −0
Original line number Diff line number Diff line
@@ -576,6 +576,7 @@ static int __init dell_smbios_init(void) 
	int ret, wmi, smm;



	if (!dmi_find_device(DMI_DEV_TYPE_OEM_STRING, "Dell System", NULL) &&

	    !dmi_find_device(DMI_DEV_TYPE_OEM_STRING, "Alienware", NULL) &&

	    !dmi_find_device(DMI_DEV_TYPE_OEM_STRING, "www.dell.com", NULL)) {

		pr_err("Unable to run on non-Dell system\n");

		return -ENODEV;

drivers/platform/x86/dell/dell-wmi-base.c

+6 −0
Original line number Diff line number Diff line
@@ -80,6 +80,12 @@ static const struct dmi_system_id dell_wmi_smbios_list[] __initconst = { 
static const struct key_entry dell_wmi_keymap_type_0000[] = {

	{ KE_IGNORE, 0x003a, { KEY_CAPSLOCK } },



	/* Meta key lock */

	{ KE_IGNORE, 0xe000, { KEY_RIGHTMETA } },



	/* Meta key unlock */

	{ KE_IGNORE, 0xe001, { KEY_RIGHTMETA } },



	/* Key code is followed by brightness level */

	{ KE_KEY,    0xe005, { KEY_BRIGHTNESSDOWN } },

	{ KE_KEY,    0xe006, { KEY_BRIGHTNESSUP } },