drm/amdgpu: expand to add multiple trap event irq id
[linux-2.6-block.git] / drivers / gpu / drm / amd / powerplay / amdgpu_smu.c
index 5daa3c855cccaa84634cf984d124974b0e872b28..4df960f0baaf8a0482bb86d9104be82dd54750b8 100644 (file)
 #include "navi10_ppt.h"
 #include "sienna_cichlid_ppt.h"
 #include "renoir_ppt.h"
+#include "amd_pcie.h"
+
+/*
+ * DO NOT use these for err/warn/info/debug messages.
+ * Use dev_err, dev_warn, dev_info and dev_dbg instead.
+ * They are more MGPU friendly.
+ */
+#undef pr_err
+#undef pr_warn
+#undef pr_info
+#undef pr_debug
 
 #undef __SMU_DUMMY_MAP
 #define __SMU_DUMMY_MAP(type)  #type
@@ -228,169 +239,48 @@ int smu_get_smc_version(struct smu_context *smu, uint32_t *if_version, uint32_t
        return ret;
 }
 
-int smu_set_soft_freq_range(struct smu_context *smu, enum smu_clk_type clk_type,
-                           uint32_t min, uint32_t max, bool lock_needed)
+int smu_set_soft_freq_range(struct smu_context *smu,
+                           enum smu_clk_type clk_type,
+                           uint32_t min,
+                           uint32_t max)
 {
        int ret = 0;
 
        if (!smu_clk_dpm_is_enabled(smu, clk_type))
                return 0;
 
-       if (lock_needed)
-               mutex_lock(&smu->mutex);
-       ret = smu_set_soft_freq_limited_range(smu, clk_type, min, max);
-       if (lock_needed)
-               mutex_unlock(&smu->mutex);
-
-       return ret;
-}
-
-int smu_set_hard_freq_range(struct smu_context *smu, enum smu_clk_type clk_type,
-                           uint32_t min, uint32_t max)
-{
-       int ret = 0, clk_id = 0;
-       uint32_t param;
-
-       if (min <= 0 && max <= 0)
-               return -EINVAL;
-
-       if (!smu_clk_dpm_is_enabled(smu, clk_type))
-               return 0;
-
-       clk_id = smu_clk_get_index(smu, clk_type);
-       if (clk_id < 0)
-               return clk_id;
-
-       if (max > 0) {
-               param = (uint32_t)((clk_id << 16) | (max & 0xffff));
-               ret = smu_send_smc_msg_with_param(smu, SMU_MSG_SetHardMaxByFreq,
-                                                 param, NULL);
-               if (ret)
-                       return ret;
-       }
+       mutex_lock(&smu->mutex);
 
-       if (min > 0) {
-               param = (uint32_t)((clk_id << 16) | (min & 0xffff));
-               ret = smu_send_smc_msg_with_param(smu, SMU_MSG_SetHardMinByFreq,
-                                                 param, NULL);
-               if (ret)
-                       return ret;
-       }
+       if (smu->ppt_funcs->set_soft_freq_limited_range)
+               ret = smu->ppt_funcs->set_soft_freq_limited_range(smu,
+                                                                 clk_type,
+                                                                 min,
+                                                                 max);
 
+       mutex_unlock(&smu->mutex);
 
        return ret;
 }
 
-int smu_get_dpm_freq_range(struct smu_context *smu, enum smu_clk_type clk_type,
-                          uint32_t *min, uint32_t *max, bool lock_needed)
+int smu_get_dpm_freq_range(struct smu_context *smu,
+                          enum smu_clk_type clk_type,
+                          uint32_t *min,
+                          uint32_t *max)
 {
-       uint32_t clock_limit;
        int ret = 0;
 
        if (!min && !max)
                return -EINVAL;
 
-       if (lock_needed)
-               mutex_lock(&smu->mutex);
-
-       if (!smu_clk_dpm_is_enabled(smu, clk_type)) {
-               switch (clk_type) {
-               case SMU_MCLK:
-               case SMU_UCLK:
-                       clock_limit = smu->smu_table.boot_values.uclk;
-                       break;
-               case SMU_GFXCLK:
-               case SMU_SCLK:
-                       clock_limit = smu->smu_table.boot_values.gfxclk;
-                       break;
-               case SMU_SOCCLK:
-                       clock_limit = smu->smu_table.boot_values.socclk;
-                       break;
-               default:
-                       clock_limit = 0;
-                       break;
-               }
-
-               /* clock in Mhz unit */
-               if (min)
-                       *min = clock_limit / 100;
-               if (max)
-                       *max = clock_limit / 100;
-       } else {
-               /*
-                * Todo: Use each asic(ASIC_ppt funcs) control the callbacks exposed to the
-                * core driver and then have helpers for stuff that is common(SMU_v11_x | SMU_v12_x funcs).
-                */
-               ret = smu_get_dpm_ultimate_freq(smu, clk_type, min, max);
-       }
-
-       if (lock_needed)
-               mutex_unlock(&smu->mutex);
-
-       return ret;
-}
-
-int smu_get_dpm_freq_by_index(struct smu_context *smu, enum smu_clk_type clk_type,
-                             uint16_t level, uint32_t *value)
-{
-       int ret = 0, clk_id = 0;
-       uint32_t param;
-
-       if (!value)
-               return -EINVAL;
-
-       if (!smu_clk_dpm_is_enabled(smu, clk_type))
-               return 0;
-
-       clk_id = smu_clk_get_index(smu, clk_type);
-       if (clk_id < 0)
-               return clk_id;
-
-       param = (uint32_t)(((clk_id & 0xffff) << 16) | (level & 0xffff));
-
-       ret = smu_send_smc_msg_with_param(smu, SMU_MSG_GetDpmFreqByIndex,
-                                         param, value);
-       if (ret)
-               return ret;
-
-       /* BIT31:  0 - Fine grained DPM, 1 - Dicrete DPM
-        * now, we un-support it */
-       *value = *value & 0x7fffffff;
-
-       return ret;
-}
-
-int smu_get_dpm_level_count(struct smu_context *smu, enum smu_clk_type clk_type,
-                           uint32_t *value)
-{
-       return smu_get_dpm_freq_by_index(smu, clk_type, 0xff, value);
-}
-
-int smu_get_dpm_level_range(struct smu_context *smu, enum smu_clk_type clk_type,
-                           uint32_t *min_value, uint32_t *max_value)
-{
-       int ret = 0;
-       uint32_t level_count = 0;
-
-       if (!min_value && !max_value)
-               return -EINVAL;
-
-       if (min_value) {
-               /* by default, level 0 clock value as min value */
-               ret = smu_get_dpm_freq_by_index(smu, clk_type, 0, min_value);
-               if (ret)
-                       return ret;
-       }
+       mutex_lock(&smu->mutex);
 
-       if (max_value) {
-               ret = smu_get_dpm_level_count(smu, clk_type, &level_count);
-               if (ret)
-                       return ret;
+       if (smu->ppt_funcs->get_dpm_ultimate_freq)
+               ret = smu->ppt_funcs->get_dpm_ultimate_freq(smu,
+                                                           clk_type,
+                                                           min,
+                                                           max);
 
-               ret = smu_get_dpm_freq_by_index(smu, clk_type, level_count - 1, max_value);
-               if (ret)
-                       return ret;
-       }
+       mutex_unlock(&smu->mutex);
 
        return ret;
 }
@@ -445,23 +335,38 @@ int smu_dpm_set_power_gate(struct smu_context *smu, uint32_t block_type,
                return -EOPNOTSUPP;
 
        switch (block_type) {
+       /*
+        * Some legacy code of amdgpu_vcn.c and vcn_v2*.c still uses
+        * AMD_IP_BLOCK_TYPE_UVD for VCN. So, here both of them are kept.
+        */
        case AMD_IP_BLOCK_TYPE_UVD:
-               ret = smu_dpm_set_uvd_enable(smu, !gate);
-               break;
-       case AMD_IP_BLOCK_TYPE_VCE:
-               ret = smu_dpm_set_vce_enable(smu, !gate);
+       case AMD_IP_BLOCK_TYPE_VCN:
+               ret = smu_dpm_set_vcn_enable(smu, !gate);
+               if (ret)
+                       dev_err(smu->adev->dev, "Failed to power %s VCN!\n",
+                               gate ? "gate" : "ungate");
                break;
        case AMD_IP_BLOCK_TYPE_GFX:
                ret = smu_gfx_off_control(smu, gate);
+               if (ret)
+                       dev_err(smu->adev->dev, "Failed to %s gfxoff!\n",
+                               gate ? "enable" : "disable");
                break;
        case AMD_IP_BLOCK_TYPE_SDMA:
                ret = smu_powergate_sdma(smu, gate);
+               if (ret)
+                       dev_err(smu->adev->dev, "Failed to power %s SDMA!\n",
+                               gate ? "gate" : "ungate");
                break;
        case AMD_IP_BLOCK_TYPE_JPEG:
                ret = smu_dpm_set_jpeg_enable(smu, !gate);
+               if (ret)
+                       dev_err(smu->adev->dev, "Failed to power %s JPEG!\n",
+                               gate ? "gate" : "ungate");
                break;
        default:
-               break;
+               dev_err(smu->adev->dev, "Unsupported block type!\n");
+               return -EINVAL;
        }
 
        return ret;
@@ -481,52 +386,6 @@ int smu_get_power_num_states(struct smu_context *smu,
        return 0;
 }
 
-int smu_common_read_sensor(struct smu_context *smu, enum amd_pp_sensors sensor,
-                          void *data, uint32_t *size)
-{
-       struct smu_power_context *smu_power = &smu->smu_power;
-       struct smu_power_gate *power_gate = &smu_power->power_gate;
-       int ret = 0;
-
-       if(!data || !size)
-               return -EINVAL;
-
-       switch (sensor) {
-       case AMDGPU_PP_SENSOR_STABLE_PSTATE_SCLK:
-               *((uint32_t *)data) = smu->pstate_sclk;
-               *size = 4;
-               break;
-       case AMDGPU_PP_SENSOR_STABLE_PSTATE_MCLK:
-               *((uint32_t *)data) = smu->pstate_mclk;
-               *size = 4;
-               break;
-       case AMDGPU_PP_SENSOR_ENABLED_SMC_FEATURES_MASK:
-               ret = smu_feature_get_enabled_mask(smu, (uint32_t *)data, 2);
-               *size = 8;
-               break;
-       case AMDGPU_PP_SENSOR_UVD_POWER:
-               *(uint32_t *)data = smu_feature_is_enabled(smu, SMU_FEATURE_DPM_UVD_BIT) ? 1 : 0;
-               *size = 4;
-               break;
-       case AMDGPU_PP_SENSOR_VCE_POWER:
-               *(uint32_t *)data = smu_feature_is_enabled(smu, SMU_FEATURE_DPM_VCE_BIT) ? 1 : 0;
-               *size = 4;
-               break;
-       case AMDGPU_PP_SENSOR_VCN_POWER_STATE:
-               *(uint32_t *)data = power_gate->vcn_gated ? 0 : 1;
-               *size = 4;
-               break;
-       default:
-               ret = -EINVAL;
-               break;
-       }
-
-       if (ret)
-               *size = 0;
-
-       return ret;
-}
-
 int smu_update_table(struct smu_context *smu, enum smu_table_id table_index, int argument,
                     void *table_data, bool drv2smu)
 {
@@ -609,7 +468,7 @@ int smu_sys_set_pp_table(struct smu_context *smu,  void *buf, size_t size)
                return -EOPNOTSUPP;
 
        if (header->usStructureSize != size) {
-               pr_err("pp table size not matched !\n");
+               dev_err(smu->adev->dev, "pp table size not matched !\n");
                return -EIO;
        }
 
@@ -633,7 +492,7 @@ int smu_sys_set_pp_table(struct smu_context *smu,  void *buf, size_t size)
 
        ret = smu_reset(smu);
        if (ret)
-               pr_info("smu reset failed, ret = %d\n", ret);
+               dev_info(smu->adev->dev, "smu reset failed, ret = %d\n", ret);
 
        smu->uploading_custom_pp_table = false;
 
@@ -778,29 +637,33 @@ static int smu_late_init(void *handle)
                return 0;
 
        ret = smu_set_default_od_settings(smu);
-       if (ret)
+       if (ret) {
+               dev_err(adev->dev, "Failed to setup default OD settings!\n");
                return ret;
+       }
 
        /*
         * Set initialized values (get from vbios) to dpm tables context such as
         * gfxclk, memclk, dcefclk, and etc. And enable the DPM feature for each
         * type of clks.
         */
-       ret = smu_populate_smc_tables(smu);
-       if (ret)
-               return ret;
-
-       ret = smu_init_max_sustainable_clocks(smu);
-       if (ret)
+       ret = smu_set_default_dpm_table(smu);
+       if (ret) {
+               dev_err(adev->dev, "Failed to setup default dpm clock tables!\n");
                return ret;
+       }
 
        ret = smu_populate_umd_state_clk(smu);
-       if (ret)
+       if (ret) {
+               dev_err(adev->dev, "Failed to populate UMD state clocks!\n");
                return ret;
+       }
 
-       ret = smu_get_power_limit(smu, &smu->default_power_limit, false, false);
-       if (ret)
+       ret = smu_get_asic_power_limits(smu);
+       if (ret) {
+               dev_err(adev->dev, "Failed to get asic power limits!\n");
                return ret;
+       }
 
        smu_get_unique_id(smu);
 
@@ -847,7 +710,7 @@ static int smu_init_fb_allocations(struct smu_context *smu)
                                              &tables[SMU_TABLE_PMSTATUSLOG].mc_address,
                                              &tables[SMU_TABLE_PMSTATUSLOG].cpu_addr);
                if (ret) {
-                       pr_err("VRAM allocation for tool table failed!\n");
+                       dev_err(adev->dev, "VRAM allocation for tool table failed!\n");
                        return ret;
                }
        }
@@ -876,7 +739,7 @@ static int smu_init_fb_allocations(struct smu_context *smu)
                                      &driver_table->mc_address,
                                      &driver_table->cpu_addr);
        if (ret) {
-               pr_err("VRAM allocation for driver table failed!\n");
+               dev_err(adev->dev, "VRAM allocation for driver table failed!\n");
                if (tables[SMU_TABLE_PMSTATUSLOG].mc_address)
                        amdgpu_bo_free_kernel(&tables[SMU_TABLE_PMSTATUSLOG].bo,
                                              &tables[SMU_TABLE_PMSTATUSLOG].mc_address,
@@ -944,6 +807,8 @@ static int smu_alloc_memory_pool(struct smu_context *smu)
                                              &memory_pool->bo,
                                              &memory_pool->mc_address,
                                              &memory_pool->cpu_addr);
+               if (ret)
+                       dev_err(adev->dev, "VRAM allocation for dramlog failed!\n");
                break;
        default:
                break;
@@ -979,7 +844,7 @@ static int smu_smc_table_sw_init(struct smu_context *smu)
         */
        ret = smu_init_smc_tables(smu);
        if (ret) {
-               pr_err("Failed to init smc tables!\n");
+               dev_err(smu->adev->dev, "Failed to init smc tables!\n");
                return ret;
        }
 
@@ -989,7 +854,7 @@ static int smu_smc_table_sw_init(struct smu_context *smu)
         */
        ret = smu_init_power(smu);
        if (ret) {
-               pr_err("Failed to init smu_init_power!\n");
+               dev_err(smu->adev->dev, "Failed to init smu_init_power!\n");
                return ret;
        }
 
@@ -1021,19 +886,27 @@ static int smu_smc_table_sw_fini(struct smu_context *smu)
 
        ret = smu_fini_power(smu);
        if (ret) {
-               pr_err("Failed to init smu_fini_power!\n");
+               dev_err(smu->adev->dev, "Failed to init smu_fini_power!\n");
                return ret;
        }
 
        ret = smu_fini_smc_tables(smu);
        if (ret) {
-               pr_err("Failed to smu_fini_smc_tables!\n");
+               dev_err(smu->adev->dev, "Failed to smu_fini_smc_tables!\n");
                return ret;
        }
 
        return 0;
 }
 
+static void smu_throttling_logging_work_fn(struct work_struct *work)
+{
+       struct smu_context *smu = container_of(work, struct smu_context,
+                                              throttling_logging_work);
+
+       smu_log_thermal_throttling(smu);
+}
+
 static int smu_sw_init(void *handle)
 {
        struct amdgpu_device *adev = (struct amdgpu_device *)handle;
@@ -1055,6 +928,7 @@ static int smu_sw_init(void *handle)
        mutex_init(&smu->metrics_lock);
        mutex_init(&smu->message_lock);
 
+       INIT_WORK(&smu->throttling_logging_work, smu_throttling_logging_work_fn);
        smu->watermarks_bitmap = 0;
        smu->power_profile_mode = PP_SMC_POWER_PROFILE_BOOTUP_DEFAULT;
        smu->default_power_profile_mode = PP_SMC_POWER_PROFILE_BOOTUP_DEFAULT;
@@ -1081,19 +955,19 @@ static int smu_sw_init(void *handle)
        smu->smu_dpm.requested_dpm_level = AMD_DPM_FORCED_LEVEL_AUTO;
        ret = smu_init_microcode(smu);
        if (ret) {
-               pr_err("Failed to load smu firmware!\n");
+               dev_err(adev->dev, "Failed to load smu firmware!\n");
                return ret;
        }
 
        ret = smu_smc_table_sw_init(smu);
        if (ret) {
-               pr_err("Failed to sw init smc table!\n");
+               dev_err(adev->dev, "Failed to sw init smc table!\n");
                return ret;
        }
 
        ret = smu_register_irq_handler(smu);
        if (ret) {
-               pr_err("Failed to register smc irq handler!\n");
+               dev_err(adev->dev, "Failed to register smc irq handler!\n");
                return ret;
        }
 
@@ -1108,7 +982,7 @@ static int smu_sw_fini(void *handle)
 
        ret = smu_smc_table_sw_fini(smu);
        if (ret) {
-               pr_err("Failed to sw fini smc table!\n");
+               dev_err(adev->dev, "Failed to sw fini smc table!\n");
                return ret;
        }
 
@@ -1117,38 +991,74 @@ static int smu_sw_fini(void *handle)
        return 0;
 }
 
+static int smu_get_thermal_temperature_range(struct smu_context *smu)
+{
+       struct amdgpu_device *adev = smu->adev;
+       struct smu_temperature_range *range =
+                               &smu->thermal_range;
+       int ret = 0;
+
+       if (!smu->ppt_funcs->get_thermal_temperature_range)
+               return 0;
+
+       ret = smu->ppt_funcs->get_thermal_temperature_range(smu, range);
+       if (ret)
+               return ret;
+
+       adev->pm.dpm.thermal.min_temp = range->min;
+       adev->pm.dpm.thermal.max_temp = range->max;
+       adev->pm.dpm.thermal.max_edge_emergency_temp = range->edge_emergency_max;
+       adev->pm.dpm.thermal.min_hotspot_temp = range->hotspot_min;
+       adev->pm.dpm.thermal.max_hotspot_crit_temp = range->hotspot_crit_max;
+       adev->pm.dpm.thermal.max_hotspot_emergency_temp = range->hotspot_emergency_max;
+       adev->pm.dpm.thermal.min_mem_temp = range->mem_min;
+       adev->pm.dpm.thermal.max_mem_crit_temp = range->mem_crit_max;
+       adev->pm.dpm.thermal.max_mem_emergency_temp = range->mem_emergency_max;
+
+       return ret;
+}
+
 static int smu_smc_hw_setup(struct smu_context *smu)
 {
        struct amdgpu_device *adev = smu->adev;
+       uint32_t pcie_gen = 0, pcie_width = 0;
        int ret;
 
        if (smu_is_dpm_running(smu) && adev->in_suspend) {
-               pr_info("dpm has been enabled\n");
+               dev_info(adev->dev, "dpm has been enabled\n");
                return 0;
        }
 
        ret = smu_init_display_count(smu, 0);
-       if (ret)
+       if (ret) {
+               dev_info(adev->dev, "Failed to pre-set display count as 0!\n");
                return ret;
+       }
 
        ret = smu_set_driver_table_location(smu);
-       if (ret)
+       if (ret) {
+               dev_err(adev->dev, "Failed to SetDriverDramAddr!\n");
                return ret;
+       }
 
        /*
         * Set PMSTATUSLOG table bo address with SetToolsDramAddr MSG for tools.
         */
        ret = smu_set_tool_table_location(smu);
-       if (ret)
+       if (ret) {
+               dev_err(adev->dev, "Failed to SetToolsDramAddr!\n");
                return ret;
+       }
 
        /*
         * Use msg SetSystemVirtualDramAddr and DramLogSetDramAddr can notify
         * pool location.
         */
        ret = smu_notify_memory_pool_location(smu);
-       if (ret)
+       if (ret) {
+               dev_err(adev->dev, "Failed to SetDramLogDramAddr!\n");
                return ret;
+       }
 
        /* smu_dump_pptable(smu); */
        /*
@@ -1156,8 +1066,10 @@ static int smu_smc_hw_setup(struct smu_context *smu)
         * SetDriverDramAddr and TransferTableDram2Smu.
         */
        ret = smu_write_pptable(smu);
-       if (ret)
+       if (ret) {
+               dev_err(adev->dev, "Failed to transfer pptable to SMC!\n");
                return ret;
+       }
 
        /* issue Run*Btc msg */
        ret = smu_run_btc(smu);
@@ -1165,23 +1077,62 @@ static int smu_smc_hw_setup(struct smu_context *smu)
                return ret;
 
        ret = smu_feature_set_allowed_mask(smu);
-       if (ret)
+       if (ret) {
+               dev_err(adev->dev, "Failed to set driver allowed features mask!\n");
                return ret;
+       }
 
        ret = smu_system_features_control(smu, true);
-       if (ret)
+       if (ret) {
+               dev_err(adev->dev, "Failed to enable requested dpm features!\n");
                return ret;
+       }
 
        if (!smu_is_dpm_running(smu))
-               pr_info("dpm has been disabled\n");
+               dev_info(adev->dev, "dpm has been disabled\n");
+
+       if (adev->pm.pcie_gen_mask & CAIL_PCIE_LINK_SPEED_SUPPORT_GEN4)
+               pcie_gen = 3;
+       else if (adev->pm.pcie_gen_mask & CAIL_PCIE_LINK_SPEED_SUPPORT_GEN3)
+               pcie_gen = 2;
+       else if (adev->pm.pcie_gen_mask & CAIL_PCIE_LINK_SPEED_SUPPORT_GEN2)
+               pcie_gen = 1;
+       else if (adev->pm.pcie_gen_mask & CAIL_PCIE_LINK_SPEED_SUPPORT_GEN1)
+               pcie_gen = 0;
+
+       /* Bit 31:16: LCLK DPM level. 0 is DPM0, and 1 is DPM1
+        * Bit 15:8:  PCIE GEN, 0 to 3 corresponds to GEN1 to GEN4
+        * Bit 7:0:   PCIE lane width, 1 to 7 corresponds is x1 to x32
+        */
+       if (adev->pm.pcie_mlw_mask & CAIL_PCIE_LINK_WIDTH_SUPPORT_X16)
+               pcie_width = 6;
+       else if (adev->pm.pcie_mlw_mask & CAIL_PCIE_LINK_WIDTH_SUPPORT_X12)
+               pcie_width = 5;
+       else if (adev->pm.pcie_mlw_mask & CAIL_PCIE_LINK_WIDTH_SUPPORT_X8)
+               pcie_width = 4;
+       else if (adev->pm.pcie_mlw_mask & CAIL_PCIE_LINK_WIDTH_SUPPORT_X4)
+               pcie_width = 3;
+       else if (adev->pm.pcie_mlw_mask & CAIL_PCIE_LINK_WIDTH_SUPPORT_X2)
+               pcie_width = 2;
+       else if (adev->pm.pcie_mlw_mask & CAIL_PCIE_LINK_WIDTH_SUPPORT_X1)
+               pcie_width = 1;
+       ret = smu_update_pcie_parameters(smu, pcie_gen, pcie_width);
+       if (ret) {
+               dev_err(adev->dev, "Attempt to override pcie params failed!\n");
+               return ret;
+       }
 
-       ret = smu_override_pcie_parameters(smu);
-       if (ret)
+       ret = smu_get_thermal_temperature_range(smu);
+       if (ret) {
+               dev_err(adev->dev, "Failed to get thermal temperature ranges!\n");
                return ret;
+       }
 
        ret = smu_enable_thermal_alert(smu);
-       if (ret)
+       if (ret) {
+               dev_err(adev->dev, "Failed to enable thermal alert!\n");
                return ret;
+       }
 
        ret = smu_i2c_eeprom_init(smu, &adev->pm.smu_i2c);
        if (ret)
@@ -1189,7 +1140,7 @@ static int smu_smc_hw_setup(struct smu_context *smu)
 
        ret = smu_disable_umc_cdr_12gbps_workaround(smu);
        if (ret) {
-               pr_err("Workaround failed to disable UMC CDR feature on 12Gbps SKU!\n");
+               dev_err(adev->dev, "Workaround failed to disable UMC CDR feature on 12Gbps SKU!\n");
                return ret;
        }
 
@@ -1201,7 +1152,7 @@ static int smu_smc_hw_setup(struct smu_context *smu)
                                   adev->pm.ac_power ? SMU_POWER_SOURCE_AC :
                                   SMU_POWER_SOURCE_DC);
        if (ret) {
-               pr_err("Failed to switch to %s mode!\n", adev->pm.ac_power ? "AC" : "DC");
+               dev_err(adev->dev, "Failed to switch to %s mode!\n", adev->pm.ac_power ? "AC" : "DC");
                return ret;
        }
 
@@ -1213,7 +1164,8 @@ static int smu_smc_hw_setup(struct smu_context *smu)
         * Set min deep sleep dce fclk with bootup value from vbios via
         * SetMinDeepSleepDcefclk MSG.
         */
-       ret = smu_set_min_dcef_deep_sleep(smu);
+       ret = smu_set_min_dcef_deep_sleep(smu,
+                                         smu->smu_table.boot_values.dcefclk / 100);
        if (ret)
                return ret;
 
@@ -1238,7 +1190,7 @@ static int smu_start_smc_engine(struct smu_context *smu)
        if (smu->ppt_funcs->check_fw_status) {
                ret = smu->ppt_funcs->check_fw_status(smu);
                if (ret) {
-                       pr_err("SMC is not ready\n");
+                       dev_err(adev->dev, "SMC is not ready\n");
                        return ret;
                }
        }
@@ -1260,19 +1212,21 @@ static int smu_hw_init(void *handle)
        struct amdgpu_device *adev = (struct amdgpu_device *)handle;
        struct smu_context *smu = &adev->smu;
 
-       if (amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev))
+       if (amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev)) {
+               smu->pm_enabled = false;
                return 0;
+       }
 
        ret = smu_start_smc_engine(smu);
        if (ret) {
-               pr_err("SMU is not ready yet!\n");
+               dev_err(adev->dev, "SMC engine is not correctly up!\n");
                return ret;
        }
 
        if (smu->is_apu) {
                smu_powergate_sdma(&adev->smu, false);
-               smu_powergate_vcn(&adev->smu, false);
-               smu_powergate_jpeg(&adev->smu, false);
+               smu_dpm_set_vcn_enable(smu, true);
+               smu_dpm_set_jpeg_enable(smu, true);
                smu_set_gfx_cgpg(&adev->smu, true);
        }
 
@@ -1281,29 +1235,45 @@ static int smu_hw_init(void *handle)
 
        /* get boot_values from vbios to set revision, gfxclk, and etc. */
        ret = smu_get_vbios_bootup_values(smu);
-       if (ret)
+       if (ret) {
+               dev_err(adev->dev, "Failed to get VBIOS boot clock values!\n");
                return ret;
+       }
 
        ret = smu_setup_pptable(smu);
-       if (ret)
+       if (ret) {
+               dev_err(adev->dev, "Failed to setup pptable!\n");
                return ret;
+       }
 
        ret = smu_get_driver_allowed_feature_mask(smu);
        if (ret)
-               goto failed;
+               return ret;
 
        ret = smu_smc_hw_setup(smu);
-       if (ret)
-               goto failed;
+       if (ret) {
+               dev_err(adev->dev, "Failed to setup smc hw!\n");
+               return ret;
+       }
+
+       /*
+        * Move maximum sustainable clock retrieving here considering
+        * 1. It is not needed on resume(from S3).
+        * 2. DAL settings come between .hw_init and .late_init of SMU.
+        *    And DAL needs to know the maximum sustainable clocks. Thus
+        *    it cannot be put in .late_init().
+        */
+       ret = smu_init_max_sustainable_clocks(smu);
+       if (ret) {
+               dev_err(adev->dev, "Failed to init max sustainable clocks!\n");
+               return ret;
+       }
 
        adev->pm.dpm_enabled = true;
 
-       pr_info("SMU is initialized successfully!\n");
+       dev_info(adev->dev, "SMU is initialized successfully!\n");
 
        return 0;
-
-failed:
-       return ret;
 }
 
 static int smu_disable_dpms(struct smu_context *smu)
@@ -1351,11 +1321,11 @@ static int smu_disable_dpms(struct smu_context *smu)
                                                      features_to_disable,
                                                      0);
                if (ret)
-                       pr_err("Failed to disable smu features except BACO.\n");
+                       dev_err(adev->dev, "Failed to disable smu features except BACO.\n");
        } else {
                ret = smu_system_features_control(smu, false);
                if (ret)
-                       pr_err("Failed to disable smu features.\n");
+                       dev_err(adev->dev, "Failed to disable smu features.\n");
        }
 
        if (adev->asic_type >= CHIP_NAVI10 &&
@@ -1372,15 +1342,19 @@ static int smu_smc_hw_cleanup(struct smu_context *smu)
 
        smu_i2c_eeprom_fini(smu, &adev->pm.smu_i2c);
 
+       cancel_work_sync(&smu->throttling_logging_work);
+
        ret = smu_disable_thermal_alert(smu);
        if (ret) {
-               pr_warn("Fail to stop thermal control!\n");
+               dev_err(adev->dev, "Fail to disable thermal alert!\n");
                return ret;
        }
 
        ret = smu_disable_dpms(smu);
-       if (ret)
+       if (ret) {
+               dev_err(adev->dev, "Fail to disable dpm features!\n");
                return ret;
+       }
 
        return 0;
 }
@@ -1396,8 +1370,8 @@ static int smu_hw_fini(void *handle)
 
        if (smu->is_apu) {
                smu_powergate_sdma(&adev->smu, true);
-               smu_powergate_vcn(&adev->smu, true);
-               smu_powergate_jpeg(&adev->smu, true);
+               smu_dpm_set_vcn_enable(smu, false);
+               smu_dpm_set_jpeg_enable(smu, false);
        }
 
        if (!smu->pm_enabled)
@@ -1468,17 +1442,19 @@ static int smu_resume(void *handle)
        if (!smu->pm_enabled)
                return 0;
 
-       pr_info("SMU is resuming...\n");
+       dev_info(adev->dev, "SMU is resuming...\n");
 
        ret = smu_start_smc_engine(smu);
        if (ret) {
-               pr_err("SMU is not ready yet!\n");
-               goto failed;
+               dev_err(adev->dev, "SMC engine is not correctly up!\n");
+               return ret;
        }
 
        ret = smu_smc_hw_setup(smu);
-       if (ret)
-               goto failed;
+       if (ret) {
+               dev_err(adev->dev, "Failed to setup smc hw!\n");
+               return ret;
+       }
 
        if (smu->is_apu)
                smu_set_gfx_cgpg(&adev->smu, true);
@@ -1487,12 +1463,9 @@ static int smu_resume(void *handle)
 
        adev->pm.dpm_enabled = true;
 
-       pr_info("SMU is resumed successfully!\n");
+       dev_info(adev->dev, "SMU is resumed successfully!\n");
 
        return 0;
-
-failed:
-       return ret;
 }
 
 int smu_display_configuration_change(struct smu_context *smu,
@@ -1509,9 +1482,8 @@ int smu_display_configuration_change(struct smu_context *smu,
 
        mutex_lock(&smu->mutex);
 
-       if (smu->ppt_funcs->set_deep_sleep_dcefclk)
-               smu->ppt_funcs->set_deep_sleep_dcefclk(smu,
-                               display_config->min_dcef_deep_sleep_set_clk / 100);
+       smu_set_min_dcef_deep_sleep(smu,
+                                   display_config->min_dcef_deep_sleep_set_clk / 100);
 
        for (index = 0; index < display_config->num_path_including_non_display; index++) {
                if (display_config->displays[index].controller_id != 0)
@@ -1580,7 +1552,7 @@ int smu_get_current_clocks(struct smu_context *smu,
                ret = smu_get_clock_info(smu, &hw_clocks, PERF_LEVEL_ACTIVITY);
 
        if (ret) {
-               pr_err("Error in smu_get_clock_info\n");
+               dev_err(smu->adev->dev, "Error in smu_get_clock_info\n");
                goto failed;
        }
 
@@ -1664,7 +1636,7 @@ static int smu_enable_umd_pstate(void *handle,
        return 0;
 }
 
-int smu_adjust_power_state_dynamic(struct smu_context *smu,
+static int smu_adjust_power_state_dynamic(struct smu_context *smu,
                                   enum amd_dpm_forced_level level,
                                   bool skip_display_settings)
 {
@@ -1676,21 +1648,21 @@ int smu_adjust_power_state_dynamic(struct smu_context *smu,
        if (!skip_display_settings) {
                ret = smu_display_config_changed(smu);
                if (ret) {
-                       pr_err("Failed to change display config!");
+                       dev_err(smu->adev->dev, "Failed to change display config!");
                        return ret;
                }
        }
 
        ret = smu_apply_clocks_adjust_rules(smu);
        if (ret) {
-               pr_err("Failed to apply clocks adjust rules!");
+               dev_err(smu->adev->dev, "Failed to apply clocks adjust rules!");
                return ret;
        }
 
        if (!skip_display_settings) {
                ret = smu_notify_smc_display_config(smu);
                if (ret) {
-                       pr_err("Failed to notify smc display config!");
+                       dev_err(smu->adev->dev, "Failed to notify smc display config!");
                        return ret;
                }
        }
@@ -1698,7 +1670,7 @@ int smu_adjust_power_state_dynamic(struct smu_context *smu,
        if (smu_dpm_ctx->dpm_level != level) {
                ret = smu_asic_set_performance_level(smu, level);
                if (ret) {
-                       pr_err("Failed to set performance level!");
+                       dev_err(smu->adev->dev, "Failed to set performance level!");
                        return ret;
                }
 
@@ -1854,8 +1826,7 @@ int smu_set_display_count(struct smu_context *smu, uint32_t count)
 
 int smu_force_clk_levels(struct smu_context *smu,
                         enum smu_clk_type clk_type,
-                        uint32_t mask,
-                        bool lock_needed)
+                        uint32_t mask)
 {
        struct smu_dpm_context *smu_dpm_ctx = &(smu->smu_dpm);
        int ret = 0;
@@ -1864,18 +1835,16 @@ int smu_force_clk_levels(struct smu_context *smu,
                return -EOPNOTSUPP;
 
        if (smu_dpm_ctx->dpm_level != AMD_DPM_FORCED_LEVEL_MANUAL) {
-               pr_debug("force clock level is for dpm manual mode only.\n");
+               dev_dbg(smu->adev->dev, "force clock level is for dpm manual mode only.\n");
                return -EINVAL;
        }
 
-       if (lock_needed)
-               mutex_lock(&smu->mutex);
+       mutex_lock(&smu->mutex);
 
        if (smu->ppt_funcs && smu->ppt_funcs->force_clk_levels)
                ret = smu->ppt_funcs->force_clk_levels(smu, clk_type, mask);
 
-       if (lock_needed)
-               mutex_unlock(&smu->mutex);
+       mutex_unlock(&smu->mutex);
 
        return ret;
 }
@@ -1922,7 +1891,7 @@ int smu_set_mp1_state(struct smu_context *smu,
 
        ret = smu_send_smc_msg(smu, msg, NULL);
        if (ret)
-               pr_err("[PrepareMp1] Failed!\n");
+               dev_err(smu->adev->dev, "[PrepareMp1] Failed!\n");
 
        mutex_unlock(&smu->mutex);
 
@@ -1944,7 +1913,7 @@ int smu_set_df_cstate(struct smu_context *smu,
 
        ret = smu->ppt_funcs->set_df_cstate(smu, state);
        if (ret)
-               pr_err("[SetDfCstate] failed!\n");
+               dev_err(smu->adev->dev, "[SetDfCstate] failed!\n");
 
        mutex_unlock(&smu->mutex);
 
@@ -1965,7 +1934,7 @@ int smu_allow_xgmi_power_down(struct smu_context *smu, bool en)
 
        ret = smu->ppt_funcs->allow_xgmi_power_down(smu, en);
        if (ret)
-               pr_err("[AllowXgmiPowerDown] failed!\n");
+               dev_err(smu->adev->dev, "[AllowXgmiPowerDown] failed!\n");
 
        mutex_unlock(&smu->mutex);
 
@@ -2031,7 +2000,7 @@ int smu_set_ac_dc(struct smu_context *smu)
                                   smu->adev->pm.ac_power ? SMU_POWER_SOURCE_AC :
                                   SMU_POWER_SOURCE_DC);
        if (ret)
-               pr_err("Failed to switch to %s mode!\n",
+               dev_err(smu->adev->dev, "Failed to switch to %s mode!\n",
                       smu->adev->pm.ac_power ? "AC" : "DC");
        mutex_unlock(&smu->mutex);
 
@@ -2142,25 +2111,18 @@ int smu_set_fan_speed_rpm(struct smu_context *smu, uint32_t speed)
 
 int smu_get_power_limit(struct smu_context *smu,
                        uint32_t *limit,
-                       bool def,
-                       bool lock_needed)
+                       bool max_setting)
 {
-       int ret = 0;
-
-       if (lock_needed) {
-               if (!smu->pm_enabled || !smu->adev->pm.dpm_enabled)
-                       return -EOPNOTSUPP;
+       if (!smu->pm_enabled || !smu->adev->pm.dpm_enabled)
+               return -EOPNOTSUPP;
 
-               mutex_lock(&smu->mutex);
-       }
+       mutex_lock(&smu->mutex);
 
-       if (smu->ppt_funcs->get_power_limit)
-               ret = smu->ppt_funcs->get_power_limit(smu, limit, def);
+       *limit = (max_setting ? smu->max_power_limit : smu->current_power_limit);
 
-       if (lock_needed)
-               mutex_unlock(&smu->mutex);
+       mutex_unlock(&smu->mutex);
 
-       return ret;
+       return 0;
 }
 
 int smu_set_power_limit(struct smu_context *smu, uint32_t limit)
@@ -2172,9 +2134,20 @@ int smu_set_power_limit(struct smu_context *smu, uint32_t limit)
 
        mutex_lock(&smu->mutex);
 
+       if (limit > smu->max_power_limit) {
+               dev_err(smu->adev->dev,
+                       "New power limit (%d) is over the max allowed %d\n",
+                       limit, smu->max_power_limit);
+               goto out;
+       }
+
+       if (!limit)
+               limit = smu->current_power_limit;
+
        if (smu->ppt_funcs->set_power_limit)
                ret = smu->ppt_funcs->set_power_limit(smu, limit);
 
+out:
        mutex_unlock(&smu->mutex);
 
        return ret;
@@ -2254,15 +2227,52 @@ int smu_read_sensor(struct smu_context *smu,
                    enum amd_pp_sensors sensor,
                    void *data, uint32_t *size)
 {
+       struct smu_umd_pstate_table *pstate_table =
+                               &smu->pstate_table;
        int ret = 0;
 
        if (!smu->pm_enabled || !smu->adev->pm.dpm_enabled)
                return -EOPNOTSUPP;
 
+       if (!data || !size)
+               return -EINVAL;
+
        mutex_lock(&smu->mutex);
 
-       if (smu->ppt_funcs->read_sensor)
-               ret = smu->ppt_funcs->read_sensor(smu, sensor, data, size);
+       switch (sensor) {
+       case AMDGPU_PP_SENSOR_STABLE_PSTATE_SCLK:
+               *((uint32_t *)data) = pstate_table->gfxclk_pstate.standard * 100;
+               *size = 4;
+               break;
+       case AMDGPU_PP_SENSOR_STABLE_PSTATE_MCLK:
+               *((uint32_t *)data) = pstate_table->uclk_pstate.standard * 100;
+               *size = 4;
+               break;
+       case AMDGPU_PP_SENSOR_ENABLED_SMC_FEATURES_MASK:
+               ret = smu_feature_get_enabled_mask(smu, (uint32_t *)data, 2);
+               *size = 8;
+               break;
+       case AMDGPU_PP_SENSOR_UVD_POWER:
+               *(uint32_t *)data = smu_feature_is_enabled(smu, SMU_FEATURE_DPM_UVD_BIT) ? 1 : 0;
+               *size = 4;
+               break;
+       case AMDGPU_PP_SENSOR_VCE_POWER:
+               *(uint32_t *)data = smu_feature_is_enabled(smu, SMU_FEATURE_DPM_VCE_BIT) ? 1 : 0;
+               *size = 4;
+               break;
+       case AMDGPU_PP_SENSOR_VCN_POWER_STATE:
+               *(uint32_t *)data = smu->smu_power.power_gate.vcn_gated ? 0 : 1;
+               *size = 4;
+               break;
+       case AMDGPU_PP_SENSOR_MIN_FAN_RPM:
+               *(uint32_t *)data = 0;
+               *size = 4;
+               break;
+       default:
+               if (smu->ppt_funcs->read_sensor)
+                       ret = smu->ppt_funcs->read_sensor(smu, sensor, data, size);
+               break;
+       }
 
        mutex_unlock(&smu->mutex);
 
@@ -2403,8 +2413,7 @@ int smu_set_deep_sleep_dcefclk(struct smu_context *smu, int clk)
 
        mutex_lock(&smu->mutex);
 
-       if (smu->ppt_funcs->set_deep_sleep_dcefclk)
-               ret = smu->ppt_funcs->set_deep_sleep_dcefclk(smu, clk);
+       ret = smu_set_min_dcef_deep_sleep(smu, clk);
 
        mutex_unlock(&smu->mutex);
 
@@ -2568,6 +2577,9 @@ int smu_set_xgmi_pstate(struct smu_context *smu,
 
        mutex_unlock(&smu->mutex);
 
+       if(ret)
+               dev_err(smu->adev->dev, "Failed to set XGMI pstate!\n");
+
        return ret;
 }
 
@@ -2639,6 +2651,9 @@ int smu_baco_enter(struct smu_context *smu)
 
        mutex_unlock(&smu->mutex);
 
+       if (ret)
+               dev_err(smu->adev->dev, "Failed to enter BACO state!\n");
+
        return ret;
 }
 
@@ -2656,6 +2671,43 @@ int smu_baco_exit(struct smu_context *smu)
 
        mutex_unlock(&smu->mutex);
 
+       if (ret)
+               dev_err(smu->adev->dev, "Failed to exit BACO state!\n");
+
+       return ret;
+}
+
+bool smu_mode1_reset_is_support(struct smu_context *smu)
+{
+       bool ret = false;
+
+       if (!smu->pm_enabled)
+               return false;
+
+       mutex_lock(&smu->mutex);
+
+       if (smu->ppt_funcs && smu->ppt_funcs->mode1_reset_is_support)
+               ret = smu->ppt_funcs->mode1_reset_is_support(smu);
+
+       mutex_unlock(&smu->mutex);
+
+       return ret;
+}
+
+int smu_mode1_reset(struct smu_context *smu)
+{
+       int ret = 0;
+
+       if (!smu->pm_enabled)
+               return -EOPNOTSUPP;
+
+       mutex_lock(&smu->mutex);
+
+       if (smu->ppt_funcs->mode1_reset)
+               ret = smu->ppt_funcs->mode1_reset(smu);
+
+       mutex_unlock(&smu->mutex);
+
        return ret;
 }
 
@@ -2673,6 +2725,9 @@ int smu_mode2_reset(struct smu_context *smu)
 
        mutex_unlock(&smu->mutex);
 
+       if (ret)
+               dev_err(smu->adev->dev, "Mode2 reset failed!\n");
+
        return ret;
 }
 
@@ -2747,29 +2802,3 @@ int smu_get_dpm_clock_table(struct smu_context *smu,
 
        return ret;
 }
-
-uint32_t smu_get_pptable_power_limit(struct smu_context *smu)
-{
-       uint32_t ret = 0;
-
-       if (smu->ppt_funcs->get_pptable_power_limit)
-               ret = smu->ppt_funcs->get_pptable_power_limit(smu);
-
-       return ret;
-}
-
-int smu_powergate_vcn(struct smu_context *smu, bool gate)
-{
-       if (!smu->is_apu)
-               return 0;
-
-       return smu_dpm_set_uvd_enable(smu, !gate);
-}
-
-int smu_powergate_jpeg(struct smu_context *smu, bool gate)
-{
-       if (!smu->is_apu)
-               return 0;
-
-       return smu_dpm_set_jpeg_enable(smu, !gate);
-}