Unverified Commit b614a4bd authored by Mario Limonciello's avatar Mario Limonciello Committed by Ilpo Järvinen
Browse files

platform/x86/amd/pmc: Move keyboard wakeup disablement detection to pmc-quirks 



Other platforms may need to disable keyboard wakeup besides Cezanne,
so move the detection into amd_pmc_quirks_init() where it may be applied
to multiple platforms.

Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Link: https://lore.kernel.org/r/20231212045006.97581-4-mario.limonciello@amd.com


Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
parent 2d53c0ab

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

+3 −0
Original line number Diff line number Diff line
@@ -235,6 +235,9 @@ void amd_pmc_quirks_init(struct amd_pmc_dev *dev) 
{

	const struct dmi_system_id *dmi_id;



	if (dev->cpu_id == AMD_CPU_ID_CZN)

		dev->disable_8042_wakeup = true;



	dmi_id = dmi_first_match(fwbug_list);

	if (!dmi_id)

		return;

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

+1 −1
Original line number Diff line number Diff line
@@ -930,7 +930,7 @@ static int amd_pmc_suspend_handler(struct device *dev) 
{

	struct amd_pmc_dev *pdev = dev_get_drvdata(dev);



	if (pdev->cpu_id == AMD_CPU_ID_CZN && !disable_workarounds) {

	if (pdev->disable_8042_wakeup && !disable_workarounds) {

		int rc = amd_pmc_wa_irq1(pdev);



		if (rc) {

drivers/platform/x86/amd/pmc/pmc.h

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ struct amd_pmc_dev { 
	struct mutex lock; /* generic mutex lock */

	struct dentry *dbgfs_dir;

	struct quirk_entry *quirks;

	bool disable_8042_wakeup;

};



void amd_pmc_process_restore_quirks(struct amd_pmc_dev *dev);