drm/amdgpu: Fix channel_index table layout for Aldebaran
Subsystems (2)
PATCH 1/1 drm/amdgpu: Fix channel_index table layout for Aldebaran
Fix the channel_index table layout to fetch the correct channel_index when calculating physical address from normalized address during page retirement.
Also, fix the number of UMC instances and number of channels within each UMC instance for Aldebaran.
--- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/umc_v6_7.c | 16 ++++++++-------- drivers/gpu/drm/amd/amdgpu/umc_v6_7.h | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-)
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +2 -2
@@ -1171,8 +1171,8 @@ static void gmc_v9_0_set_umc_funcs(struct amdgpu_device *adev)break ;case CHIP_ALDEBARAN : adev->umc.max_ras_err_cnt_per_query =UMC_V6_7_TOTAL_CHANNEL_NUM ; - adev->umc.channel_inst_num =UMC_V6_7_UMC_INSTANCE_NUM ; - adev->umc.umc_inst_num =UMC_V6_7_CHANNEL_INSTANCE_NUM ; + adev->umc.channel_inst_num =UMC_V6_7_CHANNEL_INSTANCE_NUM ; + adev->umc.umc_inst_num =UMC_V6_7_UMC_INSTANCE_NUM ; adev->umc.channel_offs =UMC_V6_7_PER_CHANNEL_OFFSET ;if (!adev->gmc.xgmi.connected_to_cpu) adev->umc.ras_funcs = &umc_v6_7_ras_funcs;
drivers/gpu/drm/amd/amdgpu/umc_v6_7.c +8 -8
@@ -30,17 +30,17 @@const uint32_t umc_v6_7_channel_idx_tbl_second[UMC_V6_7_UMC_INSTANCE_NUM ][UMC_V6_7_CHANNEL_INSTANCE_NUM ] = { - {28 ,12 ,6 ,22 }, {19 ,3 ,9 ,25 }, - {20 ,4 ,30 ,14 }, {11 ,27 ,1 ,17 }, - {24 ,8 ,2 ,18 }, {15 ,31 ,5 ,21 }, - {16 ,0 ,26 ,10 }, {7 ,23 ,29 ,13 } + {28 ,20 ,24 ,16 ,12 ,4 ,8 ,0 }, + {6 ,30 ,2 ,26 ,22 ,14 ,18 ,10 }, + {19 ,11 ,15 ,7 ,3 ,27 ,31 ,23 }, + {9 ,1 ,5 ,29 ,25 ,17 ,21 ,13 } };const uint32_t umc_v6_7_channel_idx_tbl_first[UMC_V6_7_UMC_INSTANCE_NUM ][UMC_V6_7_CHANNEL_INSTANCE_NUM ] = { - {19 ,3 ,9 ,25 }, {28 ,12 ,6 ,22 }, - {11 ,27 ,1 ,17 }, {20 ,4 ,30 ,14 }, - {15 ,31 ,5 ,21 }, {24 ,8 ,2 ,18 }, - {7 ,23 ,29 ,13 }, {16 ,0 ,26 ,10 } + {19 ,11 ,15 ,7 ,3 ,27 ,31 ,23 }, + {9 ,1 ,5 ,29 ,25 ,17 ,21 ,13 }, + {28 ,20 ,24 ,16 ,12 ,4 ,8 ,0 }, + {6 ,30 ,2 ,26 ,22 ,14 ,18 ,10 }, }; static inline uint32_t get_umc_v6_7_reg_offset(struct amdgpu_device *adev,
drivers/gpu/drm/amd/amdgpu/umc_v6_7.h +2 -2
@@ -36,9 +36,9 @@#define UMC_V6_7_INST_DIST 0x40000/* number of umc channel instance with memory map register access */ -#define UMC_V6_7_CHANNEL_INSTANCE_NUM 4 +#define UMC_V6_7_UMC_INSTANCE_NUM 4/* number of umc instance with memory map register access */ -#define UMC_V6_7_UMC_INSTANCE_NUM 8 +#define UMC_V6_7_CHANNEL_INSTANCE_NUM 8/* total channel instances in one umc block */ #define UMC_V6_7_TOTAL_CHANNEL_NUM (UMC_V6_7_CHANNEL_INSTANCE_NUM * UMC_V6_7_UMC_INSTANCE_NUM)/* UMC regiser per channel offset */
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[AMD Official Use Only]
________________________________
From: Joshi, Mukul <[email protected]>
Sent: Thursday, July 29, 2021 11:37 PM
To: [email protected] <[email protected]>
Cc: Clements, John <[email protected]>; Zhang, Hawking <[email protected]>; Joshi, Mukul <[email protected]>
Subject: [PATCH] drm/amdgpu: Fix channel_index table layout for Aldebaran
Fix the channel_index table layout to fetch the correct channel_index when calculating physical address from normalized address during page retirement.
Also, fix the number of UMC instances and number of channels within each UMC instance for Aldebaran.
--- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/umc_v6_7.c | 16 ++++++++-------- drivers/gpu/drm/amd/amdgpu/umc_v6_7.h | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-)
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +2 -2
@@ -1171,8 +1171,8 @@ static void gmc_v9_0_set_umc_funcs(struct amdgpu_device *adev)break ;case CHIP_ALDEBARAN : adev->umc.max_ras_err_cnt_per_query =UMC_V6_7_TOTAL_CHANNEL_NUM ; - adev->umc.channel_inst_num =UMC_V6_7_UMC_INSTANCE_NUM ; - adev->umc.umc_inst_num =UMC_V6_7_CHANNEL_INSTANCE_NUM ; + adev->umc.channel_inst_num =UMC_V6_7_CHANNEL_INSTANCE_NUM ; + adev->umc.umc_inst_num =UMC_V6_7_UMC_INSTANCE_NUM ; adev->umc.channel_offs =UMC_V6_7_PER_CHANNEL_OFFSET ;if (!adev->gmc.xgmi.connected_to_cpu) adev->umc.ras_funcs = &umc_v6_7_ras_funcs;
drivers/gpu/drm/amd/amdgpu/umc_v6_7.c +8 -8
@@ -30,17 +30,17 @@const uint32_t umc_v6_7_channel_idx_tbl_second[UMC_V6_7_UMC_INSTANCE_NUM ][UMC_V6_7_CHANNEL_INSTANCE_NUM ] = { - {28 ,12 ,6 ,22 }, {19 ,3 ,9 ,25 }, - {20 ,4 ,30 ,14 }, {11 ,27 ,1 ,17 }, - {24 ,8 ,2 ,18 }, {15 ,31 ,5 ,21 }, - {16 ,0 ,26 ,10 }, {7 ,23 ,29 ,13 } + {28 ,20 ,24 ,16 ,12 ,4 ,8 ,0 }, + {6 ,30 ,2 ,26 ,22 ,14 ,18 ,10 }, + {19 ,11 ,15 ,7 ,3 ,27 ,31 ,23 }, + {9 ,1 ,5 ,29 ,25 ,17 ,21 ,13 } };const uint32_t umc_v6_7_channel_idx_tbl_first[UMC_V6_7_UMC_INSTANCE_NUM ][UMC_V6_7_CHANNEL_INSTANCE_NUM ] = { - {19 ,3 ,9 ,25 }, {28 ,12 ,6 ,22 }, - {11 ,27 ,1 ,17 }, {20 ,4 ,30 ,14 }, - {15 ,31 ,5 ,21 }, {24 ,8 ,2 ,18 }, - {7 ,23 ,29 ,13 }, {16 ,0 ,26 ,10 } + {19 ,11 ,15 ,7 ,3 ,27 ,31 ,23 }, + {9 ,1 ,5 ,29 ,25 ,17 ,21 ,13 }, + {28 ,20 ,24 ,16 ,12 ,4 ,8 ,0 }, + {6 ,30 ,2 ,26 ,22 ,14 ,18 ,10 }, }; static inline uint32_t get_umc_v6_7_reg_offset(struct amdgpu_device *adev,
drivers/gpu/drm/amd/amdgpu/umc_v6_7.h +2 -2
@@ -36,9 +36,9 @@#define UMC_V6_7_INST_DIST 0x40000/* number of umc channel instance with memory map register access */ -#define UMC_V6_7_CHANNEL_INSTANCE_NUM 4 +#define UMC_V6_7_UMC_INSTANCE_NUM 4/* number of umc instance with memory map register access */ -#define UMC_V6_7_UMC_INSTANCE_NUM 8 +#define UMC_V6_7_CHANNEL_INSTANCE_NUM 8/* total channel instances in one umc block */ #define UMC_V6_7_TOTAL_CHANNEL_NUM (UMC_V6_7_CHANNEL_INSTANCE_NUM * UMC_V6_7_UMC_INSTANCE_NUM)/* UMC regiser per channel offset */
--
2.17.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[Public]
/* number of umc channel instance with memory map register access */
-#define UMC_V6_7_CHANNEL_INSTANCE_NUM 4
+#define UMC_V6_7_UMC_INSTANCE_NUM 4
/* number of umc instance with memory map register access */
-#define UMC_V6_7_UMC_INSTANCE_NUM 8
+#define UMC_V6_7_CHANNEL_INSTANCE_NUM 8
Please update the comments accordingly as well.
Regards,
Guchun
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Mukul Joshi
Sent: Thursday, July 29, 2021 11:38 PM
To: [email protected]
Cc: Joshi, Mukul <[email protected]>; Clements, John <[email protected]>; Zhang, Hawking <[email protected]>
Subject: [PATCH] drm/amdgpu: Fix channel_index table layout for Aldebaran
Fix the channel_index table layout to fetch the correct channel_index when calculating physical address from normalized address during page retirement. Also, fix the number of UMC instances and number of channels within each UMC instance for Aldebaran.
--- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/umc_v6_7.c | 16 ++++++++-------- drivers/gpu/drm/amd/amdgpu/umc_v6_7.h | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-)
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +2 -2
@@ -1171,8 +1171,8 @@ static void gmc_v9_0_set_umc_funcs(struct amdgpu_device *adev)break ;case CHIP_ALDEBARAN : adev->umc.max_ras_err_cnt_per_query =UMC_V6_7_TOTAL_CHANNEL_NUM ; - adev->umc.channel_inst_num =UMC_V6_7_UMC_INSTANCE_NUM ; - adev->umc.umc_inst_num =UMC_V6_7_CHANNEL_INSTANCE_NUM ; + adev->umc.channel_inst_num =UMC_V6_7_CHANNEL_INSTANCE_NUM ; + adev->umc.umc_inst_num =UMC_V6_7_UMC_INSTANCE_NUM ; adev->umc.channel_offs =UMC_V6_7_PER_CHANNEL_OFFSET ;if (!adev->gmc.xgmi.connected_to_cpu) adev->umc.ras_funcs = &umc_v6_7_ras_funcs; diff --git a/drivers/gpu/drm/amd/amdgpu/umc_v6_7.c b/drivers/gpu/drm/amd/amdgpu/umc_v6_7.c
index 7da12110425c..bb30336b1e8d 100644
drivers/gpu/drm/amd/amdgpu/umc_v6_7.c +8 -8
@@ -30,17 +30,17 @@const uint32_t umc_v6_7_channel_idx_tbl_second[UMC_V6_7_UMC_INSTANCE_NUM ][UMC_V6_7_CHANNEL_INSTANCE_NUM ] = { - {28 ,12 ,6 ,22 }, {19 ,3 ,9 ,25 }, - {20 ,4 ,30 ,14 }, {11 ,27 ,1 ,17 }, - {24 ,8 ,2 ,18 }, {15 ,31 ,5 ,21 }, - {16 ,0 ,26 ,10 }, {7 ,23 ,29 ,13 } + {28 ,20 ,24 ,16 ,12 ,4 ,8 ,0 }, + {6 ,30 ,2 ,26 ,22 ,14 ,18 ,10 }, + {19 ,11 ,15 ,7 ,3 ,27 ,31 ,23 }, + {9 ,1 ,5 ,29 ,25 ,17 ,21 ,13 } };const uint32_t umc_v6_7_channel_idx_tbl_first[UMC_V6_7_UMC_INSTANCE_NUM ][UMC_V6_7_CHANNEL_INSTANCE_NUM ] = { - {19 ,3 ,9 ,25 }, {28 ,12 ,6 ,22 }, - {11 ,27 ,1 ,17 }, {20 ,4 ,30 ,14 }, - {15 ,31 ,5 ,21 }, {24 ,8 ,2 ,18 }, - {7 ,23 ,29 ,13 }, {16 ,0 ,26 ,10 } + {19 ,11 ,15 ,7 ,3 ,27 ,31 ,23 }, + {9 ,1 ,5 ,29 ,25 ,17 ,21 ,13 }, + {28 ,20 ,24 ,16 ,12 ,4 ,8 ,0 }, + {6 ,30 ,2 ,26 ,22 ,14 ,18 ,10 }, }; static inline uint32_t get_umc_v6_7_reg_offset(struct amdgpu_device *adev, diff --git a/drivers/gpu/drm/amd/amdgpu/umc_v6_7.h b/drivers/gpu/drm/amd/amdgpu/umc_v6_7.h
index 81b8f1844091..57f2557e7aca 100644
drivers/gpu/drm/amd/amdgpu/umc_v6_7.h +2 -2
@@ -36,9 +36,9 @@#define UMC_V6_7_INST_DIST 0x40000/* number of umc channel instance with memory map register access */ -#define UMC_V6_7_CHANNEL_INSTANCE_NUM 4 +#define UMC_V6_7_UMC_INSTANCE_NUM 4/* number of umc instance with memory map register access */ -#define UMC_V6_7_UMC_INSTANCE_NUM 8 +#define UMC_V6_7_CHANNEL_INSTANCE_NUM 8/* total channel instances in one umc block */ #define UMC_V6_7_TOTAL_CHANNEL_NUM (UMC_V6_7_CHANNEL_INSTANCE_NUM * UMC_V6_7_UMC_INSTANCE_NUM)/* UMC regiser per channel offset */
--
2.17.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7Cguchun.chen%40amd.com%7C3e76860245e3435cc73608d952a6e901%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637631699096172598%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=IDlUT%2B%2BIBKOPgWPQQ%2Fxrxh8ZQD7SpVn%2B4uiEvT3KPw4%3D&reserved=0