drm/amdgpu: RLC-G VF Register Access Interface

- Implement Gfx v12.1 VFi interface under SRIOV
- Redirect all RLCG interface access to new function after
  Gfx v12.1

v2: squash in register updates

Signed-off-by: Bokun Zhang <Bokun.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h
index 32408574548ddff9c8ef2e43bb48ae01c0474518..e535534237a1fc4cfdfa873949592ff5e7002ff6 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h
@@ -270,6 +270,15 @@ struct amdgpu_rlcg_reg_access_ctrl {
        uint32_t grbm_cntl;
        uint32_t grbm_idx;
        uint32_t spare_int;
+
+       uint32_t vfi_cmd;
+       uint32_t vfi_stat;
+       uint32_t vfi_addr;
+       uint32_t vfi_data;
+       uint32_t vfi_grbm_cntl;
+       uint32_t vfi_grbm_idx;
+       uint32_t vfi_grbm_cntl_data;
+       uint32_t vfi_grbm_idx_data;
 };
 
 struct amdgpu_rlc {

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
index 759f3c642331d2cfeb2d1f74f59d3d475c000076..f8eac92a2b36cf3b8ac24ebe4dc425131384714a 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
@@ -1338,6 +1338,133 @@ bool amdgpu_virt_get_rlcg_reg_access_flag(struct amdgpu_device *adev,
        return ret;
 }
 
+static u32 amdgpu_virt_rlcg_vfi_reg_rw(struct amdgpu_device *adev, u32 offset, u32 v, u32 flag, u32 xcc_id)
+{
+       uint32_t timeout = 100;
+       uint32_t i;
+
+       struct amdgpu_rlcg_reg_access_ctrl *reg_access_ctrl;
+       void *vfi_cmd;
+       void *vfi_stat;
+       void *vfi_addr;
+       void *vfi_data;
+       void *vfi_grbm_cntl;
+       void *vfi_grbm_idx;
+       uint32_t cmd;
+       uint32_t stat;
+       uint32_t addr = offset;
+       uint32_t data;
+       uint32_t grbm_cntl_data;
+       uint32_t grbm_idx_data;
+
+       unsigned long flags;
+       bool is_err = true;
+
+       if (!adev->gfx.rlc.rlcg_reg_access_supported) {
+               dev_err(adev->dev, "VFi interface is not available\n");
+               return 0;
+       }
+
+       if (adev->gfx.xcc_mask && (((1 << xcc_id) & adev->gfx.xcc_mask) == 0)) {
+               dev_err(adev->dev, "VFi invalid XCC, xcc_id=0x%x\n", xcc_id);
+               return 0;
+       }
+
+       if (amdgpu_device_skip_hw_access(adev))
+               return 0;
+
+       reg_access_ctrl = &adev->gfx.rlc.reg_access_ctrl[xcc_id];
+       vfi_cmd  = (void __iomem *)adev->rmmio + 4 * reg_access_ctrl->vfi_cmd;
+       vfi_stat = (void __iomem *)adev->rmmio + 4 * reg_access_ctrl->vfi_stat;
+       vfi_addr = (void __iomem *)adev->rmmio + 4 * reg_access_ctrl->vfi_addr;
+       vfi_data = (void __iomem *)adev->rmmio + 4 * reg_access_ctrl->vfi_data;
+       vfi_grbm_cntl = (void __iomem *)adev->rmmio + 4 * reg_access_ctrl->vfi_grbm_cntl;
+       vfi_grbm_idx  = (void __iomem *)adev->rmmio + 4 * reg_access_ctrl->vfi_grbm_idx;
+       grbm_cntl_data = reg_access_ctrl->vfi_grbm_cntl_data;
+       grbm_idx_data  = reg_access_ctrl->vfi_grbm_idx_data;
+
+       if (flag == AMDGPU_RLCG_GC_WRITE) {
+               data = v;
+               cmd = AMDGPU_RLCG_VFI_CMD__WR;
+
+               // the GRBM_GFX_CNTL and GRBM_GFX_INDEX are protected by mutex outside this call
+               if (addr == reg_access_ctrl->grbm_cntl) {
+                       reg_access_ctrl->vfi_grbm_cntl_data = data;
+                       return 0;
+               } else if (addr == reg_access_ctrl->grbm_idx) {
+                       reg_access_ctrl->vfi_grbm_idx_data = data;
+                       return 0;
+               }
+
+       } else if (flag == AMDGPU_RLCG_GC_READ) {
+               data = 0;
+               cmd = AMDGPU_RLCG_VFI_CMD__RD;
+
+               // the GRBM_GFX_CNTL and GRBM_GFX_INDEX are protected by mutex outside this call
+               if (addr == reg_access_ctrl->grbm_cntl)
+                       return grbm_cntl_data;
+               else if (addr == reg_access_ctrl->grbm_idx)
+                       return grbm_idx_data;
+
+       } else {
+               dev_err(adev->dev, "VFi invalid access, flag=0x%x\n", flag);
+               return 0;
+       }
+
+       spin_lock_irqsave(&adev->virt.rlcg_reg_lock, flags);
+
+       writel(addr, vfi_addr);
+       writel(data, vfi_data);
+       writel(grbm_cntl_data, vfi_grbm_cntl);
+       writel(grbm_idx_data,  vfi_grbm_idx);
+
+       writel(AMDGPU_RLCG_VFI_STAT__BUSY, vfi_stat);
+       writel(cmd, vfi_cmd);
+
+       for (i = 0; i < timeout; i++) {
+               stat = readl(vfi_stat);
+               if (stat != AMDGPU_RLCG_VFI_STAT__BUSY)
+                       break;
+               udelay(10);
+       }
+
+       switch (stat) {
+       case AMDGPU_RLCG_VFI_STAT__DONE:
+               is_err = false;
+               if (cmd == AMDGPU_RLCG_VFI_CMD__RD)
+                       data = readl(vfi_data);
+               break;
+       case AMDGPU_RLCG_VFI_STAT__BUSY:
+               dev_err(adev->dev, "VFi access timeout\n");
+               break;
+       case AMDGPU_RLCG_VFI_STAT__INV_CMD:
+               dev_err(adev->dev, "VFi invalid command\n");
+               break;
+       case AMDGPU_RLCG_VFI_STAT__INV_ADDR:
+               dev_err(adev->dev, "VFi invalid address\n");
+               break;
+       case AMDGPU_RLCG_VFI_STAT__ERR:
+               dev_err(adev->dev, "VFi unknown error\n");
+               break;
+       default:
+               dev_err(adev->dev, "VFi unknown status code\n");
+               break;
+       }
+
+       spin_unlock_irqrestore(&adev->virt.rlcg_reg_lock, flags);
+
+       if (is_err)
+               dev_err(adev->dev, "VFi: [grbm_cntl=0x%x grbm_idx=0x%x] addr=0x%x (byte addr 0x%x), data=0x%x, cmd=0x%x\n",
+                       grbm_cntl_data, grbm_idx_data,
+                       addr, addr * 4, data, cmd);
+       else
+               dev_dbg(adev->dev, "VFi: [grbm_cntl=0x%x grbm_idx=0x%x] addr=0x%x (byte addr 0x%x), data=0x%x, cmd=0x%x\n",
+                       grbm_cntl_data, grbm_idx_data,
+                       addr, addr * 4, data, cmd);
+
+       return data;
+}
+
 u32 amdgpu_virt_rlcg_reg_rw(struct amdgpu_device *adev, u32 offset, u32 v, u32 flag, u32 xcc_id)
 {
        struct amdgpu_rlcg_reg_access_ctrl *reg_access_ctrl;
@@ -1351,6 +1478,9 @@ u32 amdgpu_virt_rlcg_reg_rw(struct amdgpu_device *adev, u32 offset, u32 v, u32 f
        void *spare_int;
        unsigned long flags;
 
+       if (amdgpu_ip_version(adev, GC_HWIP, 0) >= IP_VERSION(12, 1, 0))
+               return amdgpu_virt_rlcg_vfi_reg_rw(adev, offset, v, flag, xcc_id);
+
        if (!adev->gfx.rlc.rlcg_reg_access_supported) {
                dev_err(adev->dev,
                        "indirect registers access through rlcg is not available\n");

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h
index 608d966701a488493a01ce252eec2047c169aae3..886fbce0bfd1d1876b2af19a827c1c4495114156 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h
@@ -47,6 +47,15 @@
 #define AMDGPU_RLCG_SCRATCH1_ADDRESS_MASK      0xFFFFF
 #define AMDGPU_RLCG_SCRATCH1_ERROR_MASK        0xF000000
 
+#define AMDGPU_RLCG_VFI_CMD__WR 0x0
+#define AMDGPU_RLCG_VFI_CMD__RD 0x1
+
+#define AMDGPU_RLCG_VFI_STAT__BUSY     0x0
+#define AMDGPU_RLCG_VFI_STAT__DONE     0x1
+#define AMDGPU_RLCG_VFI_STAT__INV_CMD  0x2
+#define AMDGPU_RLCG_VFI_STAT__INV_ADDR 0x3
+#define AMDGPU_RLCG_VFI_STAT__ERR      0xFF
+
 /* all asic after AI use this offset */
 #define mmRCC_IOV_FUNC_IDENTIFIER 0xDE5
 /* tonga/fiji use this offset */

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c b/drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c
index 1b63546fbb91bf59241ef072d24396087fc5f110..86cc90a662965e11d209cc122f19b368ecc0daff 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c
@@ -526,20 +526,26 @@ static void gfx_v12_1_init_rlcg_reg_access_ctrl(struct amdgpu_device *adev)
        num_xcc = NUM_XCC(adev->gfx.xcc_mask);
        for (xcc_id = 0; xcc_id < num_xcc; xcc_id++) {
                reg_access_ctrl = &adev->gfx.rlc.reg_access_ctrl[GET_INST(GC, xcc_id)];
-               reg_access_ctrl->scratch_reg0 =
-                       SOC15_REG_OFFSET(GC, GET_INST(GC, xcc_id), regSCRATCH_REG0);
-               reg_access_ctrl->scratch_reg1 =
-                       SOC15_REG_OFFSET(GC, GET_INST(GC, xcc_id), regSCRATCH_REG1);
-               reg_access_ctrl->scratch_reg2 =
-                       SOC15_REG_OFFSET(GC, GET_INST(GC, xcc_id), regSCRATCH_REG2);
-               reg_access_ctrl->scratch_reg3 =
-                       SOC15_REG_OFFSET(GC, GET_INST(GC, xcc_id), regSCRATCH_REG3);
+
                reg_access_ctrl->grbm_cntl =
                        SOC15_REG_OFFSET(GC, GET_INST(GC, xcc_id), regGRBM_GFX_CNTL);
                reg_access_ctrl->grbm_idx =
                        SOC15_REG_OFFSET(GC, GET_INST(GC, xcc_id), regGRBM_GFX_INDEX);
-               reg_access_ctrl->spare_int =
-                       SOC15_REG_OFFSET(GC, GET_INST(GC, xcc_id), regRLC_SPARE_INT_0);
+
+               reg_access_ctrl->vfi_cmd =
+                       SOC15_REG_OFFSET(GC, GET_INST(GC, xcc_id), regRLC_VFI_CMD);
+               reg_access_ctrl->vfi_stat =
+                       SOC15_REG_OFFSET(GC, GET_INST(GC, xcc_id), regRLC_VFI_STAT);
+               reg_access_ctrl->vfi_addr =
+                       SOC15_REG_OFFSET(GC, GET_INST(GC, xcc_id), regRLC_VFI_ADDR);
+               reg_access_ctrl->vfi_data =
+                       SOC15_REG_OFFSET(GC, GET_INST(GC, xcc_id), regRLC_VFI_DATA);
+               reg_access_ctrl->vfi_grbm_cntl =
+                       SOC15_REG_OFFSET(GC, GET_INST(GC, xcc_id), regRLC_VFI_GRBM_GFX_CNTL);
+               reg_access_ctrl->vfi_grbm_idx =
+                       SOC15_REG_OFFSET(GC, GET_INST(GC, xcc_id), regRLC_VFI_GRBM_GFX_INDEX);
+               reg_access_ctrl->vfi_grbm_cntl_data = 0;
+               reg_access_ctrl->vfi_grbm_idx_data = 0;
        }
        adev->gfx.rlc.rlcg_reg_access_supported = true;
 }

diff --git a/drivers/gpu/drm/amd/include/asic_reg/gc/gc_12_1_0_offset.h b/drivers/gpu/drm/amd/include/asic_reg/gc/gc_12_1_0_offset.h
index 69731dcc324a40b0b3fb4b29a43ed607f2a4b1c3..d6a2839b4682aeda494676a01e9a016d225a06e9 100644 (file)
--- a/drivers/gpu/drm/amd/include/asic_reg/gc/gc_12_1_0_offset.h
+++ b/drivers/gpu/drm/amd/include/asic_reg/gc/gc_12_1_0_offset.h
@@ -6917,7 +6917,18 @@
 #define regRLC_SPARE_INT_2_BASE_IDX                                                                     1
 #define regRLC_RLCV_SPARE_INT_1                                                                         0x0992
 #define regRLC_RLCV_SPARE_INT_1_BASE_IDX                                                                1
-
+#define regRLC_VFI_CMD                                                                                  0x099a
+#define regRLC_VFI_CMD_BASE_IDX                                                                         1
+#define regRLC_VFI_STAT                                                                                 0x099b
+#define regRLC_VFI_STAT_BASE_IDX                                                                        1
+#define regRLC_VFI_GRBM_GFX_INDEX                                                                       0x099c
+#define regRLC_VFI_GRBM_GFX_INDEX_BASE_IDX                                                              1
+#define regRLC_VFI_GRBM_GFX_CNTL                                                                        0x099d
+#define regRLC_VFI_GRBM_GFX_CNTL_BASE_IDX                                                               1
+#define regRLC_VFI_ADDR                                                                                 0x099e
+#define regRLC_VFI_ADDR_BASE_IDX                                                                        1
+#define regRLC_VFI_DATA                                                                                 0x099f
+#define regRLC_VFI_DATA_BASE_IDX                                                                        1
 
 // addressBlock: CHIP_XCD_gfxip_xcc_gfx_cpwd_cpwd_pwrdec
 // base address: 0x3c000

diff --git a/drivers/gpu/drm/amd/include/asic_reg/gc/gc_12_1_0_sh_mask.h b/drivers/gpu/drm/amd/include/asic_reg/gc/gc_12_1_0_sh_mask.h
index 4db680044a83126811dcf2b65a0b54d3002ded46..f606c5cd03c59e6cae3e50a57524dd462235bea8 100644 (file)
--- a/drivers/gpu/drm/amd/include/asic_reg/gc/gc_12_1_0_sh_mask.h
+++ b/drivers/gpu/drm/amd/include/asic_reg/gc/gc_12_1_0_sh_mask.h
@@ -21945,6 +21945,24 @@
 #define RLC_RLCV_SPARE_INT_1__RESERVED__SHIFT                                                                 0x1
 #define RLC_RLCV_SPARE_INT_1__INTERRUPT_MASK                                                                  0x00000001L
 #define RLC_RLCV_SPARE_INT_1__RESERVED_MASK                                                                   0xFFFFFFFEL
+//RLC_VFI_CMD
+#define RLC_VFI_CMD__VFI_CMD__SHIFT                                                                           0x0
+#define RLC_VFI_CMD__VFI_CMD_MASK                                                                             0xFFFFFFFFL
+//RLC_VFI_STAT
+#define RLC_VFI_STAT__VFI_STATUS__SHIFT                                                                       0x0
+#define RLC_VFI_STAT__VFI_STATUS_MASK                                                                         0xFFFFFFFFL
+//RLC_VFI_GRBM_GFX_INDEX
+#define RLC_VFI_GRBM_GFX_INDEX__VFI_GRBM_GFX_INDEX__SHIFT                                                     0x0
+#define RLC_VFI_GRBM_GFX_INDEX__VFI_GRBM_GFX_INDEX_MASK                                                       0xFFFFFFFFL
+//RLC_VFI_GRBM_GFX_CNTL
+#define RLC_VFI_GRBM_GFX_CNTL__VFI_GRBM_GFX_CNTL__SHIFT                                                       0x0
+#define RLC_VFI_GRBM_GFX_CNTL__VFI_GRBM_GFX_CNTL_MASK                                                         0xFFFFFFFFL
+//RLC_VFI_ADDR
+#define RLC_VFI_ADDR__VFI_ADDR__SHIFT                                                                         0x0
+#define RLC_VFI_ADDR__VFI_ADDR_MASK                                                                           0xFFFFFFFFL
+//RLC_VFI_DATA
+#define RLC_VFI_DATA__VFI_DATA__SHIFT                                                                         0x0
+#define RLC_VFI_DATA__VFI_DATA_MASK                                                                           0xFFFFFFFFL
 
 
 // addressBlock: CHIP_XCD_gfxip_xcc_gfx_cpwd_cpwd_pwrdec