* [PATCH v4 01/11] platform/x86/amd/pmf: Add support for PMF core layer
2022-08-02 15:11 [PATCH v4 00/11] platform/x86/amd/pmf: Introduce AMD PMF Driver Shyam Sundar S K
@ 2022-08-02 15:11 ` Shyam Sundar S K
2022-08-05 10:20 ` Hans de Goede
2022-08-02 15:11 ` [PATCH v4 02/11] platform/x86/amd/pmf: Add support for PMF APCI layer Shyam Sundar S K
` (10 subsequent siblings)
11 siblings, 1 reply; 22+ messages in thread
From: Shyam Sundar S K @ 2022-08-02 15:11 UTC (permalink / raw)
To: hdegoede, markgross; +Cc: platform-driver-x86, Patil.Reddy, Shyam Sundar S K
PMF core layer is meant to abstract the common functionalities
across PMF features. This layer also does the plumbing work
like setting up the mailbox channel for the communication
between the PMF driver and the PMFW (Power Management Firmware)
running on the SMU.
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
---
drivers/platform/x86/amd/Kconfig | 2 +
drivers/platform/x86/amd/Makefile | 1 +
drivers/platform/x86/amd/pmf/Kconfig | 15 ++
drivers/platform/x86/amd/pmf/Makefile | 8 +
drivers/platform/x86/amd/pmf/core.c | 235 ++++++++++++++++++++++++++
drivers/platform/x86/amd/pmf/pmf.h | 46 +++++
6 files changed, 307 insertions(+)
create mode 100644 drivers/platform/x86/amd/pmf/Kconfig
create mode 100644 drivers/platform/x86/amd/pmf/Makefile
create mode 100644 drivers/platform/x86/amd/pmf/core.c
create mode 100644 drivers/platform/x86/amd/pmf/pmf.h
diff --git a/drivers/platform/x86/amd/Kconfig b/drivers/platform/x86/amd/Kconfig
index c0d0a3c5170c..a825af8126c8 100644
--- a/drivers/platform/x86/amd/Kconfig
+++ b/drivers/platform/x86/amd/Kconfig
@@ -3,6 +3,8 @@
# AMD x86 Platform Specific Drivers
#
+source "drivers/platform/x86/amd/pmf/Kconfig"
+
config AMD_PMC
tristate "AMD SoC PMC driver"
depends on ACPI && PCI && RTC_CLASS
diff --git a/drivers/platform/x86/amd/Makefile b/drivers/platform/x86/amd/Makefile
index a03fbb08e808..2c229198e24c 100644
--- a/drivers/platform/x86/amd/Makefile
+++ b/drivers/platform/x86/amd/Makefile
@@ -8,3 +8,4 @@ amd-pmc-y := pmc.o
obj-$(CONFIG_AMD_PMC) += amd-pmc.o
amd_hsmp-y := hsmp.o
obj-$(CONFIG_AMD_HSMP) += amd_hsmp.o
+obj-$(CONFIG_AMD_PMF) += pmf/
diff --git a/drivers/platform/x86/amd/pmf/Kconfig b/drivers/platform/x86/amd/pmf/Kconfig
new file mode 100644
index 000000000000..ef771bbe1198
--- /dev/null
+++ b/drivers/platform/x86/amd/pmf/Kconfig
@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# AMD PMF Driver
+#
+
+config AMD_PMF
+ tristate "AMD Platform Management Framework"
+ depends on ACPI
+ help
+ This driver provides support for the AMD Platform Management Framework.
+ The goal is to enhance end user experience by making AMD PCs smarter,
+ quiter, power efficient by adapting to user behavior and environment.
+
+ To compile this driver as a module, choose M here: the module will
+ be called amd_pmf.
diff --git a/drivers/platform/x86/amd/pmf/Makefile b/drivers/platform/x86/amd/pmf/Makefile
new file mode 100644
index 000000000000..459005f659e5
--- /dev/null
+++ b/drivers/platform/x86/amd/pmf/Makefile
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: GPL-2.0
+#
+# Makefile for linux/drivers/platform/x86/amd/pmf
+# AMD Platform Management Framework
+#
+
+obj-$(CONFIG_AMD_PMF) += amd-pmf.o
+amd-pmf-objs := core.o
diff --git a/drivers/platform/x86/amd/pmf/core.c b/drivers/platform/x86/amd/pmf/core.c
new file mode 100644
index 000000000000..aef97965c181
--- /dev/null
+++ b/drivers/platform/x86/amd/pmf/core.c
@@ -0,0 +1,235 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * AMD Platform Management Framework Driver
+ *
+ * Copyright (c) 2022, Advanced Micro Devices, Inc.
+ * All Rights Reserved.
+ *
+ * Author: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
+ */
+
+#include <linux/iopoll.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/platform_device.h>
+#include "pmf.h"
+
+/* PMF-SMU communication registers */
+#define AMD_PMF_REGISTER_MESSAGE 0xA18
+#define AMD_PMF_REGISTER_RESPONSE 0xA78
+#define AMD_PMF_REGISTER_ARGUMENT 0xA58
+
+/* Base address of SMU for mapping physical address to virtual address */
+#define AMD_PMF_SMU_INDEX_ADDRESS 0xB8
+#define AMD_PMF_SMU_INDEX_DATA 0xBC
+#define AMD_PMF_MAPPING_SIZE 0x01000
+#define AMD_PMF_BASE_ADDR_OFFSET 0x10000
+#define AMD_PMF_BASE_ADDR_LO 0x13B102E8
+#define AMD_PMF_BASE_ADDR_HI 0x13B102EC
+#define AMD_PMF_BASE_ADDR_LO_MASK GENMASK(15, 0)
+#define AMD_PMF_BASE_ADDR_HI_MASK GENMASK(31, 20)
+
+/* SMU Response Codes */
+#define AMD_PMF_RESULT_OK 0x01
+#define AMD_PMF_RESULT_CMD_REJECT_BUSY 0xFC
+#define AMD_PMF_RESULT_CMD_REJECT_PREREQ 0xFD
+#define AMD_PMF_RESULT_CMD_UNKNOWN 0xFE
+#define AMD_PMF_RESULT_FAILED 0xFF
+
+/* List of supported CPU ids */
+#define AMD_CPU_ID_PS 0x14e8
+
+#define PMF_MSG_DELAY_MIN_US 50
+#define RESPONSE_REGISTER_LOOP_MAX 20000
+
+#define DELAY_MIN_US 2000
+#define DELAY_MAX_US 3000
+
+static inline u32 amd_pmf_reg_read(struct amd_pmf_dev *dev, int reg_offset)
+{
+ return ioread32(dev->regbase + reg_offset);
+}
+
+static inline void amd_pmf_reg_write(struct amd_pmf_dev *dev, int reg_offset, u32 val)
+{
+ iowrite32(val, dev->regbase + reg_offset);
+}
+
+static void __maybe_unused amd_pmf_dump_registers(struct amd_pmf_dev *dev)
+{
+ u32 value;
+
+ value = amd_pmf_reg_read(dev, AMD_PMF_REGISTER_RESPONSE);
+ dev_dbg(dev->dev, "AMD_PMF_REGISTER_RESPONSE:%x\n", value);
+
+ value = amd_pmf_reg_read(dev, AMD_PMF_REGISTER_ARGUMENT);
+ dev_dbg(dev->dev, "AMD_PMF_REGISTER_ARGUMENT:%d\n", value);
+
+ value = amd_pmf_reg_read(dev, AMD_PMF_REGISTER_MESSAGE);
+ dev_dbg(dev->dev, "AMD_PMF_REGISTER_MESSAGE:%x\n", value);
+}
+
+int amd_pmf_send_cmd(struct amd_pmf_dev *dev, u8 message, bool get, u32 arg, u32 *data)
+{
+ int rc;
+ u32 val;
+
+ mutex_lock(&dev->lock);
+
+ /* Wait until we get a valid response */
+ rc = readx_poll_timeout(ioread32, dev->regbase + AMD_PMF_REGISTER_RESPONSE,
+ val, val != 0, PMF_MSG_DELAY_MIN_US,
+ PMF_MSG_DELAY_MIN_US * RESPONSE_REGISTER_LOOP_MAX);
+ if (rc) {
+ dev_err(dev->dev, "failed to talk to SMU\n");
+ goto out_unlock;
+ }
+
+ /* Write zero to response register */
+ amd_pmf_reg_write(dev, AMD_PMF_REGISTER_RESPONSE, 0);
+
+ /* Write argument into argument register */
+ amd_pmf_reg_write(dev, AMD_PMF_REGISTER_ARGUMENT, arg);
+
+ /* Write message ID to message ID register */
+ amd_pmf_reg_write(dev, AMD_PMF_REGISTER_MESSAGE, message);
+
+ /* Wait until we get a valid response */
+ rc = readx_poll_timeout(ioread32, dev->regbase + AMD_PMF_REGISTER_RESPONSE,
+ val, val != 0, PMF_MSG_DELAY_MIN_US,
+ PMF_MSG_DELAY_MIN_US * RESPONSE_REGISTER_LOOP_MAX);
+ if (rc) {
+ dev_err(dev->dev, "SMU response timed out\n");
+ goto out_unlock;
+ }
+
+ switch (val) {
+ case AMD_PMF_RESULT_OK:
+ if (get) {
+ /* PMFW may take longer time to return back the data */
+ usleep_range(DELAY_MIN_US, 10 * DELAY_MAX_US);
+ *data = amd_pmf_reg_read(dev, AMD_PMF_REGISTER_ARGUMENT);
+ }
+ break;
+ case AMD_PMF_RESULT_CMD_REJECT_BUSY:
+ dev_err(dev->dev, "SMU not ready. err: 0x%x\n", val);
+ rc = -EBUSY;
+ goto out_unlock;
+ case AMD_PMF_RESULT_CMD_UNKNOWN:
+ dev_err(dev->dev, "SMU cmd unknown. err: 0x%x\n", val);
+ rc = -EINVAL;
+ goto out_unlock;
+ case AMD_PMF_RESULT_CMD_REJECT_PREREQ:
+ case AMD_PMF_RESULT_FAILED:
+ default:
+ dev_err(dev->dev, "SMU cmd failed. err: 0x%x\n", val);
+ rc = -EIO;
+ goto out_unlock;
+ }
+
+out_unlock:
+ mutex_unlock(&dev->lock);
+ amd_pmf_dump_registers(dev);
+ return rc;
+}
+
+static const struct pci_device_id pmf_pci_ids[] = {
+ { PCI_DEVICE(PCI_VENDOR_ID_AMD, AMD_CPU_ID_PS) },
+ { }
+};
+
+static const struct acpi_device_id amd_pmf_acpi_ids[] = {
+ {"AMDI0102", 0},
+ { }
+};
+MODULE_DEVICE_TABLE(acpi, amd_pmf_acpi_ids);
+
+static int amd_pmf_probe(struct platform_device *pdev)
+{
+ struct amd_pmf_dev *dev;
+ struct pci_dev *rdev;
+ u32 base_addr_lo;
+ u32 base_addr_hi;
+ u64 base_addr;
+ u32 val;
+ int err;
+
+ dev = devm_kzalloc(&pdev->dev, sizeof(*dev), GFP_KERNEL);
+ if (!dev)
+ return -ENOMEM;
+
+ dev->dev = &pdev->dev;
+
+ rdev = pci_get_domain_bus_and_slot(0, 0, PCI_DEVFN(0, 0));
+ if (!rdev || !pci_match_id(pmf_pci_ids, rdev)) {
+ pci_dev_put(rdev);
+ return -ENODEV;
+ }
+
+ dev->cpu_id = rdev->device;
+ err = pci_write_config_dword(rdev, AMD_PMF_SMU_INDEX_ADDRESS, AMD_PMF_BASE_ADDR_LO);
+ if (err) {
+ dev_err(dev->dev, "error writing to 0x%x\n", AMD_PMF_SMU_INDEX_ADDRESS);
+ pci_dev_put(rdev);
+ return pcibios_err_to_errno(err);
+ }
+
+ err = pci_read_config_dword(rdev, AMD_PMF_SMU_INDEX_DATA, &val);
+ if (err) {
+ pci_dev_put(rdev);
+ return pcibios_err_to_errno(err);
+ }
+
+ base_addr_lo = val & AMD_PMF_BASE_ADDR_HI_MASK;
+
+ err = pci_write_config_dword(rdev, AMD_PMF_SMU_INDEX_ADDRESS, AMD_PMF_BASE_ADDR_HI);
+ if (err) {
+ dev_err(dev->dev, "error writing to 0x%x\n", AMD_PMF_SMU_INDEX_ADDRESS);
+ pci_dev_put(rdev);
+ return pcibios_err_to_errno(err);
+ }
+
+ err = pci_read_config_dword(rdev, AMD_PMF_SMU_INDEX_DATA, &val);
+ if (err) {
+ pci_dev_put(rdev);
+ return pcibios_err_to_errno(err);
+ }
+
+ base_addr_hi = val & AMD_PMF_BASE_ADDR_LO_MASK;
+ pci_dev_put(rdev);
+ base_addr = ((u64)base_addr_hi << 32 | base_addr_lo);
+
+ dev->regbase = devm_ioremap(dev->dev, base_addr + AMD_PMF_BASE_ADDR_OFFSET,
+ AMD_PMF_MAPPING_SIZE);
+ if (!dev->regbase)
+ return -ENOMEM;
+
+ platform_set_drvdata(pdev, dev);
+
+ mutex_init(&dev->lock);
+ dev_info(dev->dev, "registered PMF device successfully\n");
+
+ return 0;
+}
+
+static int amd_pmf_remove(struct platform_device *pdev)
+{
+ struct amd_pmf_dev *dev = platform_get_drvdata(pdev);
+
+ mutex_destroy(&dev->lock);
+ kfree(dev->buf);
+ return 0;
+}
+
+static struct platform_driver amd_pmf_driver = {
+ .driver = {
+ .name = "amd-pmf",
+ .acpi_match_table = amd_pmf_acpi_ids,
+ },
+ .probe = amd_pmf_probe,
+ .remove = amd_pmf_remove,
+};
+module_platform_driver(amd_pmf_driver);
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("AMD Platform Management Framework Driver");
diff --git a/drivers/platform/x86/amd/pmf/pmf.h b/drivers/platform/x86/amd/pmf/pmf.h
new file mode 100644
index 000000000000..1c2e942e5096
--- /dev/null
+++ b/drivers/platform/x86/amd/pmf/pmf.h
@@ -0,0 +1,46 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * AMD Platform Management Framework Driver
+ *
+ * Copyright (c) 2022, Advanced Micro Devices, Inc.
+ * All Rights Reserved.
+ *
+ * Author: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
+ */
+
+#ifndef PMF_H
+#define PMF_H
+
+/* Message Definitions */
+#define SET_SPL 0x03 /* SPL: Sustained Power Limit */
+#define SET_SPPT 0x05 /* SPPT: Slow Package Power Tracking */
+#define SET_FPPT 0x07 /* FPPT: Fast Package Power Tracking */
+#define GET_SPL 0x0B
+#define GET_SPPT 0x0D
+#define GET_FPPT 0x0F
+#define SET_DRAM_ADDR_HIGH 0x14
+#define SET_DRAM_ADDR_LOW 0x15
+#define SET_TRANSFER_TABLE 0x16
+#define SET_STT_MIN_LIMIT 0x18 /* STT: Skin Temperature Tracking */
+#define SET_STT_LIMIT_APU 0x19
+#define SET_STT_LIMIT_HS2 0x1A
+#define SET_SPPT_APU_ONLY 0x1D
+#define GET_SPPT_APU_ONLY 0x1E
+#define GET_STT_MIN_LIMIT 0x1F
+#define GET_STT_LIMIT_APU 0x20
+#define GET_STT_LIMIT_HS2 0x21
+
+struct amd_pmf_dev {
+ void __iomem *regbase;
+ void __iomem *smu_virt_addr;
+ void *buf;
+ u32 base_addr;
+ u32 cpu_id;
+ struct device *dev;
+ struct mutex lock; /* protects the PMF interface */
+};
+
+/* Core Layer */
+int amd_pmf_send_cmd(struct amd_pmf_dev *dev, u8 message, bool get, u32 arg, u32 *data);
+
+#endif /* PMF_H */
--
2.25.1
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [PATCH v4 01/11] platform/x86/amd/pmf: Add support for PMF core layer
2022-08-02 15:11 ` [PATCH v4 01/11] platform/x86/amd/pmf: Add support for PMF core layer Shyam Sundar S K
@ 2022-08-05 10:20 ` Hans de Goede
0 siblings, 0 replies; 22+ messages in thread
From: Hans de Goede @ 2022-08-05 10:20 UTC (permalink / raw)
To: Shyam Sundar S K, markgross; +Cc: platform-driver-x86, Patil.Reddy
Hi,
On 8/2/22 17:11, Shyam Sundar S K wrote:
> PMF core layer is meant to abstract the common functionalities
> across PMF features. This layer also does the plumbing work
> like setting up the mailbox channel for the communication
> between the PMF driver and the PMFW (Power Management Firmware)
> running on the SMU.
>
> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
> Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
> ---
> drivers/platform/x86/amd/Kconfig | 2 +
> drivers/platform/x86/amd/Makefile | 1 +
> drivers/platform/x86/amd/pmf/Kconfig | 15 ++
> drivers/platform/x86/amd/pmf/Makefile | 8 +
> drivers/platform/x86/amd/pmf/core.c | 235 ++++++++++++++++++++++++++
> drivers/platform/x86/amd/pmf/pmf.h | 46 +++++
> 6 files changed, 307 insertions(+)
> create mode 100644 drivers/platform/x86/amd/pmf/Kconfig
> create mode 100644 drivers/platform/x86/amd/pmf/Makefile
> create mode 100644 drivers/platform/x86/amd/pmf/core.c
> create mode 100644 drivers/platform/x86/amd/pmf/pmf.h
>
> diff --git a/drivers/platform/x86/amd/Kconfig b/drivers/platform/x86/amd/Kconfig
> index c0d0a3c5170c..a825af8126c8 100644
> --- a/drivers/platform/x86/amd/Kconfig
> +++ b/drivers/platform/x86/amd/Kconfig
> @@ -3,6 +3,8 @@
> # AMD x86 Platform Specific Drivers
> #
>
> +source "drivers/platform/x86/amd/pmf/Kconfig"
> +
> config AMD_PMC
> tristate "AMD SoC PMC driver"
> depends on ACPI && PCI && RTC_CLASS
> diff --git a/drivers/platform/x86/amd/Makefile b/drivers/platform/x86/amd/Makefile
> index a03fbb08e808..2c229198e24c 100644
> --- a/drivers/platform/x86/amd/Makefile
> +++ b/drivers/platform/x86/amd/Makefile
> @@ -8,3 +8,4 @@ amd-pmc-y := pmc.o
> obj-$(CONFIG_AMD_PMC) += amd-pmc.o
> amd_hsmp-y := hsmp.o
> obj-$(CONFIG_AMD_HSMP) += amd_hsmp.o
> +obj-$(CONFIG_AMD_PMF) += pmf/
> diff --git a/drivers/platform/x86/amd/pmf/Kconfig b/drivers/platform/x86/amd/pmf/Kconfig
> new file mode 100644
> index 000000000000..ef771bbe1198
> --- /dev/null
> +++ b/drivers/platform/x86/amd/pmf/Kconfig
> @@ -0,0 +1,15 @@
> +# SPDX-License-Identifier: GPL-2.0-only
> +#
> +# AMD PMF Driver
> +#
> +
> +config AMD_PMF
> + tristate "AMD Platform Management Framework"
> + depends on ACPI
I believe this is missing a depends on PCI (like the CONFIG_AMD_PMC has),
this seems to be necessary since this call pci_get_domain_bus_and_slot()
and a bunch of other PCI functions.
I will fix this up (added the depends) while merging this (assuming I
find no blockers in the other patches).
Regards,
Hans
> + help
> + This driver provides support for the AMD Platform Management Framework.
> + The goal is to enhance end user experience by making AMD PCs smarter,
> + quiter, power efficient by adapting to user behavior and environment.
> +
> + To compile this driver as a module, choose M here: the module will
> + be called amd_pmf.
> diff --git a/drivers/platform/x86/amd/pmf/Makefile b/drivers/platform/x86/amd/pmf/Makefile
> new file mode 100644
> index 000000000000..459005f659e5
> --- /dev/null
> +++ b/drivers/platform/x86/amd/pmf/Makefile
> @@ -0,0 +1,8 @@
> +# SPDX-License-Identifier: GPL-2.0
> +#
> +# Makefile for linux/drivers/platform/x86/amd/pmf
> +# AMD Platform Management Framework
> +#
> +
> +obj-$(CONFIG_AMD_PMF) += amd-pmf.o
> +amd-pmf-objs := core.o
> diff --git a/drivers/platform/x86/amd/pmf/core.c b/drivers/platform/x86/amd/pmf/core.c
> new file mode 100644
> index 000000000000..aef97965c181
> --- /dev/null
> +++ b/drivers/platform/x86/amd/pmf/core.c
> @@ -0,0 +1,235 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> +/*
> + * AMD Platform Management Framework Driver
> + *
> + * Copyright (c) 2022, Advanced Micro Devices, Inc.
> + * All Rights Reserved.
> + *
> + * Author: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
> + */
> +
> +#include <linux/iopoll.h>
> +#include <linux/module.h>
> +#include <linux/pci.h>
> +#include <linux/platform_device.h>
> +#include "pmf.h"
> +
> +/* PMF-SMU communication registers */
> +#define AMD_PMF_REGISTER_MESSAGE 0xA18
> +#define AMD_PMF_REGISTER_RESPONSE 0xA78
> +#define AMD_PMF_REGISTER_ARGUMENT 0xA58
> +
> +/* Base address of SMU for mapping physical address to virtual address */
> +#define AMD_PMF_SMU_INDEX_ADDRESS 0xB8
> +#define AMD_PMF_SMU_INDEX_DATA 0xBC
> +#define AMD_PMF_MAPPING_SIZE 0x01000
> +#define AMD_PMF_BASE_ADDR_OFFSET 0x10000
> +#define AMD_PMF_BASE_ADDR_LO 0x13B102E8
> +#define AMD_PMF_BASE_ADDR_HI 0x13B102EC
> +#define AMD_PMF_BASE_ADDR_LO_MASK GENMASK(15, 0)
> +#define AMD_PMF_BASE_ADDR_HI_MASK GENMASK(31, 20)
> +
> +/* SMU Response Codes */
> +#define AMD_PMF_RESULT_OK 0x01
> +#define AMD_PMF_RESULT_CMD_REJECT_BUSY 0xFC
> +#define AMD_PMF_RESULT_CMD_REJECT_PREREQ 0xFD
> +#define AMD_PMF_RESULT_CMD_UNKNOWN 0xFE
> +#define AMD_PMF_RESULT_FAILED 0xFF
> +
> +/* List of supported CPU ids */
> +#define AMD_CPU_ID_PS 0x14e8
> +
> +#define PMF_MSG_DELAY_MIN_US 50
> +#define RESPONSE_REGISTER_LOOP_MAX 20000
> +
> +#define DELAY_MIN_US 2000
> +#define DELAY_MAX_US 3000
> +
> +static inline u32 amd_pmf_reg_read(struct amd_pmf_dev *dev, int reg_offset)
> +{
> + return ioread32(dev->regbase + reg_offset);
> +}
> +
> +static inline void amd_pmf_reg_write(struct amd_pmf_dev *dev, int reg_offset, u32 val)
> +{
> + iowrite32(val, dev->regbase + reg_offset);
> +}
> +
> +static void __maybe_unused amd_pmf_dump_registers(struct amd_pmf_dev *dev)
> +{
> + u32 value;
> +
> + value = amd_pmf_reg_read(dev, AMD_PMF_REGISTER_RESPONSE);
> + dev_dbg(dev->dev, "AMD_PMF_REGISTER_RESPONSE:%x\n", value);
> +
> + value = amd_pmf_reg_read(dev, AMD_PMF_REGISTER_ARGUMENT);
> + dev_dbg(dev->dev, "AMD_PMF_REGISTER_ARGUMENT:%d\n", value);
> +
> + value = amd_pmf_reg_read(dev, AMD_PMF_REGISTER_MESSAGE);
> + dev_dbg(dev->dev, "AMD_PMF_REGISTER_MESSAGE:%x\n", value);
> +}
> +
> +int amd_pmf_send_cmd(struct amd_pmf_dev *dev, u8 message, bool get, u32 arg, u32 *data)
> +{
> + int rc;
> + u32 val;
> +
> + mutex_lock(&dev->lock);
> +
> + /* Wait until we get a valid response */
> + rc = readx_poll_timeout(ioread32, dev->regbase + AMD_PMF_REGISTER_RESPONSE,
> + val, val != 0, PMF_MSG_DELAY_MIN_US,
> + PMF_MSG_DELAY_MIN_US * RESPONSE_REGISTER_LOOP_MAX);
> + if (rc) {
> + dev_err(dev->dev, "failed to talk to SMU\n");
> + goto out_unlock;
> + }
> +
> + /* Write zero to response register */
> + amd_pmf_reg_write(dev, AMD_PMF_REGISTER_RESPONSE, 0);
> +
> + /* Write argument into argument register */
> + amd_pmf_reg_write(dev, AMD_PMF_REGISTER_ARGUMENT, arg);
> +
> + /* Write message ID to message ID register */
> + amd_pmf_reg_write(dev, AMD_PMF_REGISTER_MESSAGE, message);
> +
> + /* Wait until we get a valid response */
> + rc = readx_poll_timeout(ioread32, dev->regbase + AMD_PMF_REGISTER_RESPONSE,
> + val, val != 0, PMF_MSG_DELAY_MIN_US,
> + PMF_MSG_DELAY_MIN_US * RESPONSE_REGISTER_LOOP_MAX);
> + if (rc) {
> + dev_err(dev->dev, "SMU response timed out\n");
> + goto out_unlock;
> + }
> +
> + switch (val) {
> + case AMD_PMF_RESULT_OK:
> + if (get) {
> + /* PMFW may take longer time to return back the data */
> + usleep_range(DELAY_MIN_US, 10 * DELAY_MAX_US);
> + *data = amd_pmf_reg_read(dev, AMD_PMF_REGISTER_ARGUMENT);
> + }
> + break;
> + case AMD_PMF_RESULT_CMD_REJECT_BUSY:
> + dev_err(dev->dev, "SMU not ready. err: 0x%x\n", val);
> + rc = -EBUSY;
> + goto out_unlock;
> + case AMD_PMF_RESULT_CMD_UNKNOWN:
> + dev_err(dev->dev, "SMU cmd unknown. err: 0x%x\n", val);
> + rc = -EINVAL;
> + goto out_unlock;
> + case AMD_PMF_RESULT_CMD_REJECT_PREREQ:
> + case AMD_PMF_RESULT_FAILED:
> + default:
> + dev_err(dev->dev, "SMU cmd failed. err: 0x%x\n", val);
> + rc = -EIO;
> + goto out_unlock;
> + }
> +
> +out_unlock:
> + mutex_unlock(&dev->lock);
> + amd_pmf_dump_registers(dev);
> + return rc;
> +}
> +
> +static const struct pci_device_id pmf_pci_ids[] = {
> + { PCI_DEVICE(PCI_VENDOR_ID_AMD, AMD_CPU_ID_PS) },
> + { }
> +};
> +
> +static const struct acpi_device_id amd_pmf_acpi_ids[] = {
> + {"AMDI0102", 0},
> + { }
> +};
> +MODULE_DEVICE_TABLE(acpi, amd_pmf_acpi_ids);
> +
> +static int amd_pmf_probe(struct platform_device *pdev)
> +{
> + struct amd_pmf_dev *dev;
> + struct pci_dev *rdev;
> + u32 base_addr_lo;
> + u32 base_addr_hi;
> + u64 base_addr;
> + u32 val;
> + int err;
> +
> + dev = devm_kzalloc(&pdev->dev, sizeof(*dev), GFP_KERNEL);
> + if (!dev)
> + return -ENOMEM;
> +
> + dev->dev = &pdev->dev;
> +
> + rdev = pci_get_domain_bus_and_slot(0, 0, PCI_DEVFN(0, 0));
> + if (!rdev || !pci_match_id(pmf_pci_ids, rdev)) {
> + pci_dev_put(rdev);
> + return -ENODEV;
> + }
> +
> + dev->cpu_id = rdev->device;
> + err = pci_write_config_dword(rdev, AMD_PMF_SMU_INDEX_ADDRESS, AMD_PMF_BASE_ADDR_LO);
> + if (err) {
> + dev_err(dev->dev, "error writing to 0x%x\n", AMD_PMF_SMU_INDEX_ADDRESS);
> + pci_dev_put(rdev);
> + return pcibios_err_to_errno(err);
> + }
> +
> + err = pci_read_config_dword(rdev, AMD_PMF_SMU_INDEX_DATA, &val);
> + if (err) {
> + pci_dev_put(rdev);
> + return pcibios_err_to_errno(err);
> + }
> +
> + base_addr_lo = val & AMD_PMF_BASE_ADDR_HI_MASK;
> +
> + err = pci_write_config_dword(rdev, AMD_PMF_SMU_INDEX_ADDRESS, AMD_PMF_BASE_ADDR_HI);
> + if (err) {
> + dev_err(dev->dev, "error writing to 0x%x\n", AMD_PMF_SMU_INDEX_ADDRESS);
> + pci_dev_put(rdev);
> + return pcibios_err_to_errno(err);
> + }
> +
> + err = pci_read_config_dword(rdev, AMD_PMF_SMU_INDEX_DATA, &val);
> + if (err) {
> + pci_dev_put(rdev);
> + return pcibios_err_to_errno(err);
> + }
> +
> + base_addr_hi = val & AMD_PMF_BASE_ADDR_LO_MASK;
> + pci_dev_put(rdev);
> + base_addr = ((u64)base_addr_hi << 32 | base_addr_lo);
> +
> + dev->regbase = devm_ioremap(dev->dev, base_addr + AMD_PMF_BASE_ADDR_OFFSET,
> + AMD_PMF_MAPPING_SIZE);
> + if (!dev->regbase)
> + return -ENOMEM;
> +
> + platform_set_drvdata(pdev, dev);
> +
> + mutex_init(&dev->lock);
> + dev_info(dev->dev, "registered PMF device successfully\n");
> +
> + return 0;
> +}
> +
> +static int amd_pmf_remove(struct platform_device *pdev)
> +{
> + struct amd_pmf_dev *dev = platform_get_drvdata(pdev);
> +
> + mutex_destroy(&dev->lock);
> + kfree(dev->buf);
> + return 0;
> +}
> +
> +static struct platform_driver amd_pmf_driver = {
> + .driver = {
> + .name = "amd-pmf",
> + .acpi_match_table = amd_pmf_acpi_ids,
> + },
> + .probe = amd_pmf_probe,
> + .remove = amd_pmf_remove,
> +};
> +module_platform_driver(amd_pmf_driver);
> +
> +MODULE_LICENSE("GPL");
> +MODULE_DESCRIPTION("AMD Platform Management Framework Driver");
> diff --git a/drivers/platform/x86/amd/pmf/pmf.h b/drivers/platform/x86/amd/pmf/pmf.h
> new file mode 100644
> index 000000000000..1c2e942e5096
> --- /dev/null
> +++ b/drivers/platform/x86/amd/pmf/pmf.h
> @@ -0,0 +1,46 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> +/*
> + * AMD Platform Management Framework Driver
> + *
> + * Copyright (c) 2022, Advanced Micro Devices, Inc.
> + * All Rights Reserved.
> + *
> + * Author: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
> + */
> +
> +#ifndef PMF_H
> +#define PMF_H
> +
> +/* Message Definitions */
> +#define SET_SPL 0x03 /* SPL: Sustained Power Limit */
> +#define SET_SPPT 0x05 /* SPPT: Slow Package Power Tracking */
> +#define SET_FPPT 0x07 /* FPPT: Fast Package Power Tracking */
> +#define GET_SPL 0x0B
> +#define GET_SPPT 0x0D
> +#define GET_FPPT 0x0F
> +#define SET_DRAM_ADDR_HIGH 0x14
> +#define SET_DRAM_ADDR_LOW 0x15
> +#define SET_TRANSFER_TABLE 0x16
> +#define SET_STT_MIN_LIMIT 0x18 /* STT: Skin Temperature Tracking */
> +#define SET_STT_LIMIT_APU 0x19
> +#define SET_STT_LIMIT_HS2 0x1A
> +#define SET_SPPT_APU_ONLY 0x1D
> +#define GET_SPPT_APU_ONLY 0x1E
> +#define GET_STT_MIN_LIMIT 0x1F
> +#define GET_STT_LIMIT_APU 0x20
> +#define GET_STT_LIMIT_HS2 0x21
> +
> +struct amd_pmf_dev {
> + void __iomem *regbase;
> + void __iomem *smu_virt_addr;
> + void *buf;
> + u32 base_addr;
> + u32 cpu_id;
> + struct device *dev;
> + struct mutex lock; /* protects the PMF interface */
> +};
> +
> +/* Core Layer */
> +int amd_pmf_send_cmd(struct amd_pmf_dev *dev, u8 message, bool get, u32 arg, u32 *data);
> +
> +#endif /* PMF_H */
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH v4 02/11] platform/x86/amd/pmf: Add support for PMF APCI layer
2022-08-02 15:11 [PATCH v4 00/11] platform/x86/amd/pmf: Introduce AMD PMF Driver Shyam Sundar S K
2022-08-02 15:11 ` [PATCH v4 01/11] platform/x86/amd/pmf: Add support for PMF core layer Shyam Sundar S K
@ 2022-08-02 15:11 ` Shyam Sundar S K
2022-08-02 15:11 ` [PATCH v4 03/11] platform/x86/amd/pmf: Add support SPS PMF feature Shyam Sundar S K
` (9 subsequent siblings)
11 siblings, 0 replies; 22+ messages in thread
From: Shyam Sundar S K @ 2022-08-02 15:11 UTC (permalink / raw)
To: hdegoede, markgross; +Cc: platform-driver-x86, Patil.Reddy, Shyam Sundar S K
PMF driver implements the ACPI methods as defined by AMD for PMF Support.
The ACPI layer acts as a glue that helps in providing the infrastructure
for OEMs customization.
OEMs can refer to PMF support documentation to decide on the list of
functions to be supported on their specific platform model.
AMD mandates that PMF ACPI fn0 and fn1 to be implemented which
provides the set of functions, params and the notifications that
would be sent to PMF driver so that PMF driver can adapt and
react.
Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
---
drivers/platform/x86/amd/pmf/Makefile | 2 +-
drivers/platform/x86/amd/pmf/acpi.c | 151 ++++++++++++++++++++++++++
drivers/platform/x86/amd/pmf/core.c | 1 +
drivers/platform/x86/amd/pmf/pmf.h | 23 ++++
4 files changed, 176 insertions(+), 1 deletion(-)
create mode 100644 drivers/platform/x86/amd/pmf/acpi.c
diff --git a/drivers/platform/x86/amd/pmf/Makefile b/drivers/platform/x86/amd/pmf/Makefile
index 459005f659e5..2617eba773ce 100644
--- a/drivers/platform/x86/amd/pmf/Makefile
+++ b/drivers/platform/x86/amd/pmf/Makefile
@@ -5,4 +5,4 @@
#
obj-$(CONFIG_AMD_PMF) += amd-pmf.o
-amd-pmf-objs := core.o
+amd-pmf-objs := core.o acpi.o
diff --git a/drivers/platform/x86/amd/pmf/acpi.c b/drivers/platform/x86/amd/pmf/acpi.c
new file mode 100644
index 000000000000..b378f9e31194
--- /dev/null
+++ b/drivers/platform/x86/amd/pmf/acpi.c
@@ -0,0 +1,151 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * AMD Platform Management Framework Driver
+ *
+ * Copyright (c) 2022, Advanced Micro Devices, Inc.
+ * All Rights Reserved.
+ *
+ * Author: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
+ */
+
+#include <linux/acpi.h>
+#include "pmf.h"
+
+static union acpi_object *apmf_if_call(struct amd_pmf_dev *pdev, int fn, struct acpi_buffer *param)
+{
+ struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
+ acpi_handle ahandle = ACPI_HANDLE(pdev->dev);
+ struct acpi_object_list apmf_if_arg_list;
+ union acpi_object apmf_if_args[2];
+ acpi_status status;
+
+ apmf_if_arg_list.count = 2;
+ apmf_if_arg_list.pointer = &apmf_if_args[0];
+
+ apmf_if_args[0].type = ACPI_TYPE_INTEGER;
+ apmf_if_args[0].integer.value = fn;
+
+ if (param) {
+ apmf_if_args[1].type = ACPI_TYPE_BUFFER;
+ apmf_if_args[1].buffer.length = param->length;
+ apmf_if_args[1].buffer.pointer = param->pointer;
+ } else {
+ apmf_if_args[1].type = ACPI_TYPE_INTEGER;
+ apmf_if_args[1].integer.value = 0;
+ }
+
+ status = acpi_evaluate_object(ahandle, "APMF", &apmf_if_arg_list, &buffer);
+ if (ACPI_FAILURE(status)) {
+ dev_err(pdev->dev, "APMF method:%d call failed\n", fn);
+ kfree(buffer.pointer);
+ return NULL;
+ }
+
+ return buffer.pointer;
+}
+
+static int apmf_if_call_store_buffer(struct amd_pmf_dev *pdev, int fn, void *dest, size_t out_sz)
+{
+ union acpi_object *info;
+ size_t size;
+ int err = 0;
+
+ info = apmf_if_call(pdev, fn, NULL);
+ if (!info)
+ return -EIO;
+
+ if (info->type != ACPI_TYPE_BUFFER) {
+ dev_err(pdev->dev, "object is not a buffer\n");
+ err = -EINVAL;
+ goto out;
+ }
+
+ if (info->buffer.length < 2) {
+ dev_err(pdev->dev, "buffer too small\n");
+ err = -EINVAL;
+ goto out;
+ }
+
+ size = *(u16 *)info->buffer.pointer;
+ if (info->buffer.length < size) {
+ dev_err(pdev->dev, "buffer smaller then headersize %u < %zu\n",
+ info->buffer.length, size);
+ err = -EINVAL;
+ goto out;
+ }
+
+ if (size < out_sz) {
+ dev_err(pdev->dev, "buffer too small %zu\n", size);
+ err = -EINVAL;
+ goto out;
+ }
+
+ memcpy(dest, info->buffer.pointer, out_sz);
+
+out:
+ kfree(info);
+ return err;
+}
+
+int is_apmf_func_supported(struct amd_pmf_dev *pdev, unsigned long index)
+{
+ /* If bit-n is set, that indicates function n+1 is supported */
+ return !!(pdev->supported_func & BIT(index - 1));
+}
+
+static int apmf_if_verify_interface(struct amd_pmf_dev *pdev)
+{
+ struct apmf_verify_interface output;
+ int err;
+
+ err = apmf_if_call_store_buffer(pdev, APMF_FUNC_VERIFY_INTERFACE, &output, sizeof(output));
+ if (err)
+ return err;
+
+ pdev->supported_func = output.supported_functions;
+ dev_dbg(pdev->dev, "supported functions:0x%x notifications:0x%x\n",
+ output.supported_functions, output.notification_mask);
+
+ return 0;
+}
+
+static int apmf_get_system_params(struct amd_pmf_dev *dev)
+{
+ struct apmf_system_params params;
+ int err;
+
+ if (!is_apmf_func_supported(dev, APMF_FUNC_GET_SYS_PARAMS))
+ return -EINVAL;
+
+ err = apmf_if_call_store_buffer(dev, APMF_FUNC_GET_SYS_PARAMS, ¶ms, sizeof(params));
+ if (err)
+ return err;
+
+ dev_dbg(dev->dev, "system params mask:0x%x flags:0x%x cmd_code:0x%x\n",
+ params.valid_mask,
+ params.flags,
+ params.command_code);
+ params.flags = params.flags & params.valid_mask;
+
+ return 0;
+}
+
+int apmf_acpi_init(struct amd_pmf_dev *pmf_dev)
+{
+ int ret;
+
+ ret = apmf_if_verify_interface(pmf_dev);
+ if (ret) {
+ dev_err(pmf_dev->dev, "APMF verify interface failed :%d\n", ret);
+ goto out;
+ }
+
+ ret = apmf_get_system_params(pmf_dev);
+ if (ret) {
+ dev_err(pmf_dev->dev, "APMF apmf_get_system_params failed :%d\n", ret);
+ goto out;
+ }
+
+out:
+ return ret;
+}
diff --git a/drivers/platform/x86/amd/pmf/core.c b/drivers/platform/x86/amd/pmf/core.c
index aef97965c181..c5002b7bb904 100644
--- a/drivers/platform/x86/amd/pmf/core.c
+++ b/drivers/platform/x86/amd/pmf/core.c
@@ -204,6 +204,7 @@ static int amd_pmf_probe(struct platform_device *pdev)
if (!dev->regbase)
return -ENOMEM;
+ apmf_acpi_init(dev);
platform_set_drvdata(pdev, dev);
mutex_init(&dev->lock);
diff --git a/drivers/platform/x86/amd/pmf/pmf.h b/drivers/platform/x86/amd/pmf/pmf.h
index 1c2e942e5096..bdadbff168ee 100644
--- a/drivers/platform/x86/amd/pmf/pmf.h
+++ b/drivers/platform/x86/amd/pmf/pmf.h
@@ -11,6 +11,12 @@
#ifndef PMF_H
#define PMF_H
+#include <linux/acpi.h>
+
+/* APMF Functions */
+#define APMF_FUNC_VERIFY_INTERFACE 0
+#define APMF_FUNC_GET_SYS_PARAMS 1
+
/* Message Definitions */
#define SET_SPL 0x03 /* SPL: Sustained Power Limit */
#define SET_SPPT 0x05 /* SPPT: Slow Package Power Tracking */
@@ -30,6 +36,21 @@
#define GET_STT_LIMIT_APU 0x20
#define GET_STT_LIMIT_HS2 0x21
+/* AMD PMF BIOS interfaces */
+struct apmf_verify_interface {
+ u16 size;
+ u16 version;
+ u32 notification_mask;
+ u32 supported_functions;
+} __packed;
+
+struct apmf_system_params {
+ u16 size;
+ u32 valid_mask;
+ u32 flags;
+ u8 command_code;
+} __packed;
+
struct amd_pmf_dev {
void __iomem *regbase;
void __iomem *smu_virt_addr;
@@ -38,9 +59,11 @@ struct amd_pmf_dev {
u32 cpu_id;
struct device *dev;
struct mutex lock; /* protects the PMF interface */
+ u32 supported_func;
};
/* Core Layer */
+int apmf_acpi_init(struct amd_pmf_dev *pmf_dev);
int amd_pmf_send_cmd(struct amd_pmf_dev *dev, u8 message, bool get, u32 arg, u32 *data);
#endif /* PMF_H */
--
2.25.1
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH v4 03/11] platform/x86/amd/pmf: Add support SPS PMF feature
2022-08-02 15:11 [PATCH v4 00/11] platform/x86/amd/pmf: Introduce AMD PMF Driver Shyam Sundar S K
2022-08-02 15:11 ` [PATCH v4 01/11] platform/x86/amd/pmf: Add support for PMF core layer Shyam Sundar S K
2022-08-02 15:11 ` [PATCH v4 02/11] platform/x86/amd/pmf: Add support for PMF APCI layer Shyam Sundar S K
@ 2022-08-02 15:11 ` Shyam Sundar S K
2022-08-05 10:39 ` Hans de Goede
2022-08-18 22:47 ` Nathan Chancellor
2022-08-02 15:11 ` [PATCH v4 04/11] platform/x86/amd/pmf: Add debugfs information Shyam Sundar S K
` (8 subsequent siblings)
11 siblings, 2 replies; 22+ messages in thread
From: Shyam Sundar S K @ 2022-08-02 15:11 UTC (permalink / raw)
To: hdegoede, markgross; +Cc: platform-driver-x86, Patil.Reddy, Shyam Sundar S K
SPS (a.k.a. Static Power Slider) gives a feel of Windows performance
power slider for the Linux users, where the user selects a certain
mode (like "balanced", "low-power" or "performance") and the thermals
associated with each selected mode gets applied from the silicon
side via the mailboxes defined through PMFW.
PMF driver hooks to platform_profile by reading the PMF ACPI fn9 to
see if the support is being advertised by ACPI interface.
If supported, the PMF driver reacts to platform_profile selection choices
made by the user and adjust the system thermal behavior.
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
---
drivers/platform/x86/amd/pmf/Makefile | 2 +-
drivers/platform/x86/amd/pmf/acpi.c | 10 ++
drivers/platform/x86/amd/pmf/core.c | 26 +++++
drivers/platform/x86/amd/pmf/pmf.h | 64 +++++++++++
drivers/platform/x86/amd/pmf/sps.c | 149 ++++++++++++++++++++++++++
5 files changed, 250 insertions(+), 1 deletion(-)
create mode 100644 drivers/platform/x86/amd/pmf/sps.c
diff --git a/drivers/platform/x86/amd/pmf/Makefile b/drivers/platform/x86/amd/pmf/Makefile
index 2617eba773ce..557521a80427 100644
--- a/drivers/platform/x86/amd/pmf/Makefile
+++ b/drivers/platform/x86/amd/pmf/Makefile
@@ -5,4 +5,4 @@
#
obj-$(CONFIG_AMD_PMF) += amd-pmf.o
-amd-pmf-objs := core.o acpi.o
+amd-pmf-objs := core.o acpi.o sps.o
diff --git a/drivers/platform/x86/amd/pmf/acpi.c b/drivers/platform/x86/amd/pmf/acpi.c
index b378f9e31194..5997ab724f3a 100644
--- a/drivers/platform/x86/amd/pmf/acpi.c
+++ b/drivers/platform/x86/amd/pmf/acpi.c
@@ -93,6 +93,16 @@ int is_apmf_func_supported(struct amd_pmf_dev *pdev, unsigned long index)
return !!(pdev->supported_func & BIT(index - 1));
}
+int apmf_get_static_slider_granular(struct amd_pmf_dev *pdev,
+ struct apmf_static_slider_granular_output *data)
+{
+ if (!is_apmf_func_supported(pdev, APMF_FUNC_STATIC_SLIDER_GRANULAR))
+ return -EINVAL;
+
+ return apmf_if_call_store_buffer(pdev, APMF_FUNC_STATIC_SLIDER_GRANULAR,
+ data, sizeof(*data));
+}
+
static int apmf_if_verify_interface(struct amd_pmf_dev *pdev)
{
struct apmf_verify_interface output;
diff --git a/drivers/platform/x86/amd/pmf/core.c b/drivers/platform/x86/amd/pmf/core.c
index c5002b7bb904..a70ab6c9608a 100644
--- a/drivers/platform/x86/amd/pmf/core.c
+++ b/drivers/platform/x86/amd/pmf/core.c
@@ -12,6 +12,7 @@
#include <linux/module.h>
#include <linux/pci.h>
#include <linux/platform_device.h>
+#include <linux/power_supply.h>
#include "pmf.h"
/* PMF-SMU communication registers */
@@ -45,6 +46,14 @@
#define DELAY_MIN_US 2000
#define DELAY_MAX_US 3000
+int amd_pmf_get_power_source(void)
+{
+ if (power_supply_is_system_supplied() > 0)
+ return POWER_SOURCE_AC;
+ else
+ return POWER_SOURCE_DC;
+}
+
static inline u32 amd_pmf_reg_read(struct amd_pmf_dev *dev, int reg_offset)
{
return ioread32(dev->regbase + reg_offset);
@@ -138,6 +147,21 @@ static const struct pci_device_id pmf_pci_ids[] = {
{ }
};
+static void amd_pmf_init_features(struct amd_pmf_dev *dev)
+{
+ /* Enable Static Slider */
+ if (is_apmf_func_supported(dev, APMF_FUNC_STATIC_SLIDER_GRANULAR)) {
+ amd_pmf_init_sps(dev);
+ dev_dbg(dev->dev, "SPS enabled and Platform Profiles registered\n");
+ }
+}
+
+static void amd_pmf_deinit_features(struct amd_pmf_dev *dev)
+{
+ if (is_apmf_func_supported(dev, APMF_FUNC_STATIC_SLIDER_GRANULAR))
+ amd_pmf_deinit_sps(dev);
+}
+
static const struct acpi_device_id amd_pmf_acpi_ids[] = {
{"AMDI0102", 0},
{ }
@@ -206,6 +230,7 @@ static int amd_pmf_probe(struct platform_device *pdev)
apmf_acpi_init(dev);
platform_set_drvdata(pdev, dev);
+ amd_pmf_init_features(dev);
mutex_init(&dev->lock);
dev_info(dev->dev, "registered PMF device successfully\n");
@@ -218,6 +243,7 @@ static int amd_pmf_remove(struct platform_device *pdev)
struct amd_pmf_dev *dev = platform_get_drvdata(pdev);
mutex_destroy(&dev->lock);
+ amd_pmf_deinit_features(dev);
kfree(dev->buf);
return 0;
}
diff --git a/drivers/platform/x86/amd/pmf/pmf.h b/drivers/platform/x86/amd/pmf/pmf.h
index bdadbff168ee..5c867dac7d44 100644
--- a/drivers/platform/x86/amd/pmf/pmf.h
+++ b/drivers/platform/x86/amd/pmf/pmf.h
@@ -12,10 +12,12 @@
#define PMF_H
#include <linux/acpi.h>
+#include <linux/platform_profile.h>
/* APMF Functions */
#define APMF_FUNC_VERIFY_INTERFACE 0
#define APMF_FUNC_GET_SYS_PARAMS 1
+#define APMF_FUNC_STATIC_SLIDER_GRANULAR 9
/* Message Definitions */
#define SET_SPL 0x03 /* SPL: Sustained Power Limit */
@@ -36,6 +38,8 @@
#define GET_STT_LIMIT_APU 0x20
#define GET_STT_LIMIT_HS2 0x21
+#define ARG_NONE 0
+
/* AMD PMF BIOS interfaces */
struct apmf_verify_interface {
u16 size;
@@ -51,6 +55,30 @@ struct apmf_system_params {
u8 command_code;
} __packed;
+enum amd_stt_skin_temp {
+ STT_TEMP_APU,
+ STT_TEMP_HS2,
+ STT_TEMP_COUNT,
+};
+
+enum amd_slider_op {
+ SLIDER_OP_GET,
+ SLIDER_OP_SET,
+};
+
+enum power_source {
+ POWER_SOURCE_AC,
+ POWER_SOURCE_DC,
+ POWER_SOURCE_MAX,
+};
+
+enum power_modes {
+ POWER_MODE_PERFORMANCE,
+ POWER_MODE_BALANCED_POWER,
+ POWER_MODE_POWER_SAVER,
+ POWER_MODE_MAX,
+};
+
struct amd_pmf_dev {
void __iomem *regbase;
void __iomem *smu_virt_addr;
@@ -60,10 +88,46 @@ struct amd_pmf_dev {
struct device *dev;
struct mutex lock; /* protects the PMF interface */
u32 supported_func;
+ enum platform_profile_option current_profile;
+ struct platform_profile_handler pprof;
+};
+
+struct apmf_sps_prop_granular {
+ u32 fppt;
+ u32 sppt;
+ u32 sppt_apu_only;
+ u32 spl;
+ u32 stt_min;
+ u8 stt_skin_temp[STT_TEMP_COUNT];
+ u32 fan_id;
+} __packed;
+
+/* Static Slider */
+struct apmf_static_slider_granular_output {
+ u16 size;
+ struct apmf_sps_prop_granular prop[POWER_SOURCE_MAX * POWER_MODE_MAX];
+} __packed;
+
+struct amd_pmf_static_slider_granular {
+ u16 size;
+ struct apmf_sps_prop_granular prop[POWER_SOURCE_MAX][POWER_MODE_MAX];
};
/* Core Layer */
int apmf_acpi_init(struct amd_pmf_dev *pmf_dev);
+int is_apmf_func_supported(struct amd_pmf_dev *pdev, unsigned long index);
int amd_pmf_send_cmd(struct amd_pmf_dev *dev, u8 message, bool get, u32 arg, u32 *data);
+int amd_pmf_get_power_source(void);
+
+/* SPS Layer */
+u8 amd_pmf_get_pprof_modes(struct amd_pmf_dev *pmf);
+void amd_pmf_update_slider(struct amd_pmf_dev *dev, bool op, int idx,
+ struct amd_pmf_static_slider_granular *table);
+int amd_pmf_init_sps(struct amd_pmf_dev *dev);
+void amd_pmf_deinit_sps(struct amd_pmf_dev *dev);
+int apmf_get_static_slider_granular(struct amd_pmf_dev *pdev,
+ struct apmf_static_slider_granular_output *output);
+void amd_pmf_load_defaults_sps(struct amd_pmf_dev *dev);
+
#endif /* PMF_H */
diff --git a/drivers/platform/x86/amd/pmf/sps.c b/drivers/platform/x86/amd/pmf/sps.c
new file mode 100644
index 000000000000..ef4df3fd774b
--- /dev/null
+++ b/drivers/platform/x86/amd/pmf/sps.c
@@ -0,0 +1,149 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * AMD Platform Management Framework (PMF) Driver
+ *
+ * Copyright (c) 2022, Advanced Micro Devices, Inc.
+ * All Rights Reserved.
+ *
+ * Author: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
+ */
+
+#include "pmf.h"
+
+static int amd_pmf_profile_get(struct platform_profile_handler *pprof,
+ enum platform_profile_option *profile);
+static int amd_pmf_profile_set(struct platform_profile_handler *pprof,
+ enum platform_profile_option profile);
+static struct amd_pmf_static_slider_granular config_store;
+
+void amd_pmf_load_defaults_sps(struct amd_pmf_dev *dev)
+{
+ struct apmf_static_slider_granular_output output;
+ int i, j, idx = 0;
+
+ memset(&config_store, 0, sizeof(config_store));
+ apmf_get_static_slider_granular(dev, &output);
+
+ for (i = 0; i < POWER_SOURCE_MAX; i++) {
+ for (j = 0; j < POWER_MODE_MAX; j++) {
+ config_store.prop[i][j].spl = output.prop[idx].spl;
+ config_store.prop[i][j].sppt = output.prop[idx].sppt;
+ config_store.prop[i][j].sppt_apu_only =
+ output.prop[idx].sppt_apu_only;
+ config_store.prop[i][j].fppt = output.prop[idx].fppt;
+ config_store.prop[i][j].stt_min = output.prop[idx].stt_min;
+ config_store.prop[i][j].stt_skin_temp[STT_TEMP_APU] =
+ output.prop[idx].stt_skin_temp[STT_TEMP_APU];
+ config_store.prop[i][j].stt_skin_temp[STT_TEMP_HS2] =
+ output.prop[idx].stt_skin_temp[STT_TEMP_HS2];
+ config_store.prop[i][j].fan_id = output.prop[idx].fan_id;
+ idx++;
+ }
+ }
+}
+
+void amd_pmf_update_slider(struct amd_pmf_dev *dev, bool op, int idx,
+ struct amd_pmf_static_slider_granular *table)
+{
+ int src = amd_pmf_get_power_source();
+
+ if (op == SLIDER_OP_SET) {
+ amd_pmf_send_cmd(dev, SET_SPL, false, config_store.prop[src][idx].spl, NULL);
+ amd_pmf_send_cmd(dev, SET_FPPT, false, config_store.prop[src][idx].fppt, NULL);
+ amd_pmf_send_cmd(dev, SET_SPPT, false, config_store.prop[src][idx].sppt, NULL);
+ amd_pmf_send_cmd(dev, SET_SPPT_APU_ONLY, false,
+ config_store.prop[src][idx].sppt_apu_only, NULL);
+ amd_pmf_send_cmd(dev, SET_STT_MIN_LIMIT, false,
+ config_store.prop[src][idx].stt_min, NULL);
+ amd_pmf_send_cmd(dev, SET_STT_LIMIT_APU, false,
+ config_store.prop[src][idx].stt_skin_temp[STT_TEMP_APU], NULL);
+ amd_pmf_send_cmd(dev, SET_STT_LIMIT_HS2, false,
+ config_store.prop[src][idx].stt_skin_temp[STT_TEMP_HS2], NULL);
+ } else if (op == SLIDER_OP_GET) {
+ amd_pmf_send_cmd(dev, GET_SPL, true, ARG_NONE, &table->prop[src][idx].spl);
+ amd_pmf_send_cmd(dev, GET_FPPT, true, ARG_NONE, &table->prop[src][idx].fppt);
+ amd_pmf_send_cmd(dev, GET_SPPT, true, ARG_NONE, &table->prop[src][idx].sppt);
+ amd_pmf_send_cmd(dev, GET_SPPT_APU_ONLY, true, ARG_NONE,
+ &table->prop[src][idx].sppt_apu_only);
+ amd_pmf_send_cmd(dev, GET_STT_MIN_LIMIT, true, ARG_NONE,
+ &table->prop[src][idx].stt_min);
+ amd_pmf_send_cmd(dev, GET_STT_LIMIT_APU, true, ARG_NONE,
+ (u32 *)&table->prop[src][idx].stt_skin_temp[STT_TEMP_APU]);
+ amd_pmf_send_cmd(dev, GET_STT_LIMIT_HS2, true, ARG_NONE,
+ (u32 *)&table->prop[src][idx].stt_skin_temp[STT_TEMP_HS2]);
+ }
+}
+
+static int amd_pmf_profile_get(struct platform_profile_handler *pprof,
+ enum platform_profile_option *profile)
+{
+ struct amd_pmf_dev *pmf = container_of(pprof, struct amd_pmf_dev, pprof);
+
+ *profile = pmf->current_profile;
+ return 0;
+}
+
+u8 amd_pmf_get_pprof_modes(struct amd_pmf_dev *pmf)
+{
+ u8 mode;
+
+ switch (pmf->current_profile) {
+ case PLATFORM_PROFILE_PERFORMANCE:
+ mode = POWER_MODE_PERFORMANCE;
+ break;
+ case PLATFORM_PROFILE_BALANCED:
+ mode = POWER_MODE_BALANCED_POWER;
+ break;
+ case PLATFORM_PROFILE_LOW_POWER:
+ mode = POWER_MODE_POWER_SAVER;
+ break;
+ default:
+ dev_err(pmf->dev, "Unknown Platform Profile.\n");
+ break;
+ }
+
+ return mode;
+}
+
+int amd_pmf_profile_set(struct platform_profile_handler *pprof,
+ enum platform_profile_option profile)
+{
+ struct amd_pmf_dev *pmf = container_of(pprof, struct amd_pmf_dev, pprof);
+ u8 mode;
+
+ pmf->current_profile = profile;
+ mode = amd_pmf_get_pprof_modes(pmf);
+ amd_pmf_update_slider(pmf, SLIDER_OP_SET, mode, NULL);
+ return 0;
+}
+
+int amd_pmf_init_sps(struct amd_pmf_dev *dev)
+{
+ int err = 0;
+
+ dev->pprof.profile_get = amd_pmf_profile_get;
+ dev->pprof.profile_set = amd_pmf_profile_set;
+
+ /* Setup supported modes */
+ set_bit(PLATFORM_PROFILE_LOW_POWER, dev->pprof.choices);
+ set_bit(PLATFORM_PROFILE_BALANCED, dev->pprof.choices);
+ set_bit(PLATFORM_PROFILE_PERFORMANCE, dev->pprof.choices);
+
+ /* Create platform_profile structure and register */
+ err = platform_profile_register(&dev->pprof);
+ if (err) {
+ dev_err(dev->dev, "Failed to register SPS support, this is most likely an SBIOS bug: %d\n",
+ err);
+ return -EEXIST;
+ }
+
+ dev->current_profile = PLATFORM_PROFILE_BALANCED;
+ amd_pmf_load_defaults_sps(dev);
+
+ return err;
+}
+
+void amd_pmf_deinit_sps(struct amd_pmf_dev *dev)
+{
+ platform_profile_remove();
+}
--
2.25.1
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [PATCH v4 03/11] platform/x86/amd/pmf: Add support SPS PMF feature
2022-08-02 15:11 ` [PATCH v4 03/11] platform/x86/amd/pmf: Add support SPS PMF feature Shyam Sundar S K
@ 2022-08-05 10:39 ` Hans de Goede
2022-08-18 22:47 ` Nathan Chancellor
1 sibling, 0 replies; 22+ messages in thread
From: Hans de Goede @ 2022-08-05 10:39 UTC (permalink / raw)
To: Shyam Sundar S K, markgross; +Cc: platform-driver-x86, Patil.Reddy
Hi,
On 8/2/22 17:11, Shyam Sundar S K wrote:
> SPS (a.k.a. Static Power Slider) gives a feel of Windows performance
> power slider for the Linux users, where the user selects a certain
> mode (like "balanced", "low-power" or "performance") and the thermals
> associated with each selected mode gets applied from the silicon
> side via the mailboxes defined through PMFW.
>
> PMF driver hooks to platform_profile by reading the PMF ACPI fn9 to
> see if the support is being advertised by ACPI interface.
>
> If supported, the PMF driver reacts to platform_profile selection choices
> made by the user and adjust the system thermal behavior.
>
> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
> Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
> ---
> drivers/platform/x86/amd/pmf/Makefile | 2 +-
> drivers/platform/x86/amd/pmf/acpi.c | 10 ++
> drivers/platform/x86/amd/pmf/core.c | 26 +++++
> drivers/platform/x86/amd/pmf/pmf.h | 64 +++++++++++
> drivers/platform/x86/amd/pmf/sps.c | 149 ++++++++++++++++++++++++++
> 5 files changed, 250 insertions(+), 1 deletion(-)
> create mode 100644 drivers/platform/x86/amd/pmf/sps.c
>
> diff --git a/drivers/platform/x86/amd/pmf/Makefile b/drivers/platform/x86/amd/pmf/Makefile
> index 2617eba773ce..557521a80427 100644
> --- a/drivers/platform/x86/amd/pmf/Makefile
> +++ b/drivers/platform/x86/amd/pmf/Makefile
> @@ -5,4 +5,4 @@
> #
>
> obj-$(CONFIG_AMD_PMF) += amd-pmf.o
> -amd-pmf-objs := core.o acpi.o
> +amd-pmf-objs := core.o acpi.o sps.o
> diff --git a/drivers/platform/x86/amd/pmf/acpi.c b/drivers/platform/x86/amd/pmf/acpi.c
> index b378f9e31194..5997ab724f3a 100644
> --- a/drivers/platform/x86/amd/pmf/acpi.c
> +++ b/drivers/platform/x86/amd/pmf/acpi.c
> @@ -93,6 +93,16 @@ int is_apmf_func_supported(struct amd_pmf_dev *pdev, unsigned long index)
> return !!(pdev->supported_func & BIT(index - 1));
> }
>
> +int apmf_get_static_slider_granular(struct amd_pmf_dev *pdev,
> + struct apmf_static_slider_granular_output *data)
> +{
> + if (!is_apmf_func_supported(pdev, APMF_FUNC_STATIC_SLIDER_GRANULAR))
> + return -EINVAL;
> +
> + return apmf_if_call_store_buffer(pdev, APMF_FUNC_STATIC_SLIDER_GRANULAR,
> + data, sizeof(*data));
> +}
> +
> static int apmf_if_verify_interface(struct amd_pmf_dev *pdev)
> {
> struct apmf_verify_interface output;
> diff --git a/drivers/platform/x86/amd/pmf/core.c b/drivers/platform/x86/amd/pmf/core.c
> index c5002b7bb904..a70ab6c9608a 100644
> --- a/drivers/platform/x86/amd/pmf/core.c
> +++ b/drivers/platform/x86/amd/pmf/core.c
> @@ -12,6 +12,7 @@
> #include <linux/module.h>
> #include <linux/pci.h>
> #include <linux/platform_device.h>
> +#include <linux/power_supply.h>
> #include "pmf.h"
>
> /* PMF-SMU communication registers */
> @@ -45,6 +46,14 @@
> #define DELAY_MIN_US 2000
> #define DELAY_MAX_US 3000
>
> +int amd_pmf_get_power_source(void)
> +{
> + if (power_supply_is_system_supplied() > 0)
> + return POWER_SOURCE_AC;
> + else
> + return POWER_SOURCE_DC;
> +}
> +
> static inline u32 amd_pmf_reg_read(struct amd_pmf_dev *dev, int reg_offset)
> {
> return ioread32(dev->regbase + reg_offset);
> @@ -138,6 +147,21 @@ static const struct pci_device_id pmf_pci_ids[] = {
> { }
> };
>
> +static void amd_pmf_init_features(struct amd_pmf_dev *dev)
> +{
> + /* Enable Static Slider */
> + if (is_apmf_func_supported(dev, APMF_FUNC_STATIC_SLIDER_GRANULAR)) {
> + amd_pmf_init_sps(dev);
> + dev_dbg(dev->dev, "SPS enabled and Platform Profiles registered\n");
> + }
> +}
> +
> +static void amd_pmf_deinit_features(struct amd_pmf_dev *dev)
> +{
> + if (is_apmf_func_supported(dev, APMF_FUNC_STATIC_SLIDER_GRANULAR))
> + amd_pmf_deinit_sps(dev);
> +}
> +
> static const struct acpi_device_id amd_pmf_acpi_ids[] = {
> {"AMDI0102", 0},
> { }
> @@ -206,6 +230,7 @@ static int amd_pmf_probe(struct platform_device *pdev)
>
> apmf_acpi_init(dev);
> platform_set_drvdata(pdev, dev);
> + amd_pmf_init_features(dev);
>
> mutex_init(&dev->lock);
> dev_info(dev->dev, "registered PMF device successfully\n");
> @@ -218,6 +243,7 @@ static int amd_pmf_remove(struct platform_device *pdev)
> struct amd_pmf_dev *dev = platform_get_drvdata(pdev);
>
> mutex_destroy(&dev->lock);
> + amd_pmf_deinit_features(dev);
> kfree(dev->buf);
> return 0;
> }
> diff --git a/drivers/platform/x86/amd/pmf/pmf.h b/drivers/platform/x86/amd/pmf/pmf.h
> index bdadbff168ee..5c867dac7d44 100644
> --- a/drivers/platform/x86/amd/pmf/pmf.h
> +++ b/drivers/platform/x86/amd/pmf/pmf.h
> @@ -12,10 +12,12 @@
> #define PMF_H
>
> #include <linux/acpi.h>
> +#include <linux/platform_profile.h>
>
> /* APMF Functions */
> #define APMF_FUNC_VERIFY_INTERFACE 0
> #define APMF_FUNC_GET_SYS_PARAMS 1
> +#define APMF_FUNC_STATIC_SLIDER_GRANULAR 9
>
> /* Message Definitions */
> #define SET_SPL 0x03 /* SPL: Sustained Power Limit */
> @@ -36,6 +38,8 @@
> #define GET_STT_LIMIT_APU 0x20
> #define GET_STT_LIMIT_HS2 0x21
>
> +#define ARG_NONE 0
> +
> /* AMD PMF BIOS interfaces */
> struct apmf_verify_interface {
> u16 size;
> @@ -51,6 +55,30 @@ struct apmf_system_params {
> u8 command_code;
> } __packed;
>
> +enum amd_stt_skin_temp {
> + STT_TEMP_APU,
> + STT_TEMP_HS2,
> + STT_TEMP_COUNT,
> +};
> +
> +enum amd_slider_op {
> + SLIDER_OP_GET,
> + SLIDER_OP_SET,
> +};
> +
> +enum power_source {
> + POWER_SOURCE_AC,
> + POWER_SOURCE_DC,
> + POWER_SOURCE_MAX,
> +};
> +
> +enum power_modes {
> + POWER_MODE_PERFORMANCE,
> + POWER_MODE_BALANCED_POWER,
> + POWER_MODE_POWER_SAVER,
> + POWER_MODE_MAX,
> +};
> +
> struct amd_pmf_dev {
> void __iomem *regbase;
> void __iomem *smu_virt_addr;
> @@ -60,10 +88,46 @@ struct amd_pmf_dev {
> struct device *dev;
> struct mutex lock; /* protects the PMF interface */
> u32 supported_func;
> + enum platform_profile_option current_profile;
> + struct platform_profile_handler pprof;
> +};
> +
> +struct apmf_sps_prop_granular {
> + u32 fppt;
> + u32 sppt;
> + u32 sppt_apu_only;
> + u32 spl;
> + u32 stt_min;
> + u8 stt_skin_temp[STT_TEMP_COUNT];
> + u32 fan_id;
> +} __packed;
> +
> +/* Static Slider */
> +struct apmf_static_slider_granular_output {
> + u16 size;
> + struct apmf_sps_prop_granular prop[POWER_SOURCE_MAX * POWER_MODE_MAX];
> +} __packed;
> +
> +struct amd_pmf_static_slider_granular {
> + u16 size;
> + struct apmf_sps_prop_granular prop[POWER_SOURCE_MAX][POWER_MODE_MAX];
> };
>
> /* Core Layer */
> int apmf_acpi_init(struct amd_pmf_dev *pmf_dev);
> +int is_apmf_func_supported(struct amd_pmf_dev *pdev, unsigned long index);
> int amd_pmf_send_cmd(struct amd_pmf_dev *dev, u8 message, bool get, u32 arg, u32 *data);
> +int amd_pmf_get_power_source(void);
> +
> +/* SPS Layer */
> +u8 amd_pmf_get_pprof_modes(struct amd_pmf_dev *pmf);
> +void amd_pmf_update_slider(struct amd_pmf_dev *dev, bool op, int idx,
> + struct amd_pmf_static_slider_granular *table);
> +int amd_pmf_init_sps(struct amd_pmf_dev *dev);
> +void amd_pmf_deinit_sps(struct amd_pmf_dev *dev);
> +int apmf_get_static_slider_granular(struct amd_pmf_dev *pdev,
> + struct apmf_static_slider_granular_output *output);
> +void amd_pmf_load_defaults_sps(struct amd_pmf_dev *dev);
> +
>
> #endif /* PMF_H */
> diff --git a/drivers/platform/x86/amd/pmf/sps.c b/drivers/platform/x86/amd/pmf/sps.c
> new file mode 100644
> index 000000000000..ef4df3fd774b
> --- /dev/null
> +++ b/drivers/platform/x86/amd/pmf/sps.c
> @@ -0,0 +1,149 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * AMD Platform Management Framework (PMF) Driver
> + *
> + * Copyright (c) 2022, Advanced Micro Devices, Inc.
> + * All Rights Reserved.
> + *
> + * Author: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
> + */
> +
> +#include "pmf.h"
> +
> +static int amd_pmf_profile_get(struct platform_profile_handler *pprof,
> + enum platform_profile_option *profile);
> +static int amd_pmf_profile_set(struct platform_profile_handler *pprof,
> + enum platform_profile_option profile);
> +static struct amd_pmf_static_slider_granular config_store;
> +
> +void amd_pmf_load_defaults_sps(struct amd_pmf_dev *dev)
This function is only used in this file, so it can be static,
I will fix this up while merging this.
> +{
> + struct apmf_static_slider_granular_output output;
> + int i, j, idx = 0;
> +
> + memset(&config_store, 0, sizeof(config_store));
> + apmf_get_static_slider_granular(dev, &output);
> +
> + for (i = 0; i < POWER_SOURCE_MAX; i++) {
> + for (j = 0; j < POWER_MODE_MAX; j++) {
> + config_store.prop[i][j].spl = output.prop[idx].spl;
> + config_store.prop[i][j].sppt = output.prop[idx].sppt;
> + config_store.prop[i][j].sppt_apu_only =
> + output.prop[idx].sppt_apu_only;
> + config_store.prop[i][j].fppt = output.prop[idx].fppt;
> + config_store.prop[i][j].stt_min = output.prop[idx].stt_min;
> + config_store.prop[i][j].stt_skin_temp[STT_TEMP_APU] =
> + output.prop[idx].stt_skin_temp[STT_TEMP_APU];
> + config_store.prop[i][j].stt_skin_temp[STT_TEMP_HS2] =
> + output.prop[idx].stt_skin_temp[STT_TEMP_HS2];
> + config_store.prop[i][j].fan_id = output.prop[idx].fan_id;
> + idx++;
> + }
> + }
> +}
> +
> +void amd_pmf_update_slider(struct amd_pmf_dev *dev, bool op, int idx,
> + struct amd_pmf_static_slider_granular *table)
> +{
> + int src = amd_pmf_get_power_source();
> +
> + if (op == SLIDER_OP_SET) {
> + amd_pmf_send_cmd(dev, SET_SPL, false, config_store.prop[src][idx].spl, NULL);
> + amd_pmf_send_cmd(dev, SET_FPPT, false, config_store.prop[src][idx].fppt, NULL);
> + amd_pmf_send_cmd(dev, SET_SPPT, false, config_store.prop[src][idx].sppt, NULL);
> + amd_pmf_send_cmd(dev, SET_SPPT_APU_ONLY, false,
> + config_store.prop[src][idx].sppt_apu_only, NULL);
> + amd_pmf_send_cmd(dev, SET_STT_MIN_LIMIT, false,
> + config_store.prop[src][idx].stt_min, NULL);
> + amd_pmf_send_cmd(dev, SET_STT_LIMIT_APU, false,
> + config_store.prop[src][idx].stt_skin_temp[STT_TEMP_APU], NULL);
> + amd_pmf_send_cmd(dev, SET_STT_LIMIT_HS2, false,
> + config_store.prop[src][idx].stt_skin_temp[STT_TEMP_HS2], NULL);
> + } else if (op == SLIDER_OP_GET) {
> + amd_pmf_send_cmd(dev, GET_SPL, true, ARG_NONE, &table->prop[src][idx].spl);
> + amd_pmf_send_cmd(dev, GET_FPPT, true, ARG_NONE, &table->prop[src][idx].fppt);
> + amd_pmf_send_cmd(dev, GET_SPPT, true, ARG_NONE, &table->prop[src][idx].sppt);
> + amd_pmf_send_cmd(dev, GET_SPPT_APU_ONLY, true, ARG_NONE,
> + &table->prop[src][idx].sppt_apu_only);
> + amd_pmf_send_cmd(dev, GET_STT_MIN_LIMIT, true, ARG_NONE,
> + &table->prop[src][idx].stt_min);
> + amd_pmf_send_cmd(dev, GET_STT_LIMIT_APU, true, ARG_NONE,
> + (u32 *)&table->prop[src][idx].stt_skin_temp[STT_TEMP_APU]);
> + amd_pmf_send_cmd(dev, GET_STT_LIMIT_HS2, true, ARG_NONE,
> + (u32 *)&table->prop[src][idx].stt_skin_temp[STT_TEMP_HS2]);
> + }
> +}
> +
> +static int amd_pmf_profile_get(struct platform_profile_handler *pprof,
> + enum platform_profile_option *profile)
> +{
> + struct amd_pmf_dev *pmf = container_of(pprof, struct amd_pmf_dev, pprof);
> +
> + *profile = pmf->current_profile;
> + return 0;
> +}
> +
> +u8 amd_pmf_get_pprof_modes(struct amd_pmf_dev *pmf)
> +{
> + u8 mode;
> +
> + switch (pmf->current_profile) {
> + case PLATFORM_PROFILE_PERFORMANCE:
> + mode = POWER_MODE_PERFORMANCE;
> + break;
> + case PLATFORM_PROFILE_BALANCED:
> + mode = POWER_MODE_BALANCED_POWER;
> + break;
> + case PLATFORM_PROFILE_LOW_POWER:
> + mode = POWER_MODE_POWER_SAVER;
> + break;
> + default:
> + dev_err(pmf->dev, "Unknown Platform Profile.\n");
> + break;
> + }
> +
> + return mode;
> +}
> +
> +int amd_pmf_profile_set(struct platform_profile_handler *pprof,
> + enum platform_profile_option profile)
This function is only used in this file, so it can be static
(it actually is declared static at the top of the file)
I will fix this up while merging this.
> +{
> + struct amd_pmf_dev *pmf = container_of(pprof, struct amd_pmf_dev, pprof);
> + u8 mode;
> +
> + pmf->current_profile = profile;
> + mode = amd_pmf_get_pprof_modes(pmf);
> + amd_pmf_update_slider(pmf, SLIDER_OP_SET, mode, NULL);
> + return 0;
> +}
> +
> +int amd_pmf_init_sps(struct amd_pmf_dev *dev)
> +{
> + int err = 0;
> +
> + dev->pprof.profile_get = amd_pmf_profile_get;
> + dev->pprof.profile_set = amd_pmf_profile_set;
> +
> + /* Setup supported modes */
> + set_bit(PLATFORM_PROFILE_LOW_POWER, dev->pprof.choices);
> + set_bit(PLATFORM_PROFILE_BALANCED, dev->pprof.choices);
> + set_bit(PLATFORM_PROFILE_PERFORMANCE, dev->pprof.choices);
> +
> + /* Create platform_profile structure and register */
> + err = platform_profile_register(&dev->pprof);
> + if (err) {
> + dev_err(dev->dev, "Failed to register SPS support, this is most likely an SBIOS bug: %d\n",
> + err);
> + return -EEXIST;
> + }
> +
> + dev->current_profile = PLATFORM_PROFILE_BALANCED;
> + amd_pmf_load_defaults_sps(dev);
I just realized that there is a theoretical race here where
userspace can call amd_pmf_profile_set before
amd_pmf_load_defaults_sps() is finshed, so the
platform_profile_register() must be moved to the end of the
function. I will fix this up while merging this.
Regards,
Hans
> +
> + return err;
> +}
> +
> +void amd_pmf_deinit_sps(struct amd_pmf_dev *dev)
> +{
> + platform_profile_remove();
> +}
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PATCH v4 03/11] platform/x86/amd/pmf: Add support SPS PMF feature
2022-08-02 15:11 ` [PATCH v4 03/11] platform/x86/amd/pmf: Add support SPS PMF feature Shyam Sundar S K
2022-08-05 10:39 ` Hans de Goede
@ 2022-08-18 22:47 ` Nathan Chancellor
2022-08-19 8:58 ` Shyam Sundar S K
1 sibling, 1 reply; 22+ messages in thread
From: Nathan Chancellor @ 2022-08-18 22:47 UTC (permalink / raw)
To: Shyam Sundar S K
Cc: hdegoede, markgross, platform-driver-x86, Patil.Reddy, llvm
Hi Shyam,
On Tue, Aug 02, 2022 at 08:41:41PM +0530, Shyam Sundar S K wrote:
> SPS (a.k.a. Static Power Slider) gives a feel of Windows performance
> power slider for the Linux users, where the user selects a certain
> mode (like "balanced", "low-power" or "performance") and the thermals
> associated with each selected mode gets applied from the silicon
> side via the mailboxes defined through PMFW.
>
> PMF driver hooks to platform_profile by reading the PMF ACPI fn9 to
> see if the support is being advertised by ACPI interface.
>
> If supported, the PMF driver reacts to platform_profile selection choices
> made by the user and adjust the system thermal behavior.
>
> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
> Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
<snip>
> diff --git a/drivers/platform/x86/amd/pmf/sps.c b/drivers/platform/x86/amd/pmf/sps.c
> new file mode 100644
> index 000000000000..ef4df3fd774b
> --- /dev/null
> +++ b/drivers/platform/x86/amd/pmf/sps.c
<snip>
> +u8 amd_pmf_get_pprof_modes(struct amd_pmf_dev *pmf)
> +{
> + u8 mode;
> +
> + switch (pmf->current_profile) {
> + case PLATFORM_PROFILE_PERFORMANCE:
> + mode = POWER_MODE_PERFORMANCE;
> + break;
> + case PLATFORM_PROFILE_BALANCED:
> + mode = POWER_MODE_BALANCED_POWER;
> + break;
> + case PLATFORM_PROFILE_LOW_POWER:
> + mode = POWER_MODE_POWER_SAVER;
> + break;
> + default:
> + dev_err(pmf->dev, "Unknown Platform Profile.\n");
> + break;
> + }
> +
> + return mode;
> +}
This patch is now in -next as commit 4c71ae414474
("platform/x86/amd/pmf: Add support SPS PMF feature"), where it causes
the following clang warning:
drivers/platform/x86/amd/pmf/sps.c:96:2: error: variable 'mode' is used uninitialized whenever switch default is taken [-Werror,-Wsometimes-uninitialized]
default:
^~~~~~~
drivers/platform/x86/amd/pmf/sps.c:101:9: note: uninitialized use occurs here
return mode;
^~~~
drivers/platform/x86/amd/pmf/sps.c:84:9: note: initialize the variable 'mode' to silence this warning
u8 mode;
^
= '\0'
1 error generated.
As far as I can tell, the default case cannot actually happen due to the
advertising of choices in amd_pmf_init_sps() and the check against those
choices in platform_profile_store() but it would be good to avoid this
warning, especially given that it is fatal with CONFIG_WERROR.
I do not mind sending a patch for this but I am a little unclear what
the best fix would be. Removing the default case would cause -Wswitch
warnings because current_profile is an enum (plus it would make finding
invalid profiles harder if there was ever a change in the core). Perhaps
changing the return type to be an int, returning an error code in the
default case, then updating the call sites to check for an error? I am
open to other suggestions (or if you want to sent a fix yourself, just
consider this a report).
Cheers,
Nathan
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PATCH v4 03/11] platform/x86/amd/pmf: Add support SPS PMF feature
2022-08-18 22:47 ` Nathan Chancellor
@ 2022-08-19 8:58 ` Shyam Sundar S K
2022-08-19 9:14 ` Hans de Goede
0 siblings, 1 reply; 22+ messages in thread
From: Shyam Sundar S K @ 2022-08-19 8:58 UTC (permalink / raw)
To: Nathan Chancellor
Cc: hdegoede, markgross, platform-driver-x86, Patil.Reddy, llvm
Hi Nathan,
Thanks for bringing this up.
On 8/19/2022 4:17 AM, Nathan Chancellor wrote:
> Hi Shyam,
>
> On Tue, Aug 02, 2022 at 08:41:41PM +0530, Shyam Sundar S K wrote:
>> SPS (a.k.a. Static Power Slider) gives a feel of Windows performance
>> power slider for the Linux users, where the user selects a certain
>> mode (like "balanced", "low-power" or "performance") and the thermals
>> associated with each selected mode gets applied from the silicon
>> side via the mailboxes defined through PMFW.
>>
>> PMF driver hooks to platform_profile by reading the PMF ACPI fn9 to
>> see if the support is being advertised by ACPI interface.
>>
>> If supported, the PMF driver reacts to platform_profile selection choices
>> made by the user and adjust the system thermal behavior.
>>
>> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
>> Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
>
> <snip>
>
>> diff --git a/drivers/platform/x86/amd/pmf/sps.c b/drivers/platform/x86/amd/pmf/sps.c
>> new file mode 100644
>> index 000000000000..ef4df3fd774b
>> --- /dev/null
>> +++ b/drivers/platform/x86/amd/pmf/sps.c
>
> <snip>
>
>> +u8 amd_pmf_get_pprof_modes(struct amd_pmf_dev *pmf)
>> +{
>> + u8 mode;
>> +
>> + switch (pmf->current_profile) {
>> + case PLATFORM_PROFILE_PERFORMANCE:
>> + mode = POWER_MODE_PERFORMANCE;
>> + break;
>> + case PLATFORM_PROFILE_BALANCED:
>> + mode = POWER_MODE_BALANCED_POWER;
>> + break;
>> + case PLATFORM_PROFILE_LOW_POWER:
>> + mode = POWER_MODE_POWER_SAVER;
>> + break;
>> + default:
>> + dev_err(pmf->dev, "Unknown Platform Profile.\n");
>> + break;
>> + }
>> +
>> + return mode;
>> +}
>
> This patch is now in -next as commit 4c71ae414474
> ("platform/x86/amd/pmf: Add support SPS PMF feature"), where it causes
> the following clang warning:
>
> drivers/platform/x86/amd/pmf/sps.c:96:2: error: variable 'mode' is used uninitialized whenever switch default is taken [-Werror,-Wsometimes-uninitialized]
> default:
> ^~~~~~~
> drivers/platform/x86/amd/pmf/sps.c:101:9: note: uninitialized use occurs here
> return mode;
> ^~~~
> drivers/platform/x86/amd/pmf/sps.c:84:9: note: initialize the variable 'mode' to silence this warning
> u8 mode;
> ^
> = '\0'
> 1 error generated.
>
> As far as I can tell, the default case cannot actually happen due to the
> advertising of choices in amd_pmf_init_sps() and the check against those
> choices in platform_profile_store() but it would be good to avoid this
> warning, especially given that it is fatal with CONFIG_WERROR.
>
> I do not mind sending a patch for this but I am a little unclear what
> the best fix would be. Removing the default case would cause -Wswitch
> warnings because current_profile is an enum (plus it would make finding
> invalid profiles harder if there was ever a change in the core). Perhaps
> changing the return type to be an int, returning an error code in the
> default case, then updating the call sites to check for an error? I am
> open to other suggestions (or if you want to sent a fix yourself, just
> consider this a report).
yes, you are right. We can just change the return an error code like the
other driver implementing the platform_profile. Like below.
diff --git a/drivers/platform/x86/amd/pmf/pmf.h
b/drivers/platform/x86/amd/pmf/pmf.h
index 7613ed2ef6e3..172610f93bd1 100644
--- a/drivers/platform/x86/amd/pmf/pmf.h
+++ b/drivers/platform/x86/amd/pmf/pmf.h
@@ -303,7 +303,7 @@ int amd_pmf_init_metrics_table(struct amd_pmf_dev *dev);
int amd_pmf_get_power_source(void);
/* SPS Layer */
-u8 amd_pmf_get_pprof_modes(struct amd_pmf_dev *pmf);
+int amd_pmf_get_pprof_modes(struct amd_pmf_dev *pmf);
void amd_pmf_update_slider(struct amd_pmf_dev *dev, bool op, int idx,
struct amd_pmf_static_slider_granular *table);
int amd_pmf_init_sps(struct amd_pmf_dev *dev);
diff --git a/drivers/platform/x86/amd/pmf/sps.c
b/drivers/platform/x86/amd/pmf/sps.c
index 8923e29cc6ca..dba7e36962dc 100644
--- a/drivers/platform/x86/amd/pmf/sps.c
+++ b/drivers/platform/x86/amd/pmf/sps.c
@@ -79,9 +79,9 @@ static int amd_pmf_profile_get(struct
platform_profile_handler *pprof,
return 0;
}
-u8 amd_pmf_get_pprof_modes(struct amd_pmf_dev *pmf)
+int amd_pmf_get_pprof_modes(struct amd_pmf_dev *pmf)
{
- u8 mode;
+ int mode;
switch (pmf->current_profile) {
case PLATFORM_PROFILE_PERFORMANCE:
@@ -95,7 +95,7 @@ u8 amd_pmf_get_pprof_modes(struct amd_pmf_dev *pmf)
break;
default:
dev_err(pmf->dev, "Unknown Platform Profile.\n");
- break;
+ return -EOPNOTSUPP;
}
return mode;
@@ -105,10 +105,13 @@ static int amd_pmf_profile_set(struct
platform_profile_handler *pprof,
enum platform_profile_option profile)
{
struct amd_pmf_dev *pmf = container_of(pprof, struct
amd_pmf_dev, pprof);
- u8 mode;
+ int mode;
pmf->current_profile = profile;
mode = amd_pmf_get_pprof_modes(pmf);
+ if (mode < 0)
+ return mode;
+
amd_pmf_update_slider(pmf, SLIDER_OP_SET, mode, NULL);
return 0;
}
Thanks,
Shyam
>
> Cheers,
> Nathan
>
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [PATCH v4 03/11] platform/x86/amd/pmf: Add support SPS PMF feature
2022-08-19 8:58 ` Shyam Sundar S K
@ 2022-08-19 9:14 ` Hans de Goede
0 siblings, 0 replies; 22+ messages in thread
From: Hans de Goede @ 2022-08-19 9:14 UTC (permalink / raw)
To: Shyam Sundar S K, Nathan Chancellor
Cc: markgross, platform-driver-x86, Patil.Reddy, llvm
Hi Shyam,
On 8/19/22 10:58, Shyam Sundar S K wrote:
> Hi Nathan,
>
> Thanks for bringing this up.
>
> On 8/19/2022 4:17 AM, Nathan Chancellor wrote:
>> Hi Shyam,
>>
>> On Tue, Aug 02, 2022 at 08:41:41PM +0530, Shyam Sundar S K wrote:
>>> SPS (a.k.a. Static Power Slider) gives a feel of Windows performance
>>> power slider for the Linux users, where the user selects a certain
>>> mode (like "balanced", "low-power" or "performance") and the thermals
>>> associated with each selected mode gets applied from the silicon
>>> side via the mailboxes defined through PMFW.
>>>
>>> PMF driver hooks to platform_profile by reading the PMF ACPI fn9 to
>>> see if the support is being advertised by ACPI interface.
>>>
>>> If supported, the PMF driver reacts to platform_profile selection choices
>>> made by the user and adjust the system thermal behavior.
>>>
>>> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
>>> Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
>>
>> <snip>
>>
>>> diff --git a/drivers/platform/x86/amd/pmf/sps.c b/drivers/platform/x86/amd/pmf/sps.c
>>> new file mode 100644
>>> index 000000000000..ef4df3fd774b
>>> --- /dev/null
>>> +++ b/drivers/platform/x86/amd/pmf/sps.c
>>
>> <snip>
>>
>>> +u8 amd_pmf_get_pprof_modes(struct amd_pmf_dev *pmf)
>>> +{
>>> + u8 mode;
>>> +
>>> + switch (pmf->current_profile) {
>>> + case PLATFORM_PROFILE_PERFORMANCE:
>>> + mode = POWER_MODE_PERFORMANCE;
>>> + break;
>>> + case PLATFORM_PROFILE_BALANCED:
>>> + mode = POWER_MODE_BALANCED_POWER;
>>> + break;
>>> + case PLATFORM_PROFILE_LOW_POWER:
>>> + mode = POWER_MODE_POWER_SAVER;
>>> + break;
>>> + default:
>>> + dev_err(pmf->dev, "Unknown Platform Profile.\n");
>>> + break;
>>> + }
>>> +
>>> + return mode;
>>> +}
>>
>> This patch is now in -next as commit 4c71ae414474
>> ("platform/x86/amd/pmf: Add support SPS PMF feature"), where it causes
>> the following clang warning:
>>
>> drivers/platform/x86/amd/pmf/sps.c:96:2: error: variable 'mode' is used uninitialized whenever switch default is taken [-Werror,-Wsometimes-uninitialized]
>> default:
>> ^~~~~~~
>> drivers/platform/x86/amd/pmf/sps.c:101:9: note: uninitialized use occurs here
>> return mode;
>> ^~~~
>> drivers/platform/x86/amd/pmf/sps.c:84:9: note: initialize the variable 'mode' to silence this warning
>> u8 mode;
>> ^
>> = '\0'
>> 1 error generated.
>>
>> As far as I can tell, the default case cannot actually happen due to the
>> advertising of choices in amd_pmf_init_sps() and the check against those
>> choices in platform_profile_store() but it would be good to avoid this
>> warning, especially given that it is fatal with CONFIG_WERROR.
>>
>> I do not mind sending a patch for this but I am a little unclear what
>> the best fix would be. Removing the default case would cause -Wswitch
>> warnings because current_profile is an enum (plus it would make finding
>> invalid profiles harder if there was ever a change in the core). Perhaps
>> changing the return type to be an int, returning an error code in the
>> default case, then updating the call sites to check for an error? I am
>> open to other suggestions (or if you want to sent a fix yourself, just
>> consider this a report).
>
> yes, you are right. We can just change the return an error code like the
> other driver implementing the platform_profile. Like below.
Yes returning -EOPNOTSUPP is the right thing to do in the
default case.
Can you turn this into a proper patch/commit and submit
it please?
Regards,
Hans
>
> diff --git a/drivers/platform/x86/amd/pmf/pmf.h
> b/drivers/platform/x86/amd/pmf/pmf.h
> index 7613ed2ef6e3..172610f93bd1 100644
> --- a/drivers/platform/x86/amd/pmf/pmf.h
> +++ b/drivers/platform/x86/amd/pmf/pmf.h
> @@ -303,7 +303,7 @@ int amd_pmf_init_metrics_table(struct amd_pmf_dev *dev);
> int amd_pmf_get_power_source(void);
>
> /* SPS Layer */
> -u8 amd_pmf_get_pprof_modes(struct amd_pmf_dev *pmf);
> +int amd_pmf_get_pprof_modes(struct amd_pmf_dev *pmf);
> void amd_pmf_update_slider(struct amd_pmf_dev *dev, bool op, int idx,
> struct amd_pmf_static_slider_granular *table);
> int amd_pmf_init_sps(struct amd_pmf_dev *dev);
> diff --git a/drivers/platform/x86/amd/pmf/sps.c
> b/drivers/platform/x86/amd/pmf/sps.c
> index 8923e29cc6ca..dba7e36962dc 100644
> --- a/drivers/platform/x86/amd/pmf/sps.c
> +++ b/drivers/platform/x86/amd/pmf/sps.c
> @@ -79,9 +79,9 @@ static int amd_pmf_profile_get(struct
> platform_profile_handler *pprof,
> return 0;
> }
>
> -u8 amd_pmf_get_pprof_modes(struct amd_pmf_dev *pmf)
> +int amd_pmf_get_pprof_modes(struct amd_pmf_dev *pmf)
> {
> - u8 mode;
> + int mode;
>
> switch (pmf->current_profile) {
> case PLATFORM_PROFILE_PERFORMANCE:
> @@ -95,7 +95,7 @@ u8 amd_pmf_get_pprof_modes(struct amd_pmf_dev *pmf)
> break;
> default:
> dev_err(pmf->dev, "Unknown Platform Profile.\n");
> - break;
> + return -EOPNOTSUPP;
> }
>
> return mode;
> @@ -105,10 +105,13 @@ static int amd_pmf_profile_set(struct
> platform_profile_handler *pprof,
> enum platform_profile_option profile)
> {
> struct amd_pmf_dev *pmf = container_of(pprof, struct
> amd_pmf_dev, pprof);
> - u8 mode;
> + int mode;
>
> pmf->current_profile = profile;
> mode = amd_pmf_get_pprof_modes(pmf);
> + if (mode < 0)
> + return mode;
> +
> amd_pmf_update_slider(pmf, SLIDER_OP_SET, mode, NULL);
> return 0;
> }
>
>
> Thanks,
> Shyam
>
>>
>> Cheers,
>> Nathan
>>
>
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH v4 04/11] platform/x86/amd/pmf: Add debugfs information
2022-08-02 15:11 [PATCH v4 00/11] platform/x86/amd/pmf: Introduce AMD PMF Driver Shyam Sundar S K
` (2 preceding siblings ...)
2022-08-02 15:11 ` [PATCH v4 03/11] platform/x86/amd/pmf: Add support SPS PMF feature Shyam Sundar S K
@ 2022-08-02 15:11 ` Shyam Sundar S K
2022-08-02 15:11 ` [PATCH v4 05/11] platform/x86/amd/pmf: Add heartbeat signal support Shyam Sundar S K
` (7 subsequent siblings)
11 siblings, 0 replies; 22+ messages in thread
From: Shyam Sundar S K @ 2022-08-02 15:11 UTC (permalink / raw)
To: hdegoede, markgross; +Cc: platform-driver-x86, Patil.Reddy, Shyam Sundar S K
Add debugfs support to the PMF driver so that using this interface the
live counters from the PMFW can be queried to see if the power parameters
are getting set properly when a certain power mode change happens.
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
---
drivers/platform/x86/amd/pmf/core.c | 36 +++++++++++++++++++++++++++++
drivers/platform/x86/amd/pmf/pmf.h | 1 +
2 files changed, 37 insertions(+)
diff --git a/drivers/platform/x86/amd/pmf/core.c b/drivers/platform/x86/amd/pmf/core.c
index a70ab6c9608a..032d9dc5e09f 100644
--- a/drivers/platform/x86/amd/pmf/core.c
+++ b/drivers/platform/x86/amd/pmf/core.c
@@ -8,6 +8,7 @@
* Author: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
*/
+#include <linux/debugfs.h>
#include <linux/iopoll.h>
#include <linux/module.h>
#include <linux/pci.h>
@@ -46,6 +47,39 @@
#define DELAY_MIN_US 2000
#define DELAY_MAX_US 3000
+static int current_power_limits_show(struct seq_file *seq, void *unused)
+{
+ struct amd_pmf_dev *dev = seq->private;
+ struct amd_pmf_static_slider_granular table;
+ int mode, src = 0;
+
+ mode = amd_pmf_get_pprof_modes(dev);
+ src = amd_pmf_get_power_source();
+ amd_pmf_update_slider(dev, SLIDER_OP_GET, mode, &table);
+ seq_printf(seq, "spl:%u fppt:%u sppt:%u sppt_apu_only:%u stt_min:%u stt[APU]:%u stt[HS2]: %u\n",
+ table.prop[src][mode].spl,
+ table.prop[src][mode].fppt,
+ table.prop[src][mode].sppt,
+ table.prop[src][mode].sppt_apu_only,
+ table.prop[src][mode].stt_min,
+ table.prop[src][mode].stt_skin_temp[STT_TEMP_APU],
+ table.prop[src][mode].stt_skin_temp[STT_TEMP_HS2]);
+ return 0;
+}
+DEFINE_SHOW_ATTRIBUTE(current_power_limits);
+
+static void amd_pmf_dbgfs_unregister(struct amd_pmf_dev *dev)
+{
+ debugfs_remove_recursive(dev->dbgfs_dir);
+}
+
+static void amd_pmf_dbgfs_register(struct amd_pmf_dev *dev)
+{
+ dev->dbgfs_dir = debugfs_create_dir("amd_pmf", NULL);
+ debugfs_create_file("current_power_limits", 0644, dev->dbgfs_dir, dev,
+ ¤t_power_limits_fops);
+}
+
int amd_pmf_get_power_source(void)
{
if (power_supply_is_system_supplied() > 0)
@@ -231,6 +265,7 @@ static int amd_pmf_probe(struct platform_device *pdev)
apmf_acpi_init(dev);
platform_set_drvdata(pdev, dev);
amd_pmf_init_features(dev);
+ amd_pmf_dbgfs_register(dev);
mutex_init(&dev->lock);
dev_info(dev->dev, "registered PMF device successfully\n");
@@ -244,6 +279,7 @@ static int amd_pmf_remove(struct platform_device *pdev)
mutex_destroy(&dev->lock);
amd_pmf_deinit_features(dev);
+ amd_pmf_dbgfs_unregister(dev);
kfree(dev->buf);
return 0;
}
diff --git a/drivers/platform/x86/amd/pmf/pmf.h b/drivers/platform/x86/amd/pmf/pmf.h
index 5c867dac7d44..e13542359403 100644
--- a/drivers/platform/x86/amd/pmf/pmf.h
+++ b/drivers/platform/x86/amd/pmf/pmf.h
@@ -90,6 +90,7 @@ struct amd_pmf_dev {
u32 supported_func;
enum platform_profile_option current_profile;
struct platform_profile_handler pprof;
+ struct dentry *dbgfs_dir;
};
struct apmf_sps_prop_granular {
--
2.25.1
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH v4 05/11] platform/x86/amd/pmf: Add heartbeat signal support
2022-08-02 15:11 [PATCH v4 00/11] platform/x86/amd/pmf: Introduce AMD PMF Driver Shyam Sundar S K
` (3 preceding siblings ...)
2022-08-02 15:11 ` [PATCH v4 04/11] platform/x86/amd/pmf: Add debugfs information Shyam Sundar S K
@ 2022-08-02 15:11 ` Shyam Sundar S K
2022-08-02 15:11 ` [PATCH v4 06/11] platform/x86/amd/pmf: Add fan control support Shyam Sundar S K
` (6 subsequent siblings)
11 siblings, 0 replies; 22+ messages in thread
From: Shyam Sundar S K @ 2022-08-02 15:11 UTC (permalink / raw)
To: hdegoede, markgross; +Cc: platform-driver-x86, Patil.Reddy, Shyam Sundar S K
PMF driver can send periodic heartbeat signals to OEM BIOS. When BIOS does
not receive the signal after a period of time, it can infer that AMDPMF
has hung or failed to load.
In this situation, BIOS can fallback to legacy operations. OEM can modify
the time interval of the signal or completely disable signals through
ACPI Method.
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
---
drivers/platform/x86/amd/pmf/acpi.c | 34 +++++++++++++++++++++++++++--
drivers/platform/x86/amd/pmf/core.c | 1 +
drivers/platform/x86/amd/pmf/pmf.h | 5 +++++
3 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/drivers/platform/x86/amd/pmf/acpi.c b/drivers/platform/x86/amd/pmf/acpi.c
index 5997ab724f3a..6af0e23257ea 100644
--- a/drivers/platform/x86/amd/pmf/acpi.c
+++ b/drivers/platform/x86/amd/pmf/acpi.c
@@ -103,6 +103,22 @@ int apmf_get_static_slider_granular(struct amd_pmf_dev *pdev,
data, sizeof(*data));
}
+static void apmf_sbios_heartbeat_notify(struct work_struct *work)
+{
+ struct amd_pmf_dev *dev = container_of(work, struct amd_pmf_dev, heart_beat.work);
+ union acpi_object *info;
+
+ dev_dbg(dev->dev, "Sending heartbeat to SBIOS\n");
+ info = apmf_if_call(dev, APMF_FUNC_SBIOS_HEARTBEAT, NULL);
+ if (!info)
+ goto out;
+
+ schedule_delayed_work(&dev->heart_beat, msecs_to_jiffies(dev->hb_interval * 1000));
+
+out:
+ kfree(info);
+}
+
static int apmf_if_verify_interface(struct amd_pmf_dev *pdev)
{
struct apmf_verify_interface output;
@@ -131,15 +147,23 @@ static int apmf_get_system_params(struct amd_pmf_dev *dev)
if (err)
return err;
- dev_dbg(dev->dev, "system params mask:0x%x flags:0x%x cmd_code:0x%x\n",
+ dev_dbg(dev->dev, "system params mask:0x%x flags:0x%x cmd_code:0x%x heartbeat:%d\n",
params.valid_mask,
params.flags,
- params.command_code);
+ params.command_code,
+ params.heartbeat_int);
params.flags = params.flags & params.valid_mask;
+ dev->hb_interval = params.heartbeat_int;
return 0;
}
+void apmf_acpi_deinit(struct amd_pmf_dev *pmf_dev)
+{
+ if (pmf_dev->hb_interval)
+ cancel_delayed_work_sync(&pmf_dev->heart_beat);
+}
+
int apmf_acpi_init(struct amd_pmf_dev *pmf_dev)
{
int ret;
@@ -156,6 +180,12 @@ int apmf_acpi_init(struct amd_pmf_dev *pmf_dev)
goto out;
}
+ if (pmf_dev->hb_interval) {
+ /* send heartbeats only if the interval is not zero */
+ INIT_DELAYED_WORK(&pmf_dev->heart_beat, apmf_sbios_heartbeat_notify);
+ schedule_delayed_work(&pmf_dev->heart_beat, 0);
+ }
+
out:
return ret;
}
diff --git a/drivers/platform/x86/amd/pmf/core.c b/drivers/platform/x86/amd/pmf/core.c
index 032d9dc5e09f..87a1f9b27d2c 100644
--- a/drivers/platform/x86/amd/pmf/core.c
+++ b/drivers/platform/x86/amd/pmf/core.c
@@ -279,6 +279,7 @@ static int amd_pmf_remove(struct platform_device *pdev)
mutex_destroy(&dev->lock);
amd_pmf_deinit_features(dev);
+ apmf_acpi_deinit(dev);
amd_pmf_dbgfs_unregister(dev);
kfree(dev->buf);
return 0;
diff --git a/drivers/platform/x86/amd/pmf/pmf.h b/drivers/platform/x86/amd/pmf/pmf.h
index e13542359403..5b85a7fe0f38 100644
--- a/drivers/platform/x86/amd/pmf/pmf.h
+++ b/drivers/platform/x86/amd/pmf/pmf.h
@@ -17,6 +17,7 @@
/* APMF Functions */
#define APMF_FUNC_VERIFY_INTERFACE 0
#define APMF_FUNC_GET_SYS_PARAMS 1
+#define APMF_FUNC_SBIOS_HEARTBEAT 4
#define APMF_FUNC_STATIC_SLIDER_GRANULAR 9
/* Message Definitions */
@@ -53,6 +54,7 @@ struct apmf_system_params {
u32 valid_mask;
u32 flags;
u8 command_code;
+ u32 heartbeat_int;
} __packed;
enum amd_stt_skin_temp {
@@ -91,6 +93,8 @@ struct amd_pmf_dev {
enum platform_profile_option current_profile;
struct platform_profile_handler pprof;
struct dentry *dbgfs_dir;
+ int hb_interval; /* SBIOS heartbeat interval */
+ struct delayed_work heart_beat;
};
struct apmf_sps_prop_granular {
@@ -116,6 +120,7 @@ struct amd_pmf_static_slider_granular {
/* Core Layer */
int apmf_acpi_init(struct amd_pmf_dev *pmf_dev);
+void apmf_acpi_deinit(struct amd_pmf_dev *pmf_dev);
int is_apmf_func_supported(struct amd_pmf_dev *pdev, unsigned long index);
int amd_pmf_send_cmd(struct amd_pmf_dev *dev, u8 message, bool get, u32 arg, u32 *data);
int amd_pmf_get_power_source(void);
--
2.25.1
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH v4 06/11] platform/x86/amd/pmf: Add fan control support
2022-08-02 15:11 [PATCH v4 00/11] platform/x86/amd/pmf: Introduce AMD PMF Driver Shyam Sundar S K
` (4 preceding siblings ...)
2022-08-02 15:11 ` [PATCH v4 05/11] platform/x86/amd/pmf: Add heartbeat signal support Shyam Sundar S K
@ 2022-08-02 15:11 ` Shyam Sundar S K
2022-08-02 15:11 ` [PATCH v4 07/11] platform/x86/amd/pmf: Get performance metrics from PMFW Shyam Sundar S K
` (5 subsequent siblings)
11 siblings, 0 replies; 22+ messages in thread
From: Shyam Sundar S K @ 2022-08-02 15:11 UTC (permalink / raw)
To: hdegoede, markgross; +Cc: platform-driver-x86, Patil.Reddy, Shyam Sundar S K
PMF has a generic interface defined via PMF ACPI fn9 for influencing fan
policy during mode switch.
PMF ACPI fn9 will normally be invoked when AMDPMF needs to change the fan
table index for the EC. When AMDPMF is loaded this function will be invoked
to change fan speed. OEM can also choose to report the actual fan table
index and fan RPM to PMF through OEM structure.
This information will be communicated by PMF driver to customer BIOS.
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
---
drivers/platform/x86/amd/pmf/acpi.c | 25 +++++++++++++++++++++++++
drivers/platform/x86/amd/pmf/pmf.h | 16 ++++++++++++++++
2 files changed, 41 insertions(+)
diff --git a/drivers/platform/x86/amd/pmf/acpi.c b/drivers/platform/x86/amd/pmf/acpi.c
index 6af0e23257ea..1fc4d1400364 100644
--- a/drivers/platform/x86/amd/pmf/acpi.c
+++ b/drivers/platform/x86/amd/pmf/acpi.c
@@ -119,6 +119,31 @@ static void apmf_sbios_heartbeat_notify(struct work_struct *work)
kfree(info);
}
+int apmf_update_fan_idx(struct amd_pmf_dev *pdev, bool manual, u32 idx)
+{
+ union acpi_object *info;
+ struct apmf_fan_idx args;
+ struct acpi_buffer params;
+ int err = 0;
+
+ args.size = sizeof(args);
+ args.fan_ctl_mode = manual;
+ args.fan_ctl_idx = idx;
+
+ params.length = sizeof(args);
+ params.pointer = (void *)&args;
+
+ info = apmf_if_call(pdev, APMF_FUNC_SET_FAN_IDX, ¶ms);
+ if (!info) {
+ err = -EIO;
+ goto out;
+ }
+
+out:
+ kfree(info);
+ return err;
+}
+
static int apmf_if_verify_interface(struct amd_pmf_dev *pdev)
{
struct apmf_verify_interface output;
diff --git a/drivers/platform/x86/amd/pmf/pmf.h b/drivers/platform/x86/amd/pmf/pmf.h
index 5b85a7fe0f38..d40613a30ed7 100644
--- a/drivers/platform/x86/amd/pmf/pmf.h
+++ b/drivers/platform/x86/amd/pmf/pmf.h
@@ -18,6 +18,7 @@
#define APMF_FUNC_VERIFY_INTERFACE 0
#define APMF_FUNC_GET_SYS_PARAMS 1
#define APMF_FUNC_SBIOS_HEARTBEAT 4
+#define APMF_FUNC_SET_FAN_IDX 7
#define APMF_FUNC_STATIC_SLIDER_GRANULAR 9
/* Message Definitions */
@@ -39,6 +40,9 @@
#define GET_STT_LIMIT_APU 0x20
#define GET_STT_LIMIT_HS2 0x21
+/* Fan Index for Auto Mode */
+#define FAN_INDEX_AUTO 0xFFFFFFFF
+
#define ARG_NONE 0
/* AMD PMF BIOS interfaces */
@@ -57,6 +61,12 @@ struct apmf_system_params {
u32 heartbeat_int;
} __packed;
+struct apmf_fan_idx {
+ u16 size;
+ u8 fan_ctl_mode;
+ u32 fan_ctl_idx;
+} __packed;
+
enum amd_stt_skin_temp {
STT_TEMP_APU,
STT_TEMP_HS2,
@@ -118,6 +128,11 @@ struct amd_pmf_static_slider_granular {
struct apmf_sps_prop_granular prop[POWER_SOURCE_MAX][POWER_MODE_MAX];
};
+struct fan_table_control {
+ bool manual;
+ unsigned long fan_id;
+};
+
/* Core Layer */
int apmf_acpi_init(struct amd_pmf_dev *pmf_dev);
void apmf_acpi_deinit(struct amd_pmf_dev *pmf_dev);
@@ -136,4 +151,5 @@ int apmf_get_static_slider_granular(struct amd_pmf_dev *pdev,
void amd_pmf_load_defaults_sps(struct amd_pmf_dev *dev);
+int apmf_update_fan_idx(struct amd_pmf_dev *pdev, bool manual, u32 idx);
#endif /* PMF_H */
--
2.25.1
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH v4 07/11] platform/x86/amd/pmf: Get performance metrics from PMFW
2022-08-02 15:11 [PATCH v4 00/11] platform/x86/amd/pmf: Introduce AMD PMF Driver Shyam Sundar S K
` (5 preceding siblings ...)
2022-08-02 15:11 ` [PATCH v4 06/11] platform/x86/amd/pmf: Add fan control support Shyam Sundar S K
@ 2022-08-02 15:11 ` Shyam Sundar S K
2022-08-02 15:11 ` [PATCH v4 08/11] platform/x86/amd/pmf: Add support for Auto mode feature Shyam Sundar S K
` (4 subsequent siblings)
11 siblings, 0 replies; 22+ messages in thread
From: Shyam Sundar S K @ 2022-08-02 15:11 UTC (permalink / raw)
To: hdegoede, markgross; +Cc: platform-driver-x86, Patil.Reddy, Shyam Sundar S K
PMF driver polls for metrics information from PMFW to understand the system
behavior, power consumption etc.
This metrics table information will be used the PMF features to tweak the
thermal heuristics. The poll duration can also be changed by the user
by changing the poll duration time.
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
---
drivers/platform/x86/amd/pmf/core.c | 52 +++++++++++++++++++++++++++++
drivers/platform/x86/amd/pmf/pmf.h | 39 ++++++++++++++++++++++
2 files changed, 91 insertions(+)
diff --git a/drivers/platform/x86/amd/pmf/core.c b/drivers/platform/x86/amd/pmf/core.c
index 87a1f9b27d2c..762f769bf7ee 100644
--- a/drivers/platform/x86/amd/pmf/core.c
+++ b/drivers/platform/x86/amd/pmf/core.c
@@ -47,6 +47,11 @@
#define DELAY_MIN_US 2000
#define DELAY_MAX_US 3000
+/* override Metrics Table sample size time (in ms) */
+static int metrics_table_loop_ms = 1000;
+module_param(metrics_table_loop_ms, int, 0644);
+MODULE_PARM_DESC(metrics_table_loop_ms, " Metrics Table sample size time (default = 1000ms) ");
+
static int current_power_limits_show(struct seq_file *seq, void *unused)
{
struct amd_pmf_dev *dev = seq->private;
@@ -88,6 +93,25 @@ int amd_pmf_get_power_source(void)
return POWER_SOURCE_DC;
}
+static void amd_pmf_get_metrics(struct work_struct *work)
+{
+ struct amd_pmf_dev *dev = container_of(work, struct amd_pmf_dev, work_buffer.work);
+ ktime_t time_elapsed_ms;
+ int socket_power;
+
+ /* Transfer table contents */
+ memset(dev->buf, 0, sizeof(dev->m_table));
+ amd_pmf_send_cmd(dev, SET_TRANSFER_TABLE, 0, 7, NULL);
+ memcpy(&dev->m_table, dev->buf, sizeof(dev->m_table));
+
+ time_elapsed_ms = ktime_to_ms(ktime_get()) - dev->start_time;
+ /* Calculate the avg SoC power consumption */
+ socket_power = dev->m_table.apu_power + dev->m_table.dgpu_power;
+
+ dev->start_time = ktime_to_ms(ktime_get());
+ schedule_delayed_work(&dev->work_buffer, msecs_to_jiffies(metrics_table_loop_ms));
+}
+
static inline u32 amd_pmf_reg_read(struct amd_pmf_dev *dev, int reg_offset)
{
return ioread32(dev->regbase + reg_offset);
@@ -181,6 +205,34 @@ static const struct pci_device_id pmf_pci_ids[] = {
{ }
};
+int amd_pmf_init_metrics_table(struct amd_pmf_dev *dev)
+{
+ u64 phys_addr;
+ u32 hi, low;
+
+ INIT_DELAYED_WORK(&dev->work_buffer, amd_pmf_get_metrics);
+
+ /* Get Metrics Table Address */
+ dev->buf = kzalloc(sizeof(dev->m_table), GFP_KERNEL);
+ if (!dev->buf)
+ return -ENOMEM;
+
+ phys_addr = virt_to_phys(dev->buf);
+ hi = phys_addr >> 32;
+ low = phys_addr & GENMASK(31, 0);
+
+ amd_pmf_send_cmd(dev, SET_DRAM_ADDR_HIGH, 0, hi, NULL);
+ amd_pmf_send_cmd(dev, SET_DRAM_ADDR_LOW, 0, low, NULL);
+
+ /*
+ * Start collecting the metrics data after a small delay
+ * or else, we might end up getting stale values from PMFW.
+ */
+ schedule_delayed_work(&dev->work_buffer, msecs_to_jiffies(metrics_table_loop_ms * 3));
+
+ return 0;
+}
+
static void amd_pmf_init_features(struct amd_pmf_dev *dev)
{
/* Enable Static Slider */
diff --git a/drivers/platform/x86/amd/pmf/pmf.h b/drivers/platform/x86/amd/pmf/pmf.h
index d40613a30ed7..42e4a5f512c0 100644
--- a/drivers/platform/x86/amd/pmf/pmf.h
+++ b/drivers/platform/x86/amd/pmf/pmf.h
@@ -67,6 +67,41 @@ struct apmf_fan_idx {
u32 fan_ctl_idx;
} __packed;
+struct smu_pmf_metrics {
+ u16 gfxclk_freq; /* in MHz */
+ u16 socclk_freq; /* in MHz */
+ u16 vclk_freq; /* in MHz */
+ u16 dclk_freq; /* in MHz */
+ u16 memclk_freq; /* in MHz */
+ u16 spare;
+ u16 gfx_activity; /* in Centi */
+ u16 uvd_activity; /* in Centi */
+ u16 voltage[2]; /* in mV */
+ u16 currents[2]; /* in mA */
+ u16 power[2];/* in mW */
+ u16 core_freq[8]; /* in MHz */
+ u16 core_power[8]; /* in mW */
+ u16 core_temp[8]; /* in centi-Celsius */
+ u16 l3_freq; /* in MHz */
+ u16 l3_temp; /* in centi-Celsius */
+ u16 gfx_temp; /* in centi-Celsius */
+ u16 soc_temp; /* in centi-Celsius */
+ u16 throttler_status;
+ u16 current_socketpower; /* in mW */
+ u16 stapm_orig_limit; /* in W */
+ u16 stapm_cur_limit; /* in W */
+ u32 apu_power; /* in mW */
+ u32 dgpu_power; /* in mW */
+ u16 vdd_tdc_val; /* in mA */
+ u16 soc_tdc_val; /* in mA */
+ u16 vdd_edc_val; /* in mA */
+ u16 soc_edcv_al; /* in mA */
+ u16 infra_cpu_maxfreq; /* in MHz */
+ u16 infra_gfx_maxfreq; /* in MHz */
+ u16 skin_temp; /* in centi-Celsius */
+ u16 device_state;
+} __packed;
+
enum amd_stt_skin_temp {
STT_TEMP_APU,
STT_TEMP_HS2,
@@ -105,6 +140,9 @@ struct amd_pmf_dev {
struct dentry *dbgfs_dir;
int hb_interval; /* SBIOS heartbeat interval */
struct delayed_work heart_beat;
+ struct smu_pmf_metrics m_table;
+ struct delayed_work work_buffer;
+ ktime_t start_time;
};
struct apmf_sps_prop_granular {
@@ -138,6 +176,7 @@ int apmf_acpi_init(struct amd_pmf_dev *pmf_dev);
void apmf_acpi_deinit(struct amd_pmf_dev *pmf_dev);
int is_apmf_func_supported(struct amd_pmf_dev *pdev, unsigned long index);
int amd_pmf_send_cmd(struct amd_pmf_dev *dev, u8 message, bool get, u32 arg, u32 *data);
+int amd_pmf_init_metrics_table(struct amd_pmf_dev *dev);
int amd_pmf_get_power_source(void);
/* SPS Layer */
--
2.25.1
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH v4 08/11] platform/x86/amd/pmf: Add support for Auto mode feature
2022-08-02 15:11 [PATCH v4 00/11] platform/x86/amd/pmf: Introduce AMD PMF Driver Shyam Sundar S K
` (6 preceding siblings ...)
2022-08-02 15:11 ` [PATCH v4 07/11] platform/x86/amd/pmf: Get performance metrics from PMFW Shyam Sundar S K
@ 2022-08-02 15:11 ` Shyam Sundar S K
2022-08-05 10:52 ` Hans de Goede
2022-08-02 15:11 ` [PATCH v4 09/11] platform/x86/amd/pmf: Handle AMT and CQL events for Auto mode Shyam Sundar S K
` (3 subsequent siblings)
11 siblings, 1 reply; 22+ messages in thread
From: Shyam Sundar S K @ 2022-08-02 15:11 UTC (permalink / raw)
To: hdegoede, markgross; +Cc: platform-driver-x86, Patil.Reddy, Shyam Sundar S K
This feature has 3 modes quiet, balanced, performance
The objective of this feature is to track the moving average of system
power over the time period specified and switch to the subsequent mode.
In order to do this, PMF driver will get the moving average of APU power
from PMFW and power threshold, time constants, system config parameters
from OEM inputs.
System power as read by PMF driver from PMFW is the filtered value over
the sampling window. Every sampling window, moving average of system power
is computed. At the end of the monitoring window, the moving average is
compared against the threshold for mode switch for decision making.
With AMD managing the system config limits, any mode switch within
auto-mode will result in limits of fPPT/sPPT/STAPM or STT being scaled
down.
When "auto mode" is enabled, the static slider control remains out of
the PMF driver, so the platform_profile registration would not
happen in PMF driver.
The transition to auto-mode only happens when the APMF fn5 is enabled
in BIOS, platform_profile set to "balanced" and a AMT
(Auto Mode transition) is received.
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
---
drivers/platform/x86/amd/pmf/Makefile | 3 +-
drivers/platform/x86/amd/pmf/acpi.c | 5 +
drivers/platform/x86/amd/pmf/auto-mode.c | 263 +++++++++++++++++++++++
drivers/platform/x86/amd/pmf/core.c | 9 +
drivers/platform/x86/amd/pmf/pmf.h | 113 ++++++++++
5 files changed, 392 insertions(+), 1 deletion(-)
create mode 100644 drivers/platform/x86/amd/pmf/auto-mode.c
diff --git a/drivers/platform/x86/amd/pmf/Makefile b/drivers/platform/x86/amd/pmf/Makefile
index 557521a80427..ef2b08c9174d 100644
--- a/drivers/platform/x86/amd/pmf/Makefile
+++ b/drivers/platform/x86/amd/pmf/Makefile
@@ -5,4 +5,5 @@
#
obj-$(CONFIG_AMD_PMF) += amd-pmf.o
-amd-pmf-objs := core.o acpi.o sps.o
+amd-pmf-objs := core.o acpi.o sps.o \
+ auto-mode.o
diff --git a/drivers/platform/x86/amd/pmf/acpi.c b/drivers/platform/x86/amd/pmf/acpi.c
index 1fc4d1400364..401fee381e90 100644
--- a/drivers/platform/x86/amd/pmf/acpi.c
+++ b/drivers/platform/x86/amd/pmf/acpi.c
@@ -144,6 +144,11 @@ int apmf_update_fan_idx(struct amd_pmf_dev *pdev, bool manual, u32 idx)
return err;
}
+int apmf_get_auto_mode_def(struct amd_pmf_dev *pdev, struct apmf_auto_mode *data)
+{
+ return apmf_if_call_store_buffer(pdev, APMF_FUNC_AUTO_MODE, data, sizeof(*data));
+}
+
static int apmf_if_verify_interface(struct amd_pmf_dev *pdev)
{
struct apmf_verify_interface output;
diff --git a/drivers/platform/x86/amd/pmf/auto-mode.c b/drivers/platform/x86/amd/pmf/auto-mode.c
new file mode 100644
index 000000000000..99f5a2396b0b
--- /dev/null
+++ b/drivers/platform/x86/amd/pmf/auto-mode.c
@@ -0,0 +1,263 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * AMD Platform Management Framework Driver
+ *
+ * Copyright (c) 2022, Advanced Micro Devices, Inc.
+ * All Rights Reserved.
+ *
+ * Author: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
+ */
+
+#include <linux/acpi.h>
+#include <linux/workqueue.h>
+#include "pmf.h"
+
+static struct auto_mode_mode_config config_store;
+static const char *state_as_str(unsigned int state);
+
+static void amd_pmf_set_automode(struct amd_pmf_dev *dev, int idx,
+ struct auto_mode_mode_config *table)
+{
+ struct power_table_control *pwr_ctrl = &config_store.mode_set[idx].power_control;
+
+ amd_pmf_send_cmd(dev, SET_SPL, false, pwr_ctrl->spl, NULL);
+ amd_pmf_send_cmd(dev, SET_FPPT, false, pwr_ctrl->fppt, NULL);
+ amd_pmf_send_cmd(dev, SET_SPPT, false, pwr_ctrl->sppt, NULL);
+ amd_pmf_send_cmd(dev, SET_SPPT_APU_ONLY, false, pwr_ctrl->sppt_apu_only, NULL);
+ amd_pmf_send_cmd(dev, SET_STT_MIN_LIMIT, false, pwr_ctrl->stt_min, NULL);
+ amd_pmf_send_cmd(dev, SET_STT_LIMIT_APU, false,
+ pwr_ctrl->stt_skin_temp[STT_TEMP_APU], NULL);
+ amd_pmf_send_cmd(dev, SET_STT_LIMIT_HS2, false,
+ pwr_ctrl->stt_skin_temp[STT_TEMP_HS2], NULL);
+
+ if (is_apmf_func_supported(dev, APMF_FUNC_SET_FAN_IDX))
+ apmf_update_fan_idx(dev, config_store.mode_set[idx].fan_control.manual,
+ config_store.mode_set[idx].fan_control.fan_id);
+}
+
+static int amd_pmf_get_moving_avg(struct amd_pmf_dev *pdev, int socket_power)
+{
+ int i, total = 0;
+
+ if (pdev->socket_power_history_idx == -1) {
+ for (i = 0; i < AVG_SAMPLE_SIZE; i++)
+ pdev->socket_power_history[i] = socket_power;
+ }
+
+ pdev->socket_power_history_idx = (pdev->socket_power_history_idx + 1) % AVG_SAMPLE_SIZE;
+ pdev->socket_power_history[pdev->socket_power_history_idx] = socket_power;
+
+ for (i = 0; i < AVG_SAMPLE_SIZE; i++)
+ total += pdev->socket_power_history[i];
+
+ return total / AVG_SAMPLE_SIZE;
+}
+
+void amd_pmf_trans_automode(struct amd_pmf_dev *dev, int socket_power, ktime_t time_elapsed_ms)
+{
+ int avg_power = 0;
+ bool update = false;
+ int i, j;
+
+ /* Get the average moving average computed by auto mode algorithm */
+ avg_power = amd_pmf_get_moving_avg(dev, socket_power);
+
+ for (i = 0; i < AUTO_TRANSITION_MAX; i++) {
+ if ((config_store.transition[i].shifting_up && avg_power >=
+ config_store.transition[i].power_threshold) ||
+ (!config_store.transition[i].shifting_up && avg_power <=
+ config_store.transition[i].power_threshold)) {
+ if (config_store.transition[i].timer <
+ config_store.transition[i].time_constant)
+ config_store.transition[i].timer += time_elapsed_ms;
+ } else {
+ config_store.transition[i].timer = 0;
+ }
+
+ if (config_store.transition[i].timer >=
+ config_store.transition[i].time_constant &&
+ !config_store.transition[i].applied) {
+ config_store.transition[i].applied = true;
+ update = true;
+ } else if (config_store.transition[i].timer <=
+ config_store.transition[i].time_constant &&
+ config_store.transition[i].applied) {
+ config_store.transition[i].applied = false;
+ update = true;
+ }
+ }
+
+ dev_dbg(dev->dev, "[AUTO_MODE] avg power: %u mW mode: %s\n", avg_power,
+ state_as_str(config_store.current_mode));
+
+ if (update) {
+ for (j = 0; j < AUTO_TRANSITION_MAX; j++) {
+ /* Apply the mode with highest priority indentified */
+ if (config_store.transition[j].applied) {
+ if (config_store.current_mode !=
+ config_store.transition[j].target_mode) {
+ config_store.current_mode =
+ config_store.transition[j].target_mode;
+ dev_dbg(dev->dev, "[AUTO_MODE] moving to mode:%s\n",
+ state_as_str(config_store.current_mode));
+ amd_pmf_set_automode(dev, config_store.current_mode, NULL);
+ }
+ break;
+ }
+ }
+ }
+}
+
+static void amd_pmf_get_power_threshold(void)
+{
+ config_store.transition[AUTO_TRANSITION_TO_QUIET].power_threshold =
+ config_store.mode_set[AUTO_BALANCE].power_floor -
+ config_store.transition[AUTO_TRANSITION_TO_QUIET].power_delta;
+
+ config_store.transition[AUTO_TRANSITION_TO_PERFORMANCE].power_threshold =
+ config_store.mode_set[AUTO_BALANCE].power_floor -
+ config_store.transition[AUTO_TRANSITION_TO_PERFORMANCE].power_delta;
+
+ config_store.transition[AUTO_TRANSITION_FROM_QUIET_TO_BALANCE].power_threshold =
+ config_store.mode_set[AUTO_QUIET].power_floor -
+ config_store.transition[AUTO_TRANSITION_FROM_QUIET_TO_BALANCE].power_delta;
+
+ config_store.transition[AUTO_TRANSITION_FROM_PERFORMANCE_TO_BALANCE].power_threshold =
+ config_store.mode_set[AUTO_PERFORMANCE].power_floor -
+ config_store.transition[AUTO_TRANSITION_FROM_PERFORMANCE_TO_BALANCE].power_delta;
+}
+
+static const char *state_as_str(unsigned int state)
+{
+ switch (state) {
+ case AUTO_QUIET:
+ return "QUIET";
+ case AUTO_BALANCE:
+ return "BALANCED";
+ case AUTO_PERFORMANCE_ON_LAP:
+ return "ON_LAP";
+ case AUTO_PERFORMANCE:
+ return "PERFORMANCE";
+ default:
+ return "Unknown Auto Mode State";
+ }
+}
+
+void amd_pmf_load_defaults_auto_mode(struct amd_pmf_dev *dev)
+{
+ struct apmf_auto_mode output;
+ struct power_table_control *pwr_ctrl;
+ int i;
+
+ apmf_get_auto_mode_def(dev, &output);
+ /* time constant */
+ config_store.transition[AUTO_TRANSITION_TO_QUIET].time_constant =
+ output.balanced_to_quiet;
+ config_store.transition[AUTO_TRANSITION_TO_PERFORMANCE].time_constant =
+ output.balanced_to_perf;
+ config_store.transition[AUTO_TRANSITION_FROM_QUIET_TO_BALANCE].time_constant =
+ output.quiet_to_balanced;
+ config_store.transition[AUTO_TRANSITION_FROM_PERFORMANCE_TO_BALANCE].time_constant =
+ output.perf_to_balanced;
+
+ /* power floor */
+ config_store.mode_set[AUTO_QUIET].power_floor = output.pfloor_quiet;
+ config_store.mode_set[AUTO_BALANCE].power_floor = output.pfloor_balanced;
+ config_store.mode_set[AUTO_PERFORMANCE].power_floor = output.pfloor_perf;
+ config_store.mode_set[AUTO_PERFORMANCE_ON_LAP].power_floor = output.pfloor_perf;
+
+ /* Power delta for mode change */
+ config_store.transition[AUTO_TRANSITION_TO_QUIET].power_delta =
+ output.pd_balanced_to_quiet;
+ config_store.transition[AUTO_TRANSITION_TO_PERFORMANCE].power_delta =
+ output.pd_balanced_to_perf;
+ config_store.transition[AUTO_TRANSITION_FROM_QUIET_TO_BALANCE].power_delta =
+ output.pd_quiet_to_balanced;
+ config_store.transition[AUTO_TRANSITION_FROM_PERFORMANCE_TO_BALANCE].power_delta =
+ output.pd_perf_to_balanced;
+
+ /* Power threshold */
+ amd_pmf_get_power_threshold();
+
+ /* skin temperature limits */
+ pwr_ctrl = &config_store.mode_set[AUTO_QUIET].power_control;
+ pwr_ctrl->spl = output.spl_quiet;
+ pwr_ctrl->sppt = output.sppt_quiet;
+ pwr_ctrl->fppt = output.fppt_quiet;
+ pwr_ctrl->sppt_apu_only = output.sppt_apu_only_quiet;
+ pwr_ctrl->stt_min = output.stt_min_limit_quiet;
+ pwr_ctrl->stt_skin_temp[STT_TEMP_APU] = output.stt_apu_quiet;
+ pwr_ctrl->stt_skin_temp[STT_TEMP_HS2] = output.stt_hs2_quiet;
+
+ pwr_ctrl = &config_store.mode_set[AUTO_BALANCE].power_control;
+ pwr_ctrl->spl = output.spl_balanced;
+ pwr_ctrl->sppt = output.sppt_balanced;
+ pwr_ctrl->fppt = output.fppt_balanced;
+ pwr_ctrl->sppt_apu_only = output.sppt_apu_only_balanced;
+ pwr_ctrl->stt_min = output.stt_min_limit_balanced;
+ pwr_ctrl->stt_skin_temp[STT_TEMP_APU] = output.stt_apu_balanced;
+ pwr_ctrl->stt_skin_temp[STT_TEMP_HS2] = output.stt_hs2_balanced;
+
+ pwr_ctrl = &config_store.mode_set[AUTO_PERFORMANCE].power_control;
+ pwr_ctrl->spl = output.spl_perf;
+ pwr_ctrl->sppt = output.sppt_perf;
+ pwr_ctrl->fppt = output.fppt_perf;
+ pwr_ctrl->sppt_apu_only = output.sppt_apu_only_perf;
+ pwr_ctrl->stt_min = output.stt_min_limit_perf;
+ pwr_ctrl->stt_skin_temp[STT_TEMP_APU] = output.stt_apu_perf;
+ pwr_ctrl->stt_skin_temp[STT_TEMP_HS2] = output.stt_hs2_perf;
+
+ pwr_ctrl = &config_store.mode_set[AUTO_PERFORMANCE_ON_LAP].power_control;
+ pwr_ctrl->spl = output.spl_perf_on_lap;
+ pwr_ctrl->sppt = output.sppt_perf_on_lap;
+ pwr_ctrl->fppt = output.fppt_perf_on_lap;
+ pwr_ctrl->sppt_apu_only = output.sppt_apu_only_perf_on_lap;
+ pwr_ctrl->stt_min = output.stt_min_limit_perf_on_lap;
+ pwr_ctrl->stt_skin_temp[STT_TEMP_APU] = output.stt_apu_perf_on_lap;
+ pwr_ctrl->stt_skin_temp[STT_TEMP_HS2] = output.stt_hs2_perf_on_lap;
+
+ /* Fan ID */
+ config_store.mode_set[AUTO_QUIET].fan_control.fan_id = output.fan_id_quiet;
+ config_store.mode_set[AUTO_BALANCE].fan_control.fan_id = output.fan_id_balanced;
+ config_store.mode_set[AUTO_PERFORMANCE].fan_control.fan_id = output.fan_id_perf;
+ config_store.mode_set[AUTO_PERFORMANCE_ON_LAP].fan_control.fan_id =
+ output.fan_id_perf;
+
+ config_store.transition[AUTO_TRANSITION_TO_QUIET].target_mode = AUTO_QUIET;
+ config_store.transition[AUTO_TRANSITION_TO_PERFORMANCE].target_mode =
+ AUTO_PERFORMANCE;
+ config_store.transition[AUTO_TRANSITION_FROM_QUIET_TO_BALANCE].target_mode =
+ AUTO_BALANCE;
+ config_store.transition[AUTO_TRANSITION_FROM_PERFORMANCE_TO_BALANCE].target_mode =
+ AUTO_BALANCE;
+
+ config_store.transition[AUTO_TRANSITION_TO_QUIET].shifting_up = false;
+ config_store.transition[AUTO_TRANSITION_TO_PERFORMANCE].shifting_up = true;
+ config_store.transition[AUTO_TRANSITION_FROM_QUIET_TO_BALANCE].shifting_up = true;
+ config_store.transition[AUTO_TRANSITION_FROM_PERFORMANCE_TO_BALANCE].shifting_up =
+ false;
+
+ for (i = 0 ; i < AUTO_MODE_MAX ; i++) {
+ if (config_store.mode_set[i].fan_control.fan_id == FAN_INDEX_AUTO)
+ config_store.mode_set[i].fan_control.manual = false;
+ else
+ config_store.mode_set[i].fan_control.manual = true;
+ }
+
+ /* set to initial default values */
+ config_store.current_mode = AUTO_BALANCE;
+ dev->socket_power_history_idx = -1;
+}
+
+void amd_pmf_deinit_auto_mode(struct amd_pmf_dev *dev)
+{
+ cancel_delayed_work_sync(&dev->work_buffer);
+}
+
+void amd_pmf_init_auto_mode(struct amd_pmf_dev *dev)
+{
+ amd_pmf_load_defaults_auto_mode(dev);
+ /* update the thermal limits for Automode */
+ amd_pmf_set_automode(dev, config_store.current_mode, NULL);
+ amd_pmf_init_metrics_table(dev);
+}
diff --git a/drivers/platform/x86/amd/pmf/core.c b/drivers/platform/x86/amd/pmf/core.c
index 762f769bf7ee..42d803b49d97 100644
--- a/drivers/platform/x86/amd/pmf/core.c
+++ b/drivers/platform/x86/amd/pmf/core.c
@@ -240,12 +240,21 @@ static void amd_pmf_init_features(struct amd_pmf_dev *dev)
amd_pmf_init_sps(dev);
dev_dbg(dev->dev, "SPS enabled and Platform Profiles registered\n");
}
+
+ /* Enable Auto Mode */
+ if (is_apmf_func_supported(dev, APMF_FUNC_AUTO_MODE)) {
+ amd_pmf_init_auto_mode(dev);
+ dev_dbg(dev->dev, "Auto Mode Init done\n");
+ }
}
static void amd_pmf_deinit_features(struct amd_pmf_dev *dev)
{
if (is_apmf_func_supported(dev, APMF_FUNC_STATIC_SLIDER_GRANULAR))
amd_pmf_deinit_sps(dev);
+
+ if (is_apmf_func_supported(dev, APMF_FUNC_AUTO_MODE))
+ amd_pmf_deinit_auto_mode(dev);
}
static const struct acpi_device_id amd_pmf_acpi_ids[] = {
diff --git a/drivers/platform/x86/amd/pmf/pmf.h b/drivers/platform/x86/amd/pmf/pmf.h
index 42e4a5f512c0..ce092a529261 100644
--- a/drivers/platform/x86/amd/pmf/pmf.h
+++ b/drivers/platform/x86/amd/pmf/pmf.h
@@ -18,6 +18,7 @@
#define APMF_FUNC_VERIFY_INTERFACE 0
#define APMF_FUNC_GET_SYS_PARAMS 1
#define APMF_FUNC_SBIOS_HEARTBEAT 4
+#define APMF_FUNC_AUTO_MODE 5
#define APMF_FUNC_SET_FAN_IDX 7
#define APMF_FUNC_STATIC_SLIDER_GRANULAR 9
@@ -44,6 +45,7 @@
#define FAN_INDEX_AUTO 0xFFFFFFFF
#define ARG_NONE 0
+#define AVG_SAMPLE_SIZE 3
/* AMD PMF BIOS interfaces */
struct apmf_verify_interface {
@@ -143,6 +145,8 @@ struct amd_pmf_dev {
struct smu_pmf_metrics m_table;
struct delayed_work work_buffer;
ktime_t start_time;
+ int socket_power_history[AVG_SAMPLE_SIZE];
+ int socket_power_history_idx;
};
struct apmf_sps_prop_granular {
@@ -171,6 +175,107 @@ struct fan_table_control {
unsigned long fan_id;
};
+struct power_table_control {
+ u32 spl;
+ u32 sppt;
+ u32 fppt;
+ u32 sppt_apu_only;
+ u32 stt_min;
+ u32 stt_skin_temp[STT_TEMP_COUNT];
+ u32 reserved[16];
+};
+
+/* Auto Mode Layer */
+enum auto_mode_transition_priority {
+ AUTO_TRANSITION_TO_PERFORMANCE, /* Any other mode to Performance Mode */
+ AUTO_TRANSITION_FROM_QUIET_TO_BALANCE, /* Quiet Mode to Balance Mode */
+ AUTO_TRANSITION_TO_QUIET, /* Any other mode to Quiet Mode */
+ AUTO_TRANSITION_FROM_PERFORMANCE_TO_BALANCE, /* Performance Mode to Balance Mode */
+ AUTO_TRANSITION_MAX,
+};
+
+enum auto_mode_mode {
+ AUTO_QUIET,
+ AUTO_BALANCE,
+ AUTO_PERFORMANCE_ON_LAP,
+ AUTO_PERFORMANCE,
+ AUTO_MODE_MAX,
+};
+
+struct auto_mode_trans_params {
+ u32 time_constant; /* minimum time required to switch to next mode */
+ u32 power_delta; /* delta power to shift mode */
+ u32 power_threshold;
+ u32 timer; /* elapsed time. if timer > TimeThreshold, it will move to next mode */
+ u32 applied;
+ enum auto_mode_mode target_mode;
+ u32 shifting_up;
+};
+
+struct auto_mode_mode_settings {
+ struct power_table_control power_control;
+ struct fan_table_control fan_control;
+ u32 power_floor;
+};
+
+struct auto_mode_mode_config {
+ struct auto_mode_trans_params transition[AUTO_TRANSITION_MAX];
+ struct auto_mode_mode_settings mode_set[AUTO_MODE_MAX];
+ enum auto_mode_mode current_mode;
+};
+
+struct apmf_auto_mode {
+ u16 size;
+ /* time constant */
+ u32 balanced_to_perf;
+ u32 perf_to_balanced;
+ u32 quiet_to_balanced;
+ u32 balanced_to_quiet;
+ /* power floor */
+ u32 pfloor_perf;
+ u32 pfloor_balanced;
+ u32 pfloor_quiet;
+ /* Power delta for mode change */
+ u32 pd_balanced_to_perf;
+ u32 pd_perf_to_balanced;
+ u32 pd_quiet_to_balanced;
+ u32 pd_balanced_to_quiet;
+ /* skin temperature limits */
+ u8 stt_apu_perf_on_lap; /* CQL ON */
+ u8 stt_hs2_perf_on_lap; /* CQL ON */
+ u8 stt_apu_perf;
+ u8 stt_hs2_perf;
+ u8 stt_apu_balanced;
+ u8 stt_hs2_balanced;
+ u8 stt_apu_quiet;
+ u8 stt_hs2_quiet;
+ u32 stt_min_limit_perf_on_lap; /* CQL ON */
+ u32 stt_min_limit_perf;
+ u32 stt_min_limit_balanced;
+ u32 stt_min_limit_quiet;
+ /* SPL based */
+ u32 fppt_perf_on_lap; /* CQL ON */
+ u32 sppt_perf_on_lap; /* CQL ON */
+ u32 spl_perf_on_lap; /* CQL ON */
+ u32 sppt_apu_only_perf_on_lap; /* CQL ON */
+ u32 fppt_perf;
+ u32 sppt_perf;
+ u32 spl_perf;
+ u32 sppt_apu_only_perf;
+ u32 fppt_balanced;
+ u32 sppt_balanced;
+ u32 spl_balanced;
+ u32 sppt_apu_only_balanced;
+ u32 fppt_quiet;
+ u32 sppt_quiet;
+ u32 spl_quiet;
+ u32 sppt_apu_only_quiet;
+ /* Fan ID */
+ u32 fan_id_perf;
+ u32 fan_id_balanced;
+ u32 fan_id_quiet;
+} __packed;
+
/* Core Layer */
int apmf_acpi_init(struct amd_pmf_dev *pmf_dev);
void apmf_acpi_deinit(struct amd_pmf_dev *pmf_dev);
@@ -191,4 +296,12 @@ void amd_pmf_load_defaults_sps(struct amd_pmf_dev *dev);
int apmf_update_fan_idx(struct amd_pmf_dev *pdev, bool manual, u32 idx);
+
+/* Auto Mode Layer */
+void amd_pmf_load_defaults_auto_mode(struct amd_pmf_dev *dev);
+int apmf_get_auto_mode_def(struct amd_pmf_dev *pdev, struct apmf_auto_mode *data);
+void amd_pmf_init_auto_mode(struct amd_pmf_dev *dev);
+void amd_pmf_deinit_auto_mode(struct amd_pmf_dev *dev);
+void amd_pmf_trans_automode(struct amd_pmf_dev *dev, int socket_power, ktime_t time_elapsed_ms);
+
#endif /* PMF_H */
--
2.25.1
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [PATCH v4 08/11] platform/x86/amd/pmf: Add support for Auto mode feature
2022-08-02 15:11 ` [PATCH v4 08/11] platform/x86/amd/pmf: Add support for Auto mode feature Shyam Sundar S K
@ 2022-08-05 10:52 ` Hans de Goede
0 siblings, 0 replies; 22+ messages in thread
From: Hans de Goede @ 2022-08-05 10:52 UTC (permalink / raw)
To: Shyam Sundar S K, markgross; +Cc: platform-driver-x86, Patil.Reddy
Hi,
On 8/2/22 17:11, Shyam Sundar S K wrote:
> This feature has 3 modes quiet, balanced, performance
>
> The objective of this feature is to track the moving average of system
> power over the time period specified and switch to the subsequent mode.
>
> In order to do this, PMF driver will get the moving average of APU power
> from PMFW and power threshold, time constants, system config parameters
> from OEM inputs.
>
> System power as read by PMF driver from PMFW is the filtered value over
> the sampling window. Every sampling window, moving average of system power
> is computed. At the end of the monitoring window, the moving average is
> compared against the threshold for mode switch for decision making.
>
> With AMD managing the system config limits, any mode switch within
> auto-mode will result in limits of fPPT/sPPT/STAPM or STT being scaled
> down.
>
> When "auto mode" is enabled, the static slider control remains out of
> the PMF driver, so the platform_profile registration would not
> happen in PMF driver.
>
> The transition to auto-mode only happens when the APMF fn5 is enabled
> in BIOS, platform_profile set to "balanced" and a AMT
> (Auto Mode transition) is received.
>
> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
> Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
> ---
> drivers/platform/x86/amd/pmf/Makefile | 3 +-
> drivers/platform/x86/amd/pmf/acpi.c | 5 +
> drivers/platform/x86/amd/pmf/auto-mode.c | 263 +++++++++++++++++++++++
> drivers/platform/x86/amd/pmf/core.c | 9 +
> drivers/platform/x86/amd/pmf/pmf.h | 113 ++++++++++
> 5 files changed, 392 insertions(+), 1 deletion(-)
> create mode 100644 drivers/platform/x86/amd/pmf/auto-mode.c
>
> diff --git a/drivers/platform/x86/amd/pmf/Makefile b/drivers/platform/x86/amd/pmf/Makefile
> index 557521a80427..ef2b08c9174d 100644
> --- a/drivers/platform/x86/amd/pmf/Makefile
> +++ b/drivers/platform/x86/amd/pmf/Makefile
> @@ -5,4 +5,5 @@
> #
>
> obj-$(CONFIG_AMD_PMF) += amd-pmf.o
> -amd-pmf-objs := core.o acpi.o sps.o
> +amd-pmf-objs := core.o acpi.o sps.o \
> + auto-mode.o
> diff --git a/drivers/platform/x86/amd/pmf/acpi.c b/drivers/platform/x86/amd/pmf/acpi.c
> index 1fc4d1400364..401fee381e90 100644
> --- a/drivers/platform/x86/amd/pmf/acpi.c
> +++ b/drivers/platform/x86/amd/pmf/acpi.c
> @@ -144,6 +144,11 @@ int apmf_update_fan_idx(struct amd_pmf_dev *pdev, bool manual, u32 idx)
> return err;
> }
>
> +int apmf_get_auto_mode_def(struct amd_pmf_dev *pdev, struct apmf_auto_mode *data)
> +{
> + return apmf_if_call_store_buffer(pdev, APMF_FUNC_AUTO_MODE, data, sizeof(*data));
> +}
> +
> static int apmf_if_verify_interface(struct amd_pmf_dev *pdev)
> {
> struct apmf_verify_interface output;
> diff --git a/drivers/platform/x86/amd/pmf/auto-mode.c b/drivers/platform/x86/amd/pmf/auto-mode.c
> new file mode 100644
> index 000000000000..99f5a2396b0b
> --- /dev/null
> +++ b/drivers/platform/x86/amd/pmf/auto-mode.c
> @@ -0,0 +1,263 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * AMD Platform Management Framework Driver
> + *
> + * Copyright (c) 2022, Advanced Micro Devices, Inc.
> + * All Rights Reserved.
> + *
> + * Author: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
> + */
> +
> +#include <linux/acpi.h>
> +#include <linux/workqueue.h>
> +#include "pmf.h"
> +
> +static struct auto_mode_mode_config config_store;
> +static const char *state_as_str(unsigned int state);
> +
> +static void amd_pmf_set_automode(struct amd_pmf_dev *dev, int idx,
> + struct auto_mode_mode_config *table)
> +{
> + struct power_table_control *pwr_ctrl = &config_store.mode_set[idx].power_control;
> +
> + amd_pmf_send_cmd(dev, SET_SPL, false, pwr_ctrl->spl, NULL);
> + amd_pmf_send_cmd(dev, SET_FPPT, false, pwr_ctrl->fppt, NULL);
> + amd_pmf_send_cmd(dev, SET_SPPT, false, pwr_ctrl->sppt, NULL);
> + amd_pmf_send_cmd(dev, SET_SPPT_APU_ONLY, false, pwr_ctrl->sppt_apu_only, NULL);
> + amd_pmf_send_cmd(dev, SET_STT_MIN_LIMIT, false, pwr_ctrl->stt_min, NULL);
> + amd_pmf_send_cmd(dev, SET_STT_LIMIT_APU, false,
> + pwr_ctrl->stt_skin_temp[STT_TEMP_APU], NULL);
> + amd_pmf_send_cmd(dev, SET_STT_LIMIT_HS2, false,
> + pwr_ctrl->stt_skin_temp[STT_TEMP_HS2], NULL);
> +
> + if (is_apmf_func_supported(dev, APMF_FUNC_SET_FAN_IDX))
> + apmf_update_fan_idx(dev, config_store.mode_set[idx].fan_control.manual,
> + config_store.mode_set[idx].fan_control.fan_id);
> +}
> +
> +static int amd_pmf_get_moving_avg(struct amd_pmf_dev *pdev, int socket_power)
> +{
> + int i, total = 0;
> +
> + if (pdev->socket_power_history_idx == -1) {
> + for (i = 0; i < AVG_SAMPLE_SIZE; i++)
> + pdev->socket_power_history[i] = socket_power;
> + }
> +
> + pdev->socket_power_history_idx = (pdev->socket_power_history_idx + 1) % AVG_SAMPLE_SIZE;
> + pdev->socket_power_history[pdev->socket_power_history_idx] = socket_power;
> +
> + for (i = 0; i < AVG_SAMPLE_SIZE; i++)
> + total += pdev->socket_power_history[i];
> +
> + return total / AVG_SAMPLE_SIZE;
> +}
> +
> +void amd_pmf_trans_automode(struct amd_pmf_dev *dev, int socket_power, ktime_t time_elapsed_ms)
> +{
> + int avg_power = 0;
> + bool update = false;
> + int i, j;
> +
> + /* Get the average moving average computed by auto mode algorithm */
> + avg_power = amd_pmf_get_moving_avg(dev, socket_power);
> +
> + for (i = 0; i < AUTO_TRANSITION_MAX; i++) {
> + if ((config_store.transition[i].shifting_up && avg_power >=
> + config_store.transition[i].power_threshold) ||
> + (!config_store.transition[i].shifting_up && avg_power <=
> + config_store.transition[i].power_threshold)) {
> + if (config_store.transition[i].timer <
> + config_store.transition[i].time_constant)
> + config_store.transition[i].timer += time_elapsed_ms;
> + } else {
> + config_store.transition[i].timer = 0;
> + }
> +
> + if (config_store.transition[i].timer >=
> + config_store.transition[i].time_constant &&
> + !config_store.transition[i].applied) {
> + config_store.transition[i].applied = true;
> + update = true;
> + } else if (config_store.transition[i].timer <=
> + config_store.transition[i].time_constant &&
> + config_store.transition[i].applied) {
> + config_store.transition[i].applied = false;
> + update = true;
> + }
> + }
> +
> + dev_dbg(dev->dev, "[AUTO_MODE] avg power: %u mW mode: %s\n", avg_power,
> + state_as_str(config_store.current_mode));
> +
> + if (update) {
> + for (j = 0; j < AUTO_TRANSITION_MAX; j++) {
> + /* Apply the mode with highest priority indentified */
> + if (config_store.transition[j].applied) {
> + if (config_store.current_mode !=
> + config_store.transition[j].target_mode) {
> + config_store.current_mode =
> + config_store.transition[j].target_mode;
> + dev_dbg(dev->dev, "[AUTO_MODE] moving to mode:%s\n",
> + state_as_str(config_store.current_mode));
> + amd_pmf_set_automode(dev, config_store.current_mode, NULL);
> + }
> + break;
> + }
> + }
> + }
> +}
> +
> +static void amd_pmf_get_power_threshold(void)
> +{
> + config_store.transition[AUTO_TRANSITION_TO_QUIET].power_threshold =
> + config_store.mode_set[AUTO_BALANCE].power_floor -
> + config_store.transition[AUTO_TRANSITION_TO_QUIET].power_delta;
> +
> + config_store.transition[AUTO_TRANSITION_TO_PERFORMANCE].power_threshold =
> + config_store.mode_set[AUTO_BALANCE].power_floor -
> + config_store.transition[AUTO_TRANSITION_TO_PERFORMANCE].power_delta;
> +
> + config_store.transition[AUTO_TRANSITION_FROM_QUIET_TO_BALANCE].power_threshold =
> + config_store.mode_set[AUTO_QUIET].power_floor -
> + config_store.transition[AUTO_TRANSITION_FROM_QUIET_TO_BALANCE].power_delta;
> +
> + config_store.transition[AUTO_TRANSITION_FROM_PERFORMANCE_TO_BALANCE].power_threshold =
> + config_store.mode_set[AUTO_PERFORMANCE].power_floor -
> + config_store.transition[AUTO_TRANSITION_FROM_PERFORMANCE_TO_BALANCE].power_delta;
> +}
> +
> +static const char *state_as_str(unsigned int state)
> +{
> + switch (state) {
> + case AUTO_QUIET:
> + return "QUIET";
> + case AUTO_BALANCE:
> + return "BALANCED";
> + case AUTO_PERFORMANCE_ON_LAP:
> + return "ON_LAP";
> + case AUTO_PERFORMANCE:
> + return "PERFORMANCE";
> + default:
> + return "Unknown Auto Mode State";
> + }
> +}
> +
> +void amd_pmf_load_defaults_auto_mode(struct amd_pmf_dev *dev)
This function is only used in this file, so it can be static,
I will fix this up while merging this.
Regards,
Hans
> +{
> + struct apmf_auto_mode output;
> + struct power_table_control *pwr_ctrl;
> + int i;
> +
> + apmf_get_auto_mode_def(dev, &output);
> + /* time constant */
> + config_store.transition[AUTO_TRANSITION_TO_QUIET].time_constant =
> + output.balanced_to_quiet;
> + config_store.transition[AUTO_TRANSITION_TO_PERFORMANCE].time_constant =
> + output.balanced_to_perf;
> + config_store.transition[AUTO_TRANSITION_FROM_QUIET_TO_BALANCE].time_constant =
> + output.quiet_to_balanced;
> + config_store.transition[AUTO_TRANSITION_FROM_PERFORMANCE_TO_BALANCE].time_constant =
> + output.perf_to_balanced;
> +
> + /* power floor */
> + config_store.mode_set[AUTO_QUIET].power_floor = output.pfloor_quiet;
> + config_store.mode_set[AUTO_BALANCE].power_floor = output.pfloor_balanced;
> + config_store.mode_set[AUTO_PERFORMANCE].power_floor = output.pfloor_perf;
> + config_store.mode_set[AUTO_PERFORMANCE_ON_LAP].power_floor = output.pfloor_perf;
> +
> + /* Power delta for mode change */
> + config_store.transition[AUTO_TRANSITION_TO_QUIET].power_delta =
> + output.pd_balanced_to_quiet;
> + config_store.transition[AUTO_TRANSITION_TO_PERFORMANCE].power_delta =
> + output.pd_balanced_to_perf;
> + config_store.transition[AUTO_TRANSITION_FROM_QUIET_TO_BALANCE].power_delta =
> + output.pd_quiet_to_balanced;
> + config_store.transition[AUTO_TRANSITION_FROM_PERFORMANCE_TO_BALANCE].power_delta =
> + output.pd_perf_to_balanced;
> +
> + /* Power threshold */
> + amd_pmf_get_power_threshold();
> +
> + /* skin temperature limits */
> + pwr_ctrl = &config_store.mode_set[AUTO_QUIET].power_control;
> + pwr_ctrl->spl = output.spl_quiet;
> + pwr_ctrl->sppt = output.sppt_quiet;
> + pwr_ctrl->fppt = output.fppt_quiet;
> + pwr_ctrl->sppt_apu_only = output.sppt_apu_only_quiet;
> + pwr_ctrl->stt_min = output.stt_min_limit_quiet;
> + pwr_ctrl->stt_skin_temp[STT_TEMP_APU] = output.stt_apu_quiet;
> + pwr_ctrl->stt_skin_temp[STT_TEMP_HS2] = output.stt_hs2_quiet;
> +
> + pwr_ctrl = &config_store.mode_set[AUTO_BALANCE].power_control;
> + pwr_ctrl->spl = output.spl_balanced;
> + pwr_ctrl->sppt = output.sppt_balanced;
> + pwr_ctrl->fppt = output.fppt_balanced;
> + pwr_ctrl->sppt_apu_only = output.sppt_apu_only_balanced;
> + pwr_ctrl->stt_min = output.stt_min_limit_balanced;
> + pwr_ctrl->stt_skin_temp[STT_TEMP_APU] = output.stt_apu_balanced;
> + pwr_ctrl->stt_skin_temp[STT_TEMP_HS2] = output.stt_hs2_balanced;
> +
> + pwr_ctrl = &config_store.mode_set[AUTO_PERFORMANCE].power_control;
> + pwr_ctrl->spl = output.spl_perf;
> + pwr_ctrl->sppt = output.sppt_perf;
> + pwr_ctrl->fppt = output.fppt_perf;
> + pwr_ctrl->sppt_apu_only = output.sppt_apu_only_perf;
> + pwr_ctrl->stt_min = output.stt_min_limit_perf;
> + pwr_ctrl->stt_skin_temp[STT_TEMP_APU] = output.stt_apu_perf;
> + pwr_ctrl->stt_skin_temp[STT_TEMP_HS2] = output.stt_hs2_perf;
> +
> + pwr_ctrl = &config_store.mode_set[AUTO_PERFORMANCE_ON_LAP].power_control;
> + pwr_ctrl->spl = output.spl_perf_on_lap;
> + pwr_ctrl->sppt = output.sppt_perf_on_lap;
> + pwr_ctrl->fppt = output.fppt_perf_on_lap;
> + pwr_ctrl->sppt_apu_only = output.sppt_apu_only_perf_on_lap;
> + pwr_ctrl->stt_min = output.stt_min_limit_perf_on_lap;
> + pwr_ctrl->stt_skin_temp[STT_TEMP_APU] = output.stt_apu_perf_on_lap;
> + pwr_ctrl->stt_skin_temp[STT_TEMP_HS2] = output.stt_hs2_perf_on_lap;
> +
> + /* Fan ID */
> + config_store.mode_set[AUTO_QUIET].fan_control.fan_id = output.fan_id_quiet;
> + config_store.mode_set[AUTO_BALANCE].fan_control.fan_id = output.fan_id_balanced;
> + config_store.mode_set[AUTO_PERFORMANCE].fan_control.fan_id = output.fan_id_perf;
> + config_store.mode_set[AUTO_PERFORMANCE_ON_LAP].fan_control.fan_id =
> + output.fan_id_perf;
> +
> + config_store.transition[AUTO_TRANSITION_TO_QUIET].target_mode = AUTO_QUIET;
> + config_store.transition[AUTO_TRANSITION_TO_PERFORMANCE].target_mode =
> + AUTO_PERFORMANCE;
> + config_store.transition[AUTO_TRANSITION_FROM_QUIET_TO_BALANCE].target_mode =
> + AUTO_BALANCE;
> + config_store.transition[AUTO_TRANSITION_FROM_PERFORMANCE_TO_BALANCE].target_mode =
> + AUTO_BALANCE;
> +
> + config_store.transition[AUTO_TRANSITION_TO_QUIET].shifting_up = false;
> + config_store.transition[AUTO_TRANSITION_TO_PERFORMANCE].shifting_up = true;
> + config_store.transition[AUTO_TRANSITION_FROM_QUIET_TO_BALANCE].shifting_up = true;
> + config_store.transition[AUTO_TRANSITION_FROM_PERFORMANCE_TO_BALANCE].shifting_up =
> + false;
> +
> + for (i = 0 ; i < AUTO_MODE_MAX ; i++) {
> + if (config_store.mode_set[i].fan_control.fan_id == FAN_INDEX_AUTO)
> + config_store.mode_set[i].fan_control.manual = false;
> + else
> + config_store.mode_set[i].fan_control.manual = true;
> + }
> +
> + /* set to initial default values */
> + config_store.current_mode = AUTO_BALANCE;
> + dev->socket_power_history_idx = -1;
> +}
> +
> +void amd_pmf_deinit_auto_mode(struct amd_pmf_dev *dev)
> +{
> + cancel_delayed_work_sync(&dev->work_buffer);
> +}
> +
> +void amd_pmf_init_auto_mode(struct amd_pmf_dev *dev)
> +{
> + amd_pmf_load_defaults_auto_mode(dev);
> + /* update the thermal limits for Automode */
> + amd_pmf_set_automode(dev, config_store.current_mode, NULL);
> + amd_pmf_init_metrics_table(dev);
> +}
> diff --git a/drivers/platform/x86/amd/pmf/core.c b/drivers/platform/x86/amd/pmf/core.c
> index 762f769bf7ee..42d803b49d97 100644
> --- a/drivers/platform/x86/amd/pmf/core.c
> +++ b/drivers/platform/x86/amd/pmf/core.c
> @@ -240,12 +240,21 @@ static void amd_pmf_init_features(struct amd_pmf_dev *dev)
> amd_pmf_init_sps(dev);
> dev_dbg(dev->dev, "SPS enabled and Platform Profiles registered\n");
> }
> +
> + /* Enable Auto Mode */
> + if (is_apmf_func_supported(dev, APMF_FUNC_AUTO_MODE)) {
> + amd_pmf_init_auto_mode(dev);
> + dev_dbg(dev->dev, "Auto Mode Init done\n");
> + }
> }
>
> static void amd_pmf_deinit_features(struct amd_pmf_dev *dev)
> {
> if (is_apmf_func_supported(dev, APMF_FUNC_STATIC_SLIDER_GRANULAR))
> amd_pmf_deinit_sps(dev);
> +
> + if (is_apmf_func_supported(dev, APMF_FUNC_AUTO_MODE))
> + amd_pmf_deinit_auto_mode(dev);
> }
>
> static const struct acpi_device_id amd_pmf_acpi_ids[] = {
> diff --git a/drivers/platform/x86/amd/pmf/pmf.h b/drivers/platform/x86/amd/pmf/pmf.h
> index 42e4a5f512c0..ce092a529261 100644
> --- a/drivers/platform/x86/amd/pmf/pmf.h
> +++ b/drivers/platform/x86/amd/pmf/pmf.h
> @@ -18,6 +18,7 @@
> #define APMF_FUNC_VERIFY_INTERFACE 0
> #define APMF_FUNC_GET_SYS_PARAMS 1
> #define APMF_FUNC_SBIOS_HEARTBEAT 4
> +#define APMF_FUNC_AUTO_MODE 5
> #define APMF_FUNC_SET_FAN_IDX 7
> #define APMF_FUNC_STATIC_SLIDER_GRANULAR 9
>
> @@ -44,6 +45,7 @@
> #define FAN_INDEX_AUTO 0xFFFFFFFF
>
> #define ARG_NONE 0
> +#define AVG_SAMPLE_SIZE 3
>
> /* AMD PMF BIOS interfaces */
> struct apmf_verify_interface {
> @@ -143,6 +145,8 @@ struct amd_pmf_dev {
> struct smu_pmf_metrics m_table;
> struct delayed_work work_buffer;
> ktime_t start_time;
> + int socket_power_history[AVG_SAMPLE_SIZE];
> + int socket_power_history_idx;
> };
>
> struct apmf_sps_prop_granular {
> @@ -171,6 +175,107 @@ struct fan_table_control {
> unsigned long fan_id;
> };
>
> +struct power_table_control {
> + u32 spl;
> + u32 sppt;
> + u32 fppt;
> + u32 sppt_apu_only;
> + u32 stt_min;
> + u32 stt_skin_temp[STT_TEMP_COUNT];
> + u32 reserved[16];
> +};
> +
> +/* Auto Mode Layer */
> +enum auto_mode_transition_priority {
> + AUTO_TRANSITION_TO_PERFORMANCE, /* Any other mode to Performance Mode */
> + AUTO_TRANSITION_FROM_QUIET_TO_BALANCE, /* Quiet Mode to Balance Mode */
> + AUTO_TRANSITION_TO_QUIET, /* Any other mode to Quiet Mode */
> + AUTO_TRANSITION_FROM_PERFORMANCE_TO_BALANCE, /* Performance Mode to Balance Mode */
> + AUTO_TRANSITION_MAX,
> +};
> +
> +enum auto_mode_mode {
> + AUTO_QUIET,
> + AUTO_BALANCE,
> + AUTO_PERFORMANCE_ON_LAP,
> + AUTO_PERFORMANCE,
> + AUTO_MODE_MAX,
> +};
> +
> +struct auto_mode_trans_params {
> + u32 time_constant; /* minimum time required to switch to next mode */
> + u32 power_delta; /* delta power to shift mode */
> + u32 power_threshold;
> + u32 timer; /* elapsed time. if timer > TimeThreshold, it will move to next mode */
> + u32 applied;
> + enum auto_mode_mode target_mode;
> + u32 shifting_up;
> +};
> +
> +struct auto_mode_mode_settings {
> + struct power_table_control power_control;
> + struct fan_table_control fan_control;
> + u32 power_floor;
> +};
> +
> +struct auto_mode_mode_config {
> + struct auto_mode_trans_params transition[AUTO_TRANSITION_MAX];
> + struct auto_mode_mode_settings mode_set[AUTO_MODE_MAX];
> + enum auto_mode_mode current_mode;
> +};
> +
> +struct apmf_auto_mode {
> + u16 size;
> + /* time constant */
> + u32 balanced_to_perf;
> + u32 perf_to_balanced;
> + u32 quiet_to_balanced;
> + u32 balanced_to_quiet;
> + /* power floor */
> + u32 pfloor_perf;
> + u32 pfloor_balanced;
> + u32 pfloor_quiet;
> + /* Power delta for mode change */
> + u32 pd_balanced_to_perf;
> + u32 pd_perf_to_balanced;
> + u32 pd_quiet_to_balanced;
> + u32 pd_balanced_to_quiet;
> + /* skin temperature limits */
> + u8 stt_apu_perf_on_lap; /* CQL ON */
> + u8 stt_hs2_perf_on_lap; /* CQL ON */
> + u8 stt_apu_perf;
> + u8 stt_hs2_perf;
> + u8 stt_apu_balanced;
> + u8 stt_hs2_balanced;
> + u8 stt_apu_quiet;
> + u8 stt_hs2_quiet;
> + u32 stt_min_limit_perf_on_lap; /* CQL ON */
> + u32 stt_min_limit_perf;
> + u32 stt_min_limit_balanced;
> + u32 stt_min_limit_quiet;
> + /* SPL based */
> + u32 fppt_perf_on_lap; /* CQL ON */
> + u32 sppt_perf_on_lap; /* CQL ON */
> + u32 spl_perf_on_lap; /* CQL ON */
> + u32 sppt_apu_only_perf_on_lap; /* CQL ON */
> + u32 fppt_perf;
> + u32 sppt_perf;
> + u32 spl_perf;
> + u32 sppt_apu_only_perf;
> + u32 fppt_balanced;
> + u32 sppt_balanced;
> + u32 spl_balanced;
> + u32 sppt_apu_only_balanced;
> + u32 fppt_quiet;
> + u32 sppt_quiet;
> + u32 spl_quiet;
> + u32 sppt_apu_only_quiet;
> + /* Fan ID */
> + u32 fan_id_perf;
> + u32 fan_id_balanced;
> + u32 fan_id_quiet;
> +} __packed;
> +
> /* Core Layer */
> int apmf_acpi_init(struct amd_pmf_dev *pmf_dev);
> void apmf_acpi_deinit(struct amd_pmf_dev *pmf_dev);
> @@ -191,4 +296,12 @@ void amd_pmf_load_defaults_sps(struct amd_pmf_dev *dev);
>
>
> int apmf_update_fan_idx(struct amd_pmf_dev *pdev, bool manual, u32 idx);
> +
> +/* Auto Mode Layer */
> +void amd_pmf_load_defaults_auto_mode(struct amd_pmf_dev *dev);
> +int apmf_get_auto_mode_def(struct amd_pmf_dev *pdev, struct apmf_auto_mode *data);
> +void amd_pmf_init_auto_mode(struct amd_pmf_dev *dev);
> +void amd_pmf_deinit_auto_mode(struct amd_pmf_dev *dev);
> +void amd_pmf_trans_automode(struct amd_pmf_dev *dev, int socket_power, ktime_t time_elapsed_ms);
> +
> #endif /* PMF_H */
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH v4 09/11] platform/x86/amd/pmf: Handle AMT and CQL events for Auto mode
2022-08-02 15:11 [PATCH v4 00/11] platform/x86/amd/pmf: Introduce AMD PMF Driver Shyam Sundar S K
` (7 preceding siblings ...)
2022-08-02 15:11 ` [PATCH v4 08/11] platform/x86/amd/pmf: Add support for Auto mode feature Shyam Sundar S K
@ 2022-08-02 15:11 ` Shyam Sundar S K
2022-08-05 11:14 ` Hans de Goede
2022-08-02 15:11 ` [PATCH v4 10/11] platform/x86/amd/pmf: Force load driver on older supported platforms Shyam Sundar S K
` (2 subsequent siblings)
11 siblings, 1 reply; 22+ messages in thread
From: Shyam Sundar S K @ 2022-08-02 15:11 UTC (permalink / raw)
To: hdegoede, markgross
Cc: platform-driver-x86, Patil.Reddy, Shyam Sundar S K,
Mario Limonciello, Mark Pearson
The transition to auto-mode happens when the PMF driver receives
AMT (Auto Mode transition) event. transition logic will reside in the
PMF driver but the events would come from other supported drivers[1].
The thermal parameters would vary between when a performance "on-lap" mode
is detected and versus when not. The CQL event would get triggered from
other drivers, so that PMF driver would adjust the system thermal config
based on the ACPI inputs.
OEMs can control whether or not to enable AMT or CQL via other supported
drivers[1] but the actual transition logic resides in the AMD PMF driver.
When an AMT event is received the automatic mode transition RAPL algorithm
will run. When a CQL event is received an performance "on-lap" mode will
be enabled and thermal parameters will be adjusted accordingly.
[1]
Link: https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/commit/?h=review-hans&id=755b249250df1b612d982f3b702c831b26ecdf73
Cc: Mario Limonciello <mario.limonciello@amd.com>
Cc: Mark Pearson <markpearson@lenovo.com>
Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
---
drivers/platform/x86/amd/pmf/acpi.c | 66 ++++++++++++++++++++++++
drivers/platform/x86/amd/pmf/auto-mode.c | 38 ++++++++++++++
drivers/platform/x86/amd/pmf/core.c | 9 ++++
drivers/platform/x86/amd/pmf/pmf.h | 22 ++++++++
4 files changed, 135 insertions(+)
diff --git a/drivers/platform/x86/amd/pmf/acpi.c b/drivers/platform/x86/amd/pmf/acpi.c
index 401fee381e90..24d269bef92b 100644
--- a/drivers/platform/x86/amd/pmf/acpi.c
+++ b/drivers/platform/x86/amd/pmf/acpi.c
@@ -11,6 +11,9 @@
#include <linux/acpi.h>
#include "pmf.h"
+#define APMF_CQL_NOTIFICATION 2
+#define APMF_AMT_NOTIFICATION 3
+
static union acpi_object *apmf_if_call(struct amd_pmf_dev *pdev, int fn, struct acpi_buffer *param)
{
struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
@@ -149,6 +152,47 @@ int apmf_get_auto_mode_def(struct amd_pmf_dev *pdev, struct apmf_auto_mode *data
return apmf_if_call_store_buffer(pdev, APMF_FUNC_AUTO_MODE, data, sizeof(*data));
}
+int apmf_get_sbios_requests(struct amd_pmf_dev *pdev, struct apmf_sbios_req *req)
+{
+ return apmf_if_call_store_buffer(pdev, APMF_FUNC_SBIOS_REQUESTS,
+ req, sizeof(*req));
+}
+
+static void apmf_event_handler(acpi_handle handle, u32 event, void *data)
+{
+ struct amd_pmf_dev *pmf_dev = data;
+ struct apmf_sbios_req req;
+ int ret;
+
+ mutex_lock(&pmf_dev->update_mutex);
+ ret = apmf_get_sbios_requests(pmf_dev, &req);
+ if (ret) {
+ dev_err(pmf_dev->dev, "Failed to get SBIOS requests:%d\n", ret);
+ return;
+ }
+
+ if (req.pending_req & BIT(APMF_AMT_NOTIFICATION)) {
+ dev_dbg(pmf_dev->dev, "AMT is supported and notifications %s\n",
+ req.amt_event ? "Enabled" : "Disabled");
+ pmf_dev->amt_enabled = !!req.amt_event;
+
+ if (pmf_dev->amt_enabled)
+ amd_pmf_handle_amt(pmf_dev);
+ else
+ amd_pmf_reset_amt(pmf_dev);
+ }
+
+ if (req.pending_req & BIT(APMF_CQL_NOTIFICATION)) {
+ dev_dbg(pmf_dev->dev, "CQL is supported and notifications %s\n",
+ req.cql_event ? "Enabled" : "Disabled");
+
+ /* update the target mode information */
+ if (pmf_dev->amt_enabled)
+ amd_pmf_update_2_cql(pmf_dev, req.cql_event);
+ }
+ mutex_unlock(&pmf_dev->update_mutex);
+}
+
static int apmf_if_verify_interface(struct amd_pmf_dev *pdev)
{
struct apmf_verify_interface output;
@@ -190,12 +234,20 @@ static int apmf_get_system_params(struct amd_pmf_dev *dev)
void apmf_acpi_deinit(struct amd_pmf_dev *pmf_dev)
{
+ acpi_handle ahandle = ACPI_HANDLE(pmf_dev->dev);
+
if (pmf_dev->hb_interval)
cancel_delayed_work_sync(&pmf_dev->heart_beat);
+
+ if (is_apmf_func_supported(pmf_dev, APMF_FUNC_AUTO_MODE) &&
+ is_apmf_func_supported(pmf_dev, APMF_FUNC_SBIOS_REQUESTS))
+ acpi_remove_notify_handler(ahandle, ACPI_ALL_NOTIFY, apmf_event_handler);
}
int apmf_acpi_init(struct amd_pmf_dev *pmf_dev)
{
+ acpi_handle ahandle = ACPI_HANDLE(pmf_dev->dev);
+ acpi_status status;
int ret;
ret = apmf_if_verify_interface(pmf_dev);
@@ -216,6 +268,20 @@ int apmf_acpi_init(struct amd_pmf_dev *pmf_dev)
schedule_delayed_work(&pmf_dev->heart_beat, 0);
}
+ /* Install the APMF Notify handler */
+ if (is_apmf_func_supported(pmf_dev, APMF_FUNC_AUTO_MODE) &&
+ is_apmf_func_supported(pmf_dev, APMF_FUNC_SBIOS_REQUESTS)) {
+ status = acpi_install_notify_handler(ahandle,
+ ACPI_ALL_NOTIFY,
+ apmf_event_handler, pmf_dev);
+ if (ACPI_FAILURE(status)) {
+ dev_err(pmf_dev->dev, "failed to install notify handler\n");
+ return -ENODEV;
+ }
+ /* Call the handler once manually to catch up with possibly missed notifies. */
+ apmf_event_handler(ahandle, 0, pmf_dev);
+ }
+
out:
return ret;
}
diff --git a/drivers/platform/x86/amd/pmf/auto-mode.c b/drivers/platform/x86/amd/pmf/auto-mode.c
index 99f5a2396b0b..4e4ec6023525 100644
--- a/drivers/platform/x86/amd/pmf/auto-mode.c
+++ b/drivers/platform/x86/amd/pmf/auto-mode.c
@@ -108,6 +108,21 @@ void amd_pmf_trans_automode(struct amd_pmf_dev *dev, int socket_power, ktime_t t
}
}
+void amd_pmf_update_2_cql(struct amd_pmf_dev *dev, bool is_cql_event)
+{
+ int mode = config_store.current_mode;
+
+ config_store.transition[AUTO_TRANSITION_TO_PERFORMANCE].target_mode =
+ is_cql_event ? AUTO_PERFORMANCE_ON_LAP : AUTO_PERFORMANCE;
+
+ if ((mode == AUTO_PERFORMANCE || mode == AUTO_PERFORMANCE_ON_LAP) &&
+ mode != config_store.transition[AUTO_TRANSITION_TO_PERFORMANCE].target_mode) {
+ mode = config_store.transition[AUTO_TRANSITION_TO_PERFORMANCE].target_mode;
+ amd_pmf_set_automode(dev, mode, NULL);
+ }
+ dev_dbg(dev->dev, "updated CQL thermals\n");
+}
+
static void amd_pmf_get_power_threshold(void)
{
config_store.transition[AUTO_TRANSITION_TO_QUIET].power_threshold =
@@ -249,6 +264,29 @@ void amd_pmf_load_defaults_auto_mode(struct amd_pmf_dev *dev)
dev->socket_power_history_idx = -1;
}
+void amd_pmf_reset_amt(struct amd_pmf_dev *dev)
+{
+ /*
+ * OEM BIOS implementation guide says that if the auto mode is enabled
+ * the platform_profile registration shall be done by the OEM driver.
+ * There could be cases where both static slider and auto mode BIOS
+ * functions are enabled, in that case enable static slider updates
+ * only if it advertised as supported.
+ */
+
+ if (is_apmf_func_supported(dev, APMF_FUNC_STATIC_SLIDER_GRANULAR)) {
+ u8 mode = amd_pmf_get_pprof_modes(dev);
+
+ dev_dbg(dev->dev, "resetting AMT thermals\n");
+ amd_pmf_update_slider(dev, SLIDER_OP_SET, mode, NULL);
+ }
+}
+
+void amd_pmf_handle_amt(struct amd_pmf_dev *dev)
+{
+ amd_pmf_set_automode(dev, config_store.current_mode, NULL);
+}
+
void amd_pmf_deinit_auto_mode(struct amd_pmf_dev *dev)
{
cancel_delayed_work_sync(&dev->work_buffer);
diff --git a/drivers/platform/x86/amd/pmf/core.c b/drivers/platform/x86/amd/pmf/core.c
index 42d803b49d97..4467d682cd11 100644
--- a/drivers/platform/x86/amd/pmf/core.c
+++ b/drivers/platform/x86/amd/pmf/core.c
@@ -99,6 +99,7 @@ static void amd_pmf_get_metrics(struct work_struct *work)
ktime_t time_elapsed_ms;
int socket_power;
+ mutex_lock(&dev->update_mutex);
/* Transfer table contents */
memset(dev->buf, 0, sizeof(dev->m_table));
amd_pmf_send_cmd(dev, SET_TRANSFER_TABLE, 0, 7, NULL);
@@ -108,8 +109,14 @@ static void amd_pmf_get_metrics(struct work_struct *work)
/* Calculate the avg SoC power consumption */
socket_power = dev->m_table.apu_power + dev->m_table.dgpu_power;
+ if (dev->amt_enabled) {
+ /* Apply the Auto Mode transition */
+ amd_pmf_trans_automode(dev, socket_power, time_elapsed_ms);
+ }
+
dev->start_time = ktime_to_ms(ktime_get());
schedule_delayed_work(&dev->work_buffer, msecs_to_jiffies(metrics_table_loop_ms));
+ mutex_unlock(&dev->update_mutex);
}
static inline u32 amd_pmf_reg_read(struct amd_pmf_dev *dev, int reg_offset)
@@ -329,6 +336,7 @@ static int amd_pmf_probe(struct platform_device *pdev)
amd_pmf_dbgfs_register(dev);
mutex_init(&dev->lock);
+ mutex_init(&dev->update_mutex);
dev_info(dev->dev, "registered PMF device successfully\n");
return 0;
@@ -339,6 +347,7 @@ static int amd_pmf_remove(struct platform_device *pdev)
struct amd_pmf_dev *dev = platform_get_drvdata(pdev);
mutex_destroy(&dev->lock);
+ mutex_destroy(&dev->update_mutex);
amd_pmf_deinit_features(dev);
apmf_acpi_deinit(dev);
amd_pmf_dbgfs_unregister(dev);
diff --git a/drivers/platform/x86/amd/pmf/pmf.h b/drivers/platform/x86/amd/pmf/pmf.h
index ce092a529261..4078665c8e06 100644
--- a/drivers/platform/x86/amd/pmf/pmf.h
+++ b/drivers/platform/x86/amd/pmf/pmf.h
@@ -17,6 +17,7 @@
/* APMF Functions */
#define APMF_FUNC_VERIFY_INTERFACE 0
#define APMF_FUNC_GET_SYS_PARAMS 1
+#define APMF_FUNC_SBIOS_REQUESTS 2
#define APMF_FUNC_SBIOS_HEARTBEAT 4
#define APMF_FUNC_AUTO_MODE 5
#define APMF_FUNC_SET_FAN_IDX 7
@@ -63,6 +64,21 @@ struct apmf_system_params {
u32 heartbeat_int;
} __packed;
+struct apmf_sbios_req {
+ u16 size;
+ u32 pending_req;
+ u8 rsd;
+ u8 cql_event;
+ u8 amt_event;
+ u32 fppt;
+ u32 sppt;
+ u32 fppt_apu_only;
+ u32 spl;
+ u32 stt_min_limit;
+ u8 skin_temp_apu;
+ u8 skin_temp_hs2;
+} __packed;
+
struct apmf_fan_idx {
u16 size;
u8 fan_ctl_mode;
@@ -147,6 +163,8 @@ struct amd_pmf_dev {
ktime_t start_time;
int socket_power_history[AVG_SAMPLE_SIZE];
int socket_power_history_idx;
+ bool amt_enabled;
+ struct mutex update_mutex; /* protects race between ACPI handler and metrics thread */
};
struct apmf_sps_prop_granular {
@@ -303,5 +321,9 @@ int apmf_get_auto_mode_def(struct amd_pmf_dev *pdev, struct apmf_auto_mode *data
void amd_pmf_init_auto_mode(struct amd_pmf_dev *dev);
void amd_pmf_deinit_auto_mode(struct amd_pmf_dev *dev);
void amd_pmf_trans_automode(struct amd_pmf_dev *dev, int socket_power, ktime_t time_elapsed_ms);
+int apmf_get_sbios_requests(struct amd_pmf_dev *pdev, struct apmf_sbios_req *req);
+void amd_pmf_update_2_cql(struct amd_pmf_dev *dev, bool is_cql_event);
+void amd_pmf_reset_amt(struct amd_pmf_dev *dev);
+void amd_pmf_handle_amt(struct amd_pmf_dev *dev);
#endif /* PMF_H */
--
2.25.1
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [PATCH v4 09/11] platform/x86/amd/pmf: Handle AMT and CQL events for Auto mode
2022-08-02 15:11 ` [PATCH v4 09/11] platform/x86/amd/pmf: Handle AMT and CQL events for Auto mode Shyam Sundar S K
@ 2022-08-05 11:14 ` Hans de Goede
0 siblings, 0 replies; 22+ messages in thread
From: Hans de Goede @ 2022-08-05 11:14 UTC (permalink / raw)
To: Shyam Sundar S K, markgross
Cc: platform-driver-x86, Patil.Reddy, Mario Limonciello, Mark Pearson
Hi,
On 8/2/22 17:11, Shyam Sundar S K wrote:
> The transition to auto-mode happens when the PMF driver receives
> AMT (Auto Mode transition) event. transition logic will reside in the
> PMF driver but the events would come from other supported drivers[1].
>
> The thermal parameters would vary between when a performance "on-lap" mode
> is detected and versus when not. The CQL event would get triggered from
> other drivers, so that PMF driver would adjust the system thermal config
> based on the ACPI inputs.
>
> OEMs can control whether or not to enable AMT or CQL via other supported
> drivers[1] but the actual transition logic resides in the AMD PMF driver.
> When an AMT event is received the automatic mode transition RAPL algorithm
> will run. When a CQL event is received an performance "on-lap" mode will
> be enabled and thermal parameters will be adjusted accordingly.
>
> [1]
> Link: https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/commit/?h=review-hans&id=755b249250df1b612d982f3b702c831b26ecdf73
>
> Cc: Mario Limonciello <mario.limonciello@amd.com>
> Cc: Mark Pearson <markpearson@lenovo.com>
> Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
> ---
> drivers/platform/x86/amd/pmf/acpi.c | 66 ++++++++++++++++++++++++
> drivers/platform/x86/amd/pmf/auto-mode.c | 38 ++++++++++++++
> drivers/platform/x86/amd/pmf/core.c | 9 ++++
> drivers/platform/x86/amd/pmf/pmf.h | 22 ++++++++
> 4 files changed, 135 insertions(+)
>
> diff --git a/drivers/platform/x86/amd/pmf/acpi.c b/drivers/platform/x86/amd/pmf/acpi.c
> index 401fee381e90..24d269bef92b 100644
> --- a/drivers/platform/x86/amd/pmf/acpi.c
> +++ b/drivers/platform/x86/amd/pmf/acpi.c
> @@ -11,6 +11,9 @@
> #include <linux/acpi.h>
> #include "pmf.h"
>
> +#define APMF_CQL_NOTIFICATION 2
> +#define APMF_AMT_NOTIFICATION 3
> +
> static union acpi_object *apmf_if_call(struct amd_pmf_dev *pdev, int fn, struct acpi_buffer *param)
> {
> struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
> @@ -149,6 +152,47 @@ int apmf_get_auto_mode_def(struct amd_pmf_dev *pdev, struct apmf_auto_mode *data
> return apmf_if_call_store_buffer(pdev, APMF_FUNC_AUTO_MODE, data, sizeof(*data));
> }
>
> +int apmf_get_sbios_requests(struct amd_pmf_dev *pdev, struct apmf_sbios_req *req)
> +{
> + return apmf_if_call_store_buffer(pdev, APMF_FUNC_SBIOS_REQUESTS,
> + req, sizeof(*req));
> +}
> +
> +static void apmf_event_handler(acpi_handle handle, u32 event, void *data)
> +{
> + struct amd_pmf_dev *pmf_dev = data;
> + struct apmf_sbios_req req;
> + int ret;
> +
> + mutex_lock(&pmf_dev->update_mutex);
> + ret = apmf_get_sbios_requests(pmf_dev, &req);
> + if (ret) {
> + dev_err(pmf_dev->dev, "Failed to get SBIOS requests:%d\n", ret);
This is missing a mutex_unlock, I will fix this up (using a goto) while
merging this.
Regards,
Hans
> + return;
> + }
> +
> + if (req.pending_req & BIT(APMF_AMT_NOTIFICATION)) {
> + dev_dbg(pmf_dev->dev, "AMT is supported and notifications %s\n",
> + req.amt_event ? "Enabled" : "Disabled");
> + pmf_dev->amt_enabled = !!req.amt_event;
> +
> + if (pmf_dev->amt_enabled)
> + amd_pmf_handle_amt(pmf_dev);
> + else
> + amd_pmf_reset_amt(pmf_dev);
> + }
> +
> + if (req.pending_req & BIT(APMF_CQL_NOTIFICATION)) {
> + dev_dbg(pmf_dev->dev, "CQL is supported and notifications %s\n",
> + req.cql_event ? "Enabled" : "Disabled");
> +
> + /* update the target mode information */
> + if (pmf_dev->amt_enabled)
> + amd_pmf_update_2_cql(pmf_dev, req.cql_event);
> + }
> + mutex_unlock(&pmf_dev->update_mutex);
> +}
> +
> static int apmf_if_verify_interface(struct amd_pmf_dev *pdev)
> {
> struct apmf_verify_interface output;
> @@ -190,12 +234,20 @@ static int apmf_get_system_params(struct amd_pmf_dev *dev)
>
> void apmf_acpi_deinit(struct amd_pmf_dev *pmf_dev)
> {
> + acpi_handle ahandle = ACPI_HANDLE(pmf_dev->dev);
> +
> if (pmf_dev->hb_interval)
> cancel_delayed_work_sync(&pmf_dev->heart_beat);
> +
> + if (is_apmf_func_supported(pmf_dev, APMF_FUNC_AUTO_MODE) &&
> + is_apmf_func_supported(pmf_dev, APMF_FUNC_SBIOS_REQUESTS))
> + acpi_remove_notify_handler(ahandle, ACPI_ALL_NOTIFY, apmf_event_handler);
> }
>
> int apmf_acpi_init(struct amd_pmf_dev *pmf_dev)
> {
> + acpi_handle ahandle = ACPI_HANDLE(pmf_dev->dev);
> + acpi_status status;
> int ret;
>
> ret = apmf_if_verify_interface(pmf_dev);
> @@ -216,6 +268,20 @@ int apmf_acpi_init(struct amd_pmf_dev *pmf_dev)
> schedule_delayed_work(&pmf_dev->heart_beat, 0);
> }
>
> + /* Install the APMF Notify handler */
> + if (is_apmf_func_supported(pmf_dev, APMF_FUNC_AUTO_MODE) &&
> + is_apmf_func_supported(pmf_dev, APMF_FUNC_SBIOS_REQUESTS)) {
> + status = acpi_install_notify_handler(ahandle,
> + ACPI_ALL_NOTIFY,
> + apmf_event_handler, pmf_dev);
> + if (ACPI_FAILURE(status)) {
> + dev_err(pmf_dev->dev, "failed to install notify handler\n");
> + return -ENODEV;
> + }
> + /* Call the handler once manually to catch up with possibly missed notifies. */
> + apmf_event_handler(ahandle, 0, pmf_dev);
> + }
> +
> out:
> return ret;
> }
> diff --git a/drivers/platform/x86/amd/pmf/auto-mode.c b/drivers/platform/x86/amd/pmf/auto-mode.c
> index 99f5a2396b0b..4e4ec6023525 100644
> --- a/drivers/platform/x86/amd/pmf/auto-mode.c
> +++ b/drivers/platform/x86/amd/pmf/auto-mode.c
> @@ -108,6 +108,21 @@ void amd_pmf_trans_automode(struct amd_pmf_dev *dev, int socket_power, ktime_t t
> }
> }
>
> +void amd_pmf_update_2_cql(struct amd_pmf_dev *dev, bool is_cql_event)
> +{
> + int mode = config_store.current_mode;
> +
> + config_store.transition[AUTO_TRANSITION_TO_PERFORMANCE].target_mode =
> + is_cql_event ? AUTO_PERFORMANCE_ON_LAP : AUTO_PERFORMANCE;
> +
> + if ((mode == AUTO_PERFORMANCE || mode == AUTO_PERFORMANCE_ON_LAP) &&
> + mode != config_store.transition[AUTO_TRANSITION_TO_PERFORMANCE].target_mode) {
> + mode = config_store.transition[AUTO_TRANSITION_TO_PERFORMANCE].target_mode;
> + amd_pmf_set_automode(dev, mode, NULL);
> + }
> + dev_dbg(dev->dev, "updated CQL thermals\n");
> +}
> +
> static void amd_pmf_get_power_threshold(void)
> {
> config_store.transition[AUTO_TRANSITION_TO_QUIET].power_threshold =
> @@ -249,6 +264,29 @@ void amd_pmf_load_defaults_auto_mode(struct amd_pmf_dev *dev)
> dev->socket_power_history_idx = -1;
> }
>
> +void amd_pmf_reset_amt(struct amd_pmf_dev *dev)
> +{
> + /*
> + * OEM BIOS implementation guide says that if the auto mode is enabled
> + * the platform_profile registration shall be done by the OEM driver.
> + * There could be cases where both static slider and auto mode BIOS
> + * functions are enabled, in that case enable static slider updates
> + * only if it advertised as supported.
> + */
> +
> + if (is_apmf_func_supported(dev, APMF_FUNC_STATIC_SLIDER_GRANULAR)) {
> + u8 mode = amd_pmf_get_pprof_modes(dev);
> +
> + dev_dbg(dev->dev, "resetting AMT thermals\n");
> + amd_pmf_update_slider(dev, SLIDER_OP_SET, mode, NULL);
> + }
> +}
> +
> +void amd_pmf_handle_amt(struct amd_pmf_dev *dev)
> +{
> + amd_pmf_set_automode(dev, config_store.current_mode, NULL);
> +}
> +
> void amd_pmf_deinit_auto_mode(struct amd_pmf_dev *dev)
> {
> cancel_delayed_work_sync(&dev->work_buffer);
> diff --git a/drivers/platform/x86/amd/pmf/core.c b/drivers/platform/x86/amd/pmf/core.c
> index 42d803b49d97..4467d682cd11 100644
> --- a/drivers/platform/x86/amd/pmf/core.c
> +++ b/drivers/platform/x86/amd/pmf/core.c
> @@ -99,6 +99,7 @@ static void amd_pmf_get_metrics(struct work_struct *work)
> ktime_t time_elapsed_ms;
> int socket_power;
>
> + mutex_lock(&dev->update_mutex);
> /* Transfer table contents */
> memset(dev->buf, 0, sizeof(dev->m_table));
> amd_pmf_send_cmd(dev, SET_TRANSFER_TABLE, 0, 7, NULL);
> @@ -108,8 +109,14 @@ static void amd_pmf_get_metrics(struct work_struct *work)
> /* Calculate the avg SoC power consumption */
> socket_power = dev->m_table.apu_power + dev->m_table.dgpu_power;
>
> + if (dev->amt_enabled) {
> + /* Apply the Auto Mode transition */
> + amd_pmf_trans_automode(dev, socket_power, time_elapsed_ms);
> + }
> +
> dev->start_time = ktime_to_ms(ktime_get());
> schedule_delayed_work(&dev->work_buffer, msecs_to_jiffies(metrics_table_loop_ms));
> + mutex_unlock(&dev->update_mutex);
> }
>
> static inline u32 amd_pmf_reg_read(struct amd_pmf_dev *dev, int reg_offset)
> @@ -329,6 +336,7 @@ static int amd_pmf_probe(struct platform_device *pdev)
> amd_pmf_dbgfs_register(dev);
>
> mutex_init(&dev->lock);
> + mutex_init(&dev->update_mutex);
> dev_info(dev->dev, "registered PMF device successfully\n");
>
> return 0;
> @@ -339,6 +347,7 @@ static int amd_pmf_remove(struct platform_device *pdev)
> struct amd_pmf_dev *dev = platform_get_drvdata(pdev);
>
> mutex_destroy(&dev->lock);
> + mutex_destroy(&dev->update_mutex);
> amd_pmf_deinit_features(dev);
> apmf_acpi_deinit(dev);
> amd_pmf_dbgfs_unregister(dev);
> diff --git a/drivers/platform/x86/amd/pmf/pmf.h b/drivers/platform/x86/amd/pmf/pmf.h
> index ce092a529261..4078665c8e06 100644
> --- a/drivers/platform/x86/amd/pmf/pmf.h
> +++ b/drivers/platform/x86/amd/pmf/pmf.h
> @@ -17,6 +17,7 @@
> /* APMF Functions */
> #define APMF_FUNC_VERIFY_INTERFACE 0
> #define APMF_FUNC_GET_SYS_PARAMS 1
> +#define APMF_FUNC_SBIOS_REQUESTS 2
> #define APMF_FUNC_SBIOS_HEARTBEAT 4
> #define APMF_FUNC_AUTO_MODE 5
> #define APMF_FUNC_SET_FAN_IDX 7
> @@ -63,6 +64,21 @@ struct apmf_system_params {
> u32 heartbeat_int;
> } __packed;
>
> +struct apmf_sbios_req {
> + u16 size;
> + u32 pending_req;
> + u8 rsd;
> + u8 cql_event;
> + u8 amt_event;
> + u32 fppt;
> + u32 sppt;
> + u32 fppt_apu_only;
> + u32 spl;
> + u32 stt_min_limit;
> + u8 skin_temp_apu;
> + u8 skin_temp_hs2;
> +} __packed;
> +
> struct apmf_fan_idx {
> u16 size;
> u8 fan_ctl_mode;
> @@ -147,6 +163,8 @@ struct amd_pmf_dev {
> ktime_t start_time;
> int socket_power_history[AVG_SAMPLE_SIZE];
> int socket_power_history_idx;
> + bool amt_enabled;
> + struct mutex update_mutex; /* protects race between ACPI handler and metrics thread */
> };
>
> struct apmf_sps_prop_granular {
> @@ -303,5 +321,9 @@ int apmf_get_auto_mode_def(struct amd_pmf_dev *pdev, struct apmf_auto_mode *data
> void amd_pmf_init_auto_mode(struct amd_pmf_dev *dev);
> void amd_pmf_deinit_auto_mode(struct amd_pmf_dev *dev);
> void amd_pmf_trans_automode(struct amd_pmf_dev *dev, int socket_power, ktime_t time_elapsed_ms);
> +int apmf_get_sbios_requests(struct amd_pmf_dev *pdev, struct apmf_sbios_req *req);
>
> +void amd_pmf_update_2_cql(struct amd_pmf_dev *dev, bool is_cql_event);
> +void amd_pmf_reset_amt(struct amd_pmf_dev *dev);
> +void amd_pmf_handle_amt(struct amd_pmf_dev *dev);
> #endif /* PMF_H */
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH v4 10/11] platform/x86/amd/pmf: Force load driver on older supported platforms
2022-08-02 15:11 [PATCH v4 00/11] platform/x86/amd/pmf: Introduce AMD PMF Driver Shyam Sundar S K
` (8 preceding siblings ...)
2022-08-02 15:11 ` [PATCH v4 09/11] platform/x86/amd/pmf: Handle AMT and CQL events for Auto mode Shyam Sundar S K
@ 2022-08-02 15:11 ` Shyam Sundar S K
2022-08-05 11:05 ` Hans de Goede
2022-08-02 15:11 ` [PATCH v4 11/11] MAINTAINERS: Add AMD PMF driver entry Shyam Sundar S K
2022-08-05 11:16 ` [PATCH v4 00/11] platform/x86/amd/pmf: Introduce AMD PMF Driver Hans de Goede
11 siblings, 1 reply; 22+ messages in thread
From: Shyam Sundar S K @ 2022-08-02 15:11 UTC (permalink / raw)
To: hdegoede, markgross; +Cc: platform-driver-x86, Patil.Reddy, Shyam Sundar S K
Some of the older platforms with _HID "AMDI0100" PMF driver can be force
loaded by interested users but only for experimental purposes.
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
---
drivers/platform/x86/amd/pmf/core.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/drivers/platform/x86/amd/pmf/core.c b/drivers/platform/x86/amd/pmf/core.c
index 4467d682cd11..dbca5d7c6311 100644
--- a/drivers/platform/x86/amd/pmf/core.c
+++ b/drivers/platform/x86/amd/pmf/core.c
@@ -39,6 +39,7 @@
#define AMD_PMF_RESULT_FAILED 0xFF
/* List of supported CPU ids */
+#define AMD_CPU_ID_RMB 0x14b5
#define AMD_CPU_ID_PS 0x14e8
#define PMF_MSG_DELAY_MIN_US 50
@@ -52,6 +53,11 @@ static int metrics_table_loop_ms = 1000;
module_param(metrics_table_loop_ms, int, 0644);
MODULE_PARM_DESC(metrics_table_loop_ms, " Metrics Table sample size time (default = 1000ms) ");
+/* Force load on supported older platforms */
+static bool force_load;
+module_param(force_load, bool, 0444);
+MODULE_PARM_DESC(force_load, " Force load this driver on supported older platforms (experimental) ");
+
static int current_power_limits_show(struct seq_file *seq, void *unused)
{
struct amd_pmf_dev *dev = seq->private;
@@ -208,6 +214,7 @@ int amd_pmf_send_cmd(struct amd_pmf_dev *dev, u8 message, bool get, u32 arg, u32
}
static const struct pci_device_id pmf_pci_ids[] = {
+ { PCI_DEVICE(PCI_VENDOR_ID_AMD, AMD_CPU_ID_RMB) },
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, AMD_CPU_ID_PS) },
{ }
};
@@ -265,6 +272,7 @@ static void amd_pmf_deinit_features(struct amd_pmf_dev *dev)
}
static const struct acpi_device_id amd_pmf_acpi_ids[] = {
+ {"AMDI0100", 0x100},
{"AMDI0102", 0},
{ }
};
@@ -272,6 +280,7 @@ MODULE_DEVICE_TABLE(acpi, amd_pmf_acpi_ids);
static int amd_pmf_probe(struct platform_device *pdev)
{
+ const struct acpi_device_id *id;
struct amd_pmf_dev *dev;
struct pci_dev *rdev;
u32 base_addr_lo;
@@ -280,6 +289,13 @@ static int amd_pmf_probe(struct platform_device *pdev)
u32 val;
int err;
+ id = acpi_match_device(amd_pmf_acpi_ids, &pdev->dev);
+ if (!id)
+ return -ENODEV;
+
+ if (id->driver_data == 0x100 && !force_load)
+ return -ENODEV;
+
dev = devm_kzalloc(&pdev->dev, sizeof(*dev), GFP_KERNEL);
if (!dev)
return -ENOMEM;
--
2.25.1
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [PATCH v4 10/11] platform/x86/amd/pmf: Force load driver on older supported platforms
2022-08-02 15:11 ` [PATCH v4 10/11] platform/x86/amd/pmf: Force load driver on older supported platforms Shyam Sundar S K
@ 2022-08-05 11:05 ` Hans de Goede
0 siblings, 0 replies; 22+ messages in thread
From: Hans de Goede @ 2022-08-05 11:05 UTC (permalink / raw)
To: Shyam Sundar S K, markgross; +Cc: platform-driver-x86, Patil.Reddy
Hi,
On 8/2/22 17:11, Shyam Sundar S K wrote:
> Some of the older platforms with _HID "AMDI0100" PMF driver can be force
> loaded by interested users but only for experimental purposes.
>
> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
> Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
> ---
> drivers/platform/x86/amd/pmf/core.c | 16 ++++++++++++++++
> 1 file changed, 16 insertions(+)
>
> diff --git a/drivers/platform/x86/amd/pmf/core.c b/drivers/platform/x86/amd/pmf/core.c
> index 4467d682cd11..dbca5d7c6311 100644
> --- a/drivers/platform/x86/amd/pmf/core.c
> +++ b/drivers/platform/x86/amd/pmf/core.c
> @@ -39,6 +39,7 @@
> #define AMD_PMF_RESULT_FAILED 0xFF
>
> /* List of supported CPU ids */
> +#define AMD_CPU_ID_RMB 0x14b5
> #define AMD_CPU_ID_PS 0x14e8
>
> #define PMF_MSG_DELAY_MIN_US 50
> @@ -52,6 +53,11 @@ static int metrics_table_loop_ms = 1000;
> module_param(metrics_table_loop_ms, int, 0644);
> MODULE_PARM_DESC(metrics_table_loop_ms, " Metrics Table sample size time (default = 1000ms) ");
>
> +/* Force load on supported older platforms */
> +static bool force_load;
> +module_param(force_load, bool, 0444);
> +MODULE_PARM_DESC(force_load, " Force load this driver on supported older platforms (experimental) ");
That space at the start of the help string should not be there,
I will fix this up while merging this.
Regards,
Hans
> +
> static int current_power_limits_show(struct seq_file *seq, void *unused)
> {
> struct amd_pmf_dev *dev = seq->private;
> @@ -208,6 +214,7 @@ int amd_pmf_send_cmd(struct amd_pmf_dev *dev, u8 message, bool get, u32 arg, u32
> }
>
> static const struct pci_device_id pmf_pci_ids[] = {
> + { PCI_DEVICE(PCI_VENDOR_ID_AMD, AMD_CPU_ID_RMB) },
> { PCI_DEVICE(PCI_VENDOR_ID_AMD, AMD_CPU_ID_PS) },
> { }
> };
> @@ -265,6 +272,7 @@ static void amd_pmf_deinit_features(struct amd_pmf_dev *dev)
> }
>
> static const struct acpi_device_id amd_pmf_acpi_ids[] = {
> + {"AMDI0100", 0x100},
> {"AMDI0102", 0},
> { }
> };
> @@ -272,6 +280,7 @@ MODULE_DEVICE_TABLE(acpi, amd_pmf_acpi_ids);
>
> static int amd_pmf_probe(struct platform_device *pdev)
> {
> + const struct acpi_device_id *id;
> struct amd_pmf_dev *dev;
> struct pci_dev *rdev;
> u32 base_addr_lo;
> @@ -280,6 +289,13 @@ static int amd_pmf_probe(struct platform_device *pdev)
> u32 val;
> int err;
>
> + id = acpi_match_device(amd_pmf_acpi_ids, &pdev->dev);
> + if (!id)
> + return -ENODEV;
> +
> + if (id->driver_data == 0x100 && !force_load)
> + return -ENODEV;
> +
> dev = devm_kzalloc(&pdev->dev, sizeof(*dev), GFP_KERNEL);
> if (!dev)
> return -ENOMEM;
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH v4 11/11] MAINTAINERS: Add AMD PMF driver entry
2022-08-02 15:11 [PATCH v4 00/11] platform/x86/amd/pmf: Introduce AMD PMF Driver Shyam Sundar S K
` (9 preceding siblings ...)
2022-08-02 15:11 ` [PATCH v4 10/11] platform/x86/amd/pmf: Force load driver on older supported platforms Shyam Sundar S K
@ 2022-08-02 15:11 ` Shyam Sundar S K
2022-08-05 11:08 ` Hans de Goede
2022-08-05 11:16 ` [PATCH v4 00/11] platform/x86/amd/pmf: Introduce AMD PMF Driver Hans de Goede
11 siblings, 1 reply; 22+ messages in thread
From: Shyam Sundar S K @ 2022-08-02 15:11 UTC (permalink / raw)
To: hdegoede, markgross; +Cc: platform-driver-x86, Patil.Reddy, Shyam Sundar S K
Update the MAINTAINERS file with AMD PMF driver details.
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
---
MAINTAINERS | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index e01478062c56..d3f6cabcaab2 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -998,6 +998,13 @@ L: platform-driver-x86@vger.kernel.org
S: Maintained
F: drivers/platform/x86/amd/pmc.c
+AMD PMF DRIVER
+M: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
+L: platform-driver-x86@vger.kernel.org
+S: Maintained
+F: Documentation/ABI/testing/sysfs-amd-pmf
+F: drivers/platform/x86/amd/pmf/
+
AMD HSMP DRIVER
M: Naveen Krishna Chatradhi <naveenkrishna.chatradhi@amd.com>
R: Carlos Bilbao <carlos.bilbao@amd.com>
--
2.25.1
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [PATCH v4 11/11] MAINTAINERS: Add AMD PMF driver entry
2022-08-02 15:11 ` [PATCH v4 11/11] MAINTAINERS: Add AMD PMF driver entry Shyam Sundar S K
@ 2022-08-05 11:08 ` Hans de Goede
0 siblings, 0 replies; 22+ messages in thread
From: Hans de Goede @ 2022-08-05 11:08 UTC (permalink / raw)
To: Shyam Sundar S K, markgross; +Cc: platform-driver-x86, Patil.Reddy
Hi,
On 8/2/22 17:11, Shyam Sundar S K wrote:
> Update the MAINTAINERS file with AMD PMF driver details.
>
> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
> Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
> ---
> MAINTAINERS | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index e01478062c56..d3f6cabcaab2 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -998,6 +998,13 @@ L: platform-driver-x86@vger.kernel.org
> S: Maintained
> F: drivers/platform/x86/amd/pmc.c
>
> +AMD PMF DRIVER
> +M: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
> +L: platform-driver-x86@vger.kernel.org
> +S: Maintained
> +F: Documentation/ABI/testing/sysfs-amd-pmf
Since the CnQF support was dropped, this file
does not exist, so I've dropped this line from
the MAINTAINERS file while merging this.
Regards,
Hans
> +F: drivers/platform/x86/amd/pmf/
> +
> AMD HSMP DRIVER
> M: Naveen Krishna Chatradhi <naveenkrishna.chatradhi@amd.com>
> R: Carlos Bilbao <carlos.bilbao@amd.com>
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH v4 00/11] platform/x86/amd/pmf: Introduce AMD PMF Driver
2022-08-02 15:11 [PATCH v4 00/11] platform/x86/amd/pmf: Introduce AMD PMF Driver Shyam Sundar S K
` (10 preceding siblings ...)
2022-08-02 15:11 ` [PATCH v4 11/11] MAINTAINERS: Add AMD PMF driver entry Shyam Sundar S K
@ 2022-08-05 11:16 ` Hans de Goede
11 siblings, 0 replies; 22+ messages in thread
From: Hans de Goede @ 2022-08-05 11:16 UTC (permalink / raw)
To: Shyam Sundar S K, markgross; +Cc: platform-driver-x86, Patil.Reddy
Hi,
On 8/2/22 17:11, Shyam Sundar S K wrote:
> AMD PMF Driver (a.k.a Platform Management Framework) provides a
> centralized framework based on sensor inputs, OS hints, platform state
> and APU metrics to dynamically manage perf, power and system thermals.
>
> The goal of the driver is to enhance end user experience by making AMD
> PCs smarter, quieter, power efficient by adapting to user behavior and
> environment.
>
> The larger goals include:
>
> - Enable easy customization of smart PC solutions by OEMs.
> - Provide a framework for OEMs to add in custom algorithms and solutions
> - Improve standby and dynamic platform power through active power
> management of platform devices.
>
> In this series, support for following features has been added.
> - "Static Power Slider" meant to manage the power budget based on the
> power modes or the slider position.
> - "Auto Mode" tracks the moving power average of the APU and takes
> intelligent decisions to switch between different modes.
>
> Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
>
> v4:
> -----------
> - Remove duplicate variables in auto_mode_mode_config() structure
> - call apmf_event_handler() handler manually so that we don't miss out
> any notifies
> - Misc. error handling.
Thank you for your patch, I've applied this patch to my review-hans
branch:
https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=review-hans
The patches sitting here allows the LKP testing infra to test
the patches. I will move these over to a 6.0-rc1 based feature
branch once 6.0-rc1 is out.
Note I did do a few small last fixes while merging this, see
my replies to individual patches.
Please test the version in the review-hans branch and base
any future patches on top of the version in the review-hans
branch.
Regards,
Hans
> v3:
> -----------
> - Cleanup ACPI code path
> - Optimize metrics table collection mechanism
> - Avoid races between the acpi handler and the metrics table worker
> thread.
> - Remove redundant structures and functions.
> - Improve the code handling the apmf handler routine.
>
> v2 Resend:
> -----------
> - Patches from 9 to 11 were not sent due to wrong email address. Hence
> resending.
>
> v1->v2:
> -------
> - optimize the ACPI path by having a common routine
> apmf_if_call_store_buffer()
> - Simply Static slider interaction with platform_profile
> - Remove CONFIG_DEBUG_FS stub code
> - Drop changes introduced in platform_profile_get()
> - Drop CnQF support. Will be sent as a patch-set later.
> - Other code improvements
>
> Shyam Sundar S K (11):
> platform/x86/amd/pmf: Add support for PMF core layer
> platform/x86/amd/pmf: Add support for PMF APCI layer
> platform/x86/amd/pmf: Add support SPS PMF feature
> platform/x86/amd/pmf: Add debugfs information
> platform/x86/amd/pmf: Add heartbeat signal support
> platform/x86/amd/pmf: Add fan control support
> platform/x86/amd/pmf: Get performance metrics from PMFW
> platform/x86/amd/pmf: Add support for Auto mode feature
> platform/x86/amd/pmf: Handle AMT and CQL events for Auto mode
> platform/x86/amd/pmf: Force load driver on older supported platforms
> MAINTAINERS: Add AMD PMF driver entry
>
> MAINTAINERS | 7 +
> drivers/platform/x86/amd/Kconfig | 2 +
> drivers/platform/x86/amd/Makefile | 1 +
> drivers/platform/x86/amd/pmf/Kconfig | 15 +
> drivers/platform/x86/amd/pmf/Makefile | 9 +
> drivers/platform/x86/amd/pmf/acpi.c | 287 +++++++++++++++++
> drivers/platform/x86/amd/pmf/auto-mode.c | 301 ++++++++++++++++++
> drivers/platform/x86/amd/pmf/core.c | 385 +++++++++++++++++++++++
> drivers/platform/x86/amd/pmf/pmf.h | 329 +++++++++++++++++++
> drivers/platform/x86/amd/pmf/sps.c | 149 +++++++++
> 10 files changed, 1485 insertions(+)
> create mode 100644 drivers/platform/x86/amd/pmf/Kconfig
> create mode 100644 drivers/platform/x86/amd/pmf/Makefile
> create mode 100644 drivers/platform/x86/amd/pmf/acpi.c
> create mode 100644 drivers/platform/x86/amd/pmf/auto-mode.c
> create mode 100644 drivers/platform/x86/amd/pmf/core.c
> create mode 100644 drivers/platform/x86/amd/pmf/pmf.h
> create mode 100644 drivers/platform/x86/amd/pmf/sps.c
>
^ permalink raw reply [flat|nested] 22+ messages in thread