Merge tag 'kgdb-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt...
[linux-2.6-microblaze.git] / drivers / gpu / drm / amd / pm / swsmu / smu11 / sienna_cichlid_ppt.c
index b124a5e..c751f71 100644 (file)
 
 #define SMU_11_0_7_GFX_BUSY_THRESHOLD 15
 
+#define GET_PPTABLE_MEMBER(field, member) do {\
+       if (smu->adev->asic_type == CHIP_BEIGE_GOBY)\
+               (*member) = (smu->smu_table.driver_pptable + offsetof(PPTable_beige_goby_t, field));\
+       else\
+               (*member) = (smu->smu_table.driver_pptable + offsetof(PPTable_t, field));\
+} while(0)
+
+static int get_table_size(struct smu_context *smu)
+{
+       if (smu->adev->asic_type == CHIP_BEIGE_GOBY)
+               return sizeof(PPTable_beige_goby_t);
+       else
+               return sizeof(PPTable_t);
+}
+
 static struct cmn2asic_msg_mapping sienna_cichlid_message_map[SMU_MSG_MAX_COUNT] = {
        MSG_MAP(TestMessage,                    PPSMC_MSG_TestMessage,                 1),
        MSG_MAP(GetSmuVersion,                  PPSMC_MSG_GetSmuVersion,               1),
@@ -224,6 +239,27 @@ static struct cmn2asic_mapping sienna_cichlid_workload_map[PP_SMC_POWER_PROFILE_
        WORKLOAD_MAP(PP_SMC_POWER_PROFILE_CUSTOM,               WORKLOAD_PPLIB_CUSTOM_BIT),
 };
 
+static const uint8_t sienna_cichlid_throttler_map[] = {
+       [THROTTLER_TEMP_EDGE_BIT]       = (SMU_THROTTLER_TEMP_EDGE_BIT),
+       [THROTTLER_TEMP_HOTSPOT_BIT]    = (SMU_THROTTLER_TEMP_HOTSPOT_BIT),
+       [THROTTLER_TEMP_MEM_BIT]        = (SMU_THROTTLER_TEMP_MEM_BIT),
+       [THROTTLER_TEMP_VR_GFX_BIT]     = (SMU_THROTTLER_TEMP_VR_GFX_BIT),
+       [THROTTLER_TEMP_VR_MEM0_BIT]    = (SMU_THROTTLER_TEMP_VR_MEM0_BIT),
+       [THROTTLER_TEMP_VR_MEM1_BIT]    = (SMU_THROTTLER_TEMP_VR_MEM1_BIT),
+       [THROTTLER_TEMP_VR_SOC_BIT]     = (SMU_THROTTLER_TEMP_VR_SOC_BIT),
+       [THROTTLER_TEMP_LIQUID0_BIT]    = (SMU_THROTTLER_TEMP_LIQUID0_BIT),
+       [THROTTLER_TEMP_LIQUID1_BIT]    = (SMU_THROTTLER_TEMP_LIQUID1_BIT),
+       [THROTTLER_TDC_GFX_BIT]         = (SMU_THROTTLER_TDC_GFX_BIT),
+       [THROTTLER_TDC_SOC_BIT]         = (SMU_THROTTLER_TDC_SOC_BIT),
+       [THROTTLER_PPT0_BIT]            = (SMU_THROTTLER_PPT0_BIT),
+       [THROTTLER_PPT1_BIT]            = (SMU_THROTTLER_PPT1_BIT),
+       [THROTTLER_PPT2_BIT]            = (SMU_THROTTLER_PPT2_BIT),
+       [THROTTLER_PPT3_BIT]            = (SMU_THROTTLER_PPT3_BIT),
+       [THROTTLER_FIT_BIT]             = (SMU_THROTTLER_FIT_BIT),
+       [THROTTLER_PPM_BIT]             = (SMU_THROTTLER_PPM_BIT),
+       [THROTTLER_APCC_BIT]            = (SMU_THROTTLER_APCC_BIT),
+};
+
 static int
 sienna_cichlid_get_allowed_feature_mask(struct smu_context *smu,
                                  uint32_t *feature_mask, uint32_t num)
@@ -302,25 +338,40 @@ sienna_cichlid_get_allowed_feature_mask(struct smu_context *smu,
        if (smu->dc_controlled_by_gpio)
        *(uint64_t *)feature_mask |= FEATURE_MASK(FEATURE_ACDC_BIT);
 
-       if (amdgpu_aspm == 1)
+       if (amdgpu_aspm)
                *(uint64_t *)feature_mask |= FEATURE_MASK(FEATURE_DS_LCLK_BIT);
 
        return 0;
 }
 
-static int sienna_cichlid_check_powerplay_table(struct smu_context *smu)
+static void sienna_cichlid_check_bxco_support(struct smu_context *smu)
 {
        struct smu_table_context *table_context = &smu->smu_table;
        struct smu_11_0_7_powerplay_table *powerplay_table =
                table_context->power_play_table;
        struct smu_baco_context *smu_baco = &smu->smu_baco;
+       struct amdgpu_device *adev = smu->adev;
+       uint32_t val;
+
+       if (powerplay_table->platform_caps & SMU_11_0_7_PP_PLATFORM_CAP_BACO ||
+           powerplay_table->platform_caps & SMU_11_0_7_PP_PLATFORM_CAP_MACO) {
+               val = RREG32_SOC15(NBIO, 0, mmRCC_BIF_STRAP0);
+               smu_baco->platform_support =
+                       (val & RCC_BIF_STRAP0__STRAP_PX_CAPABLE_MASK) ? true :
+                                                                       false;
+       }
+}
+
+static int sienna_cichlid_check_powerplay_table(struct smu_context *smu)
+{
+       struct smu_table_context *table_context = &smu->smu_table;
+       struct smu_11_0_7_powerplay_table *powerplay_table =
+               table_context->power_play_table;
 
        if (powerplay_table->platform_caps & SMU_11_0_7_PP_PLATFORM_CAP_HARDWAREDC)
                smu->dc_controlled_by_gpio = true;
 
-       if (powerplay_table->platform_caps & SMU_11_0_7_PP_PLATFORM_CAP_BACO ||
-           powerplay_table->platform_caps & SMU_11_0_7_PP_PLATFORM_CAP_MACO)
-               smu_baco->platform_support = true;
+       sienna_cichlid_check_bxco_support(smu);
 
        table_context->thermal_controller_type =
                powerplay_table->thermal_controller_type;
@@ -336,10 +387,9 @@ static int sienna_cichlid_check_powerplay_table(struct smu_context *smu)
 
 static int sienna_cichlid_append_powerplay_table(struct smu_context *smu)
 {
-       struct smu_table_context *table_context = &smu->smu_table;
-       PPTable_t *smc_pptable = table_context->driver_pptable;
        struct atom_smc_dpm_info_v4_9 *smc_dpm_table;
        int index, ret;
+       I2cControllerConfig_t *table_member;
 
        index = get_index_into_master_table(atom_master_list_of_data_tables_v2_1,
                                            smc_dpm_info);
@@ -348,9 +398,9 @@ static int sienna_cichlid_append_powerplay_table(struct smu_context *smu)
                                      (uint8_t **)&smc_dpm_table);
        if (ret)
                return ret;
-
-       memcpy(smc_pptable->I2cControllers, smc_dpm_table->I2cControllers,
-              sizeof(*smc_dpm_table) - sizeof(smc_dpm_table->table_header));
+       GET_PPTABLE_MEMBER(I2cControllers, &table_member);
+       memcpy(table_member, smc_dpm_table->I2cControllers,
+                       sizeof(*smc_dpm_table) - sizeof(smc_dpm_table->table_header));
        
        return 0;
 }
@@ -360,9 +410,11 @@ static int sienna_cichlid_store_powerplay_table(struct smu_context *smu)
        struct smu_table_context *table_context = &smu->smu_table;
        struct smu_11_0_7_powerplay_table *powerplay_table =
                table_context->power_play_table;
+       int table_size;
 
+       table_size = get_table_size(smu);
        memcpy(table_context->driver_pptable, &powerplay_table->smc_pptable,
-              sizeof(PPTable_t));
+              table_size);
 
        return 0;
 }
@@ -394,9 +446,11 @@ static int sienna_cichlid_tables_init(struct smu_context *smu)
 {
        struct smu_table_context *smu_table = &smu->smu_table;
        struct smu_table *tables = smu_table->tables;
+       int table_size;
 
-       SMU_TABLE_INIT(tables, SMU_TABLE_PPTABLE, sizeof(PPTable_t),
-                      PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM);
+       table_size = get_table_size(smu);
+       SMU_TABLE_INIT(tables, SMU_TABLE_PPTABLE, table_size,
+                              PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM);
        SMU_TABLE_INIT(tables, SMU_TABLE_WATERMARKS, sizeof(Watermarks_t),
                       PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM);
        SMU_TABLE_INIT(tables, SMU_TABLE_SMU_METRICS, sizeof(SmuMetricsExternal_t),
@@ -416,7 +470,7 @@ static int sienna_cichlid_tables_init(struct smu_context *smu)
                goto err0_out;
        smu_table->metrics_time = 0;
 
-       smu_table->gpu_metrics_table_size = sizeof(struct gpu_metrics_v1_1);
+       smu_table->gpu_metrics_table_size = sizeof(struct gpu_metrics_v1_3);
        smu_table->gpu_metrics_table = kzalloc(smu_table->gpu_metrics_table_size, GFP_KERNEL);
        if (!smu_table->gpu_metrics_table)
                goto err1_out;
@@ -572,13 +626,14 @@ static int sienna_cichlid_init_smc_tables(struct smu_context *smu)
 static int sienna_cichlid_set_default_dpm_table(struct smu_context *smu)
 {
        struct smu_11_0_dpm_context *dpm_context = smu->smu_dpm.dpm_context;
-       PPTable_t *driver_ppt = smu->smu_table.driver_pptable;
        struct smu_11_0_dpm_table *dpm_table;
        struct amdgpu_device *adev = smu->adev;
        int ret = 0;
+       DpmDescriptor_t *table_member;
 
        /* socclk dpm table setup */
        dpm_table = &dpm_context->dpm_tables.soc_table;
+       GET_PPTABLE_MEMBER(DpmDescriptor, &table_member);
        if (smu_cmn_feature_is_enabled(smu, SMU_FEATURE_DPM_SOCCLK_BIT)) {
                ret = smu_v11_0_set_single_dpm_table(smu,
                                                     SMU_SOCCLK,
@@ -586,7 +641,7 @@ static int sienna_cichlid_set_default_dpm_table(struct smu_context *smu)
                if (ret)
                        return ret;
                dpm_table->is_fine_grained =
-                       !driver_ppt->DpmDescriptor[PPCLK_SOCCLK].SnapToDiscrete;
+                       !table_member[PPCLK_SOCCLK].SnapToDiscrete;
        } else {
                dpm_table->count = 1;
                dpm_table->dpm_levels[0].value = smu->smu_table.boot_values.socclk / 100;
@@ -604,7 +659,7 @@ static int sienna_cichlid_set_default_dpm_table(struct smu_context *smu)
                if (ret)
                        return ret;
                dpm_table->is_fine_grained =
-                       !driver_ppt->DpmDescriptor[PPCLK_GFXCLK].SnapToDiscrete;
+                       !table_member[PPCLK_GFXCLK].SnapToDiscrete;
        } else {
                dpm_table->count = 1;
                dpm_table->dpm_levels[0].value = smu->smu_table.boot_values.gfxclk / 100;
@@ -622,7 +677,7 @@ static int sienna_cichlid_set_default_dpm_table(struct smu_context *smu)
                if (ret)
                        return ret;
                dpm_table->is_fine_grained =
-                       !driver_ppt->DpmDescriptor[PPCLK_UCLK].SnapToDiscrete;
+                       !table_member[PPCLK_UCLK].SnapToDiscrete;
        } else {
                dpm_table->count = 1;
                dpm_table->dpm_levels[0].value = smu->smu_table.boot_values.uclk / 100;
@@ -640,7 +695,7 @@ static int sienna_cichlid_set_default_dpm_table(struct smu_context *smu)
                if (ret)
                        return ret;
                dpm_table->is_fine_grained =
-                       !driver_ppt->DpmDescriptor[PPCLK_FCLK].SnapToDiscrete;
+                       !table_member[PPCLK_FCLK].SnapToDiscrete;
        } else {
                dpm_table->count = 1;
                dpm_table->dpm_levels[0].value = smu->smu_table.boot_values.fclk / 100;
@@ -658,7 +713,7 @@ static int sienna_cichlid_set_default_dpm_table(struct smu_context *smu)
                if (ret)
                        return ret;
                dpm_table->is_fine_grained =
-                       !driver_ppt->DpmDescriptor[PPCLK_VCLK_0].SnapToDiscrete;
+                       !table_member[PPCLK_VCLK_0].SnapToDiscrete;
        } else {
                dpm_table->count = 1;
                dpm_table->dpm_levels[0].value = smu->smu_table.boot_values.vclk / 100;
@@ -677,7 +732,7 @@ static int sienna_cichlid_set_default_dpm_table(struct smu_context *smu)
                        if (ret)
                                return ret;
                        dpm_table->is_fine_grained =
-                               !driver_ppt->DpmDescriptor[PPCLK_VCLK_1].SnapToDiscrete;
+                               !table_member[PPCLK_VCLK_1].SnapToDiscrete;
                } else {
                        dpm_table->count = 1;
                        dpm_table->dpm_levels[0].value =
@@ -697,7 +752,7 @@ static int sienna_cichlid_set_default_dpm_table(struct smu_context *smu)
                if (ret)
                        return ret;
                dpm_table->is_fine_grained =
-                       !driver_ppt->DpmDescriptor[PPCLK_DCLK_0].SnapToDiscrete;
+                       !table_member[PPCLK_DCLK_0].SnapToDiscrete;
        } else {
                dpm_table->count = 1;
                dpm_table->dpm_levels[0].value = smu->smu_table.boot_values.dclk / 100;
@@ -716,7 +771,7 @@ static int sienna_cichlid_set_default_dpm_table(struct smu_context *smu)
                        if (ret)
                                return ret;
                        dpm_table->is_fine_grained =
-                               !driver_ppt->DpmDescriptor[PPCLK_DCLK_1].SnapToDiscrete;
+                               !table_member[PPCLK_DCLK_1].SnapToDiscrete;
                } else {
                        dpm_table->count = 1;
                        dpm_table->dpm_levels[0].value =
@@ -736,7 +791,7 @@ static int sienna_cichlid_set_default_dpm_table(struct smu_context *smu)
                if (ret)
                        return ret;
                dpm_table->is_fine_grained =
-                       !driver_ppt->DpmDescriptor[PPCLK_DCEFCLK].SnapToDiscrete;
+                       !table_member[PPCLK_DCEFCLK].SnapToDiscrete;
        } else {
                dpm_table->count = 1;
                dpm_table->dpm_levels[0].value = smu->smu_table.boot_values.dcefclk / 100;
@@ -754,7 +809,7 @@ static int sienna_cichlid_set_default_dpm_table(struct smu_context *smu)
                if (ret)
                        return ret;
                dpm_table->is_fine_grained =
-                       !driver_ppt->DpmDescriptor[PPCLK_PIXCLK].SnapToDiscrete;
+                       !table_member[PPCLK_PIXCLK].SnapToDiscrete;
        } else {
                dpm_table->count = 1;
                dpm_table->dpm_levels[0].value = smu->smu_table.boot_values.dcefclk / 100;
@@ -772,7 +827,7 @@ static int sienna_cichlid_set_default_dpm_table(struct smu_context *smu)
                if (ret)
                        return ret;
                dpm_table->is_fine_grained =
-                       !driver_ppt->DpmDescriptor[PPCLK_DISPCLK].SnapToDiscrete;
+                       !table_member[PPCLK_DISPCLK].SnapToDiscrete;
        } else {
                dpm_table->count = 1;
                dpm_table->dpm_levels[0].value = smu->smu_table.boot_values.dcefclk / 100;
@@ -790,7 +845,7 @@ static int sienna_cichlid_set_default_dpm_table(struct smu_context *smu)
                if (ret)
                        return ret;
                dpm_table->is_fine_grained =
-                       !driver_ppt->DpmDescriptor[PPCLK_PHYCLK].SnapToDiscrete;
+                       !table_member[PPCLK_PHYCLK].SnapToDiscrete;
        } else {
                dpm_table->count = 1;
                dpm_table->dpm_levels[0].value = smu->smu_table.boot_values.dcefclk / 100;
@@ -911,14 +966,15 @@ static int sienna_cichlid_get_current_clk_freq_by_table(struct smu_context *smu,
 
 static bool sienna_cichlid_is_support_fine_grained_dpm(struct smu_context *smu, enum smu_clk_type clk_type)
 {
-       PPTable_t *pptable = smu->smu_table.driver_pptable;
        DpmDescriptor_t *dpm_desc = NULL;
+       DpmDescriptor_t *table_member;
        uint32_t clk_index = 0;
 
+       GET_PPTABLE_MEMBER(DpmDescriptor, &table_member);
        clk_index = smu_cmn_to_asic_specific_index(smu,
                                                   CMN2ASIC_MAPPING_CLK,
                                                   clk_type);
-       dpm_desc = &pptable->DpmDescriptor[clk_index];
+       dpm_desc = &table_member[clk_index];
 
        /* 0 - Fine grained DPM, 1 - Discrete DPM */
        return dpm_desc->SnapToDiscrete == 0;
@@ -947,7 +1003,8 @@ static int sienna_cichlid_print_clk_levels(struct smu_context *smu,
        struct smu_table_context *table_context = &smu->smu_table;
        struct smu_dpm_context *smu_dpm = &smu->smu_dpm;
        struct smu_11_0_dpm_context *dpm_context = smu_dpm->dpm_context;
-       PPTable_t *pptable = (PPTable_t *)table_context->driver_pptable;
+       uint16_t *table_member;
+
        struct smu_11_0_7_overdrive_table *od_settings = smu->od_settings;
        OverDriveTable_t *od_table =
                (OverDriveTable_t *)table_context->overdrive_table;
@@ -966,6 +1023,10 @@ static int sienna_cichlid_print_clk_levels(struct smu_context *smu,
        case SMU_MCLK:
        case SMU_UCLK:
        case SMU_FCLK:
+       case SMU_VCLK:
+       case SMU_VCLK1:
+       case SMU_DCLK:
+       case SMU_DCLK1:
        case SMU_DCEFCLK:
                ret = sienna_cichlid_get_current_clk_freq_by_table(smu, clk_type, &cur_value);
                if (ret)
@@ -1016,6 +1077,7 @@ static int sienna_cichlid_print_clk_levels(struct smu_context *smu,
        case SMU_PCIE:
                gen_speed = smu_v11_0_get_current_pcie_link_speed_level(smu);
                lane_width = smu_v11_0_get_current_pcie_link_width_level(smu);
+               GET_PPTABLE_MEMBER(LclkFreq, &table_member);
                for (i = 0; i < NUM_LINK_LEVELS; i++)
                        size += sprintf(buf + size, "%d: %s %s %dMhz %s\n", i,
                                        (dpm_context->dpm_tables.pcie_table.pcie_gen[i] == 0) ? "2.5GT/s," :
@@ -1028,7 +1090,7 @@ static int sienna_cichlid_print_clk_levels(struct smu_context *smu,
                                        (dpm_context->dpm_tables.pcie_table.pcie_lane[i] == 4) ? "x8" :
                                        (dpm_context->dpm_tables.pcie_table.pcie_lane[i] == 5) ? "x12" :
                                        (dpm_context->dpm_tables.pcie_table.pcie_lane[i] == 6) ? "x16" : "",
-                                       pptable->LclkFreq[i],
+                                       table_member[i],
                                        (gen_speed == dpm_context->dpm_tables.pcie_table.pcie_gen[i]) &&
                                        (lane_width == dpm_context->dpm_tables.pcie_table.pcie_lane[i]) ?
                                        "*" : "");
@@ -1275,9 +1337,10 @@ static int sienna_cichlid_get_fan_speed_percent(struct smu_context *smu,
 
 static int sienna_cichlid_get_fan_parameters(struct smu_context *smu)
 {
-       PPTable_t *pptable = smu->smu_table.driver_pptable;
+       uint16_t *table_member;
 
-       smu->fan_max_rpm = pptable->FanMaximumRpm;
+       GET_PPTABLE_MEMBER(FanMaximumRpm, &table_member);
+       smu->fan_max_rpm = *table_member;
 
        return 0;
 }
@@ -1568,8 +1631,7 @@ static int sienna_cichlid_read_sensor(struct smu_context *smu,
                                 void *data, uint32_t *size)
 {
        int ret = 0;
-       struct smu_table_context *table_context = &smu->smu_table;
-       PPTable_t *pptable = table_context->driver_pptable;
+       uint16_t *temp;
 
        if(!data || !size)
                return -EINVAL;
@@ -1577,7 +1639,8 @@ static int sienna_cichlid_read_sensor(struct smu_context *smu,
        mutex_lock(&smu->sensor_lock);
        switch (sensor) {
        case AMDGPU_PP_SENSOR_MAX_FAN_RPM:
-               *(uint32_t *)data = pptable->FanMaximumRpm;
+               GET_PPTABLE_MEMBER(FanMaximumRpm, &temp);
+               *(uint16_t *)data = *temp;
                *size = 4;
                break;
        case AMDGPU_PP_SENSOR_MEM_LOAD:
@@ -1645,14 +1708,16 @@ static int sienna_cichlid_get_uclk_dpm_states(struct smu_context *smu, uint32_t
        uint16_t *dpm_levels = NULL;
        uint16_t i = 0;
        struct smu_table_context *table_context = &smu->smu_table;
-       PPTable_t *driver_ppt = NULL;
+       DpmDescriptor_t *table_member1;
+       uint16_t *table_member2;
 
        if (!clocks_in_khz || !num_states || !table_context->driver_pptable)
                return -EINVAL;
 
-       driver_ppt = table_context->driver_pptable;
-       num_discrete_levels = driver_ppt->DpmDescriptor[PPCLK_UCLK].NumDiscreteLevels;
-       dpm_levels = driver_ppt->FreqTableUclk;
+       GET_PPTABLE_MEMBER(DpmDescriptor, &table_member1);
+       num_discrete_levels = table_member1[PPCLK_UCLK].NumDiscreteLevels;
+       GET_PPTABLE_MEMBER(FreqTableUclk, &table_member2);
+       dpm_levels = table_member2;
 
        if (num_discrete_levels == 0 || dpm_levels == NULL)
                return -EINVAL;
@@ -1674,25 +1739,29 @@ static int sienna_cichlid_get_thermal_temperature_range(struct smu_context *smu,
        struct smu_table_context *table_context = &smu->smu_table;
        struct smu_11_0_7_powerplay_table *powerplay_table =
                                table_context->power_play_table;
-       PPTable_t *pptable = smu->smu_table.driver_pptable;
+       uint16_t *table_member;
+       uint16_t temp_edge, temp_hotspot, temp_mem;
 
        if (!range)
                return -EINVAL;
 
        memcpy(range, &smu11_thermal_policy[0], sizeof(struct smu_temperature_range));
 
-       range->max = pptable->TemperatureLimit[TEMP_EDGE] *
-               SMU_TEMPERATURE_UNITS_PER_CENTIGRADES;
-       range->edge_emergency_max = (pptable->TemperatureLimit[TEMP_EDGE] + CTF_OFFSET_EDGE) *
-               SMU_TEMPERATURE_UNITS_PER_CENTIGRADES;
-       range->hotspot_crit_max = pptable->TemperatureLimit[TEMP_HOTSPOT] *
-               SMU_TEMPERATURE_UNITS_PER_CENTIGRADES;
-       range->hotspot_emergency_max = (pptable->TemperatureLimit[TEMP_HOTSPOT] + CTF_OFFSET_HOTSPOT) *
+       GET_PPTABLE_MEMBER(TemperatureLimit, &table_member);
+       temp_edge = table_member[TEMP_EDGE];
+       temp_hotspot = table_member[TEMP_HOTSPOT];
+       temp_mem = table_member[TEMP_MEM];
+
+       range->max = temp_edge * SMU_TEMPERATURE_UNITS_PER_CENTIGRADES;
+       range->edge_emergency_max = (temp_edge + CTF_OFFSET_EDGE) *
                SMU_TEMPERATURE_UNITS_PER_CENTIGRADES;
-       range->mem_crit_max = pptable->TemperatureLimit[TEMP_MEM] *
+       range->hotspot_crit_max = temp_hotspot * SMU_TEMPERATURE_UNITS_PER_CENTIGRADES;
+       range->hotspot_emergency_max = (temp_hotspot + CTF_OFFSET_HOTSPOT) *
                SMU_TEMPERATURE_UNITS_PER_CENTIGRADES;
-       range->mem_emergency_max = (pptable->TemperatureLimit[TEMP_MEM] + CTF_OFFSET_MEM)*
+       range->mem_crit_max = temp_mem * SMU_TEMPERATURE_UNITS_PER_CENTIGRADES;
+       range->mem_emergency_max = (temp_mem + CTF_OFFSET_MEM)*
                SMU_TEMPERATURE_UNITS_PER_CENTIGRADES;
+
        range->software_shutdown_temp = powerplay_table->software_shutdown_temp;
 
        return 0;
@@ -1722,33 +1791,39 @@ static int sienna_cichlid_display_disable_memory_clock_switch(struct smu_context
        return ret;
 }
 
-static int sienna_cichlid_get_power_limit(struct smu_context *smu)
+static int sienna_cichlid_get_power_limit(struct smu_context *smu,
+                                         uint32_t *current_power_limit,
+                                         uint32_t *default_power_limit,
+                                         uint32_t *max_power_limit)
 {
        struct smu_11_0_7_powerplay_table *powerplay_table =
                (struct smu_11_0_7_powerplay_table *)smu->smu_table.power_play_table;
-       PPTable_t *pptable = smu->smu_table.driver_pptable;
        uint32_t power_limit, od_percent;
+       uint16_t *table_member;
+
+       GET_PPTABLE_MEMBER(SocketPowerLimitAc, &table_member);
 
        if (smu_v11_0_get_current_power_limit(smu, &power_limit)) {
-               /* the last hope to figure out the ppt limit */
-               if (!pptable) {
-                       dev_err(smu->adev->dev, "Cannot get PPT limit due to pptable missing!");
-                       return -EINVAL;
-               }
                power_limit =
-                       pptable->SocketPowerLimitAc[PPT_THROTTLER_PPT0];
+                       table_member[PPT_THROTTLER_PPT0];
        }
-       smu->current_power_limit = smu->default_power_limit = power_limit;
 
-       if (smu->od_enabled) {
-               od_percent = le32_to_cpu(powerplay_table->overdrive_table.max[SMU_11_0_7_ODSETTING_POWERPERCENTAGE]);
+       if (current_power_limit)
+               *current_power_limit = power_limit;
+       if (default_power_limit)
+               *default_power_limit = power_limit;
+
+       if (max_power_limit) {
+               if (smu->od_enabled) {
+                       od_percent = le32_to_cpu(powerplay_table->overdrive_table.max[SMU_11_0_7_ODSETTING_POWERPERCENTAGE]);
 
-               dev_dbg(smu->adev->dev, "ODSETTING_POWERPERCENTAGE: %d (default: %d)\n", od_percent, power_limit);
+                       dev_dbg(smu->adev->dev, "ODSETTING_POWERPERCENTAGE: %d (default: %d)\n", od_percent, power_limit);
 
-               power_limit *= (100 + od_percent);
-               power_limit /= 100;
+                       power_limit *= (100 + od_percent);
+                       power_limit /= 100;
+               }
+               *max_power_limit = power_limit;
        }
-       smu->max_power_limit = power_limit;
 
        return 0;
 }
@@ -1758,36 +1833,39 @@ static int sienna_cichlid_update_pcie_parameters(struct smu_context *smu,
                                         uint32_t pcie_width_cap)
 {
        struct smu_11_0_dpm_context *dpm_context = smu->smu_dpm.dpm_context;
-       PPTable_t *pptable = smu->smu_table.driver_pptable;
+
        uint32_t smu_pcie_arg;
+       uint8_t *table_member1, *table_member2;
        int ret, i;
 
+       GET_PPTABLE_MEMBER(PcieGenSpeed, &table_member1);
+       GET_PPTABLE_MEMBER(PcieLaneCount, &table_member2);
+
        /* lclk dpm table setup */
        for (i = 0; i < MAX_PCIE_CONF; i++) {
-               dpm_context->dpm_tables.pcie_table.pcie_gen[i] = pptable->PcieGenSpeed[i];
-               dpm_context->dpm_tables.pcie_table.pcie_lane[i] = pptable->PcieLaneCount[i];
+               dpm_context->dpm_tables.pcie_table.pcie_gen[i] = table_member1[i];
+               dpm_context->dpm_tables.pcie_table.pcie_lane[i] = table_member2[i];
        }
 
        for (i = 0; i < NUM_LINK_LEVELS; i++) {
                smu_pcie_arg = (i << 16) |
-                       ((pptable->PcieGenSpeed[i] <= pcie_gen_cap) ?
-                                       (pptable->PcieGenSpeed[i] << 8) :
-                                       (pcie_gen_cap << 8)) |
-                       ((pptable->PcieLaneCount[i] <= pcie_width_cap) ?
-                                       pptable->PcieLaneCount[i] :
-                                       pcie_width_cap);
+                       ((table_member1[i] <= pcie_gen_cap) ?
+                        (table_member1[i] << 8) :
+                        (pcie_gen_cap << 8)) |
+                       ((table_member2[i] <= pcie_width_cap) ?
+                        table_member2[i] :
+                        pcie_width_cap);
 
                ret = smu_cmn_send_smc_msg_with_param(smu,
-                                         SMU_MSG_OverridePcieParameters,
-                                         smu_pcie_arg,
-                                         NULL);
-
+                               SMU_MSG_OverridePcieParameters,
+                               smu_pcie_arg,
+                               NULL);
                if (ret)
                        return ret;
 
-               if (pptable->PcieGenSpeed[i] > pcie_gen_cap)
+               if (table_member1[i] > pcie_gen_cap)
                        dpm_context->dpm_tables.pcie_table.pcie_gen[i] = pcie_gen_cap;
-               if (pptable->PcieLaneCount[i] > pcie_width_cap)
+               if (table_member2[i] > pcie_width_cap)
                        dpm_context->dpm_tables.pcie_table.pcie_lane[i] = pcie_width_cap;
        }
 
@@ -2052,16 +2130,27 @@ static int sienna_cichlid_run_btc(struct smu_context *smu)
        return smu_cmn_send_smc_msg(smu, SMU_MSG_RunDcBtc, NULL);
 }
 
-static bool sienna_cichlid_is_baco_supported(struct smu_context *smu)
+static int sienna_cichlid_baco_enter(struct smu_context *smu)
 {
        struct amdgpu_device *adev = smu->adev;
-       uint32_t val;
 
-       if (amdgpu_sriov_vf(adev) || (!smu_v11_0_baco_is_support(smu)))
-               return false;
+       if (adev->in_runpm)
+               return smu_v11_0_baco_set_armd3_sequence(smu, BACO_SEQ_BACO);
+       else
+               return smu_v11_0_baco_enter(smu);
+}
 
-       val = RREG32_SOC15(NBIO, 0, mmRCC_BIF_STRAP0);
-       return (val & RCC_BIF_STRAP0__STRAP_PX_CAPABLE_MASK) ? true : false;
+static int sienna_cichlid_baco_exit(struct smu_context *smu)
+{
+       struct amdgpu_device *adev = smu->adev;
+
+       if (adev->in_runpm) {
+               /* Wait for PMFW handling for the Dstate change */
+               msleep(10);
+               return smu_v11_0_baco_set_armd3_sequence(smu, BACO_SEQ_ULPS);
+       } else {
+               return smu_v11_0_baco_exit(smu);
+       }
 }
 
 static bool sienna_cichlid_is_mode1_reset_supported(struct smu_context *smu)
@@ -2086,10 +2175,10 @@ static bool sienna_cichlid_is_mode1_reset_supported(struct smu_context *smu)
        return val != 0x0;
 }
 
-static void sienna_cichlid_dump_pptable(struct smu_context *smu)
+static void beige_goby_dump_pptable(struct smu_context *smu)
 {
        struct smu_table_context *table_context = &smu->smu_table;
-       PPTable_t *pptable = table_context->driver_pptable;
+       PPTable_beige_goby_t *pptable = table_context->driver_pptable;
        int i;
 
        dev_info(smu->adev->dev, "Dumped PPTable:\n");
@@ -2134,6 +2223,640 @@ static void sienna_cichlid_dump_pptable(struct smu_context *smu)
        dev_info(smu->adev->dev, "MinVoltageUlvGfx = 0x%x\n", pptable->MinVoltageUlvGfx);
        dev_info(smu->adev->dev, "MinVoltageUlvSoc = 0x%x\n", pptable->MinVoltageUlvSoc);
 
+       dev_info(smu->adev->dev, "SocLIVmin = 0x%x\n", pptable->SocLIVmin);
+
+       dev_info(smu->adev->dev, "GceaLinkMgrIdleThreshold = 0x%x\n", pptable->GceaLinkMgrIdleThreshold);
+
+       dev_info(smu->adev->dev, "MinVoltageGfx = 0x%x\n", pptable->MinVoltageGfx);
+       dev_info(smu->adev->dev, "MinVoltageSoc = 0x%x\n", pptable->MinVoltageSoc);
+       dev_info(smu->adev->dev, "MaxVoltageGfx = 0x%x\n", pptable->MaxVoltageGfx);
+       dev_info(smu->adev->dev, "MaxVoltageSoc = 0x%x\n", pptable->MaxVoltageSoc);
+
+       dev_info(smu->adev->dev, "LoadLineResistanceGfx = 0x%x\n", pptable->LoadLineResistanceGfx);
+       dev_info(smu->adev->dev, "LoadLineResistanceSoc = 0x%x\n", pptable->LoadLineResistanceSoc);
+
+       dev_info(smu->adev->dev, "VDDGFX_TVmin = 0x%x\n", pptable->VDDGFX_TVmin);
+       dev_info(smu->adev->dev, "VDDSOC_TVmin = 0x%x\n", pptable->VDDSOC_TVmin);
+       dev_info(smu->adev->dev, "VDDGFX_Vmin_HiTemp = 0x%x\n", pptable->VDDGFX_Vmin_HiTemp);
+       dev_info(smu->adev->dev, "VDDGFX_Vmin_LoTemp = 0x%x\n", pptable->VDDGFX_Vmin_LoTemp);
+       dev_info(smu->adev->dev, "VDDSOC_Vmin_HiTemp = 0x%x\n", pptable->VDDSOC_Vmin_HiTemp);
+       dev_info(smu->adev->dev, "VDDSOC_Vmin_LoTemp = 0x%x\n", pptable->VDDSOC_Vmin_LoTemp);
+       dev_info(smu->adev->dev, "VDDGFX_TVminHystersis = 0x%x\n", pptable->VDDGFX_TVminHystersis);
+       dev_info(smu->adev->dev, "VDDSOC_TVminHystersis = 0x%x\n", pptable->VDDSOC_TVminHystersis);
+
+       dev_info(smu->adev->dev, "[PPCLK_GFXCLK]\n"
+                       "  .VoltageMode          = 0x%02x\n"
+                       "  .SnapToDiscrete       = 0x%02x\n"
+                       "  .NumDiscreteLevels    = 0x%02x\n"
+                       "  .padding              = 0x%02x\n"
+                       "  .ConversionToAvfsClk{m = 0x%08x b = 0x%08x}\n"
+                       "  .SsCurve            {a = 0x%08x b = 0x%08x c = 0x%08x}\n"
+                       "  .SsFmin               = 0x%04x\n"
+                       "  .Padding_16           = 0x%04x\n",
+                       pptable->DpmDescriptor[PPCLK_GFXCLK].VoltageMode,
+                       pptable->DpmDescriptor[PPCLK_GFXCLK].SnapToDiscrete,
+                       pptable->DpmDescriptor[PPCLK_GFXCLK].NumDiscreteLevels,
+                       pptable->DpmDescriptor[PPCLK_GFXCLK].Padding,
+                       pptable->DpmDescriptor[PPCLK_GFXCLK].ConversionToAvfsClk.m,
+                       pptable->DpmDescriptor[PPCLK_GFXCLK].ConversionToAvfsClk.b,
+                       pptable->DpmDescriptor[PPCLK_GFXCLK].SsCurve.a,
+                       pptable->DpmDescriptor[PPCLK_GFXCLK].SsCurve.b,
+                       pptable->DpmDescriptor[PPCLK_GFXCLK].SsCurve.c,
+                       pptable->DpmDescriptor[PPCLK_GFXCLK].SsFmin,
+                       pptable->DpmDescriptor[PPCLK_GFXCLK].Padding16);
+
+       dev_info(smu->adev->dev, "[PPCLK_SOCCLK]\n"
+                       "  .VoltageMode          = 0x%02x\n"
+                       "  .SnapToDiscrete       = 0x%02x\n"
+                       "  .NumDiscreteLevels    = 0x%02x\n"
+                       "  .padding              = 0x%02x\n"
+                       "  .ConversionToAvfsClk{m = 0x%08x b = 0x%08x}\n"
+                       "  .SsCurve            {a = 0x%08x b = 0x%08x c = 0x%08x}\n"
+                       "  .SsFmin               = 0x%04x\n"
+                       "  .Padding_16           = 0x%04x\n",
+                       pptable->DpmDescriptor[PPCLK_SOCCLK].VoltageMode,
+                       pptable->DpmDescriptor[PPCLK_SOCCLK].SnapToDiscrete,
+                       pptable->DpmDescriptor[PPCLK_SOCCLK].NumDiscreteLevels,
+                       pptable->DpmDescriptor[PPCLK_SOCCLK].Padding,
+                       pptable->DpmDescriptor[PPCLK_SOCCLK].ConversionToAvfsClk.m,
+                       pptable->DpmDescriptor[PPCLK_SOCCLK].ConversionToAvfsClk.b,
+                       pptable->DpmDescriptor[PPCLK_SOCCLK].SsCurve.a,
+                       pptable->DpmDescriptor[PPCLK_SOCCLK].SsCurve.b,
+                       pptable->DpmDescriptor[PPCLK_SOCCLK].SsCurve.c,
+                       pptable->DpmDescriptor[PPCLK_SOCCLK].SsFmin,
+                       pptable->DpmDescriptor[PPCLK_SOCCLK].Padding16);
+
+       dev_info(smu->adev->dev, "[PPCLK_UCLK]\n"
+                       "  .VoltageMode          = 0x%02x\n"
+                       "  .SnapToDiscrete       = 0x%02x\n"
+                       "  .NumDiscreteLevels    = 0x%02x\n"
+                       "  .padding              = 0x%02x\n"
+                       "  .ConversionToAvfsClk{m = 0x%08x b = 0x%08x}\n"
+                       "  .SsCurve            {a = 0x%08x b = 0x%08x c = 0x%08x}\n"
+                       "  .SsFmin               = 0x%04x\n"
+                       "  .Padding_16           = 0x%04x\n",
+                       pptable->DpmDescriptor[PPCLK_UCLK].VoltageMode,
+                       pptable->DpmDescriptor[PPCLK_UCLK].SnapToDiscrete,
+                       pptable->DpmDescriptor[PPCLK_UCLK].NumDiscreteLevels,
+                       pptable->DpmDescriptor[PPCLK_UCLK].Padding,
+                       pptable->DpmDescriptor[PPCLK_UCLK].ConversionToAvfsClk.m,
+                       pptable->DpmDescriptor[PPCLK_UCLK].ConversionToAvfsClk.b,
+                       pptable->DpmDescriptor[PPCLK_UCLK].SsCurve.a,
+                       pptable->DpmDescriptor[PPCLK_UCLK].SsCurve.b,
+                       pptable->DpmDescriptor[PPCLK_UCLK].SsCurve.c,
+                       pptable->DpmDescriptor[PPCLK_UCLK].SsFmin,
+                       pptable->DpmDescriptor[PPCLK_UCLK].Padding16);
+
+       dev_info(smu->adev->dev, "[PPCLK_FCLK]\n"
+                       "  .VoltageMode          = 0x%02x\n"
+                       "  .SnapToDiscrete       = 0x%02x\n"
+                       "  .NumDiscreteLevels    = 0x%02x\n"
+                       "  .padding              = 0x%02x\n"
+                       "  .ConversionToAvfsClk{m = 0x%08x b = 0x%08x}\n"
+                       "  .SsCurve            {a = 0x%08x b = 0x%08x c = 0x%08x}\n"
+                       "  .SsFmin               = 0x%04x\n"
+                       "  .Padding_16           = 0x%04x\n",
+                       pptable->DpmDescriptor[PPCLK_FCLK].VoltageMode,
+                       pptable->DpmDescriptor[PPCLK_FCLK].SnapToDiscrete,
+                       pptable->DpmDescriptor[PPCLK_FCLK].NumDiscreteLevels,
+                       pptable->DpmDescriptor[PPCLK_FCLK].Padding,
+                       pptable->DpmDescriptor[PPCLK_FCLK].ConversionToAvfsClk.m,
+                       pptable->DpmDescriptor[PPCLK_FCLK].ConversionToAvfsClk.b,
+                       pptable->DpmDescriptor[PPCLK_FCLK].SsCurve.a,
+                       pptable->DpmDescriptor[PPCLK_FCLK].SsCurve.b,
+                       pptable->DpmDescriptor[PPCLK_FCLK].SsCurve.c,
+                       pptable->DpmDescriptor[PPCLK_FCLK].SsFmin,
+                       pptable->DpmDescriptor[PPCLK_FCLK].Padding16);
+
+       dev_info(smu->adev->dev, "[PPCLK_DCLK_0]\n"
+                       "  .VoltageMode          = 0x%02x\n"
+                       "  .SnapToDiscrete       = 0x%02x\n"
+                       "  .NumDiscreteLevels    = 0x%02x\n"
+                       "  .padding              = 0x%02x\n"
+                       "  .ConversionToAvfsClk{m = 0x%08x b = 0x%08x}\n"
+                       "  .SsCurve            {a = 0x%08x b = 0x%08x c = 0x%08x}\n"
+                       "  .SsFmin               = 0x%04x\n"
+                       "  .Padding_16           = 0x%04x\n",
+                       pptable->DpmDescriptor[PPCLK_DCLK_0].VoltageMode,
+                       pptable->DpmDescriptor[PPCLK_DCLK_0].SnapToDiscrete,
+                       pptable->DpmDescriptor[PPCLK_DCLK_0].NumDiscreteLevels,
+                       pptable->DpmDescriptor[PPCLK_DCLK_0].Padding,
+                       pptable->DpmDescriptor[PPCLK_DCLK_0].ConversionToAvfsClk.m,
+                       pptable->DpmDescriptor[PPCLK_DCLK_0].ConversionToAvfsClk.b,
+                       pptable->DpmDescriptor[PPCLK_DCLK_0].SsCurve.a,
+                       pptable->DpmDescriptor[PPCLK_DCLK_0].SsCurve.b,
+                       pptable->DpmDescriptor[PPCLK_DCLK_0].SsCurve.c,
+                       pptable->DpmDescriptor[PPCLK_DCLK_0].SsFmin,
+                       pptable->DpmDescriptor[PPCLK_DCLK_0].Padding16);
+
+       dev_info(smu->adev->dev, "[PPCLK_VCLK_0]\n"
+                       "  .VoltageMode          = 0x%02x\n"
+                       "  .SnapToDiscrete       = 0x%02x\n"
+                       "  .NumDiscreteLevels    = 0x%02x\n"
+                       "  .padding              = 0x%02x\n"
+                       "  .ConversionToAvfsClk{m = 0x%08x b = 0x%08x}\n"
+                       "  .SsCurve            {a = 0x%08x b = 0x%08x c = 0x%08x}\n"
+                       "  .SsFmin               = 0x%04x\n"
+                       "  .Padding_16           = 0x%04x\n",
+                       pptable->DpmDescriptor[PPCLK_VCLK_0].VoltageMode,
+                       pptable->DpmDescriptor[PPCLK_VCLK_0].SnapToDiscrete,
+                       pptable->DpmDescriptor[PPCLK_VCLK_0].NumDiscreteLevels,
+                       pptable->DpmDescriptor[PPCLK_VCLK_0].Padding,
+                       pptable->DpmDescriptor[PPCLK_VCLK_0].ConversionToAvfsClk.m,
+                       pptable->DpmDescriptor[PPCLK_VCLK_0].ConversionToAvfsClk.b,
+                       pptable->DpmDescriptor[PPCLK_VCLK_0].SsCurve.a,
+                       pptable->DpmDescriptor[PPCLK_VCLK_0].SsCurve.b,
+                       pptable->DpmDescriptor[PPCLK_VCLK_0].SsCurve.c,
+                       pptable->DpmDescriptor[PPCLK_VCLK_0].SsFmin,
+                       pptable->DpmDescriptor[PPCLK_VCLK_0].Padding16);
+
+       dev_info(smu->adev->dev, "[PPCLK_DCLK_1]\n"
+                       "  .VoltageMode          = 0x%02x\n"
+                       "  .SnapToDiscrete       = 0x%02x\n"
+                       "  .NumDiscreteLevels    = 0x%02x\n"
+                       "  .padding              = 0x%02x\n"
+                       "  .ConversionToAvfsClk{m = 0x%08x b = 0x%08x}\n"
+                       "  .SsCurve            {a = 0x%08x b = 0x%08x c = 0x%08x}\n"
+                       "  .SsFmin               = 0x%04x\n"
+                       "  .Padding_16           = 0x%04x\n",
+                       pptable->DpmDescriptor[PPCLK_DCLK_1].VoltageMode,
+                       pptable->DpmDescriptor[PPCLK_DCLK_1].SnapToDiscrete,
+                       pptable->DpmDescriptor[PPCLK_DCLK_1].NumDiscreteLevels,
+                       pptable->DpmDescriptor[PPCLK_DCLK_1].Padding,
+                       pptable->DpmDescriptor[PPCLK_DCLK_1].ConversionToAvfsClk.m,
+                       pptable->DpmDescriptor[PPCLK_DCLK_1].ConversionToAvfsClk.b,
+                       pptable->DpmDescriptor[PPCLK_DCLK_1].SsCurve.a,
+                       pptable->DpmDescriptor[PPCLK_DCLK_1].SsCurve.b,
+                       pptable->DpmDescriptor[PPCLK_DCLK_1].SsCurve.c,
+                       pptable->DpmDescriptor[PPCLK_DCLK_1].SsFmin,
+                       pptable->DpmDescriptor[PPCLK_DCLK_1].Padding16);
+
+       dev_info(smu->adev->dev, "[PPCLK_VCLK_1]\n"
+                       "  .VoltageMode          = 0x%02x\n"
+                       "  .SnapToDiscrete       = 0x%02x\n"
+                       "  .NumDiscreteLevels    = 0x%02x\n"
+                       "  .padding              = 0x%02x\n"
+                       "  .ConversionToAvfsClk{m = 0x%08x b = 0x%08x}\n"
+                       "  .SsCurve            {a = 0x%08x b = 0x%08x c = 0x%08x}\n"
+                       "  .SsFmin               = 0x%04x\n"
+                       "  .Padding_16           = 0x%04x\n",
+                       pptable->DpmDescriptor[PPCLK_VCLK_1].VoltageMode,
+                       pptable->DpmDescriptor[PPCLK_VCLK_1].SnapToDiscrete,
+                       pptable->DpmDescriptor[PPCLK_VCLK_1].NumDiscreteLevels,
+                       pptable->DpmDescriptor[PPCLK_VCLK_1].Padding,
+                       pptable->DpmDescriptor[PPCLK_VCLK_1].ConversionToAvfsClk.m,
+                       pptable->DpmDescriptor[PPCLK_VCLK_1].ConversionToAvfsClk.b,
+                       pptable->DpmDescriptor[PPCLK_VCLK_1].SsCurve.a,
+                       pptable->DpmDescriptor[PPCLK_VCLK_1].SsCurve.b,
+                       pptable->DpmDescriptor[PPCLK_VCLK_1].SsCurve.c,
+                       pptable->DpmDescriptor[PPCLK_VCLK_1].SsFmin,
+                       pptable->DpmDescriptor[PPCLK_VCLK_1].Padding16);
+
+       dev_info(smu->adev->dev, "FreqTableGfx\n");
+       for (i = 0; i < NUM_GFXCLK_DPM_LEVELS; i++)
+               dev_info(smu->adev->dev, "  .[%02d] = 0x%x\n", i, pptable->FreqTableGfx[i]);
+
+       dev_info(smu->adev->dev, "FreqTableVclk\n");
+       for (i = 0; i < NUM_VCLK_DPM_LEVELS; i++)
+               dev_info(smu->adev->dev, "  .[%02d] = 0x%x\n", i, pptable->FreqTableVclk[i]);
+
+       dev_info(smu->adev->dev, "FreqTableDclk\n");
+       for (i = 0; i < NUM_DCLK_DPM_LEVELS; i++)
+               dev_info(smu->adev->dev, "  .[%02d] = 0x%x\n", i, pptable->FreqTableDclk[i]);
+
+       dev_info(smu->adev->dev, "FreqTableSocclk\n");
+       for (i = 0; i < NUM_SOCCLK_DPM_LEVELS; i++)
+               dev_info(smu->adev->dev, "  .[%02d] = 0x%x\n", i, pptable->FreqTableSocclk[i]);
+
+       dev_info(smu->adev->dev, "FreqTableUclk\n");
+       for (i = 0; i < NUM_UCLK_DPM_LEVELS; i++)
+               dev_info(smu->adev->dev, "  .[%02d] = 0x%x\n", i, pptable->FreqTableUclk[i]);
+
+       dev_info(smu->adev->dev, "FreqTableFclk\n");
+       for (i = 0; i < NUM_FCLK_DPM_LEVELS; i++)
+               dev_info(smu->adev->dev, "  .[%02d] = 0x%x\n", i, pptable->FreqTableFclk[i]);
+
+       dev_info(smu->adev->dev, "DcModeMaxFreq\n");
+       dev_info(smu->adev->dev, "  .PPCLK_GFXCLK = 0x%x\n", pptable->DcModeMaxFreq[PPCLK_GFXCLK]);
+       dev_info(smu->adev->dev, "  .PPCLK_SOCCLK = 0x%x\n", pptable->DcModeMaxFreq[PPCLK_SOCCLK]);
+       dev_info(smu->adev->dev, "  .PPCLK_UCLK   = 0x%x\n", pptable->DcModeMaxFreq[PPCLK_UCLK]);
+       dev_info(smu->adev->dev, "  .PPCLK_FCLK   = 0x%x\n", pptable->DcModeMaxFreq[PPCLK_FCLK]);
+       dev_info(smu->adev->dev, "  .PPCLK_DCLK_0 = 0x%x\n", pptable->DcModeMaxFreq[PPCLK_DCLK_0]);
+       dev_info(smu->adev->dev, "  .PPCLK_VCLK_0 = 0x%x\n", pptable->DcModeMaxFreq[PPCLK_VCLK_0]);
+       dev_info(smu->adev->dev, "  .PPCLK_DCLK_1 = 0x%x\n", pptable->DcModeMaxFreq[PPCLK_DCLK_1]);
+       dev_info(smu->adev->dev, "  .PPCLK_VCLK_1 = 0x%x\n", pptable->DcModeMaxFreq[PPCLK_VCLK_1]);
+
+       dev_info(smu->adev->dev, "FreqTableUclkDiv\n");
+       for (i = 0; i < NUM_UCLK_DPM_LEVELS; i++)
+               dev_info(smu->adev->dev, "  .[%d] = 0x%x\n", i, pptable->FreqTableUclkDiv[i]);
+
+       dev_info(smu->adev->dev, "FclkBoostFreq = 0x%x\n", pptable->FclkBoostFreq);
+       dev_info(smu->adev->dev, "FclkParamPadding = 0x%x\n", pptable->FclkParamPadding);
+
+       dev_info(smu->adev->dev, "Mp0clkFreq\n");
+       for (i = 0; i < NUM_MP0CLK_DPM_LEVELS; i++)
+               dev_info(smu->adev->dev, "  .[%d] = 0x%x\n", i, pptable->Mp0clkFreq[i]);
+
+       dev_info(smu->adev->dev, "Mp0DpmVoltage\n");
+       for (i = 0; i < NUM_MP0CLK_DPM_LEVELS; i++)
+               dev_info(smu->adev->dev, "  .[%d] = 0x%x\n", i, pptable->Mp0DpmVoltage[i]);
+
+       dev_info(smu->adev->dev, "MemVddciVoltage\n");
+       for (i = 0; i < NUM_UCLK_DPM_LEVELS; i++)
+               dev_info(smu->adev->dev, "  .[%d] = 0x%x\n", i, pptable->MemVddciVoltage[i]);
+
+       dev_info(smu->adev->dev, "MemMvddVoltage\n");
+       for (i = 0; i < NUM_UCLK_DPM_LEVELS; i++)
+               dev_info(smu->adev->dev, "  .[%d] = 0x%x\n", i, pptable->MemMvddVoltage[i]);
+
+       dev_info(smu->adev->dev, "GfxclkFgfxoffEntry = 0x%x\n", pptable->GfxclkFgfxoffEntry);
+       dev_info(smu->adev->dev, "GfxclkFinit = 0x%x\n", pptable->GfxclkFinit);
+       dev_info(smu->adev->dev, "GfxclkFidle = 0x%x\n", pptable->GfxclkFidle);
+       dev_info(smu->adev->dev, "GfxclkSource = 0x%x\n", pptable->GfxclkSource);
+       dev_info(smu->adev->dev, "GfxclkPadding = 0x%x\n", pptable->GfxclkPadding);
+
+       dev_info(smu->adev->dev, "GfxGpoSubFeatureMask = 0x%x\n", pptable->GfxGpoSubFeatureMask);
+
+       dev_info(smu->adev->dev, "GfxGpoEnabledWorkPolicyMask = 0x%x\n", pptable->GfxGpoEnabledWorkPolicyMask);
+       dev_info(smu->adev->dev, "GfxGpoDisabledWorkPolicyMask = 0x%x\n", pptable->GfxGpoDisabledWorkPolicyMask);
+       dev_info(smu->adev->dev, "GfxGpoPadding[0] = 0x%x\n", pptable->GfxGpoPadding[0]);
+       dev_info(smu->adev->dev, "GfxGpoVotingAllow = 0x%x\n", pptable->GfxGpoVotingAllow);
+       dev_info(smu->adev->dev, "GfxGpoPadding32[0] = 0x%x\n", pptable->GfxGpoPadding32[0]);
+       dev_info(smu->adev->dev, "GfxGpoPadding32[1] = 0x%x\n", pptable->GfxGpoPadding32[1]);
+       dev_info(smu->adev->dev, "GfxGpoPadding32[2] = 0x%x\n", pptable->GfxGpoPadding32[2]);
+       dev_info(smu->adev->dev, "GfxGpoPadding32[3] = 0x%x\n", pptable->GfxGpoPadding32[3]);
+       dev_info(smu->adev->dev, "GfxDcsFopt = 0x%x\n", pptable->GfxDcsFopt);
+       dev_info(smu->adev->dev, "GfxDcsFclkFopt = 0x%x\n", pptable->GfxDcsFclkFopt);
+       dev_info(smu->adev->dev, "GfxDcsUclkFopt = 0x%x\n", pptable->GfxDcsUclkFopt);
+
+       dev_info(smu->adev->dev, "DcsGfxOffVoltage = 0x%x\n", pptable->DcsGfxOffVoltage);
+       dev_info(smu->adev->dev, "DcsMinGfxOffTime = 0x%x\n", pptable->DcsMinGfxOffTime);
+       dev_info(smu->adev->dev, "DcsMaxGfxOffTime = 0x%x\n", pptable->DcsMaxGfxOffTime);
+       dev_info(smu->adev->dev, "DcsMinCreditAccum = 0x%x\n", pptable->DcsMinCreditAccum);
+       dev_info(smu->adev->dev, "DcsExitHysteresis = 0x%x\n", pptable->DcsExitHysteresis);
+       dev_info(smu->adev->dev, "DcsTimeout = 0x%x\n", pptable->DcsTimeout);
+
+       dev_info(smu->adev->dev, "DcsParamPadding[0] = 0x%x\n", pptable->DcsParamPadding[0]);
+       dev_info(smu->adev->dev, "DcsParamPadding[1] = 0x%x\n", pptable->DcsParamPadding[1]);
+       dev_info(smu->adev->dev, "DcsParamPadding[2] = 0x%x\n", pptable->DcsParamPadding[2]);
+       dev_info(smu->adev->dev, "DcsParamPadding[3] = 0x%x\n", pptable->DcsParamPadding[3]);
+       dev_info(smu->adev->dev, "DcsParamPadding[4] = 0x%x\n", pptable->DcsParamPadding[4]);
+
+       dev_info(smu->adev->dev, "FlopsPerByteTable\n");
+       for (i = 0; i < RLC_PACE_TABLE_NUM_LEVELS; i++)
+               dev_info(smu->adev->dev, "  .[%d] = 0x%x\n", i, pptable->FlopsPerByteTable[i]);
+
+       dev_info(smu->adev->dev, "LowestUclkReservedForUlv = 0x%x\n", pptable->LowestUclkReservedForUlv);
+       dev_info(smu->adev->dev, "vddingMem[0] = 0x%x\n", pptable->PaddingMem[0]);
+       dev_info(smu->adev->dev, "vddingMem[1] = 0x%x\n", pptable->PaddingMem[1]);
+       dev_info(smu->adev->dev, "vddingMem[2] = 0x%x\n", pptable->PaddingMem[2]);
+
+       dev_info(smu->adev->dev, "UclkDpmPstates\n");
+       for (i = 0; i < NUM_UCLK_DPM_LEVELS; i++)
+               dev_info(smu->adev->dev, "  .[%d] = 0x%x\n", i, pptable->UclkDpmPstates[i]);
+
+       dev_info(smu->adev->dev, "UclkDpmSrcFreqRange\n");
+       dev_info(smu->adev->dev, "  .Fmin = 0x%x\n",
+               pptable->UclkDpmSrcFreqRange.Fmin);
+       dev_info(smu->adev->dev, "  .Fmax = 0x%x\n",
+               pptable->UclkDpmSrcFreqRange.Fmax);
+       dev_info(smu->adev->dev, "UclkDpmTargFreqRange\n");
+       dev_info(smu->adev->dev, "  .Fmin = 0x%x\n",
+               pptable->UclkDpmTargFreqRange.Fmin);
+       dev_info(smu->adev->dev, "  .Fmax = 0x%x\n",
+               pptable->UclkDpmTargFreqRange.Fmax);
+       dev_info(smu->adev->dev, "UclkDpmMidstepFreq = 0x%x\n", pptable->UclkDpmMidstepFreq);
+       dev_info(smu->adev->dev, "UclkMidstepPadding = 0x%x\n", pptable->UclkMidstepPadding);
+
+       dev_info(smu->adev->dev, "PcieGenSpeed\n");
+       for (i = 0; i < NUM_LINK_LEVELS; i++)
+               dev_info(smu->adev->dev, "  .[%d] = 0x%x\n", i, pptable->PcieGenSpeed[i]);
+
+       dev_info(smu->adev->dev, "PcieLaneCount\n");
+       for (i = 0; i < NUM_LINK_LEVELS; i++)
+               dev_info(smu->adev->dev, "  .[%d] = 0x%x\n", i, pptable->PcieLaneCount[i]);
+
+       dev_info(smu->adev->dev, "LclkFreq\n");
+       for (i = 0; i < NUM_LINK_LEVELS; i++)
+               dev_info(smu->adev->dev, "  .[%d] = 0x%x\n", i, pptable->LclkFreq[i]);
+
+       dev_info(smu->adev->dev, "FanStopTemp = 0x%x\n", pptable->FanStopTemp);
+       dev_info(smu->adev->dev, "FanStartTemp = 0x%x\n", pptable->FanStartTemp);
+
+       dev_info(smu->adev->dev, "FanGain\n");
+       for (i = 0; i < TEMP_COUNT; i++)
+               dev_info(smu->adev->dev, "  .[%d] = 0x%x\n", i, pptable->FanGain[i]);
+
+       dev_info(smu->adev->dev, "FanPwmMin = 0x%x\n", pptable->FanPwmMin);
+       dev_info(smu->adev->dev, "FanAcousticLimitRpm = 0x%x\n", pptable->FanAcousticLimitRpm);
+       dev_info(smu->adev->dev, "FanThrottlingRpm = 0x%x\n", pptable->FanThrottlingRpm);
+       dev_info(smu->adev->dev, "FanMaximumRpm = 0x%x\n", pptable->FanMaximumRpm);
+       dev_info(smu->adev->dev, "MGpuFanBoostLimitRpm = 0x%x\n", pptable->MGpuFanBoostLimitRpm);
+       dev_info(smu->adev->dev, "FanTargetTemperature = 0x%x\n", pptable->FanTargetTemperature);
+       dev_info(smu->adev->dev, "FanTargetGfxclk = 0x%x\n", pptable->FanTargetGfxclk);
+       dev_info(smu->adev->dev, "FanPadding16 = 0x%x\n", pptable->FanPadding16);
+       dev_info(smu->adev->dev, "FanTempInputSelect = 0x%x\n", pptable->FanTempInputSelect);
+       dev_info(smu->adev->dev, "FanPadding = 0x%x\n", pptable->FanPadding);
+       dev_info(smu->adev->dev, "FanZeroRpmEnable = 0x%x\n", pptable->FanZeroRpmEnable);
+       dev_info(smu->adev->dev, "FanTachEdgePerRev = 0x%x\n", pptable->FanTachEdgePerRev);
+
+       dev_info(smu->adev->dev, "FuzzyFan_ErrorSetDelta = 0x%x\n", pptable->FuzzyFan_ErrorSetDelta);
+       dev_info(smu->adev->dev, "FuzzyFan_ErrorRateSetDelta = 0x%x\n", pptable->FuzzyFan_ErrorRateSetDelta);
+       dev_info(smu->adev->dev, "FuzzyFan_PwmSetDelta = 0x%x\n", pptable->FuzzyFan_PwmSetDelta);
+       dev_info(smu->adev->dev, "FuzzyFan_Reserved = 0x%x\n", pptable->FuzzyFan_Reserved);
+
+       dev_info(smu->adev->dev, "OverrideAvfsGb[AVFS_VOLTAGE_GFX] = 0x%x\n", pptable->OverrideAvfsGb[AVFS_VOLTAGE_GFX]);
+       dev_info(smu->adev->dev, "OverrideAvfsGb[AVFS_VOLTAGE_SOC] = 0x%x\n", pptable->OverrideAvfsGb[AVFS_VOLTAGE_SOC]);
+       dev_info(smu->adev->dev, "dBtcGbGfxDfllModelSelect = 0x%x\n", pptable->dBtcGbGfxDfllModelSelect);
+       dev_info(smu->adev->dev, "Padding8_Avfs = 0x%x\n", pptable->Padding8_Avfs);
+
+       dev_info(smu->adev->dev, "qAvfsGb[AVFS_VOLTAGE_GFX]{a = 0x%x b = 0x%x c = 0x%x}\n",
+                       pptable->qAvfsGb[AVFS_VOLTAGE_GFX].a,
+                       pptable->qAvfsGb[AVFS_VOLTAGE_GFX].b,
+                       pptable->qAvfsGb[AVFS_VOLTAGE_GFX].c);
+       dev_info(smu->adev->dev, "qAvfsGb[AVFS_VOLTAGE_SOC]{a = 0x%x b = 0x%x c = 0x%x}\n",
+                       pptable->qAvfsGb[AVFS_VOLTAGE_SOC].a,
+                       pptable->qAvfsGb[AVFS_VOLTAGE_SOC].b,
+                       pptable->qAvfsGb[AVFS_VOLTAGE_SOC].c);
+       dev_info(smu->adev->dev, "dBtcGbGfxPll{a = 0x%x b = 0x%x c = 0x%x}\n",
+                       pptable->dBtcGbGfxPll.a,
+                       pptable->dBtcGbGfxPll.b,
+                       pptable->dBtcGbGfxPll.c);
+       dev_info(smu->adev->dev, "dBtcGbGfxAfll{a = 0x%x b = 0x%x c = 0x%x}\n",
+                       pptable->dBtcGbGfxDfll.a,
+                       pptable->dBtcGbGfxDfll.b,
+                       pptable->dBtcGbGfxDfll.c);
+       dev_info(smu->adev->dev, "dBtcGbSoc{a = 0x%x b = 0x%x c = 0x%x}\n",
+                       pptable->dBtcGbSoc.a,
+                       pptable->dBtcGbSoc.b,
+                       pptable->dBtcGbSoc.c);
+       dev_info(smu->adev->dev, "qAgingGb[AVFS_VOLTAGE_GFX]{m = 0x%x b = 0x%x}\n",
+                       pptable->qAgingGb[AVFS_VOLTAGE_GFX].m,
+                       pptable->qAgingGb[AVFS_VOLTAGE_GFX].b);
+       dev_info(smu->adev->dev, "qAgingGb[AVFS_VOLTAGE_SOC]{m = 0x%x b = 0x%x}\n",
+                       pptable->qAgingGb[AVFS_VOLTAGE_SOC].m,
+                       pptable->qAgingGb[AVFS_VOLTAGE_SOC].b);
+
+       dev_info(smu->adev->dev, "PiecewiseLinearDroopIntGfxDfll\n");
+       for (i = 0; i < NUM_PIECE_WISE_LINEAR_DROOP_MODEL_VF_POINTS; i++) {
+               dev_info(smu->adev->dev, "              Fset[%d] = 0x%x\n",
+                       i, pptable->PiecewiseLinearDroopIntGfxDfll.Fset[i]);
+               dev_info(smu->adev->dev, "              Vdroop[%d] = 0x%x\n",
+                       i, pptable->PiecewiseLinearDroopIntGfxDfll.Vdroop[i]);
+       }
+
+       dev_info(smu->adev->dev, "qStaticVoltageOffset[AVFS_VOLTAGE_GFX]{a = 0x%x b = 0x%x c = 0x%x}\n",
+                       pptable->qStaticVoltageOffset[AVFS_VOLTAGE_GFX].a,
+                       pptable->qStaticVoltageOffset[AVFS_VOLTAGE_GFX].b,
+                       pptable->qStaticVoltageOffset[AVFS_VOLTAGE_GFX].c);
+       dev_info(smu->adev->dev, "qStaticVoltageOffset[AVFS_VOLTAGE_SOC]{a = 0x%x b = 0x%x c = 0x%x}\n",
+                       pptable->qStaticVoltageOffset[AVFS_VOLTAGE_SOC].a,
+                       pptable->qStaticVoltageOffset[AVFS_VOLTAGE_SOC].b,
+                       pptable->qStaticVoltageOffset[AVFS_VOLTAGE_SOC].c);
+
+       dev_info(smu->adev->dev, "DcTol[AVFS_VOLTAGE_GFX] = 0x%x\n", pptable->DcTol[AVFS_VOLTAGE_GFX]);
+       dev_info(smu->adev->dev, "DcTol[AVFS_VOLTAGE_SOC] = 0x%x\n", pptable->DcTol[AVFS_VOLTAGE_SOC]);
+
+       dev_info(smu->adev->dev, "DcBtcEnabled[AVFS_VOLTAGE_GFX] = 0x%x\n", pptable->DcBtcEnabled[AVFS_VOLTAGE_GFX]);
+       dev_info(smu->adev->dev, "DcBtcEnabled[AVFS_VOLTAGE_SOC] = 0x%x\n", pptable->DcBtcEnabled[AVFS_VOLTAGE_SOC]);
+       dev_info(smu->adev->dev, "Padding8_GfxBtc[0] = 0x%x\n", pptable->Padding8_GfxBtc[0]);
+       dev_info(smu->adev->dev, "Padding8_GfxBtc[1] = 0x%x\n", pptable->Padding8_GfxBtc[1]);
+
+       dev_info(smu->adev->dev, "DcBtcMin[AVFS_VOLTAGE_GFX] = 0x%x\n", pptable->DcBtcMin[AVFS_VOLTAGE_GFX]);
+       dev_info(smu->adev->dev, "DcBtcMin[AVFS_VOLTAGE_SOC] = 0x%x\n", pptable->DcBtcMin[AVFS_VOLTAGE_SOC]);
+       dev_info(smu->adev->dev, "DcBtcMax[AVFS_VOLTAGE_GFX] = 0x%x\n", pptable->DcBtcMax[AVFS_VOLTAGE_GFX]);
+       dev_info(smu->adev->dev, "DcBtcMax[AVFS_VOLTAGE_SOC] = 0x%x\n", pptable->DcBtcMax[AVFS_VOLTAGE_SOC]);
+
+       dev_info(smu->adev->dev, "DcBtcGb[AVFS_VOLTAGE_GFX] = 0x%x\n", pptable->DcBtcGb[AVFS_VOLTAGE_GFX]);
+       dev_info(smu->adev->dev, "DcBtcGb[AVFS_VOLTAGE_SOC] = 0x%x\n", pptable->DcBtcGb[AVFS_VOLTAGE_SOC]);
+
+       dev_info(smu->adev->dev, "XgmiDpmPstates\n");
+       for (i = 0; i < NUM_XGMI_LEVELS; i++)
+               dev_info(smu->adev->dev, "  .[%d] = 0x%x\n", i, pptable->XgmiDpmPstates[i]);
+       dev_info(smu->adev->dev, "XgmiDpmSpare[0] = 0x%02x\n", pptable->XgmiDpmSpare[0]);
+       dev_info(smu->adev->dev, "XgmiDpmSpare[1] = 0x%02x\n", pptable->XgmiDpmSpare[1]);
+
+       dev_info(smu->adev->dev, "DebugOverrides = 0x%x\n", pptable->DebugOverrides);
+       dev_info(smu->adev->dev, "ReservedEquation0{a = 0x%x b = 0x%x c = 0x%x}\n",
+                       pptable->ReservedEquation0.a,
+                       pptable->ReservedEquation0.b,
+                       pptable->ReservedEquation0.c);
+       dev_info(smu->adev->dev, "ReservedEquation1{a = 0x%x b = 0x%x c = 0x%x}\n",
+                       pptable->ReservedEquation1.a,
+                       pptable->ReservedEquation1.b,
+                       pptable->ReservedEquation1.c);
+       dev_info(smu->adev->dev, "ReservedEquation2{a = 0x%x b = 0x%x c = 0x%x}\n",
+                       pptable->ReservedEquation2.a,
+                       pptable->ReservedEquation2.b,
+                       pptable->ReservedEquation2.c);
+       dev_info(smu->adev->dev, "ReservedEquation3{a = 0x%x b = 0x%x c = 0x%x}\n",
+                       pptable->ReservedEquation3.a,
+                       pptable->ReservedEquation3.b,
+                       pptable->ReservedEquation3.c);
+
+       dev_info(smu->adev->dev, "SkuReserved[0] = 0x%x\n", pptable->SkuReserved[0]);
+       dev_info(smu->adev->dev, "SkuReserved[1] = 0x%x\n", pptable->SkuReserved[1]);
+       dev_info(smu->adev->dev, "SkuReserved[2] = 0x%x\n", pptable->SkuReserved[2]);
+       dev_info(smu->adev->dev, "SkuReserved[3] = 0x%x\n", pptable->SkuReserved[3]);
+       dev_info(smu->adev->dev, "SkuReserved[4] = 0x%x\n", pptable->SkuReserved[4]);
+       dev_info(smu->adev->dev, "SkuReserved[5] = 0x%x\n", pptable->SkuReserved[5]);
+       dev_info(smu->adev->dev, "SkuReserved[6] = 0x%x\n", pptable->SkuReserved[6]);
+       dev_info(smu->adev->dev, "SkuReserved[7] = 0x%x\n", pptable->SkuReserved[7]);
+
+       dev_info(smu->adev->dev, "GamingClk[0] = 0x%x\n", pptable->GamingClk[0]);
+       dev_info(smu->adev->dev, "GamingClk[1] = 0x%x\n", pptable->GamingClk[1]);
+       dev_info(smu->adev->dev, "GamingClk[2] = 0x%x\n", pptable->GamingClk[2]);
+       dev_info(smu->adev->dev, "GamingClk[3] = 0x%x\n", pptable->GamingClk[3]);
+       dev_info(smu->adev->dev, "GamingClk[4] = 0x%x\n", pptable->GamingClk[4]);
+       dev_info(smu->adev->dev, "GamingClk[5] = 0x%x\n", pptable->GamingClk[5]);
+
+       for (i = 0; i < NUM_I2C_CONTROLLERS; i++) {
+               dev_info(smu->adev->dev, "I2cControllers[%d]:\n", i);
+               dev_info(smu->adev->dev, "                   .Enabled = 0x%x\n",
+                               pptable->I2cControllers[i].Enabled);
+               dev_info(smu->adev->dev, "                   .Speed = 0x%x\n",
+                               pptable->I2cControllers[i].Speed);
+               dev_info(smu->adev->dev, "                   .SlaveAddress = 0x%x\n",
+                               pptable->I2cControllers[i].SlaveAddress);
+               dev_info(smu->adev->dev, "                   .ControllerPort = 0x%x\n",
+                               pptable->I2cControllers[i].ControllerPort);
+               dev_info(smu->adev->dev, "                   .ControllerName = 0x%x\n",
+                               pptable->I2cControllers[i].ControllerName);
+               dev_info(smu->adev->dev, "                   .ThermalThrottler = 0x%x\n",
+                               pptable->I2cControllers[i].ThermalThrotter);
+               dev_info(smu->adev->dev, "                   .I2cProtocol = 0x%x\n",
+                               pptable->I2cControllers[i].I2cProtocol);
+               dev_info(smu->adev->dev, "                   .PaddingConfig = 0x%x\n",
+                               pptable->I2cControllers[i].PaddingConfig);
+       }
+
+       dev_info(smu->adev->dev, "GpioScl = 0x%x\n", pptable->GpioScl);
+       dev_info(smu->adev->dev, "GpioSda = 0x%x\n", pptable->GpioSda);
+       dev_info(smu->adev->dev, "FchUsbPdSlaveAddr = 0x%x\n", pptable->FchUsbPdSlaveAddr);
+       dev_info(smu->adev->dev, "I2cSpare[0] = 0x%x\n", pptable->I2cSpare[0]);
+
+       dev_info(smu->adev->dev, "Board Parameters:\n");
+       dev_info(smu->adev->dev, "VddGfxVrMapping = 0x%x\n", pptable->VddGfxVrMapping);
+       dev_info(smu->adev->dev, "VddSocVrMapping = 0x%x\n", pptable->VddSocVrMapping);
+       dev_info(smu->adev->dev, "VddMem0VrMapping = 0x%x\n", pptable->VddMem0VrMapping);
+       dev_info(smu->adev->dev, "VddMem1VrMapping = 0x%x\n", pptable->VddMem1VrMapping);
+       dev_info(smu->adev->dev, "GfxUlvPhaseSheddingMask = 0x%x\n", pptable->GfxUlvPhaseSheddingMask);
+       dev_info(smu->adev->dev, "SocUlvPhaseSheddingMask = 0x%x\n", pptable->SocUlvPhaseSheddingMask);
+       dev_info(smu->adev->dev, "VddciUlvPhaseSheddingMask = 0x%x\n", pptable->VddciUlvPhaseSheddingMask);
+       dev_info(smu->adev->dev, "MvddUlvPhaseSheddingMask = 0x%x\n", pptable->MvddUlvPhaseSheddingMask);
+
+       dev_info(smu->adev->dev, "GfxMaxCurrent = 0x%x\n", pptable->GfxMaxCurrent);
+       dev_info(smu->adev->dev, "GfxOffset = 0x%x\n", pptable->GfxOffset);
+       dev_info(smu->adev->dev, "Padding_TelemetryGfx = 0x%x\n", pptable->Padding_TelemetryGfx);
+
+       dev_info(smu->adev->dev, "SocMaxCurrent = 0x%x\n", pptable->SocMaxCurrent);
+       dev_info(smu->adev->dev, "SocOffset = 0x%x\n", pptable->SocOffset);
+       dev_info(smu->adev->dev, "Padding_TelemetrySoc = 0x%x\n", pptable->Padding_TelemetrySoc);
+
+       dev_info(smu->adev->dev, "Mem0MaxCurrent = 0x%x\n", pptable->Mem0MaxCurrent);
+       dev_info(smu->adev->dev, "Mem0Offset = 0x%x\n", pptable->Mem0Offset);
+       dev_info(smu->adev->dev, "Padding_TelemetryMem0 = 0x%x\n", pptable->Padding_TelemetryMem0);
+
+       dev_info(smu->adev->dev, "Mem1MaxCurrent = 0x%x\n", pptable->Mem1MaxCurrent);
+       dev_info(smu->adev->dev, "Mem1Offset = 0x%x\n", pptable->Mem1Offset);
+       dev_info(smu->adev->dev, "Padding_TelemetryMem1 = 0x%x\n", pptable->Padding_TelemetryMem1);
+
+       dev_info(smu->adev->dev, "MvddRatio = 0x%x\n", pptable->MvddRatio);
+
+       dev_info(smu->adev->dev, "AcDcGpio = 0x%x\n", pptable->AcDcGpio);
+       dev_info(smu->adev->dev, "AcDcPolarity = 0x%x\n", pptable->AcDcPolarity);
+       dev_info(smu->adev->dev, "VR0HotGpio = 0x%x\n", pptable->VR0HotGpio);
+       dev_info(smu->adev->dev, "VR0HotPolarity = 0x%x\n", pptable->VR0HotPolarity);
+       dev_info(smu->adev->dev, "VR1HotGpio = 0x%x\n", pptable->VR1HotGpio);
+       dev_info(smu->adev->dev, "VR1HotPolarity = 0x%x\n", pptable->VR1HotPolarity);
+       dev_info(smu->adev->dev, "GthrGpio = 0x%x\n", pptable->GthrGpio);
+       dev_info(smu->adev->dev, "GthrPolarity = 0x%x\n", pptable->GthrPolarity);
+       dev_info(smu->adev->dev, "LedPin0 = 0x%x\n", pptable->LedPin0);
+       dev_info(smu->adev->dev, "LedPin1 = 0x%x\n", pptable->LedPin1);
+       dev_info(smu->adev->dev, "LedPin2 = 0x%x\n", pptable->LedPin2);
+       dev_info(smu->adev->dev, "LedEnableMask = 0x%x\n", pptable->LedEnableMask);
+       dev_info(smu->adev->dev, "LedPcie = 0x%x\n", pptable->LedPcie);
+       dev_info(smu->adev->dev, "LedError = 0x%x\n", pptable->LedError);
+       dev_info(smu->adev->dev, "LedSpare1[0] = 0x%x\n", pptable->LedSpare1[0]);
+       dev_info(smu->adev->dev, "LedSpare1[1] = 0x%x\n", pptable->LedSpare1[1]);
+
+       dev_info(smu->adev->dev, "PllGfxclkSpreadEnabled = 0x%x\n", pptable->PllGfxclkSpreadEnabled);
+       dev_info(smu->adev->dev, "PllGfxclkSpreadPercent = 0x%x\n", pptable->PllGfxclkSpreadPercent);
+       dev_info(smu->adev->dev, "PllGfxclkSpreadFreq = 0x%x\n",    pptable->PllGfxclkSpreadFreq);
+
+       dev_info(smu->adev->dev, "DfllGfxclkSpreadEnabled = 0x%x\n", pptable->DfllGfxclkSpreadEnabled);
+       dev_info(smu->adev->dev, "DfllGfxclkSpreadPercent = 0x%x\n", pptable->DfllGfxclkSpreadPercent);
+       dev_info(smu->adev->dev, "DfllGfxclkSpreadFreq = 0x%x\n",    pptable->DfllGfxclkSpreadFreq);
+
+       dev_info(smu->adev->dev, "UclkSpreadPadding = 0x%x\n", pptable->UclkSpreadPadding);
+       dev_info(smu->adev->dev, "UclkSpreadFreq = 0x%x\n", pptable->UclkSpreadFreq);
+
+       dev_info(smu->adev->dev, "FclkSpreadEnabled = 0x%x\n", pptable->FclkSpreadEnabled);
+       dev_info(smu->adev->dev, "FclkSpreadPercent = 0x%x\n", pptable->FclkSpreadPercent);
+       dev_info(smu->adev->dev, "FclkSpreadFreq = 0x%x\n", pptable->FclkSpreadFreq);
+
+       dev_info(smu->adev->dev, "MemoryChannelEnabled = 0x%x\n", pptable->MemoryChannelEnabled);
+       dev_info(smu->adev->dev, "DramBitWidth = 0x%x\n", pptable->DramBitWidth);
+       dev_info(smu->adev->dev, "PaddingMem1[0] = 0x%x\n", pptable->PaddingMem1[0]);
+       dev_info(smu->adev->dev, "PaddingMem1[1] = 0x%x\n", pptable->PaddingMem1[1]);
+       dev_info(smu->adev->dev, "PaddingMem1[2] = 0x%x\n", pptable->PaddingMem1[2]);
+
+       dev_info(smu->adev->dev, "TotalBoardPower = 0x%x\n", pptable->TotalBoardPower);
+       dev_info(smu->adev->dev, "BoardPowerPadding = 0x%x\n", pptable->BoardPowerPadding);
+
+       dev_info(smu->adev->dev, "XgmiLinkSpeed\n");
+       for (i = 0; i < NUM_XGMI_PSTATE_LEVELS; i++)
+               dev_info(smu->adev->dev, "  .[%d] = 0x%x\n", i, pptable->XgmiLinkSpeed[i]);
+       dev_info(smu->adev->dev, "XgmiLinkWidth\n");
+       for (i = 0; i < NUM_XGMI_PSTATE_LEVELS; i++)
+               dev_info(smu->adev->dev, "  .[%d] = 0x%x\n", i, pptable->XgmiLinkWidth[i]);
+       dev_info(smu->adev->dev, "XgmiFclkFreq\n");
+       for (i = 0; i < NUM_XGMI_PSTATE_LEVELS; i++)
+               dev_info(smu->adev->dev, "  .[%d] = 0x%x\n", i, pptable->XgmiFclkFreq[i]);
+       dev_info(smu->adev->dev, "XgmiSocVoltage\n");
+       for (i = 0; i < NUM_XGMI_PSTATE_LEVELS; i++)
+               dev_info(smu->adev->dev, "  .[%d] = 0x%x\n", i, pptable->XgmiSocVoltage[i]);
+
+       dev_info(smu->adev->dev, "HsrEnabled = 0x%x\n", pptable->HsrEnabled);
+       dev_info(smu->adev->dev, "VddqOffEnabled = 0x%x\n", pptable->VddqOffEnabled);
+       dev_info(smu->adev->dev, "PaddingUmcFlags[0] = 0x%x\n", pptable->PaddingUmcFlags[0]);
+       dev_info(smu->adev->dev, "PaddingUmcFlags[1] = 0x%x\n", pptable->PaddingUmcFlags[1]);
+
+       dev_info(smu->adev->dev, "BoardReserved[0] = 0x%x\n", pptable->BoardReserved[0]);
+       dev_info(smu->adev->dev, "BoardReserved[1] = 0x%x\n", pptable->BoardReserved[1]);
+       dev_info(smu->adev->dev, "BoardReserved[2] = 0x%x\n", pptable->BoardReserved[2]);
+       dev_info(smu->adev->dev, "BoardReserved[3] = 0x%x\n", pptable->BoardReserved[3]);
+       dev_info(smu->adev->dev, "BoardReserved[4] = 0x%x\n", pptable->BoardReserved[4]);
+       dev_info(smu->adev->dev, "BoardReserved[5] = 0x%x\n", pptable->BoardReserved[5]);
+       dev_info(smu->adev->dev, "BoardReserved[6] = 0x%x\n", pptable->BoardReserved[6]);
+       dev_info(smu->adev->dev, "BoardReserved[7] = 0x%x\n", pptable->BoardReserved[7]);
+       dev_info(smu->adev->dev, "BoardReserved[8] = 0x%x\n", pptable->BoardReserved[8]);
+       dev_info(smu->adev->dev, "BoardReserved[9] = 0x%x\n", pptable->BoardReserved[9]);
+       dev_info(smu->adev->dev, "BoardReserved[10] = 0x%x\n", pptable->BoardReserved[10]);
+
+       dev_info(smu->adev->dev, "MmHubPadding[0] = 0x%x\n", pptable->MmHubPadding[0]);
+       dev_info(smu->adev->dev, "MmHubPadding[1] = 0x%x\n", pptable->MmHubPadding[1]);
+       dev_info(smu->adev->dev, "MmHubPadding[2] = 0x%x\n", pptable->MmHubPadding[2]);
+       dev_info(smu->adev->dev, "MmHubPadding[3] = 0x%x\n", pptable->MmHubPadding[3]);
+       dev_info(smu->adev->dev, "MmHubPadding[4] = 0x%x\n", pptable->MmHubPadding[4]);
+       dev_info(smu->adev->dev, "MmHubPadding[5] = 0x%x\n", pptable->MmHubPadding[5]);
+       dev_info(smu->adev->dev, "MmHubPadding[6] = 0x%x\n", pptable->MmHubPadding[6]);
+       dev_info(smu->adev->dev, "MmHubPadding[7] = 0x%x\n", pptable->MmHubPadding[7]);
+}
+
+static void sienna_cichlid_dump_pptable(struct smu_context *smu)
+{
+       struct smu_table_context *table_context = &smu->smu_table;
+       PPTable_t *pptable = table_context->driver_pptable;
+       int i;
+
+       if (smu->adev->asic_type == CHIP_BEIGE_GOBY) {
+               beige_goby_dump_pptable(smu);
+               return;
+       }
+
+       dev_info(smu->adev->dev, "Dumped PPTable:\n");
+
+       dev_info(smu->adev->dev, "Version = 0x%08x\n", pptable->Version);
+       dev_info(smu->adev->dev, "FeaturesToRun[0] = 0x%08x\n", pptable->FeaturesToRun[0]);
+       dev_info(smu->adev->dev, "FeaturesToRun[1] = 0x%08x\n", pptable->FeaturesToRun[1]);
+
+       for (i = 0; i < PPT_THROTTLER_COUNT; i++) {
+               dev_info(smu->adev->dev, "SocketPowerLimitAc[%d] = 0x%x\n", i, pptable->SocketPowerLimitAc[i]);
+               dev_info(smu->adev->dev, "SocketPowerLimitAcTau[%d] = 0x%x\n", i, pptable->SocketPowerLimitAcTau[i]);
+               dev_info(smu->adev->dev, "SocketPowerLimitDc[%d] = 0x%x\n", i, pptable->SocketPowerLimitDc[i]);
+               dev_info(smu->adev->dev, "SocketPowerLimitDcTau[%d] = 0x%x\n", i, pptable->SocketPowerLimitDcTau[i]);
+       }
+
+       for (i = 0; i < TDC_THROTTLER_COUNT; i++) {
+               dev_info(smu->adev->dev, "TdcLimit[%d] = 0x%x\n", i, pptable->TdcLimit[i]);
+               dev_info(smu->adev->dev, "TdcLimitTau[%d] = 0x%x\n", i, pptable->TdcLimitTau[i]);
+       }
+
+       for (i = 0; i < TEMP_COUNT; i++) {
+               dev_info(smu->adev->dev, "TemperatureLimit[%d] = 0x%x\n", i, pptable->TemperatureLimit[i]);
+       }
+
+       dev_info(smu->adev->dev, "FitLimit = 0x%x\n", pptable->FitLimit);
+       dev_info(smu->adev->dev, "TotalPowerConfig = 0x%x\n", pptable->TotalPowerConfig);
+       dev_info(smu->adev->dev, "TotalPowerPadding[0] = 0x%x\n", pptable->TotalPowerPadding[0]);
+       dev_info(smu->adev->dev, "TotalPowerPadding[1] = 0x%x\n", pptable->TotalPowerPadding[1]);
+       dev_info(smu->adev->dev, "TotalPowerPadding[2] = 0x%x\n", pptable->TotalPowerPadding[2]);
+
+       dev_info(smu->adev->dev, "ApccPlusResidencyLimit = 0x%x\n", pptable->ApccPlusResidencyLimit);
+       for (i = 0; i < NUM_SMNCLK_DPM_LEVELS; i++) {
+               dev_info(smu->adev->dev, "SmnclkDpmFreq[%d] = 0x%x\n", i, pptable->SmnclkDpmFreq[i]);
+               dev_info(smu->adev->dev, "SmnclkDpmVoltage[%d] = 0x%x\n", i, pptable->SmnclkDpmVoltage[i]);
+       }
+       dev_info(smu->adev->dev, "ThrottlerControlMask = 0x%x\n", pptable->ThrottlerControlMask);
+
+       dev_info(smu->adev->dev, "FwDStateMask = 0x%x\n", pptable->FwDStateMask);
+
+       dev_info(smu->adev->dev, "UlvVoltageOffsetSoc = 0x%x\n", pptable->UlvVoltageOffsetSoc);
+       dev_info(smu->adev->dev, "UlvVoltageOffsetGfx = 0x%x\n", pptable->UlvVoltageOffsetGfx);
+       dev_info(smu->adev->dev, "MinVoltageUlvGfx = 0x%x\n", pptable->MinVoltageUlvGfx);
+       dev_info(smu->adev->dev, "MinVoltageUlvSoc = 0x%x\n", pptable->MinVoltageUlvSoc);
+
        dev_info(smu->adev->dev, "SocLIVmin = 0x%x\n", pptable->SocLIVmin);
        dev_info(smu->adev->dev, "PaddingLIVmin = 0x%x\n", pptable->PaddingLIVmin);
 
@@ -2950,8 +3673,8 @@ static ssize_t sienna_cichlid_get_gpu_metrics(struct smu_context *smu,
                                              void **table)
 {
        struct smu_table_context *smu_table = &smu->smu_table;
-       struct gpu_metrics_v1_1 *gpu_metrics =
-               (struct gpu_metrics_v1_1 *)smu_table->gpu_metrics_table;
+       struct gpu_metrics_v1_3 *gpu_metrics =
+               (struct gpu_metrics_v1_3 *)smu_table->gpu_metrics_table;
        SmuMetricsExternal_t metrics_external;
        SmuMetrics_t *metrics =
                &(metrics_external.SmuMetrics);
@@ -2965,7 +3688,7 @@ static ssize_t sienna_cichlid_get_gpu_metrics(struct smu_context *smu,
        if (ret)
                return ret;
 
-       smu_cmn_init_soft_gpu_metrics(gpu_metrics, 1, 1);
+       smu_cmn_init_soft_gpu_metrics(gpu_metrics, 1, 3);
 
        gpu_metrics->temperature_edge = metrics->TemperatureEdge;
        gpu_metrics->temperature_hotspot = metrics->TemperatureHotspot;
@@ -3000,6 +3723,9 @@ static ssize_t sienna_cichlid_get_gpu_metrics(struct smu_context *smu,
        gpu_metrics->current_dclk1 = metrics->CurrClock[PPCLK_DCLK_1];
 
        gpu_metrics->throttle_status = metrics->ThrottlerStatus;
+       gpu_metrics->indep_throttle_status =
+                       smu_cmn_get_indep_throttler_status(metrics->ThrottlerStatus,
+                                                          sienna_cichlid_throttler_map);
 
        gpu_metrics->current_fan_speed = metrics->CurrFanSpeed;
 
@@ -3022,7 +3748,7 @@ static ssize_t sienna_cichlid_get_gpu_metrics(struct smu_context *smu,
 
        *table = (void *)gpu_metrics;
 
-       return sizeof(struct gpu_metrics_v1_1);
+       return sizeof(struct gpu_metrics_v1_3);
 }
 
 static int sienna_cichlid_enable_mgpu_fan_boost(struct smu_context *smu)
@@ -3202,11 +3928,11 @@ static const struct pptable_funcs sienna_cichlid_ppt_funcs = {
        .register_irq_handler = smu_v11_0_register_irq_handler,
        .set_azalia_d3_pme = smu_v11_0_set_azalia_d3_pme,
        .get_max_sustainable_clocks_by_dc = smu_v11_0_get_max_sustainable_clocks_by_dc,
-       .baco_is_support= sienna_cichlid_is_baco_supported,
+       .baco_is_support = smu_v11_0_baco_is_support,
        .baco_get_state = smu_v11_0_baco_get_state,
        .baco_set_state = smu_v11_0_baco_set_state,
-       .baco_enter = smu_v11_0_baco_enter,
-       .baco_exit = smu_v11_0_baco_exit,
+       .baco_enter = sienna_cichlid_baco_enter,
+       .baco_exit = sienna_cichlid_baco_exit,
        .mode1_reset_is_support = sienna_cichlid_is_mode1_reset_supported,
        .mode1_reset = smu_v11_0_mode1_reset,
        .get_dpm_ultimate_freq = sienna_cichlid_get_dpm_ultimate_freq,