drm/amdgpu: initialize umc ras function
Subsystems (2)
PATCH 1/1 drm/amdgpu: initialize umc ras function
From: John Clements <[email protected]>
support umc ras function initialization for aldebaran
--- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 13 +++++++++++++ drivers/gpu/drm/amd/amdgpu/umc_v6_7.c | 15 +++++++++++++++ drivers/gpu/drm/amd/amdgpu/umc_v6_7.h | 12 ++++++++++++ 3 files changed, 40 insertions(+)
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +13 -0
@@ -53,6 +53,7 @@#include "mmhub_v1_7.h" #include "umc_v6_1.h" #include "umc_v6_0.h" +#include "umc_v6_7.h" #include "hdp_v4_0.h" #include "ivsrcid/vmc/irqsrcs_vmc_1_0.h"
@@ -1163,6 +1164,18 @@ static void gmc_v9_0_set_umc_funcs(struct amdgpu_device *adev) adev->umc.channel_idx_tbl = &umc_v6_1_channel_idx_tbl[0 ][0 ]; adev->umc.ras_funcs = &umc_v6_1_ras_funcs;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_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; +if (1 & adev->smuio.funcs->get_die_id (adev)) + adev->umc.channel_idx_tbl = &umc_v6_7_channel_idx_tbl_first[0 ][0 ]; +else + adev->umc.channel_idx_tbl = &umc_v6_7_channel_idx_tbl_second[0 ][0 ]; +break ;default :break ; }
drivers/gpu/drm/amd/amdgpu/umc_v6_7.c +15 -0
@@ -28,6 +28,21 @@#include "umc/umc_6_7_0_offset.h" #include "umc/umc_6_7_0_sh_mask.h" +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 } +}; +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 } +}; +static inline uint32_t get_umc_v6_7_reg_offset (struct amdgpu_device *adev,uint32_t umc_inst,uint32_t ch_inst)
drivers/gpu/drm/amd/amdgpu/umc_v6_7.h +12 -0
@@ -32,6 +32,18 @@#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 +/* number of umc instance with memory map register access */ +#define UMC_V6_7_UMC_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 */ +#define UMC_V6_7_PER_CHANNEL_OFFSET 0x400extern const struct amdgpu_umc_ras_funcs umc_v6_7_ras_funcs; +extern const uint32_t + umc_v6_7_channel_idx_tbl_second[UMC_V6_7_UMC_INSTANCE_NUM ][UMC_V6_7_CHANNEL_INSTANCE_NUM ]; +extern const uint32_t + umc_v6_7_channel_idx_tbl_first[UMC_V6_7_UMC_INSTANCE_NUM ][UMC_V6_7_CHANNEL_INSTANCE_NUM ];#endif
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[AMD Official Use Only]
-----Original Message-----
From: Stanley.Yang <[email protected]>
Sent: Thursday, July 8, 2021 11:28 AM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>; Zhang, Hawking <[email protected]>; Clements, John <[email protected]>; Clements, John <[email protected]>; Yang, Stanley <[email protected]>
Subject: [PATCH Review 1/1] drm/amdgpu: initialize umc ras function
From: John Clements <[email protected]>
support umc ras function initialization for aldebaran
--- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 13 +++++++++++++ drivers/gpu/drm/amd/amdgpu/umc_v6_7.c | 15 +++++++++++++++ drivers/gpu/drm/amd/amdgpu/umc_v6_7.h | 12 ++++++++++++ 3 files changed, 40 insertions(+)
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +13 -0
@@ -53,6 +53,7 @@#include "mmhub_v1_7.h" #include "umc_v6_1.h" #include "umc_v6_0.h" +#include "umc_v6_7.h" #include "hdp_v4_0.h" #include "ivsrcid/vmc/irqsrcs_vmc_1_0.h"
@@ -1163,6 +1164,18 @@ static void gmc_v9_0_set_umc_funcs(struct amdgpu_device *adev) adev->umc.channel_idx_tbl = &umc_v6_1_channel_idx_tbl[0 ][0 ]; adev->umc.ras_funcs = &umc_v6_1_ras_funcs;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_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; +if (1 & adev->smuio.funcs->get_die_id (adev)) + adev->umc.channel_idx_tbl = &umc_v6_7_channel_idx_tbl_first[0 ][0 ]; +else + adev->umc.channel_idx_tbl = &umc_v6_7_channel_idx_tbl_second[0 ][0 ]; +break ;default :break ; }
drivers/gpu/drm/amd/amdgpu/umc_v6_7.c +15 -0
@@ -28,6 +28,21 @@#include "umc/umc_6_7_0_offset.h" #include "umc/umc_6_7_0_sh_mask.h" +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 } +}; +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 } +}; +static inline uint32_t get_umc_v6_7_reg_offset (struct amdgpu_device *adev,uint32_t umc_inst,uint32_t ch_inst)
drivers/gpu/drm/amd/amdgpu/umc_v6_7.h +14 -0
@@ -32,6 +32,18 @@#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 +/* number of umc instance with memory map register access */ +#define UMC_V6_7_UMC_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 */ +#define UMC_V6_7_PER_CHANNEL_OFFSET 0x400extern const struct amdgpu_umc_ras_funcs umc_v6_7_ras_funcs; +extern const uint32_t + +umc_v6_7_channel_idx_tbl_second[UMC_V6_7_UMC_INSTANCE_NUM][UMC_V6_7_CHA +NNEL_INSTANCE_NUM ]; +extern const uint32_t +
+umc_v6_7_channel_idx_tbl_first[UMC_V6_7_UMC_INSTANCE_NUM][UMC_V6_7_CHAN +NEL_INSTANCE_NUM];
#endif
--
2.17.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[Public]
+ {24, 8, 2, 18}, {15, 31, 5, 21},
+ {19, 3, 9, 25}, {28, 12, 6, 22},
The coding style should be corrected. With this fixed, the patch is:
Regards,
Guchun
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Stanley.Yang
Sent: Thursday, July 8, 2021 11:28 AM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>; Yang, Stanley <[email protected]>; Clements, John <[email protected]>; Zhang, Hawking <[email protected]>
Subject: [PATCH Review 1/1] drm/amdgpu: initialize umc ras function
From: John Clements <[email protected]>
support umc ras function initialization for aldebaran
--- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 13 +++++++++++++ drivers/gpu/drm/amd/amdgpu/umc_v6_7.c | 15 +++++++++++++++ drivers/gpu/drm/amd/amdgpu/umc_v6_7.h | 12 ++++++++++++ 3 files changed, 40 insertions(+)
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +13 -0
@@ -53,6 +53,7 @@#include "mmhub_v1_7.h" #include "umc_v6_1.h" #include "umc_v6_0.h" +#include "umc_v6_7.h" #include "hdp_v4_0.h" #include "ivsrcid/vmc/irqsrcs_vmc_1_0.h"
@@ -1163,6 +1164,18 @@ static void gmc_v9_0_set_umc_funcs(struct amdgpu_device *adev) adev->umc.channel_idx_tbl = &umc_v6_1_channel_idx_tbl[0 ][0 ]; adev->umc.ras_funcs = &umc_v6_1_ras_funcs;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_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; +if (1 & adev->smuio.funcs->get_die_id (adev)) + adev->umc.channel_idx_tbl = &umc_v6_7_channel_idx_tbl_first[0 ][0 ]; +else + adev->umc.channel_idx_tbl = &umc_v6_7_channel_idx_tbl_second[0 ][0 ]; +break ;default :break ; }
drivers/gpu/drm/amd/amdgpu/umc_v6_7.c +15 -0
@@ -28,6 +28,21 @@#include "umc/umc_6_7_0_offset.h" #include "umc/umc_6_7_0_sh_mask.h" +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 } +}; +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 } +}; +static inline uint32_t get_umc_v6_7_reg_offset (struct amdgpu_device *adev,uint32_t umc_inst,uint32_t ch_inst)
drivers/gpu/drm/amd/amdgpu/umc_v6_7.h +14 -0
@@ -32,6 +32,18 @@#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 +/* number of umc instance with memory map register access */ +#define UMC_V6_7_UMC_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 */ +#define UMC_V6_7_PER_CHANNEL_OFFSET 0x400extern const struct amdgpu_umc_ras_funcs umc_v6_7_ras_funcs; +extern const uint32_t + +umc_v6_7_channel_idx_tbl_second[UMC_V6_7_UMC_INSTANCE_NUM][UMC_V6_7_CHA +NNEL_INSTANCE_NUM ]; +extern const uint32_t +
+umc_v6_7_channel_idx_tbl_first[UMC_V6_7_UMC_INSTANCE_NUM][UMC_V6_7_CHAN +NEL_INSTANCE_NUM];
#endif
--
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%7Ce8096b1d4d444569123808d941c07a33%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637613117226702014%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=5UII5U8c3Yqr5X89XRGe7uSLThqrRqnyovL3gWSL0vg%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx