Commit 1968f2be authored by Shyam Sundar S K's avatar Shyam Sundar S K Committed by Hans de Goede
Browse files

platform/x86/amd/pmc: Add new acpi id for PMC controller 



New version of PMC controller will have a separate ACPI id, add that
to the support list.

Signed-off-by: default avatarShyam Sundar S K <Shyam-sundar.S-k@amd.com>
Link: https://lore.kernel.org/r/20220630050324.3780654-1-Shyam-sundar.S-k@amd.com


Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
parent 9ab762a8

drivers/platform/x86/amd-pmc.c

+7 −2
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ 
#define AMD_CPU_ID_PCO			AMD_CPU_ID_RV

#define AMD_CPU_ID_CZN			AMD_CPU_ID_RN

#define AMD_CPU_ID_YC			0x14B5

#define AMD_CPU_ID_CB			0x14D8



#define PMC_MSG_DELAY_MIN_US		50

#define RESPONSE_REGISTER_LOOP_MAX	20000
@@ -318,6 +319,7 @@ static int amd_pmc_idlemask_read(struct amd_pmc_dev *pdev, struct device *dev, 
		val = amd_pmc_reg_read(pdev, AMD_PMC_SCRATCH_REG_CZN);

		break;

	case AMD_CPU_ID_YC:

	case AMD_CPU_ID_CB:

		val = amd_pmc_reg_read(pdev, AMD_PMC_SCRATCH_REG_YC);

		break;

	default:
@@ -491,7 +493,7 @@ static void amd_pmc_dbgfs_register(struct amd_pmc_dev *dev) 
			    &amd_pmc_idlemask_fops);

	/* Enable STB only when the module_param is set */

	if (enable_stb) {

		if (dev->cpu_id == AMD_CPU_ID_YC)

		if (dev->cpu_id == AMD_CPU_ID_YC || dev->cpu_id == AMD_CPU_ID_CB)

			debugfs_create_file("stb_read", 0644, dev->dbgfs_dir, dev,

					    &amd_pmc_stb_debugfs_fops_v2);

		else
@@ -615,6 +617,7 @@ static int amd_pmc_get_os_hint(struct amd_pmc_dev *dev) 
		return MSG_OS_HINT_PCO;

	case AMD_CPU_ID_RN:

	case AMD_CPU_ID_YC:

	case AMD_CPU_ID_CB:

		return MSG_OS_HINT_RN;

	}

	return -EINVAL;
@@ -735,6 +738,7 @@ static struct acpi_s2idle_dev_ops amd_pmc_s2idle_dev_ops = { 
#endif



static const struct pci_device_id pmc_pci_ids[] = {

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, AMD_CPU_ID_CB) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, AMD_CPU_ID_YC) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, AMD_CPU_ID_CZN) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, AMD_CPU_ID_RN) },
@@ -877,7 +881,7 @@ static int amd_pmc_probe(struct platform_device *pdev) 


	mutex_init(&dev->lock);



	if (enable_stb && dev->cpu_id == AMD_CPU_ID_YC) {

	if (enable_stb && (dev->cpu_id == AMD_CPU_ID_YC || dev->cpu_id == AMD_CPU_ID_CB)) {

		err = amd_pmc_s2d_init(dev);

		if (err)

			return err;
@@ -915,6 +919,7 @@ static const struct acpi_device_id amd_pmc_acpi_ids[] = { 
	{"AMDI0005", 0},

	{"AMDI0006", 0},

	{"AMDI0007", 0},

	{"AMDI0008", 0},

	{"AMD0004", 0},

	{"AMD0005", 0},

	{ }