Reviewed-by: Emily Deng <Emily.Deng@xxxxxxx> >-----Original Message----- >From: amd-gfx <amd-gfx-bounces@xxxxxxxxxxxxxxxxxxxxx> On Behalf Of >jianzh@xxxxxxx >Sent: Monday, September 9, 2019 6:37 PM >To: amd-gfx@xxxxxxxxxxxxxxxxxxxxx >Cc: Zhao, Jiange <Jiange.Zhao@xxxxxxx> >Subject: [PATCH] drm/amdgpu: Add SRIOV mailbox backend for Navi1x > >From: Jiange Zhao <Jiange.Zhao@xxxxxxx> > >Mimic the ones for Vega10, add mailbox backend for Navi1x > >Signed-off-by: Jiange Zhao <Jiange.Zhao@xxxxxxx> >--- > drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- > drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 380 >++++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/mxgpu_nv.h >| 41 +++ > 3 files changed, 422 insertions(+), 1 deletion(-) create mode 100644 >drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c > create mode 100644 drivers/gpu/drm/amd/amdgpu/mxgpu_nv.h > >diff --git a/drivers/gpu/drm/amd/amdgpu/Makefile >b/drivers/gpu/drm/amd/amdgpu/Makefile >index 84614a71bb4d..43dc4aa18930 100644 >--- a/drivers/gpu/drm/amd/amdgpu/Makefile >+++ b/drivers/gpu/drm/amd/amdgpu/Makefile >@@ -68,7 +68,7 @@ amdgpu-$(CONFIG_DRM_AMDGPU_SI)+= si.o >gmc_v6_0.o gfx_v6_0.o si_ih.o si_dma.o dce amdgpu-y += \ > vi.o mxgpu_vi.o nbio_v6_1.o soc15.o emu_soc.o mxgpu_ai.o >nbio_v7_0.o vega10_reg_init.o \ > vega20_reg_init.o nbio_v7_4.o nbio_v2_3.o nv.o navi10_reg_init.o >navi14_reg_init.o \ >- arct_reg_init.o navi12_reg_init.o >+ arct_reg_init.o navi12_reg_init.o mxgpu_nv.o > > # add DF block > amdgpu-y += \ >diff --git a/drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c >b/drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c >new file mode 100644 >index 000000000000..0d8767eb7a70 >--- /dev/null >+++ b/drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c >@@ -0,0 +1,380 @@ >+/* >+ * Copyright 2014 Advanced Micro Devices, Inc. >+ * >+ * Permission is hereby granted, free of charge, to any person >+obtaining a >+ * copy of this software and associated documentation files (the >+"Software"), >+ * to deal in the Software without restriction, including without >+limitation >+ * the rights to use, copy, modify, merge, publish, distribute, >+sublicense, >+ * and/or sell copies of the Software, and to permit persons to whom >+the >+ * Software is furnished to do so, subject to the following conditions: >+ * >+ * The above copyright notice and this permission notice shall be >+included in >+ * all copies or substantial portions of the Software. >+ * >+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, >+EXPRESS OR >+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF >+MERCHANTABILITY, >+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO >EVENT >+SHALL >+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, >+DAMAGES OR >+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR >+OTHERWISE, >+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR >THE USE >+OR >+ * OTHER DEALINGS IN THE SOFTWARE. >+ * >+ */ >+ >+#include "amdgpu.h" >+#include "nbio/nbio_2_3_offset.h" >+#include "nbio/nbio_2_3_sh_mask.h" >+#include "gc/gc_10_1_0_offset.h" >+#include "gc/gc_10_1_0_sh_mask.h" >+#include "soc15.h" >+#include "navi10_ih.h" >+#include "soc15_common.h" >+#include "mxgpu_nv.h" >+#include "mxgpu_ai.h" >+ >+static void xgpu_nv_mailbox_send_ack(struct amdgpu_device *adev) { >+ WREG8(NV_MAIBOX_CONTROL_RCV_OFFSET_BYTE, 2); } >+ >+static void xgpu_nv_mailbox_set_valid(struct amdgpu_device *adev, bool >+val) { >+ WREG8(NV_MAIBOX_CONTROL_TRN_OFFSET_BYTE, val ? 1 : 0); } >+ >+/* >+ * this peek_msg could *only* be called in IRQ routine becuase in IRQ >+routine >+ * RCV_MSG_VALID filed of BIF_BX_PF_MAILBOX_CONTROL must already be >set >+to 1 >+ * by host. >+ * >+ * if called no in IRQ routine, this peek_msg cannot guaranteed to >+return the >+ * correct value since it doesn't return the RCV_DW0 under the case >+that >+ * RCV_MSG_VALID is set by host. >+ */ >+static enum idh_event xgpu_nv_mailbox_peek_msg(struct amdgpu_device >+*adev) { >+ return RREG32_NO_KIQ(SOC15_REG_OFFSET(NBIO, 0, >+ > mmBIF_BX_PF_MAILBOX_MSGBUF_RCV_DW0)); >+} >+ >+ >+static int xgpu_nv_mailbox_rcv_msg(struct amdgpu_device *adev, >+ enum idh_event event) >+{ >+ u32 reg; >+ >+ reg = RREG32_NO_KIQ(SOC15_REG_OFFSET(NBIO, 0, >+ >mmBIF_BX_PF_MAILBOX_MSGBUF_RCV_DW0)); >+ if (reg != event) >+ return -ENOENT; >+ >+ xgpu_nv_mailbox_send_ack(adev); >+ >+ return 0; >+} >+ >+static uint8_t xgpu_nv_peek_ack(struct amdgpu_device *adev) { >+ return RREG8(NV_MAIBOX_CONTROL_TRN_OFFSET_BYTE) & 2; } >+ >+static int xgpu_nv_poll_ack(struct amdgpu_device *adev) { >+ int timeout = NV_MAILBOX_POLL_ACK_TIMEDOUT; >+ u8 reg; >+ >+ do { >+ reg = RREG8(NV_MAIBOX_CONTROL_TRN_OFFSET_BYTE); >+ if (reg & 2) >+ return 0; >+ >+ mdelay(5); >+ timeout -= 5; >+ } while (timeout > 1); >+ >+ pr_err("Doesn't get TRN_MSG_ACK from pf in %d msec\n", >+NV_MAILBOX_POLL_ACK_TIMEDOUT); >+ >+ return -ETIME; >+} >+ >+static int xgpu_nv_poll_msg(struct amdgpu_device *adev, enum idh_event >+event) { >+ int r, timeout = NV_MAILBOX_POLL_MSG_TIMEDOUT; >+ >+ do { >+ r = xgpu_nv_mailbox_rcv_msg(adev, event); >+ if (!r) >+ return 0; >+ >+ msleep(10); >+ timeout -= 10; >+ } while (timeout > 1); >+ >+ pr_err("Doesn't get msg:%d from pf, error=%d\n", event, r); >+ >+ return -ETIME; >+} >+ >+static void xgpu_nv_mailbox_trans_msg (struct amdgpu_device *adev, >+ enum idh_request req, u32 data1, u32 data2, u32 data3) { >+ u32 reg; >+ int r; >+ uint8_t trn; >+ >+ /* IMPORTANT: >+ * clear TRN_MSG_VALID valid to clear host's RCV_MSG_ACK >+ * and with host's RCV_MSG_ACK cleared hw automatically clear >host's RCV_MSG_ACK >+ * which lead to VF's TRN_MSG_ACK cleared, otherwise below >xgpu_nv_poll_ack() >+ * will return immediatly >+ */ >+ do { >+ xgpu_nv_mailbox_set_valid(adev, false); >+ trn = xgpu_nv_peek_ack(adev); >+ if (trn) { >+ pr_err("trn=%x ACK should not assert! wait again !\n", >trn); >+ msleep(1); >+ } >+ } while (trn); >+ >+ reg = RREG32_NO_KIQ(SOC15_REG_OFFSET(NBIO, 0, >+ >mmBIF_BX_PF_MAILBOX_MSGBUF_TRN_DW0)); >+ reg = REG_SET_FIELD(reg, BIF_BX_PF_MAILBOX_MSGBUF_TRN_DW0, >+ MSGBUF_DATA, req); >+ WREG32_NO_KIQ(SOC15_REG_OFFSET(NBIO, 0, >mmBIF_BX_PF_MAILBOX_MSGBUF_TRN_DW0), >+ reg); >+ WREG32_NO_KIQ(SOC15_REG_OFFSET(NBIO, 0, >mmBIF_BX_PF_MAILBOX_MSGBUF_TRN_DW1), >+ data1); >+ WREG32_NO_KIQ(SOC15_REG_OFFSET(NBIO, 0, >mmBIF_BX_PF_MAILBOX_MSGBUF_TRN_DW2), >+ data2); >+ WREG32_NO_KIQ(SOC15_REG_OFFSET(NBIO, 0, >mmBIF_BX_PF_MAILBOX_MSGBUF_TRN_DW3), >+ data3); >+ >+ xgpu_nv_mailbox_set_valid(adev, true); >+ >+ /* start to poll ack */ >+ r = xgpu_nv_poll_ack(adev); >+ if (r) >+ pr_err("Doesn't get ack from pf, continue\n"); >+ >+ xgpu_nv_mailbox_set_valid(adev, false); } >+ >+static int xgpu_nv_send_access_requests(struct amdgpu_device *adev, >+ enum idh_request req) >+{ >+ int r; >+ >+ xgpu_nv_mailbox_trans_msg(adev, req, 0, 0, 0); >+ >+ /* start to check msg if request is idh_req_gpu_init_access */ >+ if (req == IDH_REQ_GPU_INIT_ACCESS || >+ req == IDH_REQ_GPU_FINI_ACCESS || >+ req == IDH_REQ_GPU_RESET_ACCESS) { >+ r = xgpu_nv_poll_msg(adev, IDH_READY_TO_ACCESS_GPU); >+ if (r) { >+ pr_err("Doesn't get READY_TO_ACCESS_GPU from pf, >give up\n"); >+ return r; >+ } >+ /* Retrieve checksum from mailbox2 */ >+ if (req == IDH_REQ_GPU_INIT_ACCESS || req == >IDH_REQ_GPU_RESET_ACCESS) { >+ adev->virt.fw_reserve.checksum_key = >+ RREG32_NO_KIQ(SOC15_REG_OFFSET(NBIO, >0, >+ > mmBIF_BX_PF_MAILBOX_MSGBUF_RCV_DW2)); >+ } >+ } >+ >+ return 0; >+} >+ >+static int xgpu_nv_request_reset(struct amdgpu_device *adev) { >+ return xgpu_nv_send_access_requests(adev, >IDH_REQ_GPU_RESET_ACCESS); } >+ >+static int xgpu_nv_request_full_gpu_access(struct amdgpu_device *adev, >+ bool init) >+{ >+ enum idh_request req; >+ >+ req = init ? IDH_REQ_GPU_INIT_ACCESS : >IDH_REQ_GPU_FINI_ACCESS; >+ return xgpu_nv_send_access_requests(adev, req); } >+ >+static int xgpu_nv_release_full_gpu_access(struct amdgpu_device *adev, >+ bool init) >+{ >+ enum idh_request req; >+ int r = 0; >+ >+ req = init ? IDH_REL_GPU_INIT_ACCESS : IDH_REL_GPU_FINI_ACCESS; >+ r = xgpu_nv_send_access_requests(adev, req); >+ >+ return r; >+} >+ >+static int xgpu_nv_mailbox_ack_irq(struct amdgpu_device *adev, >+ struct amdgpu_irq_src *source, >+ struct amdgpu_iv_entry *entry) >+{ >+ DRM_DEBUG("get ack intr and do nothing.\n"); >+ return 0; >+} >+ >+static int xgpu_nv_set_mailbox_ack_irq(struct amdgpu_device *adev, >+ struct amdgpu_irq_src *source, >+ unsigned type, >+ enum amdgpu_interrupt_state state) { >+ u32 tmp = RREG32_NO_KIQ(SOC15_REG_OFFSET(NBIO, 0, >+mmBIF_BX_PF_MAILBOX_INT_CNTL)); >+ >+ tmp = REG_SET_FIELD(tmp, BIF_BX_PF_MAILBOX_INT_CNTL, >ACK_INT_EN, >+ (state == AMDGPU_IRQ_STATE_ENABLE) ? 1 : >0); >+ WREG32_NO_KIQ(SOC15_REG_OFFSET(NBIO, 0, >mmBIF_BX_PF_MAILBOX_INT_CNTL), >+tmp); >+ >+ return 0; >+} >+ >+static void xgpu_nv_mailbox_flr_work(struct work_struct *work) { >+ struct amdgpu_virt *virt = container_of(work, struct amdgpu_virt, >flr_work); >+ struct amdgpu_device *adev = container_of(virt, struct >amdgpu_device, virt); >+ int timeout = NV_MAILBOX_POLL_FLR_TIMEDOUT; >+ int locked; >+ >+ /* block amdgpu_gpu_recover till msg FLR COMPLETE received, >+ * otherwise the mailbox msg will be ruined/reseted by >+ * the VF FLR. >+ * >+ * we can unlock the lock_reset to allow "amdgpu_job_timedout" >+ * to run gpu_recover() after FLR_NOTIFICATION_CMPL received >+ * which means host side had finished this VF's FLR. >+ */ >+ locked = mutex_trylock(&adev->lock_reset); >+ if (locked) >+ adev->in_gpu_reset = 1; >+ >+ do { >+ if (xgpu_nv_mailbox_peek_msg(adev) == >IDH_FLR_NOTIFICATION_CMPL) >+ goto flr_done; >+ >+ msleep(10); >+ timeout -= 10; >+ } while (timeout > 1); >+ >+flr_done: >+ if (locked) { >+ adev->in_gpu_reset = 0; >+ mutex_unlock(&adev->lock_reset); >+ } >+ >+ /* Trigger recovery for world switch failure if no TDR */ >+ if (amdgpu_device_should_recover_gpu(adev)) >+ amdgpu_device_gpu_recover(adev, NULL); } >+ >+static int xgpu_nv_set_mailbox_rcv_irq(struct amdgpu_device *adev, >+ struct amdgpu_irq_src *src, >+ unsigned type, >+ enum amdgpu_interrupt_state state) { >+ u32 tmp = RREG32_NO_KIQ(SOC15_REG_OFFSET(NBIO, 0, >+mmBIF_BX_PF_MAILBOX_INT_CNTL)); >+ >+ tmp = REG_SET_FIELD(tmp, BIF_BX_PF_MAILBOX_INT_CNTL, >VALID_INT_EN, >+ (state == AMDGPU_IRQ_STATE_ENABLE) ? 1 : 0); >+ WREG32_NO_KIQ(SOC15_REG_OFFSET(NBIO, 0, >mmBIF_BX_PF_MAILBOX_INT_CNTL), >+tmp); >+ >+ return 0; >+} >+ >+static int xgpu_nv_mailbox_rcv_irq(struct amdgpu_device *adev, >+ struct amdgpu_irq_src *source, >+ struct amdgpu_iv_entry *entry) >+{ >+ enum idh_event event = xgpu_nv_mailbox_peek_msg(adev); >+ >+ switch (event) { >+ case IDH_FLR_NOTIFICATION: >+ if (amdgpu_sriov_runtime(adev)) >+ schedule_work(&adev->virt.flr_work); >+ break; >+ /* READY_TO_ACCESS_GPU is fetched by kernel polling, IRQ >can ignore >+ * it byfar since that polling thread will handle it, >+ * other msg like flr complete is not handled here. >+ */ >+ case IDH_CLR_MSG_BUF: >+ case IDH_FLR_NOTIFICATION_CMPL: >+ case IDH_READY_TO_ACCESS_GPU: >+ default: >+ break; >+ } >+ >+ return 0; >+} >+ >+static const struct amdgpu_irq_src_funcs xgpu_nv_mailbox_ack_irq_funcs = >{ >+ .set = xgpu_nv_set_mailbox_ack_irq, >+ .process = xgpu_nv_mailbox_ack_irq, >+}; >+ >+static const struct amdgpu_irq_src_funcs xgpu_nv_mailbox_rcv_irq_funcs = { >+ .set = xgpu_nv_set_mailbox_rcv_irq, >+ .process = xgpu_nv_mailbox_rcv_irq, >+}; >+ >+void xgpu_nv_mailbox_set_irq_funcs(struct amdgpu_device *adev) { >+ adev->virt.ack_irq.num_types = 1; >+ adev->virt.ack_irq.funcs = &xgpu_nv_mailbox_ack_irq_funcs; >+ adev->virt.rcv_irq.num_types = 1; >+ adev->virt.rcv_irq.funcs = &xgpu_nv_mailbox_rcv_irq_funcs; } >+ >+int xgpu_nv_mailbox_add_irq_id(struct amdgpu_device *adev) { >+ int r; >+ >+ r = amdgpu_irq_add_id(adev, SOC15_IH_CLIENTID_BIF, 135, &adev- >>virt.rcv_irq); >+ if (r) >+ return r; >+ >+ r = amdgpu_irq_add_id(adev, SOC15_IH_CLIENTID_BIF, 138, &adev- >>virt.ack_irq); >+ if (r) { >+ amdgpu_irq_put(adev, &adev->virt.rcv_irq, 0); >+ return r; >+ } >+ >+ return 0; >+} >+ >+int xgpu_nv_mailbox_get_irq(struct amdgpu_device *adev) { >+ int r; >+ >+ r = amdgpu_irq_get(adev, &adev->virt.rcv_irq, 0); >+ if (r) >+ return r; >+ r = amdgpu_irq_get(adev, &adev->virt.ack_irq, 0); >+ if (r) { >+ amdgpu_irq_put(adev, &adev->virt.rcv_irq, 0); >+ return r; >+ } >+ >+ INIT_WORK(&adev->virt.flr_work, xgpu_nv_mailbox_flr_work); >+ >+ return 0; >+} >+ >+void xgpu_nv_mailbox_put_irq(struct amdgpu_device *adev) { >+ amdgpu_irq_put(adev, &adev->virt.ack_irq, 0); >+ amdgpu_irq_put(adev, &adev->virt.rcv_irq, 0); } >+ >+const struct amdgpu_virt_ops xgpu_nv_virt_ops = { >+ .req_full_gpu = xgpu_nv_request_full_gpu_access, >+ .rel_full_gpu = xgpu_nv_release_full_gpu_access, >+ .reset_gpu = xgpu_nv_request_reset, >+ .wait_reset = NULL, >+ .trans_msg = xgpu_nv_mailbox_trans_msg, }; >diff --git a/drivers/gpu/drm/amd/amdgpu/mxgpu_nv.h >b/drivers/gpu/drm/amd/amdgpu/mxgpu_nv.h >new file mode 100644 >index 000000000000..99b15f6865cb >--- /dev/null >+++ b/drivers/gpu/drm/amd/amdgpu/mxgpu_nv.h >@@ -0,0 +1,41 @@ >+/* >+ * Copyright 2014 Advanced Micro Devices, Inc. >+ * >+ * Permission is hereby granted, free of charge, to any person >+obtaining a >+ * copy of this software and associated documentation files (the >+"Software"), >+ * to deal in the Software without restriction, including without >+limitation >+ * the rights to use, copy, modify, merge, publish, distribute, >+sublicense, >+ * and/or sell copies of the Software, and to permit persons to whom >+the >+ * Software is furnished to do so, subject to the following conditions: >+ * >+ * The above copyright notice and this permission notice shall be >+included in >+ * all copies or substantial portions of the Software. >+ * >+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, >+EXPRESS OR >+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF >+MERCHANTABILITY, >+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO >EVENT >+SHALL >+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, >+DAMAGES OR >+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR >+OTHERWISE, >+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR >THE USE >+OR >+ * OTHER DEALINGS IN THE SOFTWARE. >+ * >+ */ >+ >+#ifndef __MXGPU_NV_H__ >+#define __MXGPU_NV_H__ >+ >+#define NV_MAILBOX_POLL_ACK_TIMEDOUT 500 >+#define NV_MAILBOX_POLL_MSG_TIMEDOUT 12000 >+#define NV_MAILBOX_POLL_FLR_TIMEDOUT 500 >+ >+extern const struct amdgpu_virt_ops xgpu_nv_virt_ops; >+ >+void xgpu_nv_mailbox_set_irq_funcs(struct amdgpu_device *adev); int >+xgpu_nv_mailbox_add_irq_id(struct amdgpu_device *adev); int >+xgpu_nv_mailbox_get_irq(struct amdgpu_device *adev); void >+xgpu_nv_mailbox_put_irq(struct amdgpu_device *adev); >+ >+#define NV_MAIBOX_CONTROL_TRN_OFFSET_BYTE >(SOC15_REG_OFFSET(NBIO, 0, >+mmBIF_BX_PF_MAILBOX_CONTROL) * 4) #define >+NV_MAIBOX_CONTROL_RCV_OFFSET_BYTE (SOC15_REG_OFFSET(NBIO, 0, >+mmBIF_BX_PF_MAILBOX_CONTROL) * 4 + 1) >+ >+#endif >-- >2.20.1 > >_______________________________________________ >amd-gfx mailing list >amd-gfx@xxxxxxxxxxxxxxxxxxxxx >https://lists.freedesktop.org/mailman/listinfo/amd-gfx _______________________________________________ amd-gfx mailing list amd-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/amd-gfx