Reviewed-by: Xiangliang.Yu <Xiangliang.Yu at amd.com> Thanks! Xiangliang Yu > -----Original Message----- > From: amd-gfx [mailto:amd-gfx-bounces at lists.freedesktop.org] On Behalf > Of Pixel Ding > Sent: Monday, February 06, 2017 3:00 PM > To: amd-gfx at lists.freedesktop.org > Cc: Xue, Ken <Ken.Xue at amd.com> > Subject: [PATCH 1/2] drm/amdgpu/virt: refine handshake between guest > and host by mailbox > > From: Ken Xue <Ken.Xue at amd.com> > > The previous handshake doesn't check the VALID flag for mailbox. A bug > occurs that the driver believes it's in exclusive mode but actually it's not, then > the subsequent initliaztion fails. > > The right protocol should be that guest driver checks VALID flag and makes > sure the host driver has already recieved the ACK message and handle it like: > > A: send MSG-> clear VALID-> > B: send ACK-> check VALID > > Signed-off-by: Ken Xue <Ken.Xue at amd.com> > Acked-by: Pixel Ding <Pixel.Ding at amd.com> > --- > drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c | 26 > +++++++++++++++++++++++++- > 1 file changed, 25 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c > b/drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c > index d2622b6..5fe4aad 100644 > --- a/drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c > +++ b/drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c > @@ -318,10 +318,25 @@ void xgpu_vi_init_golden_registers(struct > amdgpu_device *adev) static void xgpu_vi_mailbox_send_ack(struct > amdgpu_device *adev) { > u32 reg; > + int timeout = VI_MAILBOX_TIMEDOUT; > + u32 mask = REG_FIELD_MASK(MAILBOX_CONTROL, > RCV_MSG_VALID); > > reg = RREG32(mmMAILBOX_CONTROL); > reg = REG_SET_FIELD(reg, MAILBOX_CONTROL, RCV_MSG_ACK, 1); > WREG32(mmMAILBOX_CONTROL, reg); > + > + /*Wait for RCV_MSG_VALID to be 0*/ > + reg = RREG32(mmMAILBOX_CONTROL); > + while (reg & mask) { > + if (timeout <= 0) { > + pr_err("RCV_MSG_VALID is not cleared\n"); > + break; > + } > + mdelay(1); > + timeout -=1; > + > + reg = RREG32(mmMAILBOX_CONTROL); > + } > } > > static void xgpu_vi_mailbox_set_valid(struct amdgpu_device *adev, bool val) > @@ -339,6 +354,8 @@ static void xgpu_vi_mailbox_trans_msg(struct > amdgpu_device *adev, { > u32 reg; > > + xgpu_vi_mailbox_send_ack(adev); > + > reg = RREG32(mmMAILBOX_MSGBUF_TRN_DW0); > reg = REG_SET_FIELD(reg, MAILBOX_MSGBUF_TRN_DW0, > MSGBUF_DATA, event); > @@ -351,6 +368,11 @@ static int xgpu_vi_mailbox_rcv_msg(struct > amdgpu_device *adev, > enum idh_event event) > { > u32 reg; > + u32 mask = REG_FIELD_MASK(MAILBOX_CONTROL, > RCV_MSG_VALID); > + > + reg = RREG32(mmMAILBOX_CONTROL); > + if (!(reg & mask)) > + return -ENOENT; > > reg = RREG32(mmMAILBOX_MSGBUF_RCV_DW0); > if (reg != event) > @@ -419,7 +441,9 @@ static int xgpu_vi_send_access_requests(struct > amdgpu_device *adev, > xgpu_vi_mailbox_set_valid(adev, false); > > /* start to check msg if request is idh_req_gpu_init_access */ > - if (request == IDH_REQ_GPU_INIT_ACCESS) { > + if (request == IDH_REQ_GPU_INIT_ACCESS || > + request == IDH_REQ_GPU_FINI_ACCESS || > + request == IDH_REQ_GPU_RESET_ACCESS) { > r = xgpu_vi_poll_msg(adev, IDH_READY_TO_ACCESS_GPU); > if (r) > return r; > -- > 2.7.4 > > _______________________________________________ > amd-gfx mailing list > amd-gfx at lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx
