drm/amd/swsmu: add if condition for smu v14.0.1
Subsystems (3)
PATCH 1/1 drm/amd/swsmu: add if condition for smu v14.0.1
smu v14.0.1 re-used smu v14.0.0
--- drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c +4 -4
@@ -136,7 +136,7 @@ int smu_v14_0_load_microcode(struct smu_context *smu) 1 & ~MP1_SMN_PUB_CTRL__LX3_RESET_MASK);for (i =0 ; i < adev->usec_timeout; i++) { -if (amdgpu_ip_version (adev,MP1_HWIP ,0 ) ==IP_VERSION (14 ,0 ,0 )) +if (amdgpu_ip_version (adev,MP1_HWIP ,0 ) ==IP_VERSION (14 ,0 ,0 ) ||amdgpu_ip_version (adev,MP1_HWIP ,0 ) ==IP_VERSION (14 ,0 ,1 )) mp1_fw_flags =RREG32_PCIE (MP1_Public | (smnMP1_FIRMWARE_FLAGS_14_0_0 &0xffffffff ));else
@@ -209,7 +209,7 @@ int smu_v14_0_check_fw_status(struct smu_context *smu)struct amdgpu_device *adev = smu->adev;uint32_t mp1_fw_flags; -if (amdgpu_ip_version (adev,MP1_HWIP ,0 ) ==IP_VERSION (14 ,0 ,0 )) +if (amdgpu_ip_version (adev,MP1_HWIP ,0 ) ==IP_VERSION (14 ,0 ,0 ) ||amdgpu_ip_version (adev,MP1_HWIP ,0 ) ==IP_VERSION (14 ,0 ,1 )) mp1_fw_flags =RREG32_PCIE (MP1_Public | (smnMP1_FIRMWARE_FLAGS_14_0_0 &0xffffffff ));else
@@ -856,7 +856,7 @@ static int smu_v14_0_set_irq_state(struct amdgpu_device *adev,// TODO /* For MP1 SW irqs */ -if (amdgpu_ip_version (adev,MP1_HWIP ,0 ) ==IP_VERSION (14 ,0 ,0 )) { +if (amdgpu_ip_version (adev,MP1_HWIP ,0 ) ==IP_VERSION (14 ,0 ,0 ) ||amdgpu_ip_version (adev,MP1_HWIP ,0 ) ==IP_VERSION (14 ,0 ,1 )) { val =RREG32_SOC15 (MP1 ,0 , regMP1_SMN_IH_SW_INT_CTRL_mp1_14_0_0); val =REG_SET_FIELD (val,MP1_SMN_IH_SW_INT_CTRL ,INT_MASK ,1 );WREG32_SOC15 (MP1 ,0 , regMP1_SMN_IH_SW_INT_CTRL_mp1_14_0_0, val);
@@ -872,7 +872,7 @@ static int smu_v14_0_set_irq_state(struct amdgpu_device *adev,// TODO /* For MP1 SW irqs */ -if (amdgpu_ip_version (adev,MP1_HWIP ,0 ) ==IP_VERSION (14 ,0 ,0 )) { +if (amdgpu_ip_version (adev,MP1_HWIP ,0 ) ==IP_VERSION (14 ,0 ,0 ) ||amdgpu_ip_version (adev,MP1_HWIP ,0 ) ==IP_VERSION (14 ,0 ,1 )) { val =RREG32_SOC15 (MP1 ,0 , regMP1_SMN_IH_SW_INT_mp1_14_0_0); val =REG_SET_FIELD (val,MP1_SMN_IH_SW_INT ,ID ,0xFE ); val =REG_SET_FIELD (val,MP1_SMN_IH_SW_INT ,VALID ,0 );
Signature · 1 line
2.25.1
Quoted 4 lines · Li Ma
smu v14.0.1 re-used smu v14.0.0
Signed-off-by Li Ma <[email protected]>
Quoted 47 lines
--- drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c +4
-5@@ -136,7 +136,7 @@ int smu_v14_0_load_microcode(struct smu_context *smu) 1 & ~MP1_SMN_PUB_CTRL__LX3_RESET_MASK);for (i =0 ; i < adev->usec_timeout; i++) { -if (amdgpu_ip_version (adev,MP1_HWIP ,0 ) ==IP_VERSION (14 ,0 ,0 )) +if (amdgpu_ip_version (adev,MP1_HWIP ,0 ) ==IP_VERSION (14 ,0 ,0 ) ||amdgpu_ip_version (adev,MP1_HWIP ,0 ) ==IP_VERSION (14 ,0 ,1 )) mp1_fw_flags =RREG32_PCIE (MP1_Public | (smnMP1_FIRMWARE_FLAGS_14_0_0 &0xffffffff ));else @@ -209,7 +209,7 @@ int smu_v14_0_check_fw_status(struct smu_context *smu)struct amdgpu_device *adev = smu->adev;uint32_t mp1_fw_flags; -if (amdgpu_ip_version (adev,MP1_HWIP ,0 ) ==IP_VERSION (14 ,0 ,0 )) +if (amdgpu_ip_version (adev,MP1_HWIP ,0 ) ==IP_VERSION (14 ,0 ,0 ) ||amdgpu_ip_version (adev,MP1_HWIP ,0 ) ==IP_VERSION (14 ,0 ,1 )) mp1_fw_flags =RREG32_PCIE (MP1_Public | (smnMP1_FIRMWARE_FLAGS_14_0_0 &0xffffffff ));else @@ -856,7 +856,7 @@ static int smu_v14_0_set_irq_state(struct amdgpu_device *adev,// TODO /* For MP1 SW irqs */ -if (amdgpu_ip_version (adev,MP1_HWIP ,0 ) ==IP_VERSION (14 ,0 ,0 )) { +if (amdgpu_ip_version (adev,MP1_HWIP ,0 ) ==IP_VERSION (14 ,0 ,0 ) ||amdgpu_ip_version (adev,MP1_HWIP ,0 ) ==IP_VERSION (14 ,0 ,1 )) { val =RREG32_SOC15 (MP1 ,0 , regMP1_SMN_IH_SW_INT_CTRL_mp1_14_0_0); val =REG_SET_FIELD (val,MP1_SMN_IH_SW_INT_CTRL ,INT_MASK ,1 );WREG32_SOC15 (MP1 ,0 , regMP1_SMN_IH_SW_INT_CTRL_mp1_14_0_0, val);@@ -872,7 +872,7 @@ static int smu_v14_0_set_irq_state(struct amdgpu_device *adev,// TODO /* For MP1 SW irqs */ -if (amdgpu_ip_version (adev,MP1_HWIP ,0 ) ==IP_VERSION (14 ,0 ,0 )) { +if (amdgpu_ip_version (adev,MP1_HWIP ,0 ) ==IP_VERSION (14 ,0 ,0 ) ||amdgpu_ip_version (adev,MP1_HWIP ,0 ) ==IP_VERSION (14 ,0 ,1 )) { val =RREG32_SOC15 (MP1 ,0 , regMP1_SMN_IH_SW_INT_mp1_14_0_0); val =REG_SET_FIELD (val,MP1_SMN_IH_SW_INT ,ID ,0xFE ); val =REG_SET_FIELD (val,MP1_SMN_IH_SW_INT ,VALID ,0 ); --2.25.1
[AMD Official Use Only - General]
Best Regards,
Yifan
-----Original Message-----
From: Ma, Li <[email protected]>
Sent: Wednesday, April 17, 2024 8:52 PM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>; Zhang, Yifan <[email protected]>; Feng, Kenneth <[email protected]>; Gao, Likun <[email protected]>; Ma, Li <[email protected]>
Subject: [PATCH] drm/amd/swsmu: add if condition for smu v14.0.1
smu v14.0.1 re-used smu v14.0.0
--- drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c +2 -1
@@ -136,7 +136,7 @@ int smu_v14_0_load_microcode(struct smu_context *smu) 1 & ~MP1_SMN_PUB_CTRL__LX3_RESET_MASK);for (i =0 ; i < adev->usec_timeout; i++) { -if (amdgpu_ip_version (adev,MP1_HWIP ,0 ) ==IP_VERSION (14 ,0 ,0 )) +if (amdgpu_ip_version (adev,MP1_HWIP ,0 ) ==IP_VERSION (14 ,0 ,0 ) || +amdgpu_ip_version (adev,MP1_HWIP ,0 ) ==IP_VERSION (14 ,0 ,1 )) mp1_fw_flags =RREG32_PCIE (MP1_Public | (smnMP1_FIRMWARE_FLAGS_14_0_0 &0xffffffff ));
else
@@ -209,7 +209,7 @@ int smu_v14_0_check_fw_status(struct smu_context *smu)
struct amdgpu_device *adev = smu->adev;
uint32_t mp1_fw_flags;- if (amdgpu_ip_version(adev, MP1_HWIP, 0) == IP_VERSION(14, 0, 0))
+ if (amdgpu_ip_version(adev, MP1_HWIP, 0) == IP_VERSION(14, 0, 0) ||
+amdgpu_ip_version(adev, MP1_HWIP, 0) == IP_VERSION(14, 0, 1))
mp1_fw_flags = RREG32_PCIE(MP1_Public |
(smnMP1_FIRMWARE_FLAGS_14_0_0 & 0xffffffff));
else
@@ -856,7 +856,7 @@ static int smu_v14_0_set_irq_state(struct amdgpu_device *adev,
// TODO
/* For MP1 SW irqs */
- if (amdgpu_ip_version(adev, MP1_HWIP, 0) == IP_VERSION(14, 0, 0)) {
+ if (amdgpu_ip_version(adev, MP1_HWIP, 0) == IP_VERSION(14, 0, 0) ||
+amdgpu_ip_version(adev, MP1_HWIP, 0) == IP_VERSION(14, 0, 1)) {
val = RREG32_SOC15(MP1, 0, regMP1_SMN_IH_SW_INT_CTRL_mp1_14_0_0);
val = REG_SET_FIELD(val, MP1_SMN_IH_SW_INT_CTRL, INT_MASK, 1);
WREG32_SOC15(MP1, 0, regMP1_SMN_IH_SW_INT_CTRL_mp1_14_0_0, val); @@ -872,7 +872,7 @@ static int smu_v14_0_set_irq_state(struct amdgpu_device *adev,
// TODO
/* For MP1 SW irqs */
- if (amdgpu_ip_version(adev, MP1_HWIP, 0) == IP_VERSION(14, 0, 0)) {
+ if (amdgpu_ip_version(adev, MP1_HWIP, 0) == IP_VERSION(14, 0, 0) ||
+amdgpu_ip_version(adev, MP1_HWIP, 0) == IP_VERSION(14, 0, 1)) {
val = RREG32_SOC15(MP1, 0, regMP1_SMN_IH_SW_INT_mp1_14_0_0);
val = REG_SET_FIELD(val, MP1_SMN_IH_SW_INT, ID, 0xFE);
val = REG_SET_FIELD(val, MP1_SMN_IH_SW_INT, VALID, 0);--
2.25.1