]> git.ipfire.org Git - thirdparty/linux.git/blobdiff - drivers/platform/x86/amd/pmc.c
Merge tag 'platform-drivers-x86-v6.5-1' of git://git.kernel.org/pub/scm/linux/kernel...
[thirdparty/linux.git] / drivers / platform / x86 / amd / pmc.c
index 1304cd6f13f6acc3021530b091881353d038306f..7d3d080ff174879890e3956d345c98679562b87d 100644 (file)
@@ -45,7 +45,6 @@
 #define AMD_PMC_STB_DUMMY_PC           0xC6000007
 
 /* STB S2D(Spill to DRAM) has different message port offset */
-#define STB_SPILL_TO_DRAM              0xBE
 #define AMD_S2D_REGISTER_MESSAGE       0xA20
 #define AMD_S2D_REGISTER_RESPONSE      0xA80
 #define AMD_S2D_REGISTER_ARGUMENT      0xA88
@@ -99,7 +98,6 @@
 #define PMC_MSG_DELAY_MIN_US           50
 #define RESPONSE_REGISTER_LOOP_MAX     20000
 
-#define SOC_SUBSYSTEM_IP_MAX   12
 #define DELAY_MIN_US           2000
 #define DELAY_MAX_US           3000
 #define FIFO_SIZE              4096
@@ -115,6 +113,7 @@ enum s2d_arg {
        S2D_PHYS_ADDR_LOW,
        S2D_PHYS_ADDR_HIGH,
        S2D_NUM_SAMPLES,
+       S2D_DRAM_SIZE,
 };
 
 struct amd_pmc_bit_map {
@@ -132,9 +131,18 @@ static const struct amd_pmc_bit_map soc15_ip_blk[] = {
        {"ISP",         BIT(6)},
        {"NBIO",        BIT(7)},
        {"DF",          BIT(8)},
-       {"USB0",        BIT(9)},
-       {"USB1",        BIT(10)},
+       {"USB3_0",      BIT(9)},
+       {"USB3_1",      BIT(10)},
        {"LAPIC",       BIT(11)},
+       {"USB3_2",      BIT(12)},
+       {"USB3_3",      BIT(13)},
+       {"USB3_4",      BIT(14)},
+       {"USB4_0",      BIT(15)},
+       {"USB4_1",      BIT(16)},
+       {"MPM",         BIT(17)},
+       {"JPEG",        BIT(18)},
+       {"IPU",         BIT(19)},
+       {"UMSCH",       BIT(20)},
        {}
 };
 
@@ -147,6 +155,9 @@ struct amd_pmc_dev {
        u32 base_addr;
        u32 cpu_id;
        u32 active_ips;
+       u32 dram_size;
+       u32 num_ips;
+       u32 s2d_msg_id;
 /* SMU version information */
        u8 smu_program;
        u8 major;
@@ -194,8 +205,8 @@ struct smu_metrics {
        u64 timein_s0i3_totaltime;
        u64 timein_swdrips_lastcapture;
        u64 timein_swdrips_totaltime;
-       u64 timecondition_notmet_lastcapture[SOC_SUBSYSTEM_IP_MAX];
-       u64 timecondition_notmet_totaltime[SOC_SUBSYSTEM_IP_MAX];
+       u64 timecondition_notmet_lastcapture[32];
+       u64 timecondition_notmet_totaltime[32];
 } __packed;
 
 static int amd_pmc_stb_debugfs_open(struct inode *inode, struct file *filp)
@@ -261,7 +272,7 @@ static int amd_pmc_stb_debugfs_open_v2(struct inode *inode, struct file *filp)
        dev->msg_port = 1;
 
        /* Get the num_samples to calculate the last push location */
-       ret = amd_pmc_send_cmd(dev, S2D_NUM_SAMPLES, &num_samples, STB_SPILL_TO_DRAM, 1);
+       ret = amd_pmc_send_cmd(dev, S2D_NUM_SAMPLES, &num_samples, dev->s2d_msg_id, true);
        /* Clear msg_port for other SMU operation */
        dev->msg_port = 0;
        if (ret) {
@@ -308,6 +319,23 @@ static const struct file_operations amd_pmc_stb_debugfs_fops_v2 = {
        .release = amd_pmc_stb_debugfs_release_v2,
 };
 
+static void amd_pmc_get_ip_info(struct amd_pmc_dev *dev)
+{
+       switch (dev->cpu_id) {
+       case AMD_CPU_ID_PCO:
+       case AMD_CPU_ID_RN:
+       case AMD_CPU_ID_YC:
+       case AMD_CPU_ID_CB:
+               dev->num_ips = 12;
+               dev->s2d_msg_id = 0xBE;
+               break;
+       case AMD_CPU_ID_PS:
+               dev->num_ips = 21;
+               dev->s2d_msg_id = 0x85;
+               break;
+       }
+}
+
 static int amd_pmc_setup_smu_logging(struct amd_pmc_dev *dev)
 {
        if (dev->cpu_id == AMD_CPU_ID_PCO) {
@@ -317,15 +345,15 @@ static int amd_pmc_setup_smu_logging(struct amd_pmc_dev *dev)
 
        /* Get Active devices list from SMU */
        if (!dev->active_ips)
-               amd_pmc_send_cmd(dev, 0, &dev->active_ips, SMU_MSG_GET_SUP_CONSTRAINTS, 1);
+               amd_pmc_send_cmd(dev, 0, &dev->active_ips, SMU_MSG_GET_SUP_CONSTRAINTS, true);
 
        /* Get dram address */
        if (!dev->smu_virt_addr) {
                u32 phys_addr_low, phys_addr_hi;
                u64 smu_phys_addr;
 
-               amd_pmc_send_cmd(dev, 0, &phys_addr_low, SMU_MSG_LOG_GETDRAM_ADDR_LO, 1);
-               amd_pmc_send_cmd(dev, 0, &phys_addr_hi, SMU_MSG_LOG_GETDRAM_ADDR_HI, 1);
+               amd_pmc_send_cmd(dev, 0, &phys_addr_low, SMU_MSG_LOG_GETDRAM_ADDR_LO, true);
+               amd_pmc_send_cmd(dev, 0, &phys_addr_hi, SMU_MSG_LOG_GETDRAM_ADDR_HI, true);
                smu_phys_addr = ((u64)phys_addr_hi << 32 | phys_addr_low);
 
                dev->smu_virt_addr = devm_ioremap(dev->dev, smu_phys_addr,
@@ -335,8 +363,8 @@ static int amd_pmc_setup_smu_logging(struct amd_pmc_dev *dev)
        }
 
        /* Start the logging */
-       amd_pmc_send_cmd(dev, 0, NULL, SMU_MSG_LOG_RESET, 0);
-       amd_pmc_send_cmd(dev, 0, NULL, SMU_MSG_LOG_START, 0);
+       amd_pmc_send_cmd(dev, 0, NULL, SMU_MSG_LOG_RESET, false);
+       amd_pmc_send_cmd(dev, 0, NULL, SMU_MSG_LOG_START, false);
 
        return 0;
 }
@@ -377,7 +405,7 @@ static int amd_pmc_get_smu_version(struct amd_pmc_dev *dev)
        if (dev->cpu_id == AMD_CPU_ID_PCO)
                return -ENODEV;
 
-       rc = amd_pmc_send_cmd(dev, 0, &val, SMU_MSG_GETSMUVERSION, 1);
+       rc = amd_pmc_send_cmd(dev, 0, &val, SMU_MSG_GETSMUVERSION, true);
        if (rc)
                return rc;
 
@@ -469,7 +497,7 @@ static int smu_fw_info_show(struct seq_file *s, void *unused)
                   table.timeto_resume_to_os_lastcapture);
 
        seq_puts(s, "\n=== Active time (in us) ===\n");
-       for (idx = 0 ; idx < SOC_SUBSYSTEM_IP_MAX ; idx++) {
+       for (idx = 0 ; idx < dev->num_ips ; idx++) {
                if (soc15_ip_blk[idx].bit_mask & dev->active_ips)
                        seq_printf(s, "%-8s : %lld\n", soc15_ip_blk[idx].name,
                                   table.timecondition_notmet_lastcapture[idx]);
@@ -562,6 +590,18 @@ static void amd_pmc_dbgfs_unregister(struct amd_pmc_dev *dev)
        debugfs_remove_recursive(dev->dbgfs_dir);
 }
 
+static bool amd_pmc_is_stb_supported(struct amd_pmc_dev *dev)
+{
+       switch (dev->cpu_id) {
+       case AMD_CPU_ID_YC:
+       case AMD_CPU_ID_CB:
+       case AMD_CPU_ID_PS:
+               return true;
+       default:
+               return false;
+       }
+}
+
 static void amd_pmc_dbgfs_register(struct amd_pmc_dev *dev)
 {
        dev->dbgfs_dir = debugfs_create_dir("amd_pmc", NULL);
@@ -573,8 +613,7 @@ static void amd_pmc_dbgfs_register(struct amd_pmc_dev *dev)
                            &amd_pmc_idlemask_fops);
        /* Enable STB only when the module_param is set */
        if (enable_stb) {
-               if (dev->cpu_id == AMD_CPU_ID_YC || dev->cpu_id == AMD_CPU_ID_CB ||
-                   dev->cpu_id == AMD_CPU_ID_PS)
+               if (amd_pmc_is_stb_supported(dev))
                        debugfs_create_file("stb_read", 0644, dev->dbgfs_dir, dev,
                                            &amd_pmc_stb_debugfs_fops_v2);
                else
@@ -794,7 +833,7 @@ static void amd_pmc_s2idle_prepare(void)
        }
 
        msg = amd_pmc_get_os_hint(pdev);
-       rc = amd_pmc_send_cmd(pdev, arg, NULL, msg, 0);
+       rc = amd_pmc_send_cmd(pdev, arg, NULL, msg, false);
        if (rc) {
                dev_err(pdev->dev, "suspend failed: %d\n", rc);
                return;
@@ -829,7 +868,7 @@ static int amd_pmc_dump_data(struct amd_pmc_dev *pdev)
        if (pdev->cpu_id == AMD_CPU_ID_PCO)
                return -ENODEV;
 
-       return amd_pmc_send_cmd(pdev, 0, NULL, SMU_MSG_LOG_DUMP_DATA, 0);
+       return amd_pmc_send_cmd(pdev, 0, NULL, SMU_MSG_LOG_DUMP_DATA, false);
 }
 
 static void amd_pmc_s2idle_restore(void)
@@ -839,7 +878,7 @@ static void amd_pmc_s2idle_restore(void)
        u8 msg;
 
        msg = amd_pmc_get_os_hint(pdev);
-       rc = amd_pmc_send_cmd(pdev, 0, NULL, msg, 0);
+       rc = amd_pmc_send_cmd(pdev, 0, NULL, msg, false);
        if (rc)
                dev_err(pdev->dev, "resume failed: %d\n", rc);
 
@@ -890,29 +929,65 @@ static const struct pci_device_id pmc_pci_ids[] = {
        { }
 };
 
+static int amd_pmc_get_dram_size(struct amd_pmc_dev *dev)
+{
+       int ret;
+
+       switch (dev->cpu_id) {
+       case AMD_CPU_ID_YC:
+               if (!(dev->major > 90 || (dev->major == 90 && dev->minor > 39))) {
+                       ret = -EINVAL;
+                       goto err_dram_size;
+               }
+               break;
+       default:
+               ret = -EINVAL;
+               goto err_dram_size;
+       }
+
+       ret = amd_pmc_send_cmd(dev, S2D_DRAM_SIZE, &dev->dram_size, dev->s2d_msg_id, true);
+       if (ret || !dev->dram_size)
+               goto err_dram_size;
+
+       return 0;
+
+err_dram_size:
+       dev_err(dev->dev, "DRAM size command not supported for this platform\n");
+       return ret;
+}
+
 static int amd_pmc_s2d_init(struct amd_pmc_dev *dev)
 {
        u32 phys_addr_low, phys_addr_hi;
        u64 stb_phys_addr;
        u32 size = 0;
+       int ret;
 
        /* Spill to DRAM feature uses separate SMU message port */
        dev->msg_port = 1;
 
-       amd_pmc_send_cmd(dev, S2D_TELEMETRY_SIZE, &size, STB_SPILL_TO_DRAM, 1);
+       /* Get num of IP blocks within the SoC */
+       amd_pmc_get_ip_info(dev);
+
+       amd_pmc_send_cmd(dev, S2D_TELEMETRY_SIZE, &size, dev->s2d_msg_id, true);
        if (size != S2D_TELEMETRY_BYTES_MAX)
                return -EIO;
 
+       /* Get DRAM size */
+       ret = amd_pmc_get_dram_size(dev);
+       if (ret)
+               dev->dram_size = S2D_TELEMETRY_DRAMBYTES_MAX;
+
        /* Get STB DRAM address */
-       amd_pmc_send_cmd(dev, S2D_PHYS_ADDR_LOW, &phys_addr_low, STB_SPILL_TO_DRAM, 1);
-       amd_pmc_send_cmd(dev, S2D_PHYS_ADDR_HIGH, &phys_addr_hi, STB_SPILL_TO_DRAM, 1);
+       amd_pmc_send_cmd(dev, S2D_PHYS_ADDR_LOW, &phys_addr_low, dev->s2d_msg_id, true);
+       amd_pmc_send_cmd(dev, S2D_PHYS_ADDR_HIGH, &phys_addr_hi, dev->s2d_msg_id, true);
 
        stb_phys_addr = ((u64)phys_addr_hi << 32 | phys_addr_low);
 
        /* Clear msg_port for other SMU operation */
        dev->msg_port = 0;
 
-       dev->stb_virt_addr = devm_ioremap(dev->dev, stb_phys_addr, S2D_TELEMETRY_DRAMBYTES_MAX);
+       dev->stb_virt_addr = devm_ioremap(dev->dev, stb_phys_addr, dev->dram_size);
        if (!dev->stb_virt_addr)
                return -ENOMEM;
 
@@ -1001,7 +1076,7 @@ static int amd_pmc_probe(struct platform_device *pdev)
 
        mutex_init(&dev->lock);
 
-       if (enable_stb && (dev->cpu_id == AMD_CPU_ID_YC || dev->cpu_id == AMD_CPU_ID_CB)) {
+       if (enable_stb && amd_pmc_is_stb_supported(dev)) {
                err = amd_pmc_s2d_init(dev);
                if (err)
                        goto err_pci_dev_put;