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

platform/x86/amd: pmf: Drop all quirks 



As multiple platform profile handlers can now be registered, the quirks
to avoid registering amd-pmf as a handler are no longer necessary.
Drop them.

Reviewed-by: default avatarArmin Wolf <W_Armin@gmx.de>
Tested-by: default avatarMark Pearson <mpearson-lenovo@squebb.ca>
Tested-by: default avatarMatthew Schwartz <matthew.schwartz@linux.dev>
Acked-by: default avatarShyam Sundar S K <Shyam-sundar.S-k@amd.com>
Reviewed-by: default avatarMark Pearson <mpearson-lenovo@squebb.ca>
Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Link: https://lore.kernel.org/r/20241206031918.1537-22-mario.limonciello@amd.com


Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
parent 68883474

drivers/platform/x86/amd/pmf/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -7,4 +7,4 @@ 
obj-$(CONFIG_AMD_PMF) += amd-pmf.o

amd-pmf-objs := core.o acpi.o sps.o \

		auto-mode.o cnqf.o \

		tee-if.o spc.o pmf-quirks.o
 
		tee-if.o spc.o

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

+0 −1
Original line number Diff line number Diff line
@@ -456,7 +456,6 @@ static int amd_pmf_probe(struct platform_device *pdev) 
	mutex_init(&dev->lock);

	mutex_init(&dev->update_mutex);



	amd_pmf_quirks_init(dev);

	apmf_acpi_init(dev);

	platform_set_drvdata(pdev, dev);

	amd_pmf_dbgfs_register(dev);

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

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

/*

 * AMD Platform Management Framework Driver Quirks

 *

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

 * All Rights Reserved.

 *

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

 */



#include <linux/dmi.h>



#include "pmf.h"



struct quirk_entry {

	u32 supported_func;

};



static struct quirk_entry quirk_no_sps_bug = {

	.supported_func = 0x4003,

};



static const struct dmi_system_id fwbug_list[] = {

	{

		.ident = "ROG Zephyrus G14",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),

			DMI_MATCH(DMI_PRODUCT_NAME, "GA403U"),

		},

		.driver_data = &quirk_no_sps_bug,

	},

	{

		.ident = "ROG Ally X",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),

			DMI_MATCH(DMI_PRODUCT_NAME, "RC72LA"),

		},

		.driver_data = &quirk_no_sps_bug,

	},

	{

		.ident = "ASUS TUF Gaming A14",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),

			DMI_MATCH(DMI_PRODUCT_NAME, "FA401W"),

		},

		.driver_data = &quirk_no_sps_bug,

	},

	{}

};



void amd_pmf_quirks_init(struct amd_pmf_dev *dev)

{

	const struct dmi_system_id *dmi_id;

	struct quirk_entry *quirks;



	dmi_id = dmi_first_match(fwbug_list);

	if (!dmi_id)

		return;



	quirks = dmi_id->driver_data;

	if (quirks->supported_func) {

		dev->supported_func = quirks->supported_func;

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

			dmi_id->ident);

	}

}

drivers/platform/x86/amd/pmf/pmf.h

+0 −3
Original line number Diff line number Diff line
@@ -797,7 +797,4 @@ int amd_pmf_smartpc_apply_bios_output(struct amd_pmf_dev *dev, u32 val, u32 preq 
void amd_pmf_populate_ta_inputs(struct amd_pmf_dev *dev, struct ta_pmf_enact_table *in);

void amd_pmf_dump_ta_inputs(struct amd_pmf_dev *dev, struct ta_pmf_enact_table *in);



/* Quirk infrastructure */

void amd_pmf_quirks_init(struct amd_pmf_dev *dev);



#endif /* PMF_H */