Skip to contentSkip to conversation

drm/amd/pm: enable mode1 reset on smu_v13_0_10

PATCH In review Kenneth Feng 3 participants 3 messages Nov 8, 2022

Subsystems (3)
lore
Share & tools
lore

Kenneth Feng

author maintainer
#0 lore raw

PATCH v2 1/1 drm/amd/pm: enable mode1 reset on smu_v13_0_10

enable mode1 reset and prioritize debug port on msu_v13_0_10 as a more reliable message processing

v2 - move mode1 reset callback to smu_v13_0_0_ppt.c

---
 drivers/gpu/drm/amd/amdgpu/soc21.c            |  1 +
 drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h |  4 ++
 .../drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c  | 53 ++++++++++++++++++-
 drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c        | 18 +++++++
 drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h        |  3 ++
 5 files changed, 77 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/soc21.c +1 -0
index 1d4013ed0d10..b258e9aa0558 100644
@@ -322,6 +322,7 @@ soc21_asic_reset_method(struct amdgpu_device *adev)
 	switch (adev->ip_versions[MP1_HWIP][0]) {
 	case IP_VERSION(13, 0, 0):
 	case IP_VERSION(13, 0, 7):
+	case IP_VERSION(13, 0, 10):
 		return AMD_RESET_METHOD_MODE1;
 	case IP_VERSION(13, 0, 4):
 		return AMD_RESET_METHOD_MODE2;
drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h +4 -0
index e2fa3b066b96..1bc26e93a83c 100644
@@ -568,6 +568,10 @@ struct smu_context
 	u32 param_reg;
 	u32 msg_reg;
 	u32 resp_reg;
+
+	u32 debug_param_reg;
+	u32 debug_msg_reg;
+	u32 debug_resp_reg;
 };
 
 struct i2c_adapter;
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c +51 -2

75 lines not on this page · raw message

drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c +18 -0
index e4f8f90ac5aa..768b6e7dbd77 100644
@@ -233,6 +233,18 @@ static void __smu_cmn_send_msg(struct smu_context *smu,
 	WREG32(smu->msg_reg, msg);
 }
 
+static int __smu_cmn_send_debug_msg(struct smu_context *smu,
+			       u32 msg,
+			       u32 param)
+{
+	struct amdgpu_device *adev = smu->adev;
+
+	WREG32(smu->debug_param_reg, param);
+	WREG32(smu->debug_msg_reg, msg);
+	WREG32(smu->debug_resp_reg, 0);
+
+	return 0;
+}
 /**
  * smu_cmn_send_msg_without_waiting -- send the message; don't wait for status
  * @smu: pointer to an SMU context
@@ -386,6 +398,12 @@ int smu_cmn_send_smc_msg(struct smu_context *smu,
 					       read_arg);
 }
 
+int smu_cmn_send_debug_smc_msg(struct smu_context *smu,
+			 uint32_t msg)
+{
+	return __smu_cmn_send_debug_msg(smu, msg, 0);
+}
+
 int smu_cmn_to_asic_specific_index(struct smu_context *smu,
 				   enum smu_cmn2asic_mapping_type type,
 				   uint32_t index)
drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h +3 -0
index 1526ce09c399..f82cf76dd3a4 100644
@@ -42,6 +42,9 @@ int smu_cmn_send_smc_msg(struct smu_context *smu,
 			 enum smu_message_type msg,
 			 uint32_t *read_arg);
 
+int smu_cmn_send_debug_smc_msg(struct smu_context *smu,
+			 uint32_t msg);
+
 int smu_cmn_wait_for_response(struct smu_context *smu);
 
 int smu_cmn_to_asic_specific_index(struct smu_context *smu,
Signature · 1 line
2.25.1
Reviewed-by on v2 1/1
#1 lore raw

[AMD Official Use Only - General]

a typo issue in commit message: "msu",
and one comment inline.

Best Regards
Kevin
________________________________
发件人: amd-gfx <[email protected]> 代表 Kenneth Feng <[email protected]> 发送时间: 2022年11月8日星期二 上午8:36
收件人: [email protected]
抄送: Feng, Kenneth
主题: [PATCH v2] drm/amd/pm: enable mode1 reset on smu_v13_0_10

enable mode1 reset and prioritize debug port on msu_v13_0_10 as a more reliable message processing

v2 - move mode1 reset callback to smu_v13_0_0_ppt.c

---
 drivers/gpu/drm/amd/amdgpu/soc21.c            |  1 +
 drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h |  4 ++
 .../drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c  | 53 ++++++++++++++++++-
 drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c        | 18 +++++++
 drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h        |  3 ++
 5 files changed, 77 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/soc21.c +1 -0
index 1d4013ed0d10..b258e9aa0558 100644
@@ -322,6 +322,7 @@ soc21_asic_reset_method(struct amdgpu_device *adev)
         switch (adev->ip_versions[MP1_HWIP][0]) {
         case IP_VERSION(13, 0, 0):
         case IP_VERSION(13, 0, 7):
+       case IP_VERSION(13, 0, 10):
                 return AMD_RESET_METHOD_MODE1;
         case IP_VERSION(13, 0, 4):
                 return AMD_RESET_METHOD_MODE2;
drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h +4 -0
index e2fa3b066b96..1bc26e93a83c 100644
@@ -568,6 +568,10 @@ struct smu_context
         u32 param_reg;
         u32 msg_reg;
         u32 resp_reg;
+
+       u32 debug_param_reg;
+       u32 debug_msg_reg;
+       u32 debug_resp_reg;
 };
 
 struct i2c_adapter;
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c +23 -0
index 29529328152d..588527310188 100644
@@ -70,6 +70,26 @@
 
 #define MP0_MP1_DATA_REGION_SIZE_COMBOPPTABLE   0x4000
 
+#define mmMP1_SMN_C2PMSG_66                                                                            0x0282
+#define mmMP1_SMN_C2PMSG_66_BASE_IDX                                                                   0
+
+#define mmMP1_SMN_C2PMSG_82                                                                            0x0292
+#define mmMP1_SMN_C2PMSG_82_BASE_IDX                                                                   0
+
+#define mmMP1_SMN_C2PMSG_90                                                                            0x029a
+#define mmMP1_SMN_C2PMSG_90_BASE_IDX                                                                   0
+
+#define mmMP1_SMN_C2PMSG_75                                                                            0x028b
+#define mmMP1_SMN_C2PMSG_75_BASE_IDX                                                                   0
+
+#define mmMP1_SMN_C2PMSG_53                                                                            0x0275
+#define mmMP1_SMN_C2PMSG_53_BASE_IDX                                                                   0
+
+#define mmMP1_SMN_C2PMSG_54                                                                            0x0276
+#define mmMP1_SMN_C2PMSG_54_BASE_IDX                                                                   0
+
+#define DEBUGSMC_MSG_Mode1Reset        2
+
 static struct cmn2asic_msg_mapping smu_v13_0_0_message_map[SMU_MSG_MAX_COUNT] = {
         MSG_MAP(TestMessage,                    PPSMC_MSG_TestMessage,                 1),
         MSG_MAP(GetSmuVersion,                  PPSMC_MSG_GetSmuVersion,               1),
@@ -1763,6 +1783,35 @@ static int smu_v13_0_0_set_df_cstate(struct smu_context *smu,
                                                NULL);
 }
 
+static int smu_v13_0_0_mode1_reset(struct smu_context *smu)
+{
+       int ret = 0;

kevin:
No initialization required

+ struct amdgpu_device *adev = smu->adev;
+
+ if (adev->ip_versions[MP1_HWIP][0] == IP_VERSION(13, 0, 10))
+ ret = smu_cmn_send_debug_smc_msg(smu, DEBUGSMC_MSG_Mode1Reset);
+ else
+ ret = smu_cmn_send_smc_msg(smu, SMU_MSG_Mode1Reset, NULL);
+
+ if (!ret)
+ msleep(SMU13_MODE1_RESET_WAIT_TIME_IN_MS);
+
+ return ret;
+}
+
+static void smu_v13_0_0_set_smu_mailbox_registers(struct smu_context *smu) +{
+ struct amdgpu_device *adev = smu->adev;
+

+       smu->param_reg = SOC15_REG_OFFSET(MP1, 0, mmMP1_SMN_C2PMSG_82);
+       smu->msg_reg = SOC15_REG_OFFSET(MP1, 0, mmMP1_SMN_C2PMSG_66);
+       smu->resp_reg = SOC15_REG_OFFSET(MP1, 0, mmMP1_SMN_C2PMSG_90);
+
+       smu->debug_param_reg = SOC15_REG_OFFSET(MP1, 0, mmMP1_SMN_C2PMSG_53);
+       smu->debug_msg_reg = SOC15_REG_OFFSET(MP1, 0, mmMP1_SMN_C2PMSG_75);
+       smu->debug_resp_reg = SOC15_REG_OFFSET(MP1, 0, mmMP1_SMN_C2PMSG_54);
+}
+
 static const struct pptable_funcs smu_v13_0_0_ppt_funcs = {
         .get_allowed_feature_mask = smu_v13_0_0_get_allowed_feature_mask,
         .set_default_dpm_table = smu_v13_0_0_set_default_dpm_table,
@@ -1830,7 +1879,7 @@ static const struct pptable_funcs smu_v13_0_0_ppt_funcs = {
         .baco_enter = smu_v13_0_baco_enter,
         .baco_exit = smu_v13_0_baco_exit,
         .mode1_reset_is_support = smu_v13_0_0_is_mode1_reset_supported,
-       .mode1_reset = smu_v13_0_mode1_reset,
+       .mode1_reset = smu_v13_0_0_mode1_reset,
         .set_mp1_state = smu_v13_0_0_set_mp1_state,
         .set_df_cstate = smu_v13_0_0_set_df_cstate,
 };
@@ -1844,5 +1893,5 @@ void smu_v13_0_0_set_ppt_funcs(struct smu_context *smu)
         smu->table_map = smu_v13_0_0_table_map;
         smu->pwr_src_map = smu_v13_0_0_pwr_src_map;
         smu->workload_map = smu_v13_0_0_workload_map;

- smu_v13_0_set_smu_mailbox_registers(smu);
+ smu_v13_0_0_set_smu_mailbox_registers(smu);
}

drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c +18 -0
index e4f8f90ac5aa..768b6e7dbd77 100644
@@ -233,6 +233,18 @@ static void __smu_cmn_send_msg(struct smu_context *smu,
         WREG32(smu->msg_reg, msg);
 }
 
+static int __smu_cmn_send_debug_msg(struct smu_context *smu,
+                              u32 msg,
+                              u32 param)
+{
+       struct amdgpu_device *adev = smu->adev;
+
+       WREG32(smu->debug_param_reg, param);
+       WREG32(smu->debug_msg_reg, msg);
+       WREG32(smu->debug_resp_reg, 0);
+
+       return 0;
+}
 /**
  * smu_cmn_send_msg_without_waiting -- send the message; don't wait for status
  * @smu: pointer to an SMU context
@@ -386,6 +398,12 @@ int smu_cmn_send_smc_msg(struct smu_context *smu,
                                                read_arg);
 }
 
+int smu_cmn_send_debug_smc_msg(struct smu_context *smu,
+                        uint32_t msg)
+{
+       return __smu_cmn_send_debug_msg(smu, msg, 0);
+}
+
 int smu_cmn_to_asic_specific_index(struct smu_context *smu,
                                    enum smu_cmn2asic_mapping_type type,
                                    uint32_t index)
drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h +3 -0
index 1526ce09c399..f82cf76dd3a4 100644
@@ -42,6 +42,9 @@ int smu_cmn_send_smc_msg(struct smu_context *smu,
                          enum smu_message_type msg,
                          uint32_t *read_arg);
 
+int smu_cmn_send_debug_smc_msg(struct smu_context *smu,
+                        uint32_t msg);
+
 int smu_cmn_wait_for_response(struct smu_context *smu);
 
 int smu_cmn_to_asic_specific_index(struct smu_context *smu,

--
2.25.1

#2 lore raw
In reply to Kenneth Feng
Quoted 148 lines · Kenneth Feng

enable mode1 reset and prioritize debug port on msu_v13_0_10 as a more reliable message processing

v2 - move mode1 reset callback to smu_v13_0_0_ppt.c

---
  drivers/gpu/drm/amd/amdgpu/soc21.c            |  1 +
  drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h |  4 ++
  .../drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c  | 53 ++++++++++++++++++-
  drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c        | 18 +++++++
  drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h        |  3 ++
  5 files changed, 77 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/soc21.c +1 -0
index 1d4013ed0d10..b258e9aa0558 100644
@@ -322,6 +322,7 @@ soc21_asic_reset_method(struct amdgpu_device *adev)
  	switch (adev->ip_versions[MP1_HWIP][0]) {
  	case IP_VERSION(13, 0, 0):
  	case IP_VERSION(13, 0, 7):
+	case IP_VERSION(13, 0, 10):
  		return AMD_RESET_METHOD_MODE1;
  	case IP_VERSION(13, 0, 4):
  		return AMD_RESET_METHOD_MODE2;
drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h +4 -0
index e2fa3b066b96..1bc26e93a83c 100644
@@ -568,6 +568,10 @@ struct smu_context
  	u32 param_reg;
  	u32 msg_reg;
  	u32 resp_reg;
+
+	u32 debug_param_reg;
+	u32 debug_msg_reg;
+	u32 debug_resp_reg;
  };
 
  struct i2c_adapter;
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c +51 -2
index 29529328152d..588527310188 100644
@@ -70,6 +70,26 @@
 
  #define MP0_MP1_DATA_REGION_SIZE_COMBOPPTABLE	0x4000
 
+#define mmMP1_SMN_C2PMSG_66                                                                            0x0282
+#define mmMP1_SMN_C2PMSG_66_BASE_IDX                                                                   0
+
+#define mmMP1_SMN_C2PMSG_82                                                                            0x0292
+#define mmMP1_SMN_C2PMSG_82_BASE_IDX                                                                   0
+
+#define mmMP1_SMN_C2PMSG_90                                                                            0x029a
+#define mmMP1_SMN_C2PMSG_90_BASE_IDX                                                                   0
+
+#define mmMP1_SMN_C2PMSG_75                                                                            0x028b
+#define mmMP1_SMN_C2PMSG_75_BASE_IDX                                                                   0
+
+#define mmMP1_SMN_C2PMSG_53                                                                            0x0275
+#define mmMP1_SMN_C2PMSG_53_BASE_IDX                                                                   0
+
+#define mmMP1_SMN_C2PMSG_54                                                                            0x0276
+#define mmMP1_SMN_C2PMSG_54_BASE_IDX                                                                   0
+
+#define DEBUGSMC_MSG_Mode1Reset	2
+
  static struct cmn2asic_msg_mapping smu_v13_0_0_message_map[SMU_MSG_MAX_COUNT] = {
  	MSG_MAP(TestMessage,			PPSMC_MSG_TestMessage,                 1),
  	MSG_MAP(GetSmuVersion,			PPSMC_MSG_GetSmuVersion,               1),
@@ -1763,6 +1783,35 @@ static int smu_v13_0_0_set_df_cstate(struct smu_context *smu,
  					       NULL);
  }
 
+static int smu_v13_0_0_mode1_reset(struct smu_context *smu)
+{
+	int ret = 0;
+	struct amdgpu_device *adev = smu->adev;
+
+	if (adev->ip_versions[MP1_HWIP][0] == IP_VERSION(13, 0, 10))
+		ret = smu_cmn_send_debug_smc_msg(smu, DEBUGSMC_MSG_Mode1Reset);
+	else
+		ret = smu_cmn_send_smc_msg(smu, SMU_MSG_Mode1Reset, NULL);
+
+	if (!ret)
+		msleep(SMU13_MODE1_RESET_WAIT_TIME_IN_MS);
+
+	return ret;
+}
+
+static void smu_v13_0_0_set_smu_mailbox_registers(struct smu_context *smu)
+{
+	struct amdgpu_device *adev = smu->adev;
+
+	smu->param_reg = SOC15_REG_OFFSET(MP1, 0, mmMP1_SMN_C2PMSG_82);
+	smu->msg_reg = SOC15_REG_OFFSET(MP1, 0, mmMP1_SMN_C2PMSG_66);
+	smu->resp_reg = SOC15_REG_OFFSET(MP1, 0, mmMP1_SMN_C2PMSG_90);
+
+	smu->debug_param_reg = SOC15_REG_OFFSET(MP1, 0, mmMP1_SMN_C2PMSG_53);
+	smu->debug_msg_reg = SOC15_REG_OFFSET(MP1, 0, mmMP1_SMN_C2PMSG_75);
+	smu->debug_resp_reg = SOC15_REG_OFFSET(MP1, 0, mmMP1_SMN_C2PMSG_54);
+}
+
  static const struct pptable_funcs smu_v13_0_0_ppt_funcs = {
  	.get_allowed_feature_mask = smu_v13_0_0_get_allowed_feature_mask,
  	.set_default_dpm_table = smu_v13_0_0_set_default_dpm_table,
@@ -1830,7 +1879,7 @@ static const struct pptable_funcs smu_v13_0_0_ppt_funcs = {
  	.baco_enter = smu_v13_0_baco_enter,
  	.baco_exit = smu_v13_0_baco_exit,
  	.mode1_reset_is_support = smu_v13_0_0_is_mode1_reset_supported,
-	.mode1_reset = smu_v13_0_mode1_reset,
+	.mode1_reset = smu_v13_0_0_mode1_reset,
  	.set_mp1_state = smu_v13_0_0_set_mp1_state,
  	.set_df_cstate = smu_v13_0_0_set_df_cstate,
  };
@@ -1844,5 +1893,5 @@ void smu_v13_0_0_set_ppt_funcs(struct smu_context *smu)
  	smu->table_map = smu_v13_0_0_table_map;
  	smu->pwr_src_map = smu_v13_0_0_pwr_src_map;
  	smu->workload_map = smu_v13_0_0_workload_map;
-	smu_v13_0_set_smu_mailbox_registers(smu);
+	smu_v13_0_0_set_smu_mailbox_registers(smu);
  }
drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c +12 -0
index e4f8f90ac5aa..768b6e7dbd77 100644
@@ -233,6 +233,18 @@ static void __smu_cmn_send_msg(struct smu_context *smu,
  	WREG32(smu->msg_reg, msg);
  }
 
+static int __smu_cmn_send_debug_msg(struct smu_context *smu,
+			       u32 msg,
+			       u32 param)
+{
+	struct amdgpu_device *adev = smu->adev;
+
+	WREG32(smu->debug_param_reg, param);
+	WREG32(smu->debug_msg_reg, msg);
+	WREG32(smu->debug_resp_reg, 0);
+
+	return 0;
+}
  /**
   * smu_cmn_send_msg_without_waiting -- send the message; don't wait for status
   * @smu: pointer to an SMU context

drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c int smu_cmn_send_smc_msg(struct smu_context *smu, · line 403

Quoted 6 lines
drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c +3 -0
@@ -386,6 +398,12 @@ int smu_cmn_send_smc_msg(struct smu_context *smu,
  					       read_arg);
  }
 
+int smu_cmn_send_debug_smc_msg(struct smu_context *smu,
+			 uint32_t msg) > +{
+	return __smu_cmn_send_debug_msg(smu, msg, 0);

Since this is a common API interface, passing 0 as param value doesn't look good.Instead keep the param also as part of the argument and pass 0 as value from the caller (for ex:smu v13.0.10 implementation in this case)

Thanks,
Lijo

Quoted 19 lines
drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c +2 -0
+}
+
  int smu_cmn_to_asic_specific_index(struct smu_context *smu,
  				   enum smu_cmn2asic_mapping_type type,
  				   uint32_t index)
drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h +3 -0
index 1526ce09c399..f82cf76dd3a4 100644
@@ -42,6 +42,9 @@ int smu_cmn_send_smc_msg(struct smu_context *smu,
  			 enum smu_message_type msg,
  			 uint32_t *read_arg);
 
+int smu_cmn_send_debug_smc_msg(struct smu_context *smu,
+			 uint32_t msg);
+
  int smu_cmn_wait_for_response(struct smu_context *smu);
 
  int smu_cmn_to_asic_specific_index(struct smu_context *smu,