Skip to contentSkip to conversation

drm/amdgpu: add ih 6.1 registers

PATCH In review Alex Deucher 3 participants 5 messages Jul 24, 2023 – Jul 25, 2023

Subsystems (2)
lore
Share & tools
lore

Alex Deucher

author maintainer
#0 lore raw

PATCH 1/3 drm/amdgpu: add ih 6.1 registers

From: benl <[email protected]>

Add new registers.

v2: updates (Alex)

---
 .../asic_reg/oss/osssys_6_1_0_offset.h        |  279 +++++
 .../asic_reg/oss/osssys_6_1_0_sh_mask.h       | 1019 +++++++++++++++++
 2 files changed, 1298 insertions(+)
 create mode 100644 drivers/gpu/drm/amd/include/asic_reg/oss/osssys_6_1_0_offset.h
 create mode 100644 drivers/gpu/drm/amd/include/asic_reg/oss/osssys_6_1_0_sh_mask.h
drivers/gpu/drm/amd/include/asic_reg/oss/osssys_6_1_0_offset.h new file +279 -0
new file mode 100644
index 0000000000000..a5e7ba5d99caf
@@ -0,0 +1,279 @@
+/*
+ * Copyright 2023 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 _osssys_6_1_0_OFFSET_HEADER
+#define _osssys_6_1_0_OFFSET_HEADER
+
+
+
+// addressBlock: osssys_osssysdec
+// base address: 0x4280
+#define regIH_VMID_0_LUT                                                                                0x0000
+#define regIH_VMID_0_LUT_BASE_IDX                                                                       0
+#define regIH_VMID_1_LUT                                                                                0x0001
+#define regIH_VMID_1_LUT_BASE_IDX                                                                       0
+#define regIH_VMID_2_LUT                                                                                0x0002
+#define regIH_VMID_2_LUT_BASE_IDX                                                                       0
+#define regIH_VMID_3_LUT                                                                                0x0003
+#define regIH_VMID_3_LUT_BASE_IDX                                                                       0
+#define regIH_VMID_4_LUT                                                                                0x0004
+#define regIH_VMID_4_LUT_BASE_IDX                                                                       0
+#define regIH_VMID_5_LUT                                                                                0x0005
+#define regIH_VMID_5_LUT_BASE_IDX                                                                       0
+#define regIH_VMID_6_LUT                                                                                0x0006
+#define regIH_VMID_6_LUT_BASE_IDX                                                                       0
+#define regIH_VMID_7_LUT                                                                                0x0007
+#define regIH_VMID_7_LUT_BASE_IDX                                                                       0
+#define regIH_VMID_8_LUT                                                                                0x0008
+#define regIH_VMID_8_LUT_BASE_IDX                                                                       0
+#define regIH_VMID_9_LUT                                                                                0x0009
+#define regIH_VMID_9_LUT_BASE_IDX                                                                       0
+#define regIH_VMID_10_LUT                                                                               0x000a
+#define regIH_VMID_10_LUT_BASE_IDX                                                                      0
+#define regIH_VMID_11_LUT                                                                               0x000b
+#define regIH_VMID_11_LUT_BASE_IDX                                                                      0
+#define regIH_VMID_12_LUT                                                                               0x000c
+#define regIH_VMID_12_LUT_BASE_IDX                                                                      0
+#define regIH_VMID_13_LUT                                                                               0x000d
+#define regIH_VMID_13_LUT_BASE_IDX                                                                      0
+#define regIH_VMID_14_LUT                                                                               0x000e
+#define regIH_VMID_14_LUT_BASE_IDX                                                                      0
+#define regIH_VMID_15_LUT                                                                               0x000f
+#define regIH_VMID_15_LUT_BASE_IDX                                                                      0
+#define regIH_VMID_0_LUT_MM                                                                             0x0010
+#define regIH_VMID_0_LUT_MM_BASE_IDX                                                                    0
+#define regIH_VMID_1_LUT_MM                                                                             0x0011
+#define regIH_VMID_1_LUT_MM_BASE_IDX                                                                    0
+#define regIH_VMID_2_LUT_MM                                                                             0x0012
+#define regIH_VMID_2_LUT_MM_BASE_IDX                                                                    0
+#define regIH_VMID_3_LUT_MM                                                                             0x0013
+#define regIH_VMID_3_LUT_MM_BASE_IDX                                                                    0
+#define regIH_VMID_4_LUT_MM                                                                             0x0014
+#define regIH_VMID_4_LUT_MM_BASE_IDX                                                                    0
+#define regIH_VMID_5_LUT_MM                                                                             0x0015
+#define regIH_VMID_5_LUT_MM_BASE_IDX                                                                    0
+#define regIH_VMID_6_LUT_MM                                                                             0x0016
+#define regIH_VMID_6_LUT_MM_BASE_IDX                                                                    0
+#define regIH_VMID_7_LUT_MM                                                                             0x0017
+#define regIH_VMID_7_LUT_MM_BASE_IDX                                                                    0
+#define regIH_VMID_8_LUT_MM                                                                             0x0018
+#define regIH_VMID_8_LUT_MM_BASE_IDX                                                                    0
+#define regIH_VMID_9_LUT_MM                                                                             0x0019
+#define regIH_VMID_9_LUT_MM_BASE_IDX                                                                    0
+#define regIH_VMID_10_LUT_MM                                                                            0x001a
+#define regIH_VMID_10_LUT_MM_BASE_IDX                                                                   0
+#define regIH_VMID_11_LUT_MM                                                                            0x001b
+#define regIH_VMID_11_LUT_MM_BASE_IDX                                                                   0
+#define regIH_VMID_12_LUT_MM                                                                            0x001c
+#define regIH_VMID_12_LUT_MM_BASE_IDX                                                                   0
+#define regIH_VMID_13_LUT_MM                                                                            0x001d
+#define regIH_VMID_13_LUT_MM_BASE_IDX                                                                   0
+#define regIH_VMID_14_LUT_MM                                                                            0x001e
+#define regIH_VMID_14_LUT_MM_BASE_IDX                                                                   0
+#define regIH_VMID_15_LUT_MM                                                                            0x001f
+#define regIH_VMID_15_LUT_MM_BASE_IDX                                                                   0
+#define regIH_COOKIE_0                                                                                  0x0020
+#define regIH_COOKIE_0_BASE_IDX                                                                         0
+#define regIH_COOKIE_1                                                                                  0x0021
+#define regIH_COOKIE_1_BASE_IDX                                                                         0
+#define regIH_COOKIE_2                                                                                  0x0022
+#define regIH_COOKIE_2_BASE_IDX                                                                         0
+#define regIH_COOKIE_3                                                                                  0x0023
+#define regIH_COOKIE_3_BASE_IDX                                                                         0
+#define regIH_COOKIE_4                                                                                  0x0024
+#define regIH_COOKIE_4_BASE_IDX                                                                         0
+#define regIH_COOKIE_5                                                                                  0x0025
+#define regIH_COOKIE_5_BASE_IDX                                                                         0
+#define regIH_COOKIE_6                                                                                  0x0026
+#define regIH_COOKIE_6_BASE_IDX                                                                         0
+#define regIH_COOKIE_7                                                                                  0x0027
+#define regIH_COOKIE_7_BASE_IDX                                                                         0
+#define regIH_REGISTER_LAST_PART0                                                                       0x003f
+#define regIH_REGISTER_LAST_PART0_BASE_IDX                                                              0
+#define regIH_RB_CNTL                                                                                   0x0080
+#define regIH_RB_CNTL_BASE_IDX                                                                          0
+#define regIH_RB_RPTR                                                                                   0x0081
+#define regIH_RB_RPTR_BASE_IDX                                                                          0
+#define regIH_RB_WPTR                                                                                   0x0082
+#define regIH_RB_WPTR_BASE_IDX                                                                          0
+#define regIH_RB_BASE                                                                                   0x0083
+#define regIH_RB_BASE_BASE_IDX                                                                          0
+#define regIH_RB_BASE_HI                                                                                0x0084
+#define regIH_RB_BASE_HI_BASE_IDX                                                                       0
+#define regIH_RB_WPTR_ADDR_HI                                                                           0x0085
+#define regIH_RB_WPTR_ADDR_HI_BASE_IDX                                                                  0
+#define regIH_RB_WPTR_ADDR_LO                                                                           0x0086
+#define regIH_RB_WPTR_ADDR_LO_BASE_IDX                                                                  0
+#define regIH_DOORBELL_RPTR                                                                             0x0087
+#define regIH_DOORBELL_RPTR_BASE_IDX                                                                    0
+#define regIH_DOORBELL_RETRY_CAM                                                                        0x0088
+#define regIH_DOORBELL_RETRY_CAM_BASE_IDX                                                               0
+#define regIH_RB_CNTL_RING1                                                                             0x008c
+#define regIH_RB_CNTL_RING1_BASE_IDX                                                                    0
+#define regIH_RB_RPTR_RING1                                                                             0x008d
+#define regIH_RB_RPTR_RING1_BASE_IDX                                                                    0
+#define regIH_RB_WPTR_RING1                                                                             0x008e
+#define regIH_RB_WPTR_RING1_BASE_IDX                                                                    0
+#define regIH_RB_BASE_RING1                                                                             0x008f
+#define regIH_RB_BASE_RING1_BASE_IDX                                                                    0
+#define regIH_RB_BASE_HI_RING1                                                                          0x0090
+#define regIH_RB_BASE_HI_RING1_BASE_IDX                                                                 0
+#define regIH_DOORBELL_RPTR_RING1                                                                       0x0093
+#define regIH_DOORBELL_RPTR_RING1_BASE_IDX                                                              0
+#define regIH_RETRY_CAM_ACK                                                                             0x00a4
+#define regIH_RETRY_CAM_ACK_BASE_IDX                                                                    0
+#define regIH_VERSION                                                                                   0x00a5
+#define regIH_VERSION_BASE_IDX                                                                          0
+#define regIH_CNTL                                                                                      0x00a8
+#define regIH_CNTL_BASE_IDX                                                                             0
+#define regIH_CLK_CTRL                                                                                  0x00a9
+#define regIH_CLK_CTRL_BASE_IDX                                                                         0
+#define regIH_STORM_CLIENT_LIST_CNTL                                                                    0x00aa
+#define regIH_STORM_CLIENT_LIST_CNTL_BASE_IDX                                                           0
+#define regIH_LIMIT_INT_RATE_CNTL                                                                       0x00ab
+#define regIH_LIMIT_INT_RATE_CNTL_BASE_IDX                                                              0
+#define regIH_RETRY_INT_CAM_CNTL                                                                        0x00ac
+#define regIH_RETRY_INT_CAM_CNTL_BASE_IDX                                                               0
+#define regIH_MEM_POWER_CTRL                                                                            0x00ad
+#define regIH_MEM_POWER_CTRL_BASE_IDX                                                                   0
+#define regIH_MEM_POWER_CTRL2                                                                           0x00ae
+#define regIH_MEM_POWER_CTRL2_BASE_IDX                                                                  0
+#define regIH_CNTL2                                                                                     0x00c1
+#define regIH_CNTL2_BASE_IDX                                                                            0
+#define regIH_STATUS                                                                                    0x00c2
+#define regIH_STATUS_BASE_IDX                                                                           0
+#define regIH_PERFMON_CNTL                                                                              0x00c3
+#define regIH_PERFMON_CNTL_BASE_IDX                                                                     0
+#define regIH_PERFCOUNTER0_RESULT                                                                       0x00c4
+#define regIH_PERFCOUNTER0_RESULT_BASE_IDX                                                              0
+#define regIH_PERFCOUNTER1_RESULT                                                                       0x00c5
+#define regIH_PERFCOUNTER1_RESULT_BASE_IDX                                                              0
+#define regIH_DSM_MATCH_VALUE_BIT_31_0                                                                  0x00c7
+#define regIH_DSM_MATCH_VALUE_BIT_31_0_BASE_IDX                                                         0
+#define regIH_DSM_MATCH_VALUE_BIT_63_32                                                                 0x00c8
+#define regIH_DSM_MATCH_VALUE_BIT_63_32_BASE_IDX                                                        0
+#define regIH_DSM_MATCH_VALUE_BIT_95_64                                                                 0x00c9
+#define regIH_DSM_MATCH_VALUE_BIT_95_64_BASE_IDX                                                        0
+#define regIH_DSM_MATCH_FIELD_CONTROL                                                                   0x00ca
+#define regIH_DSM_MATCH_FIELD_CONTROL_BASE_IDX                                                          0
+#define regIH_DSM_MATCH_DATA_CONTROL                                                                    0x00cb
+#define regIH_DSM_MATCH_DATA_CONTROL_BASE_IDX                                                           0
+#define regIH_DSM_MATCH_FCN_ID                                                                          0x00cc
+#define regIH_DSM_MATCH_FCN_ID_BASE_IDX                                                                 0
+#define regIH_VF_RB_STATUS                                                                              0x00ce
+#define regIH_VF_RB_STATUS_BASE_IDX                                                                     0
+#define regIH_VF_RB_STATUS2                                                                             0x00cf
+#define regIH_VF_RB_STATUS2_BASE_IDX                                                                    0
+#define regIH_VF_RB1_STATUS                                                                             0x00d0
+#define regIH_VF_RB1_STATUS_BASE_IDX                                                                    0
+#define regIH_VF_RB1_STATUS2                                                                            0x00d1
+#define regIH_VF_RB1_STATUS2_BASE_IDX                                                                   0
+#define regIH_RB_STATUS                                                                                 0x00d4
+#define regIH_RB_STATUS_BASE_IDX                                                                        0
+#define regIH_INT_FLOOD_CNTL                                                                            0x00d5
+#define regIH_INT_FLOOD_CNTL_BASE_IDX                                                                   0
+#define regIH_RB0_INT_FLOOD_STATUS                                                                      0x00d6
+#define regIH_RB0_INT_FLOOD_STATUS_BASE_IDX                                                             0
+#define regIH_RB1_INT_FLOOD_STATUS                                                                      0x00d7
+#define regIH_RB1_INT_FLOOD_STATUS_BASE_IDX                                                             0
+#define regIH_INT_FLOOD_STATUS                                                                          0x00d9
+#define regIH_INT_FLOOD_STATUS_BASE_IDX                                                                 0
+#define regIH_INT_FLAGS                                                                                 0x00dc
+#define regIH_INT_FLAGS_BASE_IDX                                                                        0
+#define regIH_LAST_INT_INFO0                                                                            0x00dd
+#define regIH_LAST_INT_INFO0_BASE_IDX                                                                   0
+#define regIH_LAST_INT_INFO1                                                                            0x00de
+#define regIH_LAST_INT_INFO1_BASE_IDX                                                                   0
+#define regIH_LAST_INT_INFO2                                                                            0x00df
+#define regIH_LAST_INT_INFO2_BASE_IDX                                                                   0
+#define regIH_SCRATCH                                                                                   0x00e0
+#define regIH_SCRATCH_BASE_IDX                                                                          0
+#define regIH_CLIENT_CREDIT_ERROR                                                                       0x00e1
+#define regIH_CLIENT_CREDIT_ERROR_BASE_IDX                                                              0
+#define regIH_GPU_IOV_VIOLATION_LOG                                                                     0x00e2
+#define regIH_GPU_IOV_VIOLATION_LOG_BASE_IDX                                                            0
+#define regIH_GPU_IOV_VIOLATION_LOG2                                                                    0x00e3
+#define regIH_GPU_IOV_VIOLATION_LOG2_BASE_IDX                                                           0
+#define regIH_COOKIE_REC_VIOLATION_LOG                                                                  0x00e4
+#define regIH_COOKIE_REC_VIOLATION_LOG_BASE_IDX                                                         0
+#define regIH_CREDIT_STATUS                                                                             0x00e5
+#define regIH_CREDIT_STATUS_BASE_IDX                                                                    0
+#define regIH_MMHUB_ERROR                                                                               0x00e6
+#define regIH_MMHUB_ERROR_BASE_IDX                                                                      0
+#define regIH_VF_RB_STATUS3                                                                             0x00ea
+#define regIH_VF_RB_STATUS3_BASE_IDX                                                                    0
+#define regIH_VF_RB_STATUS4                                                                             0x00eb
+#define regIH_VF_RB_STATUS4_BASE_IDX                                                                    0
+#define regIH_VF_RB1_STATUS3                                                                            0x00ec
+#define regIH_VF_RB1_STATUS3_BASE_IDX                                                                   0
+#define regIH_MSI_STORM_CTRL                                                                            0x00f1
+#define regIH_MSI_STORM_CTRL_BASE_IDX                                                                   0
+#define regIH_MSI_STORM_CLIENT_INDEX                                                                    0x00f2
+#define regIH_MSI_STORM_CLIENT_INDEX_BASE_IDX                                                           0
+#define regIH_MSI_STORM_CLIENT_DATA                                                                     0x00f3
+#define regIH_MSI_STORM_CLIENT_DATA_BASE_IDX                                                            0
+#define regIH_REGISTER_LAST_PART2                                                                       0x00ff
+#define regIH_REGISTER_LAST_PART2_BASE_IDX                                                              0
+#define regSEM_MAILBOX                                                                                  0x010a
+#define regSEM_MAILBOX_BASE_IDX                                                                         0
+#define regSEM_MAILBOX_CLEAR                                                                            0x010b
+#define regSEM_MAILBOX_CLEAR_BASE_IDX                                                                   0
+#define regSEM_REGISTER_LAST_PART2                                                                      0x017f
+#define regSEM_REGISTER_LAST_PART2_BASE_IDX                                                             0
+#define regIH_ACTIVE_FCN_ID                                                                             0x0180
+#define regIH_ACTIVE_FCN_ID_BASE_IDX                                                                    0
+#define regIH_VIRT_RESET_REQ                                                                            0x0181
+#define regIH_VIRT_RESET_REQ_BASE_IDX                                                                   0
+#define regIH_CLIENT_CFG                                                                                0x0184
+#define regIH_CLIENT_CFG_BASE_IDX                                                                       0
+#define regIH_RING1_CLIENT_CFG_INDEX                                                                    0x0185
+#define regIH_RING1_CLIENT_CFG_INDEX_BASE_IDX                                                           0
+#define regIH_RING1_CLIENT_CFG_DATA                                                                     0x0186
+#define regIH_RING1_CLIENT_CFG_DATA_BASE_IDX                                                            0
+#define regIH_CLIENT_CFG_INDEX                                                                          0x0188
+#define regIH_CLIENT_CFG_INDEX_BASE_IDX                                                                 0
+#define regIH_CLIENT_CFG_DATA                                                                           0x0189
+#define regIH_CLIENT_CFG_DATA_BASE_IDX                                                                  0
+#define regIH_CLIENT_CFG_DATA2                                                                          0x018a
+#define regIH_CLIENT_CFG_DATA2_BASE_IDX                                                                 0
+#define regIH_CID_REMAP_INDEX                                                                           0x018b
+#define regIH_CID_REMAP_INDEX_BASE_IDX                                                                  0
+#define regIH_CID_REMAP_DATA                                                                            0x018c
+#define regIH_CID_REMAP_DATA_BASE_IDX                                                                   0
+#define regIH_CHICKEN                                                                                   0x018d
+#define regIH_CHICKEN_BASE_IDX                                                                          0
+#define regIH_MMHUB_CNTL                                                                                0x018e
+#define regIH_MMHUB_CNTL_BASE_IDX                                                                       0
+#define regIH_INT_DROP_CNTL                                                                             0x018f
+#define regIH_INT_DROP_CNTL_BASE_IDX                                                                    0
+#define regIH_INT_DROP_MATCH_VALUE0                                                                     0x0190
+#define regIH_INT_DROP_MATCH_VALUE0_BASE_IDX                                                            0
+#define regIH_INT_DROP_MATCH_VALUE1                                                                     0x0191
+#define regIH_INT_DROP_MATCH_VALUE1_BASE_IDX                                                            0
+#define regIH_INT_DROP_MATCH_MASK0                                                                      0x0192
+#define regIH_INT_DROP_MATCH_MASK0_BASE_IDX                                                             0
+#define regIH_INT_DROP_MATCH_MASK1                                                                      0x0193
+#define regIH_INT_DROP_MATCH_MASK1_BASE_IDX                                                             0
+#define regIH_REGISTER_LAST_PART1                                                                       0x019f
+#define regIH_REGISTER_LAST_PART1_BASE_IDX                                                              0
+
+#endif
drivers/gpu/drm/amd/include/asic_reg/oss/osssys_6_1_0_sh_mask.h new file +1019 -0

1,019 lines not on this page · raw message

Signature · 1 line
2.41.0
author maintainer
#1 lore raw

PATCH 2/3 drm/amdgpu: add ih 6.1 support

From: benl <[email protected]>

Add initial support for IH 6.1.

---
 drivers/gpu/drm/amd/amdgpu/Makefile  |   3 +-
 drivers/gpu/drm/amd/amdgpu/ih_v6_1.c | 769 +++++++++++++++++++++++++++
 drivers/gpu/drm/amd/amdgpu/ih_v6_1.h |  28 +
 3 files changed, 799 insertions(+), 1 deletion(-)
 create mode 100644 drivers/gpu/drm/amd/amdgpu/ih_v6_1.c
 create mode 100644 drivers/gpu/drm/amd/amdgpu/ih_v6_1.h
drivers/gpu/drm/amd/amdgpu/Makefile +2 -1
index 29325981778a0..384b798a9bad1 100644
@@ -129,7 +129,8 @@ amdgpu-y += \
 	vega10_ih.o \
 	vega20_ih.o \
 	navi10_ih.o \
-	ih_v6_0.o
+	ih_v6_0.o \
+	ih_v6_1.o
 
 # add PSP block
 amdgpu-y += \
drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +769 -0

769 lines not on this page · raw message

drivers/gpu/drm/amd/amdgpu/ih_v6_1.h new file +28 -0
new file mode 100644
index 0000000000000..c48930d394cff
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2021 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 __IH_V6_1_IH_H__
+#define __IH_V6_1_IH_H__
+
+extern const struct amdgpu_ip_block_version ih_v6_1_ip_block;
+
+#endif
Signature · 1 line
2.41.0
#2 lore raw

RE: [PATCH 2/3] drm/amdgpu: add ih 6.1 support

[Public]

Quoted 46 lines

-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Alex Deucher
Sent: Tuesday, July 25, 2023 4:05 AM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>; Li, Ben <[email protected]>
Subject: [PATCH 2/3] drm/amdgpu: add ih 6.1 support

From: benl <[email protected]>

Add initial support for IH 6.1.

---
 drivers/gpu/drm/amd/amdgpu/Makefile  |   3 +-
 drivers/gpu/drm/amd/amdgpu/ih_v6_1.c | 769
+++++++++++++++++++++++++++  drivers/gpu/drm/amd/amdgpu/ih_v6_1.h
|  28 +
 3 files changed, 799 insertions(+), 1 deletion(-)  create mode 100644
drivers/gpu/drm/amd/amdgpu/ih_v6_1.c
 create mode 100644 drivers/gpu/drm/amd/amdgpu/ih_v6_1.h
drivers/gpu/drm/amd/amdgpu/Makefile +2 -1
index 29325981778a0..384b798a9bad1 100644
@@ -129,7 +129,8 @@ amdgpu-y += \
      vega10_ih.o \
      vega20_ih.o \
      navi10_ih.o \
-     ih_v6_0.o
+     ih_v6_0.o \
+     ih_v6_1.o
 
 # add PSP block
 amdgpu-y += \
drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +0 -0
new file mode 100644
index 0000000000000..5795a66ccbc5d

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c line 3

Quoted 3 lines
drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +3 -0
@@ -0,0 +1,769 @@
+/*
+ * Copyright 2021 Advanced Micro Devices, Inc.
+ *

I guess the copyright year here should be 2023? Same for the new header file ih_v6_1.h if it's right.

Regards,
Guchun

Quoted 890 lines
drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +21 -0
+ * 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

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +6 -0
+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

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +36 -0
+OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+#include <linux/pci.h>
+
+#include "amdgpu.h"
+#include "amdgpu_ih.h"
+
+#include "oss/osssys_6_1_0_offset.h"
+#include "oss/osssys_6_1_0_sh_mask.h"
+
+#include "soc15_common.h"
+#include "ih_v6_1.h"
+
+#define MAX_REARM_RETRY 10
+
+static void ih_v6_1_set_interrupt_funcs(struct amdgpu_device *adev);
+
+/**
+ * ih_v6_1_init_register_offset - Initialize register offset for ih
+rings
+ *
+ * @adev: amdgpu_device pointer
+ *
+ * Initialize register offset ih rings (IH_V6_0).
+ */
+static void ih_v6_1_init_register_offset(struct amdgpu_device *adev) {
+     struct amdgpu_ih_regs *ih_regs;
+
+     /* ih ring 2 is removed
+      * ih ring and ih ring 1 are available */
+     if (adev->irq.ih.ring_size) {
+             ih_regs = &adev->irq.ih.ih_regs;
+             ih_regs->ih_rb_base = SOC15_REG_OFFSET(OSSSYS, 0,

regIH_RB_BASE);
+ ih_regs->ih_rb_base_hi = SOC15_REG_OFFSET(OSSSYS, 0,
regIH_RB_BASE_HI);
+ ih_regs->ih_rb_cntl = SOC15_REG_OFFSET(OSSSYS, 0,
regIH_RB_CNTL);
+ ih_regs->ih_rb_wptr = SOC15_REG_OFFSET(OSSSYS, 0,
regIH_RB_WPTR);
+ ih_regs->ih_rb_rptr = SOC15_REG_OFFSET(OSSSYS, 0,
regIH_RB_RPTR);
+ ih_regs->ih_doorbell_rptr = SOC15_REG_OFFSET(OSSSYS, 0,
regIH_DOORBELL_RPTR);
+ ih_regs->ih_rb_wptr_addr_lo = SOC15_REG_OFFSET(OSSSYS,
0, regIH_RB_WPTR_ADDR_LO);
+ ih_regs->ih_rb_wptr_addr_hi = SOC15_REG_OFFSET(OSSSYS,
0, regIH_RB_WPTR_ADDR_HI);

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +6 -0
+             ih_regs->psp_reg_id = PSP_REG_IH_RB_CNTL;
+     }
+
+     if (adev->irq.ih1.ring_size) {
+             ih_regs = &adev->irq.ih1.ih_regs;
+             ih_regs->ih_rb_base = SOC15_REG_OFFSET(OSSSYS, 0,

regIH_RB_BASE_RING1);
+ ih_regs->ih_rb_base_hi = SOC15_REG_OFFSET(OSSSYS, 0,
regIH_RB_BASE_HI_RING1);
+ ih_regs->ih_rb_cntl = SOC15_REG_OFFSET(OSSSYS, 0,
regIH_RB_CNTL_RING1);
+ ih_regs->ih_rb_wptr = SOC15_REG_OFFSET(OSSSYS, 0,
regIH_RB_WPTR_RING1);
+ ih_regs->ih_rb_rptr = SOC15_REG_OFFSET(OSSSYS, 0,
regIH_RB_RPTR_RING1);
+ ih_regs->ih_doorbell_rptr = SOC15_REG_OFFSET(OSSSYS, 0,
regIH_DOORBELL_RPTR_RING1);

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +30 -0
+             ih_regs->psp_reg_id = PSP_REG_IH_RB_CNTL_RING1;
+     }
+}
+
+/**
+ * force_update_wptr_for_self_int - Force update the wptr for self
+interrupt
+ *
+ * @adev: amdgpu_device pointer
+ * @threshold: threshold to trigger the wptr reporting
+ * @timeout: timeout to trigger the wptr reporting
+ * @enabled: Enable/disable timeout flush mechanism
+ *
+ * threshold input range: 0 ~ 15, default 0,
+ * real_threshold = 2^threshold
+ * timeout input range: 0 ~ 20, default 8,
+ * real_timeout = (2^timeout) * 1024 / (socclk_freq)
+ *
+ * Force update wptr for self interrupt ( >= SIENNA_CICHLID).
+ */
+static void
+force_update_wptr_for_self_int(struct amdgpu_device *adev,
+                            u32 threshold, u32 timeout, bool enabled) {
+     u32 ih_cntl, ih_rb_cntl;
+
+     ih_cntl = RREG32_SOC15(OSSSYS, 0, regIH_CNTL2);
+     ih_rb_cntl = RREG32_SOC15(OSSSYS, 0, regIH_RB_CNTL_RING1);
+
+     ih_cntl = REG_SET_FIELD(ih_cntl, IH_CNTL2,
+                             SELF_IV_FORCE_WPTR_UPDATE_TIMEOUT,

timeout);

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +2 -0
+     ih_cntl = REG_SET_FIELD(ih_cntl, IH_CNTL2,
+                             SELF_IV_FORCE_WPTR_UPDATE_ENABLE,

enabled);

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +4 -0
+     ih_rb_cntl = REG_SET_FIELD(ih_rb_cntl, IH_RB_CNTL_RING1,
+                                RB_USED_INT_THRESHOLD, threshold);
+
+     if (amdgpu_sriov_vf(adev) && amdgpu_sriov_reg_indirect_ih(adev))

{
+ if (psp_reg_program(&adev->psp,
PSP_REG_IH_RB_CNTL_RING1, ih_rb_cntl))

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +3 -0
+                     return;
+     } else {
+             WREG32_SOC15(OSSSYS, 0, regIH_RB_CNTL_RING1,

ih_rb_cntl);

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +24 -0
+     }
+
+     WREG32_SOC15(OSSSYS, 0, regIH_CNTL2, ih_cntl); }
+
+/**
+ * ih_v6_1_toggle_ring_interrupts - toggle the interrupt ring buffer
+ *
+ * @adev: amdgpu_device pointer
+ * @ih: amdgpu_ih_ring pointer
+ * @enable: true - enable the interrupts, false - disable the
+interrupts
+ *
+ * Toggle the interrupt ring buffer (IH_V6_0)  */ static int
+ih_v6_1_toggle_ring_interrupts(struct amdgpu_device *adev,
+                                       struct amdgpu_ih_ring *ih,
+                                       bool enable)
+{
+     struct amdgpu_ih_regs *ih_regs;
+     uint32_t tmp;
+
+     ih_regs = &ih->ih_regs;
+
+     tmp = RREG32(ih_regs->ih_rb_cntl);
+     tmp = REG_SET_FIELD(tmp, IH_RB_CNTL, RB_ENABLE, (enable ? 1 :

0));

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +3 -0
+     /* enable_intr field is only valid in ring0 */
+     if (ih == &adev->irq.ih)
+             tmp = REG_SET_FIELD(tmp, IH_RB_CNTL, ENABLE_INTR,

(enable ? 1 : 0));

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +2 -0
+
+     if (amdgpu_sriov_vf(adev) && amdgpu_sriov_reg_indirect_ih(adev))

{

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +37 -0
+             if (psp_reg_program(&adev->psp, ih_regs->psp_reg_id, tmp))
+                     return -ETIMEDOUT;
+     } else {
+             WREG32(ih_regs->ih_rb_cntl, tmp);
+     }
+
+     if (enable) {
+             ih->enabled = true;
+     } else {
+             /* set rptr, wptr to 0 */
+             WREG32(ih_regs->ih_rb_rptr, 0);
+             WREG32(ih_regs->ih_rb_wptr, 0);
+             ih->enabled = false;
+             ih->rptr = 0;
+     }
+
+     return 0;
+}
+
+/**
+ * ih_v6_1_toggle_interrupts - Toggle all the available interrupt ring
+buffers
+ *
+ * @adev: amdgpu_device pointer
+ * @enable: enable or disable interrupt ring buffers
+ *
+ * Toggle all the available interrupt ring buffers (IH_V6_0).
+ */
+static int ih_v6_1_toggle_interrupts(struct amdgpu_device *adev, bool
+enable) {
+     struct amdgpu_ih_ring *ih[] = {&adev->irq.ih, &adev->irq.ih1};
+     int i;
+     int r;
+
+     for (i = 0; i < ARRAY_SIZE(ih); i++) {
+             if (ih[i]->ring_size) {
+                     r = ih_v6_1_toggle_ring_interrupts(adev, ih[i],

enable);

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +19 -0
+                     if (r)
+                             return r;
+             }
+     }
+
+     return 0;
+}
+
+static uint32_t ih_v6_1_rb_cntl(struct amdgpu_ih_ring *ih, uint32_t
+ih_rb_cntl) {
+     int rb_bufsz = order_base_2(ih->ring_size / 4);
+
+     ih_rb_cntl = REG_SET_FIELD(ih_rb_cntl, IH_RB_CNTL,
+                                MC_SPACE, ih->use_bus_addr ? 2 : 4);
+     ih_rb_cntl = REG_SET_FIELD(ih_rb_cntl, IH_RB_CNTL,
+                                WPTR_OVERFLOW_CLEAR, 1);
+     ih_rb_cntl = REG_SET_FIELD(ih_rb_cntl, IH_RB_CNTL,
+                                WPTR_OVERFLOW_ENABLE, 1);
+     ih_rb_cntl = REG_SET_FIELD(ih_rb_cntl, IH_RB_CNTL, RB_SIZE,

rb_bufsz);
+ /* Ring Buffer write pointer writeback. If enabled, IH_RB_WPTR
register

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +46 -0
+      * value is written to memory
+      */
+     ih_rb_cntl = REG_SET_FIELD(ih_rb_cntl, IH_RB_CNTL,
+                                WPTR_WRITEBACK_ENABLE, 1);
+     ih_rb_cntl = REG_SET_FIELD(ih_rb_cntl, IH_RB_CNTL, MC_SNOOP, 1);
+     ih_rb_cntl = REG_SET_FIELD(ih_rb_cntl, IH_RB_CNTL, MC_RO, 0);
+     ih_rb_cntl = REG_SET_FIELD(ih_rb_cntl, IH_RB_CNTL, MC_VMID, 0);
+
+     return ih_rb_cntl;
+}
+
+static uint32_t ih_v6_1_doorbell_rptr(struct amdgpu_ih_ring *ih) {
+     u32 ih_doorbell_rtpr = 0;
+
+     if (ih->use_doorbell) {
+             ih_doorbell_rtpr = REG_SET_FIELD(ih_doorbell_rtpr,
+                                              IH_DOORBELL_RPTR, OFFSET,
+                                              ih->doorbell_index);
+             ih_doorbell_rtpr = REG_SET_FIELD(ih_doorbell_rtpr,
+                                              IH_DOORBELL_RPTR,
+                                              ENABLE, 1);
+     } else {
+             ih_doorbell_rtpr = REG_SET_FIELD(ih_doorbell_rtpr,
+                                              IH_DOORBELL_RPTR,
+                                              ENABLE, 0);
+     }
+     return ih_doorbell_rtpr;
+}
+
+/**
+ * ih_v6_1_enable_ring - enable an ih ring buffer
+ *
+ * @adev: amdgpu_device pointer
+ * @ih: amdgpu_ih_ring pointer
+ *
+ * Enable an ih ring buffer (IH_V6_0)
+ */
+static int ih_v6_1_enable_ring(struct amdgpu_device *adev,
+                                   struct amdgpu_ih_ring *ih)
+{
+     struct amdgpu_ih_regs *ih_regs;
+     uint32_t tmp;
+
+     ih_regs = &ih->ih_regs;
+
+     /* Ring Buffer base. [39:8] of 40-bit address of the beginning of the

ring buffer*/

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +7 -0
+     WREG32(ih_regs->ih_rb_base, ih->gpu_addr >> 8);
+     WREG32(ih_regs->ih_rb_base_hi, (ih->gpu_addr >> 40) & 0xff);
+
+     tmp = RREG32(ih_regs->ih_rb_cntl);
+     tmp = ih_v6_1_rb_cntl(ih, tmp);
+     if (ih == &adev->irq.ih)
+             tmp = REG_SET_FIELD(tmp, IH_RB_CNTL,

RPTR_REARM, !!adev->irq.msi_enabled);

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +2 -0
+     if (ih == &adev->irq.ih1) {
+             tmp = REG_SET_FIELD(tmp, IH_RB_CNTL,

WPTR_OVERFLOW_ENABLE, 0);
+ tmp = REG_SET_FIELD(tmp, IH_RB_CNTL,
RB_FULL_DRAIN_ENABLE, 1);

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +3 -0
+     }
+
+     if (amdgpu_sriov_vf(adev) && amdgpu_sriov_reg_indirect_ih(adev))

{
+ if (psp_reg_program(&adev->psp, ih_regs->psp_reg_id, tmp))
{

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +9 -0
+                     DRM_ERROR("PSP program IH_RB_CNTL failed!\n");
+                     return -ETIMEDOUT;
+             }
+     } else {
+             WREG32(ih_regs->ih_rb_cntl, tmp);
+     }
+
+     if (ih == &adev->irq.ih) {
+             /* set the ih ring 0 writeback address whether it's enabled or

not */
+ WREG32(ih_regs->ih_rb_wptr_addr_lo, lower_32_bits(ih-

Quoted 1 line

wptr_addr));

+ WREG32(ih_regs->ih_rb_wptr_addr_hi, upper_32_bits(ih-

Quoted 1 line

wptr_addr) & 0xFFFF);

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +37 -0
+     }
+
+     /* set rptr, wptr to 0 */
+     WREG32(ih_regs->ih_rb_wptr, 0);
+     WREG32(ih_regs->ih_rb_rptr, 0);
+
+     WREG32(ih_regs->ih_doorbell_rptr, ih_v6_1_doorbell_rptr(ih));
+
+     return 0;
+}
+
+/**
+ * ih_v6_1_irq_init - init and enable the interrupt ring
+ *
+ * @adev: amdgpu_device pointer
+ *
+ * Allocate a ring buffer for the interrupt controller,
+ * enable the RLC, disable interrupts, enable the IH
+ * ring buffer and enable it.
+ * Called at device load and reume.
+ * Returns 0 for success, errors for failure.
+ */
+static int ih_v6_1_irq_init(struct amdgpu_device *adev) {
+     struct amdgpu_ih_ring *ih[] = {&adev->irq.ih, &adev->irq.ih1};
+     u32 ih_chicken;
+     u32 tmp;
+     int ret;
+     int i;
+
+     /* disable irqs */
+     ret = ih_v6_1_toggle_interrupts(adev, false);
+     if (ret)
+             return ret;
+
+     adev->nbio.funcs->ih_control(adev);
+
+     if (unlikely((adev->firmware.load_type ==

AMDGPU_FW_LOAD_DIRECT) ||
+ (adev->firmware.load_type ==
AMDGPU_FW_LOAD_RLC_BACKDOOR_AUTO))) {

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +2 -0
+             if (ih[0]->use_bus_addr) {
+                     ih_chicken = RREG32_SOC15(OSSSYS, 0,

regIH_CHICKEN);

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +2 -0
+                     ih_chicken = REG_SET_FIELD(ih_chicken,
+                                     IH_CHICKEN,

MC_SPACE_GPA_ENABLE, 1);
+ WREG32_SOC15(OSSSYS, 0, regIH_CHICKEN,
ih_chicken);

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +22 -0
+             }
+     }
+
+     for (i = 0; i < ARRAY_SIZE(ih); i++) {
+             if (ih[i]->ring_size) {
+                     ret = ih_v6_1_enable_ring(adev, ih[i]);
+                     if (ret)
+                             return ret;
+             }
+     }
+
+     /* update doorbell range for ih ring 0 */
+     adev->nbio.funcs->ih_doorbell_range(adev, ih[0]->use_doorbell,
+                                         ih[0]->doorbell_index);
+
+     tmp = RREG32_SOC15(OSSSYS, 0, regIH_STORM_CLIENT_LIST_CNTL);
+     tmp = REG_SET_FIELD(tmp, IH_STORM_CLIENT_LIST_CNTL,
+                         CLIENT18_IS_STORM_CLIENT, 1);
+     WREG32_SOC15(OSSSYS, 0, regIH_STORM_CLIENT_LIST_CNTL, tmp);
+
+     tmp = RREG32_SOC15(OSSSYS, 0, regIH_INT_FLOOD_CNTL);
+     tmp = REG_SET_FIELD(tmp, IH_INT_FLOOD_CNTL,

FLOOD_CNTL_ENABLE, 1);

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +82 -0
+     WREG32_SOC15(OSSSYS, 0, regIH_INT_FLOOD_CNTL, tmp);
+
+     /* GC/MMHUB UTCL2 page fault interrupts are configured as
+      * MSI storm capable interrupts by deafult. The delay is
+      * used to avoid ISR being called too frequently
+      * when page fault happens on several continuous page
+      * and thus avoid MSI storm */
+     tmp = RREG32_SOC15(OSSSYS, 0, regIH_MSI_STORM_CTRL);
+     tmp = REG_SET_FIELD(tmp, IH_MSI_STORM_CTRL,
+                         DELAY, 3);
+     WREG32_SOC15(OSSSYS, 0, regIH_MSI_STORM_CTRL, tmp);
+
+     pci_set_master(adev->pdev);
+
+     /* enable interrupts */
+     ret = ih_v6_1_toggle_interrupts(adev, true);
+     if (ret)
+             return ret;
+     /* enable wptr force update for self int */
+     force_update_wptr_for_self_int(adev, 0, 8, true);
+
+     if (adev->irq.ih_soft.ring_size)
+             adev->irq.ih_soft.enabled = true;
+
+     return 0;
+}
+
+/**
+ * ih_v6_1_irq_disable - disable interrupts
+ *
+ * @adev: amdgpu_device pointer
+ *
+ * Disable interrupts on the hw.
+ */
+static void ih_v6_1_irq_disable(struct amdgpu_device *adev) {
+     force_update_wptr_for_self_int(adev, 0, 8, false);
+     ih_v6_1_toggle_interrupts(adev, false);
+
+     /* Wait and acknowledge irq */
+     mdelay(1);
+}
+
+/**
+ * ih_v6_1_get_wptr - get the IH ring buffer wptr
+ *
+ * @adev: amdgpu_device pointer
+ * @ih: amdgpu_ih_ring pointer
+ *
+ * Get the IH ring buffer wptr from either the register
+ * or the writeback memory buffer.  Also check for
+ * ring buffer overflow and deal with it.
+ * Returns the value of the wptr.
+ */
+static u32 ih_v6_1_get_wptr(struct amdgpu_device *adev,
+                           struct amdgpu_ih_ring *ih)
+{
+     u32 wptr, tmp;
+     struct amdgpu_ih_regs *ih_regs;
+
+     wptr = le32_to_cpu(*ih->wptr_cpu);
+     ih_regs = &ih->ih_regs;
+
+     if (!REG_GET_FIELD(wptr, IH_RB_WPTR, RB_OVERFLOW))
+             goto out;
+
+     wptr = RREG32_NO_KIQ(ih_regs->ih_rb_wptr);
+     if (!REG_GET_FIELD(wptr, IH_RB_WPTR, RB_OVERFLOW))
+             goto out;
+     wptr = REG_SET_FIELD(wptr, IH_RB_WPTR, RB_OVERFLOW, 0);
+
+     /* When a ring buffer overflow happen start parsing interrupt
+      * from the last not overwritten vector (wptr + 32). Hopefully
+      * this should allow us to catch up.
+      */
+     tmp = (wptr + 32) & ih->ptr_mask;
+     dev_warn(adev->dev, "IH ring buffer overflow "
+              "(0x%08X, 0x%08X, 0x%08X)\n",
+              wptr, ih->rptr, tmp);
+     ih->rptr = tmp;
+
+     tmp = RREG32_NO_KIQ(ih_regs->ih_rb_cntl);
+     tmp = REG_SET_FIELD(tmp, IH_RB_CNTL, WPTR_OVERFLOW_CLEAR,

1);

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +113 -0
+     WREG32_NO_KIQ(ih_regs->ih_rb_cntl, tmp);
+out:
+     return (wptr & ih->ptr_mask);
+}
+
+/**
+ * ih_v6_1_irq_rearm - rearm IRQ if lost
+ *
+ * @adev: amdgpu_device pointer
+ * @ih: amdgpu_ih_ring pointer
+ *
+ */
+static void ih_v6_1_irq_rearm(struct amdgpu_device *adev,
+                            struct amdgpu_ih_ring *ih)
+{
+     uint32_t v = 0;
+     uint32_t i = 0;
+     struct amdgpu_ih_regs *ih_regs;
+
+     ih_regs = &ih->ih_regs;
+
+     /* Rearm IRQ / re-write doorbell if doorbell write is lost */
+     for (i = 0; i < MAX_REARM_RETRY; i++) {
+             v = RREG32_NO_KIQ(ih_regs->ih_rb_rptr);
+             if ((v < ih->ring_size) && (v != ih->rptr))
+                     WDOORBELL32(ih->doorbell_index, ih->rptr);
+             else
+                     break;
+     }
+}
+
+/**
+ * ih_v6_1_set_rptr - set the IH ring buffer rptr
+ *
+ * @adev: amdgpu_device pointer
+ * @ih: amdgpu_ih_ring pointer
+ *
+ * Set the IH ring buffer rptr.
+ */
+static void ih_v6_1_set_rptr(struct amdgpu_device *adev,
+                            struct amdgpu_ih_ring *ih)
+{
+     struct amdgpu_ih_regs *ih_regs;
+
+     if (ih->use_doorbell) {
+             /* XXX check if swapping is necessary on BE */
+             *ih->rptr_cpu = ih->rptr;
+             WDOORBELL32(ih->doorbell_index, ih->rptr);
+
+             if (amdgpu_sriov_vf(adev))
+                     ih_v6_1_irq_rearm(adev, ih);
+     } else {
+             ih_regs = &ih->ih_regs;
+             WREG32(ih_regs->ih_rb_rptr, ih->rptr);
+     }
+}
+
+/**
+ * ih_v6_1_self_irq - dispatch work for ring 1
+ *
+ * @adev: amdgpu_device pointer
+ * @source: irq source
+ * @entry: IV with WPTR update
+ *
+ * Update the WPTR from the IV and schedule work to handle the entries.
+ */
+static int ih_v6_1_self_irq(struct amdgpu_device *adev,
+                           struct amdgpu_irq_src *source,
+                           struct amdgpu_iv_entry *entry) {
+     uint32_t wptr = cpu_to_le32(entry->src_data[0]);
+
+     switch (entry->ring_id) {
+     case 1:
+             *adev->irq.ih1.wptr_cpu = wptr;
+             schedule_work(&adev->irq.ih1_work);
+             break;
+     default: break;
+     }
+     return 0;
+}
+
+static const struct amdgpu_irq_src_funcs ih_v6_1_self_irq_funcs = {
+     .process = ih_v6_1_self_irq,
+};
+
+static void ih_v6_1_set_self_irq_funcs(struct amdgpu_device *adev) {
+     adev->irq.self_irq.num_types = 0;
+     adev->irq.self_irq.funcs = &ih_v6_1_self_irq_funcs; }
+
+static int ih_v6_1_early_init(void *handle) {
+     struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+
+     ih_v6_1_set_interrupt_funcs(adev);
+     ih_v6_1_set_self_irq_funcs(adev);
+     return 0;
+}
+
+static int ih_v6_1_sw_init(void *handle) {
+     int r;
+     struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+     bool use_bus_addr;
+
+     r = amdgpu_irq_add_id(adev, SOC21_IH_CLIENTID_IH, 0,
+                           &adev->irq.self_irq);
+
+     if (r)
+             return r;
+
+     /* use gpu virtual address for ih ring
+      * until ih_checken is programmed to allow
+      * use bus address for ih ring by psp bl */
+     use_bus_addr =
+             (adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) ?

false : true;
+ r = amdgpu_ih_ring_init(adev, &adev->irq.ih, 256 * 1024,
use_bus_addr);

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +85 -0
+     if (r)
+             return r;
+
+     adev->irq.ih.use_doorbell = true;
+     adev->irq.ih.doorbell_index = adev->doorbell_index.ih << 1;
+
+     adev->irq.ih1.ring_size = 0;
+     adev->irq.ih2.ring_size = 0;
+
+     /* initialize ih control register offset */
+     ih_v6_1_init_register_offset(adev);
+
+     r = amdgpu_ih_ring_init(adev, &adev->irq.ih_soft, PAGE_SIZE, true);
+     if (r)
+             return r;
+
+     r = amdgpu_irq_init(adev);
+
+     return r;
+}
+
+static int ih_v6_1_sw_fini(void *handle) {
+     struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+
+     amdgpu_irq_fini_sw(adev);
+
+     return 0;
+}
+
+static int ih_v6_1_hw_init(void *handle) {
+     int r;
+     struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+
+     r = ih_v6_1_irq_init(adev);
+     if (r)
+             return r;
+
+     return 0;
+}
+
+static int ih_v6_1_hw_fini(void *handle) {
+     struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+
+     ih_v6_1_irq_disable(adev);
+
+     return 0;
+}
+
+static int ih_v6_1_suspend(void *handle) {
+     struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+
+     return ih_v6_1_hw_fini(adev);
+}
+
+static int ih_v6_1_resume(void *handle) {
+     struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+
+     return ih_v6_1_hw_init(adev);
+}
+
+static bool ih_v6_1_is_idle(void *handle) {
+     /* todo */
+     return true;
+}
+
+static int ih_v6_1_wait_for_idle(void *handle) {
+     /* todo */
+     return -ETIMEDOUT;
+}
+
+static int ih_v6_1_soft_reset(void *handle) {
+     /* todo */
+     return 0;
+}
+
+static void ih_v6_1_update_clockgating_state(struct amdgpu_device *adev,
+                                            bool enable)
+{
+     uint32_t data, def, field_val;
+
+     if (adev->cg_flags & AMD_CG_SUPPORT_IH_CG) {
+             def = data = RREG32_SOC15(OSSSYS, 0, regIH_CLK_CTRL);
+             field_val = enable ? 0 : 1;
+             data = REG_SET_FIELD(data, IH_CLK_CTRL,
+                                  DBUS_MUX_CLK_SOFT_OVERRIDE,

field_val);

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +2 -0
+             data = REG_SET_FIELD(data, IH_CLK_CTRL,
+                                  OSSSYS_SHARE_CLK_SOFT_OVERRIDE,

field_val);

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +2 -0
+             data = REG_SET_FIELD(data, IH_CLK_CTRL,
+                                  LIMIT_SMN_CLK_SOFT_OVERRIDE,

field_val);

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +13 -0
+             data = REG_SET_FIELD(data, IH_CLK_CTRL,
+                                  DYN_CLK_SOFT_OVERRIDE, field_val);
+             data = REG_SET_FIELD(data, IH_CLK_CTRL,
+                                  REG_CLK_SOFT_OVERRIDE, field_val);
+             if (def != data)
+                     WREG32_SOC15(OSSSYS, 0, regIH_CLK_CTRL, data);
+     }
+
+     return;
+}
+
+static int ih_v6_1_set_clockgating_state(void *handle,
+                                        enum amd_clockgating_state state)

{

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +8 -0
+     struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+
+     ih_v6_1_update_clockgating_state(adev,
+                             state == AMD_CG_STATE_GATE);
+     return 0;
+}
+
+static void ih_v6_1_update_ih_mem_power_gating(struct amdgpu_device

*adev,

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +6 -0
+                                            bool enable)
+{
+     uint32_t ih_mem_pwr_cntl;
+
+     /* Disable ih sram power cntl before switch powergating mode */
+     ih_mem_pwr_cntl = RREG32_SOC15(OSSSYS, 0,

regIH_MEM_POWER_CTRL);
+ ih_mem_pwr_cntl = REG_SET_FIELD(ih_mem_pwr_cntl,
IH_MEM_POWER_CTRL,
+ IH_BUFFER_MEM_POWER_CTRL_EN,
0);
+ WREG32_SOC15(OSSSYS, 0, regIH_MEM_POWER_CTRL,
ih_mem_pwr_cntl);

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +5 -0
+
+     /* It is recommended to set mem powergating mode to DS mode */
+     if (enable) {
+             /* mem power mode */
+             ih_mem_pwr_cntl = REG_SET_FIELD(ih_mem_pwr_cntl,

IH_MEM_POWER_CTRL,

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +2 -0
+
      IH_BUFFER_MEM_POWER_LS_EN, 0);
+             ih_mem_pwr_cntl = REG_SET_FIELD(ih_mem_pwr_cntl,

IH_MEM_POWER_CTRL,

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +2 -0
+
      IH_BUFFER_MEM_POWER_DS_EN, 1);
+             ih_mem_pwr_cntl = REG_SET_FIELD(ih_mem_pwr_cntl,

IH_MEM_POWER_CTRL,

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +3 -0
+
      IH_BUFFER_MEM_POWER_SD_EN, 0);
+             /* cam mem power mode */
+             ih_mem_pwr_cntl = REG_SET_FIELD(ih_mem_pwr_cntl,

IH_MEM_POWER_CTRL,

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +2 -0
+
      IH_RETRY_INT_CAM_MEM_POWER_LS_EN, 0);
+             ih_mem_pwr_cntl = REG_SET_FIELD(ih_mem_pwr_cntl,

IH_MEM_POWER_CTRL,

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +2 -0
+
      IH_RETRY_INT_CAM_MEM_POWER_DS_EN, 1);
+             ih_mem_pwr_cntl = REG_SET_FIELD(ih_mem_pwr_cntl,

IH_MEM_POWER_CTRL,

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +3 -0
+
      IH_RETRY_INT_CAM_MEM_POWER_SD_EN, 0);
+             /* re-enable power cntl */
+             ih_mem_pwr_cntl = REG_SET_FIELD(ih_mem_pwr_cntl,

IH_MEM_POWER_CTRL,

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +4 -0
+
      IH_BUFFER_MEM_POWER_CTRL_EN, 1);
+     } else {
+             /* mem power mode */
+             ih_mem_pwr_cntl = REG_SET_FIELD(ih_mem_pwr_cntl,

IH_MEM_POWER_CTRL,

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +2 -0
+
      IH_BUFFER_MEM_POWER_LS_EN, 0);
+             ih_mem_pwr_cntl = REG_SET_FIELD(ih_mem_pwr_cntl,

IH_MEM_POWER_CTRL,

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +2 -0
+
      IH_BUFFER_MEM_POWER_DS_EN, 0);
+             ih_mem_pwr_cntl = REG_SET_FIELD(ih_mem_pwr_cntl,

IH_MEM_POWER_CTRL,

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +3 -0
+
      IH_BUFFER_MEM_POWER_SD_EN, 0);
+             /* cam mem power mode */
+             ih_mem_pwr_cntl = REG_SET_FIELD(ih_mem_pwr_cntl,

IH_MEM_POWER_CTRL,

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +2 -0
+
      IH_RETRY_INT_CAM_MEM_POWER_LS_EN, 0);
+             ih_mem_pwr_cntl = REG_SET_FIELD(ih_mem_pwr_cntl,

IH_MEM_POWER_CTRL,

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +2 -0
+
      IH_RETRY_INT_CAM_MEM_POWER_DS_EN, 0);
+             ih_mem_pwr_cntl = REG_SET_FIELD(ih_mem_pwr_cntl,

IH_MEM_POWER_CTRL,

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +3 -0
+
      IH_RETRY_INT_CAM_MEM_POWER_SD_EN, 0);
+             /* re-enable power cntl*/
+             ih_mem_pwr_cntl = REG_SET_FIELD(ih_mem_pwr_cntl,

IH_MEM_POWER_CTRL,

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +4 -0
+
      IH_BUFFER_MEM_POWER_CTRL_EN, 1);
+     }
+
+     WREG32_SOC15(OSSSYS, 0, regIH_MEM_POWER_CTRL,

ih_mem_pwr_cntl); }

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +3 -0
+
+static int ih_v6_1_set_powergating_state(void *handle,
+                                      enum amd_powergating_state state)

{

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +53 -0
+     struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+     bool enable = (state == AMD_PG_STATE_GATE);
+
+     if (adev->pg_flags & AMD_PG_SUPPORT_IH_SRAM_PG)
+             ih_v6_1_update_ih_mem_power_gating(adev, enable);
+
+     return 0;
+}
+
+static void ih_v6_1_get_clockgating_state(void *handle, u64 *flags) {
+     struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+
+     if (!RREG32_SOC15(OSSSYS, 0, regIH_CLK_CTRL))
+             *flags |= AMD_CG_SUPPORT_IH_CG;
+
+     return;
+}
+
+static const struct amd_ip_funcs ih_v6_1_ip_funcs = {
+     .name = "ih_v6_1",
+     .early_init = ih_v6_1_early_init,
+     .late_init = NULL,
+     .sw_init = ih_v6_1_sw_init,
+     .sw_fini = ih_v6_1_sw_fini,
+     .hw_init = ih_v6_1_hw_init,
+     .hw_fini = ih_v6_1_hw_fini,
+     .suspend = ih_v6_1_suspend,
+     .resume = ih_v6_1_resume,
+     .is_idle = ih_v6_1_is_idle,
+     .wait_for_idle = ih_v6_1_wait_for_idle,
+     .soft_reset = ih_v6_1_soft_reset,
+     .set_clockgating_state = ih_v6_1_set_clockgating_state,
+     .set_powergating_state = ih_v6_1_set_powergating_state,
+     .get_clockgating_state = ih_v6_1_get_clockgating_state, };
+
+static const struct amdgpu_ih_funcs ih_v6_1_funcs = {
+     .get_wptr = ih_v6_1_get_wptr,
+     .decode_iv = amdgpu_ih_decode_iv_helper,
+     .decode_iv_ts = amdgpu_ih_decode_iv_ts_helper,
+     .set_rptr = ih_v6_1_set_rptr
+};
+
+static void ih_v6_1_set_interrupt_funcs(struct amdgpu_device *adev) {
+     adev->irq.ih_funcs = &ih_v6_1_funcs;
+}
+
+const struct amdgpu_ip_block_version ih_v6_1_ip_block = {
+     .type = AMD_IP_BLOCK_TYPE_IH,
+     .major = 6,
+     .minor = 0,
+     .rev = 0,
+     .funcs = &ih_v6_1_ip_funcs,
+};
drivers/gpu/drm/amd/amdgpu/ih_v6_1.h new file +24 -0
new file mode 100644
index 0000000000000..c48930d394cff
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2021 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

drivers/gpu/drm/amd/amdgpu/ih_v6_1.h new file +6 -0
+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

drivers/gpu/drm/amd/amdgpu/ih_v6_1.h new file +10 -1
+OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+#ifndef __IH_V6_1_IH_H__
+#define __IH_V6_1_IH_H__
+
+extern const struct amdgpu_ip_block_version ih_v6_1_ip_block;
+
+#endif
--

2.41.0

#3 lore raw

Re: [PATCH 2/3] drm/amdgpu: add ih 6.1 support

Quoted 40 lines · Guchun

[Public]

Quoted 37 lines

-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Alex Deucher
Sent: Tuesday, July 25, 2023 4:05 AM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>; Li, Ben <[email protected]>
Subject: [PATCH 2/3] drm/amdgpu: add ih 6.1 support

From: benl <[email protected]>

Add initial support for IH 6.1.

---
 drivers/gpu/drm/amd/amdgpu/Makefile  |   3 +-
 drivers/gpu/drm/amd/amdgpu/ih_v6_1.c | 769
+++++++++++++++++++++++++++  drivers/gpu/drm/amd/amdgpu/ih_v6_1.h
|  28 +
 3 files changed, 799 insertions(+), 1 deletion(-)  create mode 100644
drivers/gpu/drm/amd/amdgpu/ih_v6_1.c
 create mode 100644 drivers/gpu/drm/amd/amdgpu/ih_v6_1.h
drivers/gpu/drm/amd/amdgpu/Makefile +2 -1
index 29325981778a0..384b798a9bad1 100644
@@ -129,7 +129,8 @@ amdgpu-y += \
      vega10_ih.o \
      vega20_ih.o \
      navi10_ih.o \
-     ih_v6_0.o
+     ih_v6_0.o \
+     ih_v6_1.o
 
Quoted 14 lines

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c line 3

Quoted 12 lines
drivers/gpu/drm/amd/amdgpu/Makefile +0 -0
 # add PSP block
 amdgpu-y += \
drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +3 -0
new file mode 100644
index 0000000000000..5795a66ccbc5d
@@ -0,0 +1,769 @@
+/*
+ * Copyright 2021 Advanced Micro Devices, Inc.
+ *

I guess the copyright year here should be 2023? Same for the new header file ih_v6_1.h if it's right.

Fixed up locally. Thanks!

Alex

Quoted 895 lines

Regards,
Guchun

Quoted 890 lines
drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +21 -0
+ * 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

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +6 -0
+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

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +36 -0
+OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+#include <linux/pci.h>
+
+#include "amdgpu.h"
+#include "amdgpu_ih.h"
+
+#include "oss/osssys_6_1_0_offset.h"
+#include "oss/osssys_6_1_0_sh_mask.h"
+
+#include "soc15_common.h"
+#include "ih_v6_1.h"
+
+#define MAX_REARM_RETRY 10
+
+static void ih_v6_1_set_interrupt_funcs(struct amdgpu_device *adev);
+
+/**
+ * ih_v6_1_init_register_offset - Initialize register offset for ih
+rings
+ *
+ * @adev: amdgpu_device pointer
+ *
+ * Initialize register offset ih rings (IH_V6_0).
+ */
+static void ih_v6_1_init_register_offset(struct amdgpu_device *adev) {
+     struct amdgpu_ih_regs *ih_regs;
+
+     /* ih ring 2 is removed
+      * ih ring and ih ring 1 are available */
+     if (adev->irq.ih.ring_size) {
+             ih_regs = &adev->irq.ih.ih_regs;
+             ih_regs->ih_rb_base = SOC15_REG_OFFSET(OSSSYS, 0,

regIH_RB_BASE);
+ ih_regs->ih_rb_base_hi = SOC15_REG_OFFSET(OSSSYS, 0,
regIH_RB_BASE_HI);
+ ih_regs->ih_rb_cntl = SOC15_REG_OFFSET(OSSSYS, 0,
regIH_RB_CNTL);
+ ih_regs->ih_rb_wptr = SOC15_REG_OFFSET(OSSSYS, 0,
regIH_RB_WPTR);
+ ih_regs->ih_rb_rptr = SOC15_REG_OFFSET(OSSSYS, 0,
regIH_RB_RPTR);
+ ih_regs->ih_doorbell_rptr = SOC15_REG_OFFSET(OSSSYS, 0,
regIH_DOORBELL_RPTR);
+ ih_regs->ih_rb_wptr_addr_lo = SOC15_REG_OFFSET(OSSSYS,
0, regIH_RB_WPTR_ADDR_LO);
+ ih_regs->ih_rb_wptr_addr_hi = SOC15_REG_OFFSET(OSSSYS,
0, regIH_RB_WPTR_ADDR_HI);

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +6 -0
+             ih_regs->psp_reg_id = PSP_REG_IH_RB_CNTL;
+     }
+
+     if (adev->irq.ih1.ring_size) {
+             ih_regs = &adev->irq.ih1.ih_regs;
+             ih_regs->ih_rb_base = SOC15_REG_OFFSET(OSSSYS, 0,

regIH_RB_BASE_RING1);
+ ih_regs->ih_rb_base_hi = SOC15_REG_OFFSET(OSSSYS, 0,
regIH_RB_BASE_HI_RING1);
+ ih_regs->ih_rb_cntl = SOC15_REG_OFFSET(OSSSYS, 0,
regIH_RB_CNTL_RING1);
+ ih_regs->ih_rb_wptr = SOC15_REG_OFFSET(OSSSYS, 0,
regIH_RB_WPTR_RING1);
+ ih_regs->ih_rb_rptr = SOC15_REG_OFFSET(OSSSYS, 0,
regIH_RB_RPTR_RING1);
+ ih_regs->ih_doorbell_rptr = SOC15_REG_OFFSET(OSSSYS, 0,
regIH_DOORBELL_RPTR_RING1);

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +30 -0
+             ih_regs->psp_reg_id = PSP_REG_IH_RB_CNTL_RING1;
+     }
+}
+
+/**
+ * force_update_wptr_for_self_int - Force update the wptr for self
+interrupt
+ *
+ * @adev: amdgpu_device pointer
+ * @threshold: threshold to trigger the wptr reporting
+ * @timeout: timeout to trigger the wptr reporting
+ * @enabled: Enable/disable timeout flush mechanism
+ *
+ * threshold input range: 0 ~ 15, default 0,
+ * real_threshold = 2^threshold
+ * timeout input range: 0 ~ 20, default 8,
+ * real_timeout = (2^timeout) * 1024 / (socclk_freq)
+ *
+ * Force update wptr for self interrupt ( >= SIENNA_CICHLID).
+ */
+static void
+force_update_wptr_for_self_int(struct amdgpu_device *adev,
+                            u32 threshold, u32 timeout, bool enabled) {
+     u32 ih_cntl, ih_rb_cntl;
+
+     ih_cntl = RREG32_SOC15(OSSSYS, 0, regIH_CNTL2);
+     ih_rb_cntl = RREG32_SOC15(OSSSYS, 0, regIH_RB_CNTL_RING1);
+
+     ih_cntl = REG_SET_FIELD(ih_cntl, IH_CNTL2,
+                             SELF_IV_FORCE_WPTR_UPDATE_TIMEOUT,

timeout);

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +2 -0
+     ih_cntl = REG_SET_FIELD(ih_cntl, IH_CNTL2,
+                             SELF_IV_FORCE_WPTR_UPDATE_ENABLE,

enabled);

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +4 -0
+     ih_rb_cntl = REG_SET_FIELD(ih_rb_cntl, IH_RB_CNTL_RING1,
+                                RB_USED_INT_THRESHOLD, threshold);
+
+     if (amdgpu_sriov_vf(adev) && amdgpu_sriov_reg_indirect_ih(adev))

{
+ if (psp_reg_program(&adev->psp,
PSP_REG_IH_RB_CNTL_RING1, ih_rb_cntl))

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +3 -0
+                     return;
+     } else {
+             WREG32_SOC15(OSSSYS, 0, regIH_RB_CNTL_RING1,

ih_rb_cntl);

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +24 -0
+     }
+
+     WREG32_SOC15(OSSSYS, 0, regIH_CNTL2, ih_cntl); }
+
+/**
+ * ih_v6_1_toggle_ring_interrupts - toggle the interrupt ring buffer
+ *
+ * @adev: amdgpu_device pointer
+ * @ih: amdgpu_ih_ring pointer
+ * @enable: true - enable the interrupts, false - disable the
+interrupts
+ *
+ * Toggle the interrupt ring buffer (IH_V6_0)  */ static int
+ih_v6_1_toggle_ring_interrupts(struct amdgpu_device *adev,
+                                       struct amdgpu_ih_ring *ih,
+                                       bool enable)
+{
+     struct amdgpu_ih_regs *ih_regs;
+     uint32_t tmp;
+
+     ih_regs = &ih->ih_regs;
+
+     tmp = RREG32(ih_regs->ih_rb_cntl);
+     tmp = REG_SET_FIELD(tmp, IH_RB_CNTL, RB_ENABLE, (enable ? 1 :

0));

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +3 -0
+     /* enable_intr field is only valid in ring0 */
+     if (ih == &adev->irq.ih)
+             tmp = REG_SET_FIELD(tmp, IH_RB_CNTL, ENABLE_INTR,

(enable ? 1 : 0));

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +2 -0
+
+     if (amdgpu_sriov_vf(adev) && amdgpu_sriov_reg_indirect_ih(adev))

{

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +37 -0
+             if (psp_reg_program(&adev->psp, ih_regs->psp_reg_id, tmp))
+                     return -ETIMEDOUT;
+     } else {
+             WREG32(ih_regs->ih_rb_cntl, tmp);
+     }
+
+     if (enable) {
+             ih->enabled = true;
+     } else {
+             /* set rptr, wptr to 0 */
+             WREG32(ih_regs->ih_rb_rptr, 0);
+             WREG32(ih_regs->ih_rb_wptr, 0);
+             ih->enabled = false;
+             ih->rptr = 0;
+     }
+
+     return 0;
+}
+
+/**
+ * ih_v6_1_toggle_interrupts - Toggle all the available interrupt ring
+buffers
+ *
+ * @adev: amdgpu_device pointer
+ * @enable: enable or disable interrupt ring buffers
+ *
+ * Toggle all the available interrupt ring buffers (IH_V6_0).
+ */
+static int ih_v6_1_toggle_interrupts(struct amdgpu_device *adev, bool
+enable) {
+     struct amdgpu_ih_ring *ih[] = {&adev->irq.ih, &adev->irq.ih1};
+     int i;
+     int r;
+
+     for (i = 0; i < ARRAY_SIZE(ih); i++) {
+             if (ih[i]->ring_size) {
+                     r = ih_v6_1_toggle_ring_interrupts(adev, ih[i],

enable);

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +19 -0
+                     if (r)
+                             return r;
+             }
+     }
+
+     return 0;
+}
+
+static uint32_t ih_v6_1_rb_cntl(struct amdgpu_ih_ring *ih, uint32_t
+ih_rb_cntl) {
+     int rb_bufsz = order_base_2(ih->ring_size / 4);
+
+     ih_rb_cntl = REG_SET_FIELD(ih_rb_cntl, IH_RB_CNTL,
+                                MC_SPACE, ih->use_bus_addr ? 2 : 4);
+     ih_rb_cntl = REG_SET_FIELD(ih_rb_cntl, IH_RB_CNTL,
+                                WPTR_OVERFLOW_CLEAR, 1);
+     ih_rb_cntl = REG_SET_FIELD(ih_rb_cntl, IH_RB_CNTL,
+                                WPTR_OVERFLOW_ENABLE, 1);
+     ih_rb_cntl = REG_SET_FIELD(ih_rb_cntl, IH_RB_CNTL, RB_SIZE,

rb_bufsz);
+ /* Ring Buffer write pointer writeback. If enabled, IH_RB_WPTR
register

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +46 -0
+      * value is written to memory
+      */
+     ih_rb_cntl = REG_SET_FIELD(ih_rb_cntl, IH_RB_CNTL,
+                                WPTR_WRITEBACK_ENABLE, 1);
+     ih_rb_cntl = REG_SET_FIELD(ih_rb_cntl, IH_RB_CNTL, MC_SNOOP, 1);
+     ih_rb_cntl = REG_SET_FIELD(ih_rb_cntl, IH_RB_CNTL, MC_RO, 0);
+     ih_rb_cntl = REG_SET_FIELD(ih_rb_cntl, IH_RB_CNTL, MC_VMID, 0);
+
+     return ih_rb_cntl;
+}
+
+static uint32_t ih_v6_1_doorbell_rptr(struct amdgpu_ih_ring *ih) {
+     u32 ih_doorbell_rtpr = 0;
+
+     if (ih->use_doorbell) {
+             ih_doorbell_rtpr = REG_SET_FIELD(ih_doorbell_rtpr,
+                                              IH_DOORBELL_RPTR, OFFSET,
+                                              ih->doorbell_index);
+             ih_doorbell_rtpr = REG_SET_FIELD(ih_doorbell_rtpr,
+                                              IH_DOORBELL_RPTR,
+                                              ENABLE, 1);
+     } else {
+             ih_doorbell_rtpr = REG_SET_FIELD(ih_doorbell_rtpr,
+                                              IH_DOORBELL_RPTR,
+                                              ENABLE, 0);
+     }
+     return ih_doorbell_rtpr;
+}
+
+/**
+ * ih_v6_1_enable_ring - enable an ih ring buffer
+ *
+ * @adev: amdgpu_device pointer
+ * @ih: amdgpu_ih_ring pointer
+ *
+ * Enable an ih ring buffer (IH_V6_0)
+ */
+static int ih_v6_1_enable_ring(struct amdgpu_device *adev,
+                                   struct amdgpu_ih_ring *ih)
+{
+     struct amdgpu_ih_regs *ih_regs;
+     uint32_t tmp;
+
+     ih_regs = &ih->ih_regs;
+
+     /* Ring Buffer base. [39:8] of 40-bit address of the beginning of the

ring buffer*/

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +7 -0
+     WREG32(ih_regs->ih_rb_base, ih->gpu_addr >> 8);
+     WREG32(ih_regs->ih_rb_base_hi, (ih->gpu_addr >> 40) & 0xff);
+
+     tmp = RREG32(ih_regs->ih_rb_cntl);
+     tmp = ih_v6_1_rb_cntl(ih, tmp);
+     if (ih == &adev->irq.ih)
+             tmp = REG_SET_FIELD(tmp, IH_RB_CNTL,

RPTR_REARM, !!adev->irq.msi_enabled);

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +2 -0
+     if (ih == &adev->irq.ih1) {
+             tmp = REG_SET_FIELD(tmp, IH_RB_CNTL,

WPTR_OVERFLOW_ENABLE, 0);
+ tmp = REG_SET_FIELD(tmp, IH_RB_CNTL,
RB_FULL_DRAIN_ENABLE, 1);

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +3 -0
+     }
+
+     if (amdgpu_sriov_vf(adev) && amdgpu_sriov_reg_indirect_ih(adev))

{
+ if (psp_reg_program(&adev->psp, ih_regs->psp_reg_id, tmp))
{

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +9 -0
+                     DRM_ERROR("PSP program IH_RB_CNTL failed!\n");
+                     return -ETIMEDOUT;
+             }
+     } else {
+             WREG32(ih_regs->ih_rb_cntl, tmp);
+     }
+
+     if (ih == &adev->irq.ih) {
+             /* set the ih ring 0 writeback address whether it's enabled or

not */
+ WREG32(ih_regs->ih_rb_wptr_addr_lo, lower_32_bits(ih-

Quoted 1 line

wptr_addr));

+ WREG32(ih_regs->ih_rb_wptr_addr_hi, upper_32_bits(ih-

Quoted 1 line

wptr_addr) & 0xFFFF);

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +37 -0
+     }
+
+     /* set rptr, wptr to 0 */
+     WREG32(ih_regs->ih_rb_wptr, 0);
+     WREG32(ih_regs->ih_rb_rptr, 0);
+
+     WREG32(ih_regs->ih_doorbell_rptr, ih_v6_1_doorbell_rptr(ih));
+
+     return 0;
+}
+
+/**
+ * ih_v6_1_irq_init - init and enable the interrupt ring
+ *
+ * @adev: amdgpu_device pointer
+ *
+ * Allocate a ring buffer for the interrupt controller,
+ * enable the RLC, disable interrupts, enable the IH
+ * ring buffer and enable it.
+ * Called at device load and reume.
+ * Returns 0 for success, errors for failure.
+ */
+static int ih_v6_1_irq_init(struct amdgpu_device *adev) {
+     struct amdgpu_ih_ring *ih[] = {&adev->irq.ih, &adev->irq.ih1};
+     u32 ih_chicken;
+     u32 tmp;
+     int ret;
+     int i;
+
+     /* disable irqs */
+     ret = ih_v6_1_toggle_interrupts(adev, false);
+     if (ret)
+             return ret;
+
+     adev->nbio.funcs->ih_control(adev);
+
+     if (unlikely((adev->firmware.load_type ==

AMDGPU_FW_LOAD_DIRECT) ||
+ (adev->firmware.load_type ==
AMDGPU_FW_LOAD_RLC_BACKDOOR_AUTO))) {

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +2 -0
+             if (ih[0]->use_bus_addr) {
+                     ih_chicken = RREG32_SOC15(OSSSYS, 0,

regIH_CHICKEN);

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +2 -0
+                     ih_chicken = REG_SET_FIELD(ih_chicken,
+                                     IH_CHICKEN,

MC_SPACE_GPA_ENABLE, 1);
+ WREG32_SOC15(OSSSYS, 0, regIH_CHICKEN,
ih_chicken);

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +22 -0
+             }
+     }
+
+     for (i = 0; i < ARRAY_SIZE(ih); i++) {
+             if (ih[i]->ring_size) {
+                     ret = ih_v6_1_enable_ring(adev, ih[i]);
+                     if (ret)
+                             return ret;
+             }
+     }
+
+     /* update doorbell range for ih ring 0 */
+     adev->nbio.funcs->ih_doorbell_range(adev, ih[0]->use_doorbell,
+                                         ih[0]->doorbell_index);
+
+     tmp = RREG32_SOC15(OSSSYS, 0, regIH_STORM_CLIENT_LIST_CNTL);
+     tmp = REG_SET_FIELD(tmp, IH_STORM_CLIENT_LIST_CNTL,
+                         CLIENT18_IS_STORM_CLIENT, 1);
+     WREG32_SOC15(OSSSYS, 0, regIH_STORM_CLIENT_LIST_CNTL, tmp);
+
+     tmp = RREG32_SOC15(OSSSYS, 0, regIH_INT_FLOOD_CNTL);
+     tmp = REG_SET_FIELD(tmp, IH_INT_FLOOD_CNTL,

FLOOD_CNTL_ENABLE, 1);

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +82 -0
+     WREG32_SOC15(OSSSYS, 0, regIH_INT_FLOOD_CNTL, tmp);
+
+     /* GC/MMHUB UTCL2 page fault interrupts are configured as
+      * MSI storm capable interrupts by deafult. The delay is
+      * used to avoid ISR being called too frequently
+      * when page fault happens on several continuous page
+      * and thus avoid MSI storm */
+     tmp = RREG32_SOC15(OSSSYS, 0, regIH_MSI_STORM_CTRL);
+     tmp = REG_SET_FIELD(tmp, IH_MSI_STORM_CTRL,
+                         DELAY, 3);
+     WREG32_SOC15(OSSSYS, 0, regIH_MSI_STORM_CTRL, tmp);
+
+     pci_set_master(adev->pdev);
+
+     /* enable interrupts */
+     ret = ih_v6_1_toggle_interrupts(adev, true);
+     if (ret)
+             return ret;
+     /* enable wptr force update for self int */
+     force_update_wptr_for_self_int(adev, 0, 8, true);
+
+     if (adev->irq.ih_soft.ring_size)
+             adev->irq.ih_soft.enabled = true;
+
+     return 0;
+}
+
+/**
+ * ih_v6_1_irq_disable - disable interrupts
+ *
+ * @adev: amdgpu_device pointer
+ *
+ * Disable interrupts on the hw.
+ */
+static void ih_v6_1_irq_disable(struct amdgpu_device *adev) {
+     force_update_wptr_for_self_int(adev, 0, 8, false);
+     ih_v6_1_toggle_interrupts(adev, false);
+
+     /* Wait and acknowledge irq */
+     mdelay(1);
+}
+
+/**
+ * ih_v6_1_get_wptr - get the IH ring buffer wptr
+ *
+ * @adev: amdgpu_device pointer
+ * @ih: amdgpu_ih_ring pointer
+ *
+ * Get the IH ring buffer wptr from either the register
+ * or the writeback memory buffer.  Also check for
+ * ring buffer overflow and deal with it.
+ * Returns the value of the wptr.
+ */
+static u32 ih_v6_1_get_wptr(struct amdgpu_device *adev,
+                           struct amdgpu_ih_ring *ih)
+{
+     u32 wptr, tmp;
+     struct amdgpu_ih_regs *ih_regs;
+
+     wptr = le32_to_cpu(*ih->wptr_cpu);
+     ih_regs = &ih->ih_regs;
+
+     if (!REG_GET_FIELD(wptr, IH_RB_WPTR, RB_OVERFLOW))
+             goto out;
+
+     wptr = RREG32_NO_KIQ(ih_regs->ih_rb_wptr);
+     if (!REG_GET_FIELD(wptr, IH_RB_WPTR, RB_OVERFLOW))
+             goto out;
+     wptr = REG_SET_FIELD(wptr, IH_RB_WPTR, RB_OVERFLOW, 0);
+
+     /* When a ring buffer overflow happen start parsing interrupt
+      * from the last not overwritten vector (wptr + 32). Hopefully
+      * this should allow us to catch up.
+      */
+     tmp = (wptr + 32) & ih->ptr_mask;
+     dev_warn(adev->dev, "IH ring buffer overflow "
+              "(0x%08X, 0x%08X, 0x%08X)\n",
+              wptr, ih->rptr, tmp);
+     ih->rptr = tmp;
+
+     tmp = RREG32_NO_KIQ(ih_regs->ih_rb_cntl);
+     tmp = REG_SET_FIELD(tmp, IH_RB_CNTL, WPTR_OVERFLOW_CLEAR,

1);

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +113 -0
+     WREG32_NO_KIQ(ih_regs->ih_rb_cntl, tmp);
+out:
+     return (wptr & ih->ptr_mask);
+}
+
+/**
+ * ih_v6_1_irq_rearm - rearm IRQ if lost
+ *
+ * @adev: amdgpu_device pointer
+ * @ih: amdgpu_ih_ring pointer
+ *
+ */
+static void ih_v6_1_irq_rearm(struct amdgpu_device *adev,
+                            struct amdgpu_ih_ring *ih)
+{
+     uint32_t v = 0;
+     uint32_t i = 0;
+     struct amdgpu_ih_regs *ih_regs;
+
+     ih_regs = &ih->ih_regs;
+
+     /* Rearm IRQ / re-write doorbell if doorbell write is lost */
+     for (i = 0; i < MAX_REARM_RETRY; i++) {
+             v = RREG32_NO_KIQ(ih_regs->ih_rb_rptr);
+             if ((v < ih->ring_size) && (v != ih->rptr))
+                     WDOORBELL32(ih->doorbell_index, ih->rptr);
+             else
+                     break;
+     }
+}
+
+/**
+ * ih_v6_1_set_rptr - set the IH ring buffer rptr
+ *
+ * @adev: amdgpu_device pointer
+ * @ih: amdgpu_ih_ring pointer
+ *
+ * Set the IH ring buffer rptr.
+ */
+static void ih_v6_1_set_rptr(struct amdgpu_device *adev,
+                            struct amdgpu_ih_ring *ih)
+{
+     struct amdgpu_ih_regs *ih_regs;
+
+     if (ih->use_doorbell) {
+             /* XXX check if swapping is necessary on BE */
+             *ih->rptr_cpu = ih->rptr;
+             WDOORBELL32(ih->doorbell_index, ih->rptr);
+
+             if (amdgpu_sriov_vf(adev))
+                     ih_v6_1_irq_rearm(adev, ih);
+     } else {
+             ih_regs = &ih->ih_regs;
+             WREG32(ih_regs->ih_rb_rptr, ih->rptr);
+     }
+}
+
+/**
+ * ih_v6_1_self_irq - dispatch work for ring 1
+ *
+ * @adev: amdgpu_device pointer
+ * @source: irq source
+ * @entry: IV with WPTR update
+ *
+ * Update the WPTR from the IV and schedule work to handle the entries.
+ */
+static int ih_v6_1_self_irq(struct amdgpu_device *adev,
+                           struct amdgpu_irq_src *source,
+                           struct amdgpu_iv_entry *entry) {
+     uint32_t wptr = cpu_to_le32(entry->src_data[0]);
+
+     switch (entry->ring_id) {
+     case 1:
+             *adev->irq.ih1.wptr_cpu = wptr;
+             schedule_work(&adev->irq.ih1_work);
+             break;
+     default: break;
+     }
+     return 0;
+}
+
+static const struct amdgpu_irq_src_funcs ih_v6_1_self_irq_funcs = {
+     .process = ih_v6_1_self_irq,
+};
+
+static void ih_v6_1_set_self_irq_funcs(struct amdgpu_device *adev) {
+     adev->irq.self_irq.num_types = 0;
+     adev->irq.self_irq.funcs = &ih_v6_1_self_irq_funcs; }
+
+static int ih_v6_1_early_init(void *handle) {
+     struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+
+     ih_v6_1_set_interrupt_funcs(adev);
+     ih_v6_1_set_self_irq_funcs(adev);
+     return 0;
+}
+
+static int ih_v6_1_sw_init(void *handle) {
+     int r;
+     struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+     bool use_bus_addr;
+
+     r = amdgpu_irq_add_id(adev, SOC21_IH_CLIENTID_IH, 0,
+                           &adev->irq.self_irq);
+
+     if (r)
+             return r;
+
+     /* use gpu virtual address for ih ring
+      * until ih_checken is programmed to allow
+      * use bus address for ih ring by psp bl */
+     use_bus_addr =
+             (adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) ?

false : true;
+ r = amdgpu_ih_ring_init(adev, &adev->irq.ih, 256 * 1024,
use_bus_addr);

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +85 -0
+     if (r)
+             return r;
+
+     adev->irq.ih.use_doorbell = true;
+     adev->irq.ih.doorbell_index = adev->doorbell_index.ih << 1;
+
+     adev->irq.ih1.ring_size = 0;
+     adev->irq.ih2.ring_size = 0;
+
+     /* initialize ih control register offset */
+     ih_v6_1_init_register_offset(adev);
+
+     r = amdgpu_ih_ring_init(adev, &adev->irq.ih_soft, PAGE_SIZE, true);
+     if (r)
+             return r;
+
+     r = amdgpu_irq_init(adev);
+
+     return r;
+}
+
+static int ih_v6_1_sw_fini(void *handle) {
+     struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+
+     amdgpu_irq_fini_sw(adev);
+
+     return 0;
+}
+
+static int ih_v6_1_hw_init(void *handle) {
+     int r;
+     struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+
+     r = ih_v6_1_irq_init(adev);
+     if (r)
+             return r;
+
+     return 0;
+}
+
+static int ih_v6_1_hw_fini(void *handle) {
+     struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+
+     ih_v6_1_irq_disable(adev);
+
+     return 0;
+}
+
+static int ih_v6_1_suspend(void *handle) {
+     struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+
+     return ih_v6_1_hw_fini(adev);
+}
+
+static int ih_v6_1_resume(void *handle) {
+     struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+
+     return ih_v6_1_hw_init(adev);
+}
+
+static bool ih_v6_1_is_idle(void *handle) {
+     /* todo */
+     return true;
+}
+
+static int ih_v6_1_wait_for_idle(void *handle) {
+     /* todo */
+     return -ETIMEDOUT;
+}
+
+static int ih_v6_1_soft_reset(void *handle) {
+     /* todo */
+     return 0;
+}
+
+static void ih_v6_1_update_clockgating_state(struct amdgpu_device *adev,
+                                            bool enable)
+{
+     uint32_t data, def, field_val;
+
+     if (adev->cg_flags & AMD_CG_SUPPORT_IH_CG) {
+             def = data = RREG32_SOC15(OSSSYS, 0, regIH_CLK_CTRL);
+             field_val = enable ? 0 : 1;
+             data = REG_SET_FIELD(data, IH_CLK_CTRL,
+                                  DBUS_MUX_CLK_SOFT_OVERRIDE,

field_val);

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +2 -0
+             data = REG_SET_FIELD(data, IH_CLK_CTRL,
+                                  OSSSYS_SHARE_CLK_SOFT_OVERRIDE,

field_val);

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +2 -0
+             data = REG_SET_FIELD(data, IH_CLK_CTRL,
+                                  LIMIT_SMN_CLK_SOFT_OVERRIDE,

field_val);

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +13 -0
+             data = REG_SET_FIELD(data, IH_CLK_CTRL,
+                                  DYN_CLK_SOFT_OVERRIDE, field_val);
+             data = REG_SET_FIELD(data, IH_CLK_CTRL,
+                                  REG_CLK_SOFT_OVERRIDE, field_val);
+             if (def != data)
+                     WREG32_SOC15(OSSSYS, 0, regIH_CLK_CTRL, data);
+     }
+
+     return;
+}
+
+static int ih_v6_1_set_clockgating_state(void *handle,
+                                        enum amd_clockgating_state state)

{

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +8 -0
+     struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+
+     ih_v6_1_update_clockgating_state(adev,
+                             state == AMD_CG_STATE_GATE);
+     return 0;
+}
+
+static void ih_v6_1_update_ih_mem_power_gating(struct amdgpu_device

*adev,

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +6 -0
+                                            bool enable)
+{
+     uint32_t ih_mem_pwr_cntl;
+
+     /* Disable ih sram power cntl before switch powergating mode */
+     ih_mem_pwr_cntl = RREG32_SOC15(OSSSYS, 0,

regIH_MEM_POWER_CTRL);
+ ih_mem_pwr_cntl = REG_SET_FIELD(ih_mem_pwr_cntl,
IH_MEM_POWER_CTRL,
+ IH_BUFFER_MEM_POWER_CTRL_EN,
0);
+ WREG32_SOC15(OSSSYS, 0, regIH_MEM_POWER_CTRL,
ih_mem_pwr_cntl);

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +5 -0
+
+     /* It is recommended to set mem powergating mode to DS mode */
+     if (enable) {
+             /* mem power mode */
+             ih_mem_pwr_cntl = REG_SET_FIELD(ih_mem_pwr_cntl,

IH_MEM_POWER_CTRL,

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +2 -0
+
      IH_BUFFER_MEM_POWER_LS_EN, 0);
+             ih_mem_pwr_cntl = REG_SET_FIELD(ih_mem_pwr_cntl,

IH_MEM_POWER_CTRL,

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +2 -0
+
      IH_BUFFER_MEM_POWER_DS_EN, 1);
+             ih_mem_pwr_cntl = REG_SET_FIELD(ih_mem_pwr_cntl,

IH_MEM_POWER_CTRL,

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +3 -0
+
      IH_BUFFER_MEM_POWER_SD_EN, 0);
+             /* cam mem power mode */
+             ih_mem_pwr_cntl = REG_SET_FIELD(ih_mem_pwr_cntl,

IH_MEM_POWER_CTRL,

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +2 -0
+
      IH_RETRY_INT_CAM_MEM_POWER_LS_EN, 0);
+             ih_mem_pwr_cntl = REG_SET_FIELD(ih_mem_pwr_cntl,

IH_MEM_POWER_CTRL,

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +2 -0
+
      IH_RETRY_INT_CAM_MEM_POWER_DS_EN, 1);
+             ih_mem_pwr_cntl = REG_SET_FIELD(ih_mem_pwr_cntl,

IH_MEM_POWER_CTRL,

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +3 -0
+
      IH_RETRY_INT_CAM_MEM_POWER_SD_EN, 0);
+             /* re-enable power cntl */
+             ih_mem_pwr_cntl = REG_SET_FIELD(ih_mem_pwr_cntl,

IH_MEM_POWER_CTRL,

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +4 -0
+
      IH_BUFFER_MEM_POWER_CTRL_EN, 1);
+     } else {
+             /* mem power mode */
+             ih_mem_pwr_cntl = REG_SET_FIELD(ih_mem_pwr_cntl,

IH_MEM_POWER_CTRL,

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +2 -0
+
      IH_BUFFER_MEM_POWER_LS_EN, 0);
+             ih_mem_pwr_cntl = REG_SET_FIELD(ih_mem_pwr_cntl,

IH_MEM_POWER_CTRL,

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +2 -0
+
      IH_BUFFER_MEM_POWER_DS_EN, 0);
+             ih_mem_pwr_cntl = REG_SET_FIELD(ih_mem_pwr_cntl,

IH_MEM_POWER_CTRL,

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +3 -0
+
      IH_BUFFER_MEM_POWER_SD_EN, 0);
+             /* cam mem power mode */
+             ih_mem_pwr_cntl = REG_SET_FIELD(ih_mem_pwr_cntl,

IH_MEM_POWER_CTRL,

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +2 -0
+
      IH_RETRY_INT_CAM_MEM_POWER_LS_EN, 0);
+             ih_mem_pwr_cntl = REG_SET_FIELD(ih_mem_pwr_cntl,

IH_MEM_POWER_CTRL,

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +2 -0
+
      IH_RETRY_INT_CAM_MEM_POWER_DS_EN, 0);
+             ih_mem_pwr_cntl = REG_SET_FIELD(ih_mem_pwr_cntl,

IH_MEM_POWER_CTRL,

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +3 -0
+
      IH_RETRY_INT_CAM_MEM_POWER_SD_EN, 0);
+             /* re-enable power cntl*/
+             ih_mem_pwr_cntl = REG_SET_FIELD(ih_mem_pwr_cntl,

IH_MEM_POWER_CTRL,

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +4 -0
+
      IH_BUFFER_MEM_POWER_CTRL_EN, 1);
+     }
+
+     WREG32_SOC15(OSSSYS, 0, regIH_MEM_POWER_CTRL,

ih_mem_pwr_cntl); }

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +3 -0
+
+static int ih_v6_1_set_powergating_state(void *handle,
+                                      enum amd_powergating_state state)

{

drivers/gpu/drm/amd/amdgpu/ih_v6_1.c new file +53 -0
+     struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+     bool enable = (state == AMD_PG_STATE_GATE);
+
+     if (adev->pg_flags & AMD_PG_SUPPORT_IH_SRAM_PG)
+             ih_v6_1_update_ih_mem_power_gating(adev, enable);
+
+     return 0;
+}
+
+static void ih_v6_1_get_clockgating_state(void *handle, u64 *flags) {
+     struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+
+     if (!RREG32_SOC15(OSSSYS, 0, regIH_CLK_CTRL))
+             *flags |= AMD_CG_SUPPORT_IH_CG;
+
+     return;
+}
+
+static const struct amd_ip_funcs ih_v6_1_ip_funcs = {
+     .name = "ih_v6_1",
+     .early_init = ih_v6_1_early_init,
+     .late_init = NULL,
+     .sw_init = ih_v6_1_sw_init,
+     .sw_fini = ih_v6_1_sw_fini,
+     .hw_init = ih_v6_1_hw_init,
+     .hw_fini = ih_v6_1_hw_fini,
+     .suspend = ih_v6_1_suspend,
+     .resume = ih_v6_1_resume,
+     .is_idle = ih_v6_1_is_idle,
+     .wait_for_idle = ih_v6_1_wait_for_idle,
+     .soft_reset = ih_v6_1_soft_reset,
+     .set_clockgating_state = ih_v6_1_set_clockgating_state,
+     .set_powergating_state = ih_v6_1_set_powergating_state,
+     .get_clockgating_state = ih_v6_1_get_clockgating_state, };
+
+static const struct amdgpu_ih_funcs ih_v6_1_funcs = {
+     .get_wptr = ih_v6_1_get_wptr,
+     .decode_iv = amdgpu_ih_decode_iv_helper,
+     .decode_iv_ts = amdgpu_ih_decode_iv_ts_helper,
+     .set_rptr = ih_v6_1_set_rptr
+};
+
+static void ih_v6_1_set_interrupt_funcs(struct amdgpu_device *adev) {
+     adev->irq.ih_funcs = &ih_v6_1_funcs;
+}
+
+const struct amdgpu_ip_block_version ih_v6_1_ip_block = {
+     .type = AMD_IP_BLOCK_TYPE_IH,
+     .major = 6,
+     .minor = 0,
+     .rev = 0,
+     .funcs = &ih_v6_1_ip_funcs,
+};
drivers/gpu/drm/amd/amdgpu/ih_v6_1.h new file +24 -0
new file mode 100644
index 0000000000000..c48930d394cff
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2021 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

drivers/gpu/drm/amd/amdgpu/ih_v6_1.h new file +6 -0
+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

drivers/gpu/drm/amd/amdgpu/ih_v6_1.h new file +10 -1
+OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+#ifndef __IH_V6_1_IH_H__
+#define __IH_V6_1_IH_H__
+
+extern const struct amdgpu_ip_block_version ih_v6_1_ip_block;
+
+#endif
--

2.41.0

author maintainer
#4 lore raw

PATCH 3/3 drm/amdgpu/discovery: add ih 6.1.0 support

In reply to Alex Deucher

From: Prike Liang <[email protected]>

Add to IP discovery table.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +4 -0
index 59ed6d4ebfed0..9d8d08daca57a 100644
@@ -65,6 +65,7 @@
 #include "soc21.h"
 #include "navi10_ih.h"
 #include "ih_v6_0.h"
+#include "ih_v6_1.h"
 #include "gfx_v10_0.h"
 #include "gfx_v11_0.h"
 #include "sdma_v5_0.h"
@@ -1702,6 +1703,9 @@ static int amdgpu_discovery_set_ih_ip_blocks(struct amdgpu_device *adev)
 	case IP_VERSION(6, 0, 2):
 		amdgpu_device_ip_block_add(adev, &ih_v6_0_ip_block);
 		break;
+	case IP_VERSION(6, 1, 0):
+		amdgpu_device_ip_block_add(adev, &ih_v6_1_ip_block);
+		break;
 	default:
 		dev_err(adev->dev,
 			"Failed to add ih ip block(OSSSYS_HWIP:0x%x)\n",
Signature · 1 line
2.41.0