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

Merge tag 'platform-drivers-x86-v6.5-2' of... 

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

Pull x86 platform driver fixes from Hans de Goede:
 "Misc small fixes and hw-id additions"

* tag 'platform-drivers-x86-v6.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86:
  platform/x86: touchscreen_dmi: Add info for the Archos 101 Cesium Educ tablet
  platform/x86: dell-ddv: Fix mangled list in documentation
  platform/x86: dell-ddv: Improve error handling
  platform/x86/amd: pmf: Add new ACPI ID AMDI0103
  platform/x86/amd: pmc: Add new ACPI ID AMDI000A
  platform/x86/amd: pmc: Apply nvme quirk to HP 15s-eq2xxx
  platform/x86: Move s2idle quirk from thinkpad-acpi to amd-pmc
  platform/x86: int3472/discrete: set variable skl_int3472_regulator_second_sensor storage-class-specifier to static
  platform/x86/intel/tpmi: Prevent overflow for cap_offset
  platform/x86: wmi: Replace open coded guid_parse_and_compare()
  platform/x86: wmi: Break possible infinite loop when parsing GUID
parents 9a3236ce 6b293a8c

Documentation/wmi/devices/dell-wmi-ddv.rst

+2 −1
Original line number Diff line number Diff line
@@ -187,7 +187,8 @@ WMI method BatteryeRawAnalytics() 


Returns a buffer usually containg 12 blocks of analytics data.

Those blocks contain:

- block number starting with 0 (u8)



- a block number starting with 0 (u8)

- 31 bytes of unknown data



.. note::

drivers/platform/x86/amd/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
# AMD x86 Platform-Specific Drivers

#



amd-pmc-y			:= pmc.o

amd-pmc-y			:= pmc.o pmc-quirks.o

obj-$(CONFIG_AMD_PMC)		+= amd-pmc.o

amd_hsmp-y			:= hsmp.o

obj-$(CONFIG_AMD_HSMP)		+= amd_hsmp.o

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

0 → 100644
+176 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later

/*

 * AMD SoC Power Management Controller Driver Quirks

 *

 * Copyright (c) 2023, Advanced Micro Devices, Inc.

 * All Rights Reserved.

 *

 * Author: Mario Limonciello <mario.limonciello@amd.com>

 */



#include <linux/dmi.h>

#include <linux/io.h>

#include <linux/ioport.h>

#include <linux/slab.h>



#include "pmc.h"



struct quirk_entry {

	u32 s2idle_bug_mmio;

};



static struct quirk_entry quirk_s2idle_bug = {

	.s2idle_bug_mmio = 0xfed80380,

};



static const struct dmi_system_id fwbug_list[] = {

	{

		.ident = "L14 Gen2 AMD",

		.driver_data = &quirk_s2idle_bug,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "20X5"),

		}

	},

	{

		.ident = "T14s Gen2 AMD",

		.driver_data = &quirk_s2idle_bug,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "20XF"),

		}

	},

	{

		.ident = "X13 Gen2 AMD",

		.driver_data = &quirk_s2idle_bug,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "20XH"),

		}

	},

	{

		.ident = "T14 Gen2 AMD",

		.driver_data = &quirk_s2idle_bug,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "20XK"),

		}

	},

	{

		.ident = "T14 Gen1 AMD",

		.driver_data = &quirk_s2idle_bug,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "20UD"),

		}

	},

	{

		.ident = "T14 Gen1 AMD",

		.driver_data = &quirk_s2idle_bug,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "20UE"),

		}

	},

	{

		.ident = "T14s Gen1 AMD",

		.driver_data = &quirk_s2idle_bug,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "20UH"),

		}

	},

	{

		.ident = "T14s Gen1 AMD",

		.driver_data = &quirk_s2idle_bug,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "20UJ"),

		}

	},

	{

		.ident = "P14s Gen1 AMD",

		.driver_data = &quirk_s2idle_bug,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "20Y1"),

		}

	},

	{

		.ident = "P14s Gen2 AMD",

		.driver_data = &quirk_s2idle_bug,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "21A0"),

		}

	},

	{

		.ident = "P14s Gen2 AMD",

		.driver_data = &quirk_s2idle_bug,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "21A1"),

		}

	},

	/* https://gitlab.freedesktop.org/drm/amd/-/issues/2684 */

	{

		.ident = "HP Laptop 15s-eq2xxx",

		.driver_data = &quirk_s2idle_bug,

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "HP"),

			DMI_MATCH(DMI_PRODUCT_NAME, "HP Laptop 15s-eq2xxx"),

		}

	},

	{}

};



/*

 * Laptops that run a SMI handler during the D3->D0 transition that occurs

 * specifically when exiting suspend to idle which can cause

 * large delays during resume when the IOMMU translation layer is enabled (the default

 * behavior) for NVME devices:

 *

 * To avoid this firmware problem, skip the SMI handler on these machines before the

 * D0 transition occurs.

 */

static void amd_pmc_skip_nvme_smi_handler(u32 s2idle_bug_mmio)

{

	struct resource *res;

	void __iomem *addr;

	u8 val;



	res = request_mem_region_muxed(s2idle_bug_mmio, 1, "amd_pmc_pm80");

	if (!res)

		return;



	addr = ioremap(s2idle_bug_mmio, 1);

	if (!addr)

		goto cleanup_resource;



	val = ioread8(addr);

	iowrite8(val & ~BIT(0), addr);



	iounmap(addr);

cleanup_resource:

	release_resource(res);

	kfree(res);

}



void amd_pmc_process_restore_quirks(struct amd_pmc_dev *dev)

{

	if (dev->quirks && dev->quirks->s2idle_bug_mmio)

		amd_pmc_skip_nvme_smi_handler(dev->quirks->s2idle_bug_mmio);

}



void amd_pmc_quirks_init(struct amd_pmc_dev *dev)

{

	const struct dmi_system_id *dmi_id;



	dmi_id = dmi_first_match(fwbug_list);

	if (!dmi_id)

		return;

	dev->quirks = dmi_id->driver_data;

	if (dev->quirks->s2idle_bug_mmio)

		pr_info("Using s2idle quirk to avoid %s platform firmware bug\n",

			dmi_id->ident);

}

drivers/platform/x86/amd/pmc.c

+9 −23
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ 
#include <linux/seq_file.h>

#include <linux/uaccess.h>



#include "pmc.h"



/* SMU communication registers */

#define AMD_PMC_REGISTER_MESSAGE	0x538

#define AMD_PMC_REGISTER_RESPONSE	0x980
@@ -94,6 +96,7 @@ 
#define AMD_CPU_ID_CB			0x14D8

#define AMD_CPU_ID_PS			0x14E8

#define AMD_CPU_ID_SP			0x14A4

#define PCI_DEVICE_ID_AMD_1AH_M20H_ROOT 0x1507



#define PMC_MSG_DELAY_MIN_US		50

#define RESPONSE_REGISTER_LOOP_MAX	20000
@@ -146,29 +149,6 @@ static const struct amd_pmc_bit_map soc15_ip_blk[] = { 
	{}

};



struct amd_pmc_dev {

	void __iomem *regbase;

	void __iomem *smu_virt_addr;

	void __iomem *stb_virt_addr;

	void __iomem *fch_virt_addr;

	bool msg_port;

	u32 base_addr;

	u32 cpu_id;

	u32 active_ips;

	u32 dram_size;

	u32 num_ips;

	u32 s2d_msg_id;

/* SMU version information */

	u8 smu_program;

	u8 major;

	u8 minor;

	u8 rev;

	struct device *dev;

	struct pci_dev *rdev;

	struct mutex lock; /* generic mutex lock */

	struct dentry *dbgfs_dir;

};



static bool enable_stb;

module_param(enable_stb, bool, 0644);

MODULE_PARM_DESC(enable_stb, "Enable the STB debug mechanism");
@@ -891,6 +871,8 @@ static void amd_pmc_s2idle_restore(void) 


	/* Notify on failed entry */

	amd_pmc_validate_deepest(pdev);



	amd_pmc_process_restore_quirks(pdev);

}



static struct acpi_s2idle_dev_ops amd_pmc_s2idle_dev_ops = {
@@ -926,6 +908,7 @@ static const struct pci_device_id pmc_pci_ids[] = { 
	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, AMD_CPU_ID_PCO) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, AMD_CPU_ID_RV) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, AMD_CPU_ID_SP) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M20H_ROOT) },

	{ }

};
@@ -1087,6 +1070,8 @@ static int amd_pmc_probe(struct platform_device *pdev) 
		err = acpi_register_lps0_dev(&amd_pmc_s2idle_dev_ops);

		if (err)

			dev_warn(dev->dev, "failed to register LPS0 sleep handler, expect increased power consumption\n");

		if (!disable_workarounds)

			amd_pmc_quirks_init(dev);

	}



	amd_pmc_dbgfs_register(dev);
@@ -1115,6 +1100,7 @@ static const struct acpi_device_id amd_pmc_acpi_ids[] = { 
	{"AMDI0007", 0},

	{"AMDI0008", 0},

	{"AMDI0009", 0},

	{"AMDI000A", 0},

	{"AMD0004", 0},

	{"AMD0005", 0},

	{ }

drivers/platform/x86/amd/pmc.h

0 → 100644
+44 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-or-later */

/*

 * AMD SoC Power Management Controller Driver

 *

 * Copyright (c) 2023, Advanced Micro Devices, Inc.

 * All Rights Reserved.

 *

 * Author: Mario Limonciello <mario.limonciello@amd.com>

 */



#ifndef PMC_H

#define PMC_H



#include <linux/types.h>

#include <linux/mutex.h>



struct amd_pmc_dev {

	void __iomem *regbase;

	void __iomem *smu_virt_addr;

	void __iomem *stb_virt_addr;

	void __iomem *fch_virt_addr;

	bool msg_port;

	u32 base_addr;

	u32 cpu_id;

	u32 active_ips;

	u32 dram_size;

	u32 num_ips;

	u32 s2d_msg_id;

/* SMU version information */

	u8 smu_program;

	u8 major;

	u8 minor;

	u8 rev;

	struct device *dev;

	struct pci_dev *rdev;

	struct mutex lock; /* generic mutex lock */

	struct dentry *dbgfs_dir;

	struct quirk_entry *quirks;

};



void amd_pmc_process_restore_quirks(struct amd_pmc_dev *dev);

void amd_pmc_quirks_init(struct amd_pmc_dev *dev);



#endif /* PMC_H */