Commit 4a370955 authored by Monk Liu's avatar Monk Liu Committed by Alex Deucher

drm/amdgpu:no kiq for mailbox registers access

Use no kiq version reg access due to:
1) better performance
2) INTR context consideration (some routine in mailbox is in
   INTR context e.g.xgpu_vi_mailbox_rcv_irq)
Signed-off-by: default avatarMonk Liu <Monk.Liu@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarXiangliang Yu <Xiangliang.Yu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 562fe45c
...@@ -321,12 +321,12 @@ static void xgpu_vi_mailbox_send_ack(struct amdgpu_device *adev) ...@@ -321,12 +321,12 @@ static void xgpu_vi_mailbox_send_ack(struct amdgpu_device *adev)
int timeout = VI_MAILBOX_TIMEDOUT; int timeout = VI_MAILBOX_TIMEDOUT;
u32 mask = REG_FIELD_MASK(MAILBOX_CONTROL, RCV_MSG_VALID); u32 mask = REG_FIELD_MASK(MAILBOX_CONTROL, RCV_MSG_VALID);
reg = RREG32(mmMAILBOX_CONTROL); reg = RREG32_NO_KIQ(mmMAILBOX_CONTROL);
reg = REG_SET_FIELD(reg, MAILBOX_CONTROL, RCV_MSG_ACK, 1); reg = REG_SET_FIELD(reg, MAILBOX_CONTROL, RCV_MSG_ACK, 1);
WREG32(mmMAILBOX_CONTROL, reg); WREG32_NO_KIQ(mmMAILBOX_CONTROL, reg);
/*Wait for RCV_MSG_VALID to be 0*/ /*Wait for RCV_MSG_VALID to be 0*/
reg = RREG32(mmMAILBOX_CONTROL); reg = RREG32_NO_KIQ(mmMAILBOX_CONTROL);
while (reg & mask) { while (reg & mask) {
if (timeout <= 0) { if (timeout <= 0) {
pr_err("RCV_MSG_VALID is not cleared\n"); pr_err("RCV_MSG_VALID is not cleared\n");
...@@ -335,7 +335,7 @@ static void xgpu_vi_mailbox_send_ack(struct amdgpu_device *adev) ...@@ -335,7 +335,7 @@ static void xgpu_vi_mailbox_send_ack(struct amdgpu_device *adev)
mdelay(1); mdelay(1);
timeout -=1; timeout -=1;
reg = RREG32(mmMAILBOX_CONTROL); reg = RREG32_NO_KIQ(mmMAILBOX_CONTROL);
} }
} }
...@@ -343,10 +343,10 @@ static void xgpu_vi_mailbox_set_valid(struct amdgpu_device *adev, bool val) ...@@ -343,10 +343,10 @@ static void xgpu_vi_mailbox_set_valid(struct amdgpu_device *adev, bool val)
{ {
u32 reg; u32 reg;
reg = RREG32(mmMAILBOX_CONTROL); reg = RREG32_NO_KIQ(mmMAILBOX_CONTROL);
reg = REG_SET_FIELD(reg, MAILBOX_CONTROL, reg = REG_SET_FIELD(reg, MAILBOX_CONTROL,
TRN_MSG_VALID, val ? 1 : 0); TRN_MSG_VALID, val ? 1 : 0);
WREG32(mmMAILBOX_CONTROL, reg); WREG32_NO_KIQ(mmMAILBOX_CONTROL, reg);
} }
static void xgpu_vi_mailbox_trans_msg(struct amdgpu_device *adev, static void xgpu_vi_mailbox_trans_msg(struct amdgpu_device *adev,
...@@ -354,10 +354,10 @@ static void xgpu_vi_mailbox_trans_msg(struct amdgpu_device *adev, ...@@ -354,10 +354,10 @@ static void xgpu_vi_mailbox_trans_msg(struct amdgpu_device *adev,
{ {
u32 reg; u32 reg;
reg = RREG32(mmMAILBOX_MSGBUF_TRN_DW0); reg = RREG32_NO_KIQ(mmMAILBOX_MSGBUF_TRN_DW0);
reg = REG_SET_FIELD(reg, MAILBOX_MSGBUF_TRN_DW0, reg = REG_SET_FIELD(reg, MAILBOX_MSGBUF_TRN_DW0,
MSGBUF_DATA, event); MSGBUF_DATA, event);
WREG32(mmMAILBOX_MSGBUF_TRN_DW0, reg); WREG32_NO_KIQ(mmMAILBOX_MSGBUF_TRN_DW0, reg);
xgpu_vi_mailbox_set_valid(adev, true); xgpu_vi_mailbox_set_valid(adev, true);
} }
...@@ -368,11 +368,11 @@ static int xgpu_vi_mailbox_rcv_msg(struct amdgpu_device *adev, ...@@ -368,11 +368,11 @@ static int xgpu_vi_mailbox_rcv_msg(struct amdgpu_device *adev,
u32 reg; u32 reg;
u32 mask = REG_FIELD_MASK(MAILBOX_CONTROL, RCV_MSG_VALID); u32 mask = REG_FIELD_MASK(MAILBOX_CONTROL, RCV_MSG_VALID);
reg = RREG32(mmMAILBOX_CONTROL); reg = RREG32_NO_KIQ(mmMAILBOX_CONTROL);
if (!(reg & mask)) if (!(reg & mask))
return -ENOENT; return -ENOENT;
reg = RREG32(mmMAILBOX_MSGBUF_RCV_DW0); reg = RREG32_NO_KIQ(mmMAILBOX_MSGBUF_RCV_DW0);
if (reg != event) if (reg != event)
return -ENOENT; return -ENOENT;
...@@ -388,7 +388,7 @@ static int xgpu_vi_poll_ack(struct amdgpu_device *adev) ...@@ -388,7 +388,7 @@ static int xgpu_vi_poll_ack(struct amdgpu_device *adev)
u32 mask = REG_FIELD_MASK(MAILBOX_CONTROL, TRN_MSG_ACK); u32 mask = REG_FIELD_MASK(MAILBOX_CONTROL, TRN_MSG_ACK);
u32 reg; u32 reg;
reg = RREG32(mmMAILBOX_CONTROL); reg = RREG32_NO_KIQ(mmMAILBOX_CONTROL);
while (!(reg & mask)) { while (!(reg & mask)) {
if (timeout <= 0) { if (timeout <= 0) {
pr_err("Doesn't get ack from pf.\n"); pr_err("Doesn't get ack from pf.\n");
...@@ -398,7 +398,7 @@ static int xgpu_vi_poll_ack(struct amdgpu_device *adev) ...@@ -398,7 +398,7 @@ static int xgpu_vi_poll_ack(struct amdgpu_device *adev)
msleep(1); msleep(1);
timeout -= 1; timeout -= 1;
reg = RREG32(mmMAILBOX_CONTROL); reg = RREG32_NO_KIQ(mmMAILBOX_CONTROL);
} }
return r; return r;
...@@ -490,11 +490,11 @@ static int xgpu_vi_set_mailbox_ack_irq(struct amdgpu_device *adev, ...@@ -490,11 +490,11 @@ static int xgpu_vi_set_mailbox_ack_irq(struct amdgpu_device *adev,
unsigned type, unsigned type,
enum amdgpu_interrupt_state state) enum amdgpu_interrupt_state state)
{ {
u32 tmp = RREG32(mmMAILBOX_INT_CNTL); u32 tmp = RREG32_NO_KIQ(mmMAILBOX_INT_CNTL);
tmp = REG_SET_FIELD(tmp, MAILBOX_INT_CNTL, ACK_INT_EN, tmp = REG_SET_FIELD(tmp, MAILBOX_INT_CNTL, ACK_INT_EN,
(state == AMDGPU_IRQ_STATE_ENABLE) ? 1 : 0); (state == AMDGPU_IRQ_STATE_ENABLE) ? 1 : 0);
WREG32(mmMAILBOX_INT_CNTL, tmp); WREG32_NO_KIQ(mmMAILBOX_INT_CNTL, tmp);
return 0; return 0;
} }
...@@ -519,11 +519,11 @@ static int xgpu_vi_set_mailbox_rcv_irq(struct amdgpu_device *adev, ...@@ -519,11 +519,11 @@ static int xgpu_vi_set_mailbox_rcv_irq(struct amdgpu_device *adev,
unsigned type, unsigned type,
enum amdgpu_interrupt_state state) enum amdgpu_interrupt_state state)
{ {
u32 tmp = RREG32(mmMAILBOX_INT_CNTL); u32 tmp = RREG32_NO_KIQ(mmMAILBOX_INT_CNTL);
tmp = REG_SET_FIELD(tmp, MAILBOX_INT_CNTL, VALID_INT_EN, tmp = REG_SET_FIELD(tmp, MAILBOX_INT_CNTL, VALID_INT_EN,
(state == AMDGPU_IRQ_STATE_ENABLE) ? 1 : 0); (state == AMDGPU_IRQ_STATE_ENABLE) ? 1 : 0);
WREG32(mmMAILBOX_INT_CNTL, tmp); WREG32_NO_KIQ(mmMAILBOX_INT_CNTL, tmp);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment