drm/amd/powerplay: ack the SMUToHost interrupt on receive
Subsystems (2)
PATCH 1/1 drm/amd/powerplay: ack the SMUToHost interrupt on receive
There will be no further interrupt without proper ack for current one.
--- drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +6 -0
@@ -1535,6 +1535,7 @@ static int smu_v11_0_irq_process(struct amdgpu_device *adev,*/ uint32_t ctxid = entry->src_data[0 ];struct smu_context *smu = &adev->smu; +uint32_t data;if (client_id ==SOC15_IH_CLIENTID_THM ) {switch (src_id) {
@@ -1576,6 +1577,11 @@ static int smu_v11_0_irq_process(struct amdgpu_device *adev,orderly_poweroff (true); }else if (client_id ==SOC15_IH_CLIENTID_MP1 ) {if (src_id ==0xfe ) { +/* ACK SMUToHost interrupt */ + data =RREG32_SOC15 (MP1 ,0 , mmMP1_SMN_IH_SW_INT_CTRL); + data =REG_SET_FIELD (0 ,MP1_SMN_IH_SW_INT_CTRL ,INT_ACK ,1 ); +WREG32_SOC15 (MP1 ,0 , mmMP1_SMN_IH_SW_INT_CTRL, data); +switch (ctxid) {case 0x3 :dev_dbg (adev->dev,"Switched to AC mode!\n" );
Signature · 6 lines
2.26.2 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 23 lines · Evan Quan
There will be no further interrupt without proper ack for current one.
Change-Id Iad5adcaf7dd5c3a773b3d93ee0922a424dba8ac8Signed-off-by Evan Quan <[email protected]>--- drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 6 ++++++ 1 file changed, 6 insertions(+)drivers/gpu/drm/amd/powerplay/smu_v11_0.c +1
-0@@ -1535,6 +1535,7 @@ static int smu_v11_0_irq_process(struct amdgpu_device *adev,*/ uint32_t ctxid = entry->src_data[0 ];struct smu_context *smu = &adev->smu; +uint32_t data;if (client_id ==SOC15_IH_CLIENTID_THM ) {switch (src_id) {
drivers/gpu/drm/amd/powerplay/smu_v11_0.c static int smu_v11_0_irq_process(struct amdgpu_device *adev, · line 1582
Quoted 6 lines
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +3
-0@@ -1576,6 +1577,11 @@ static int smu_v11_0_irq_process(struct amdgpu_device *adev,orderly_poweroff (true); }else if (client_id ==SOC15_IH_CLIENTID_MP1 ) {if (src_id ==0xfe ) { +/* ACK SMUToHost interrupt */ + data =RREG32_SOC15 (MP1 ,0 , mmMP1_SMN_IH_SW_INT_CTRL); + data =REG_SET_FIELD (0 ,MP1_SMN_IH_SW_INT_CTRL ,INT_ACK ,1 );
Did you intend to clear the register here before setting the bit or just set the ACK bit? With that clarified:
Quoted 8 lines
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +2
-1+WREG32_SOC15 (MP1 ,0 , mmMP1_SMN_IH_SW_INT_CTRL, data); +switch (ctxid) {case 0x3 :dev_dbg (adev->dev,"Switched to AC mode!\n" ); --2.26.2
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quan, Evan
Reviewed-by Alex Deucher[AMD Official Use Only - Internal Distribution Only]
Just setting the ACK bit is enough and no need to touch other bits. It's aligned with windows and confirmed by my local test.
Thanks,
Evan
-----Original Message-----
From: Alex Deucher <[email protected]>
Sent: Tuesday, May 12, 2020 9:05 PM
To: Quan, Evan <[email protected]>
Cc: amd-gfx list <[email protected]>; Deucher, Alexander <[email protected]>
Subject: Re: [PATCH] drm/amd/powerplay: ack the SMUToHost interrupt on receive
Quoted 23 lines · Evan Quan
There will be no further interrupt without proper ack for current one.
Change-Id Iad5adcaf7dd5c3a773b3d93ee0922a424dba8ac8Signed-off-by Evan Quan <[email protected]>--- drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 6 ++++++ 1 file changed, 6 insertions(+)drivers/gpu/drm/amd/powerplay/smu_v11_0.c +1
-0@@ -1535,6 +1535,7 @@ static int smu_v11_0_irq_process(struct amdgpu_device *adev,*/ uint32_t ctxid = entry->src_data[0 ];struct smu_context *smu = &adev->smu; +uint32_t data;if (client_id ==SOC15_IH_CLIENTID_THM ) {switch (src_id) {
drivers/gpu/drm/amd/powerplay/smu_v11_0.c static int smu_v11_0_irq_process(struct amdgpu_device *adev, · line 1583
Quoted 7 lines
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +4
-0@@ -1576,6 +1577,11 @@ static int smu_v11_0_irq_process(struct amdgpu_device *adev,orderly_poweroff (true); }else if (client_id ==SOC15_IH_CLIENTID_MP1 ) {if (src_id ==0xfe ) { +/* ACK SMUToHost interrupt */ + data =RREG32_SOC15 (MP1 ,0 , mmMP1_SMN_IH_SW_INT_CTRL); + data =REG_SET_FIELD (0 , +MP1_SMN_IH_SW_INT_CTRL ,INT_ACK ,1 );
Did you intend to clear the register here before setting the bit or just set the ACK bit? With that clarified:
Quoted 10 lines
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +3
-0+WREG32_SOC15 (MP1 ,0 , mmMP1_SMN_IH_SW_INT_CTRL, + data); +switch (ctxid) {case 0x3 : dev_dbg(adev->dev, "Switched to ACmode!\n");
--
2.26.2
Quoted 8 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flist
s.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7Cev an.quan%40amd.com%7Cdd256ffb1af04cd76e7208d7f675247c%7C3dd8961fe4884e6 08e11a82d994e183d%7C0%7C0%7C637248855296590946&sdata=vqgWfjcX9Sqqb We7plBmWhDVfAuyvwhNABovaafHwiE%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quan, Evan
Reviewed-by Alex Deucher[AMD Official Use Only - Internal Distribution Only]
-----Original Message-----
From: Alex Deucher <[email protected]>
Sent: Tuesday, May 12, 2020 9:05 PM
To: Quan, Evan <[email protected]>
Cc: amd-gfx list <[email protected]>; Deucher, Alexander <[email protected]>
Subject: Re: [PATCH] drm/amd/powerplay: ack the SMUToHost interrupt on receive
Quoted 23 lines · Evan Quan
There will be no further interrupt without proper ack for current one.
Change-Id Iad5adcaf7dd5c3a773b3d93ee0922a424dba8ac8Signed-off-by Evan Quan <[email protected]>--- drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 6 ++++++ 1 file changed, 6 insertions(+)drivers/gpu/drm/amd/powerplay/smu_v11_0.c +1
-0@@ -1535,6 +1535,7 @@ static int smu_v11_0_irq_process(struct amdgpu_device *adev,*/ uint32_t ctxid = entry->src_data[0 ];struct smu_context *smu = &adev->smu; +uint32_t data;if (client_id ==SOC15_IH_CLIENTID_THM ) {switch (src_id) {
drivers/gpu/drm/amd/powerplay/smu_v11_0.c static int smu_v11_0_irq_process(struct amdgpu_device *adev, · line 1583
Quoted 7 lines
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +4
-0@@ -1576,6 +1577,11 @@ static int smu_v11_0_irq_process(struct amdgpu_device *adev,orderly_poweroff (true); }else if (client_id ==SOC15_IH_CLIENTID_MP1 ) {if (src_id ==0xfe ) { +/* ACK SMUToHost interrupt */ + data =RREG32_SOC15 (MP1 ,0 , mmMP1_SMN_IH_SW_INT_CTRL); + data =REG_SET_FIELD (0 , +MP1_SMN_IH_SW_INT_CTRL ,INT_ACK ,1 );
Did you intend to clear the register here before setting the bit or just set the ACK bit? With that clarified:
[Quan, Evan] OK. I see your point. There is a typo here. Should be " data = REG_SET_FIELD(data, MP1_SMN_IH_SW_INT_CTRL, INT_ACK, 1);". Will send out a new patch.
Quoted 10 lines
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +3
-0+WREG32_SOC15 (MP1 ,0 , mmMP1_SMN_IH_SW_INT_CTRL, + data); +switch (ctxid) {case 0x3 : dev_dbg(adev->dev, "Switched to ACmode!\n");
--
2.26.2
Quoted 8 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flist
s.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7Cev an.quan%40amd.com%7Cdd256ffb1af04cd76e7208d7f675247c%7C3dd8961fe4884e6 08e11a82d994e183d%7C0%7C0%7C637248855296590946&sdata=vqgWfjcX9Sqqb We7plBmWhDVfAuyvwhNABovaafHwiE%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx