drm/amdgpu: move umc late init from gmc to umc block
Subsystems (2)
PATCH 1/3 drm/amdgpu: move umc late init from gmc to umc block
umc late init is umc specific, it's more suitable to be put in umc block
--- drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 48 ---------------- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 2 - drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 73 +++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 2 + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 8 ++- drivers/gpu/drm/amd/amdgpu/umc_v6_1.c | 1 + 7 files changed, 82 insertions(+), 54 deletions(-) create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c
drivers/gpu/drm/amd/amdgpu/Makefile +1 -1
@@ -55,7 +55,7 @@ amdgpu-y += amdgpu_device.o amdgpu_kms.o \ amdgpu_vf_error.o amdgpu_sched.o amdgpu_debugfs.o amdgpu_ids.o \ amdgpu_gmc.o amdgpu_mmhub.o amdgpu_xgmi.o amdgpu_csa.o amdgpu_ras.o amdgpu_vm_cpu.o \ amdgpu_vm_sdma.o amdgpu_pmu.o amdgpu_discovery.o amdgpu_ras_eeprom.o amdgpu_nbio.o \ - smu_v11_0_i2c.o + amdgpu_umc.o smu_v11_0_i2c.o amdgpu-$(CONFIG_PERF_EVENTS) += amdgpu_pmu.o
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +0 -48
51 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h +0 -2
@@ -234,7 +234,5 @@ void amdgpu_gmc_agp_location(struct amdgpu_device *adev, struct amdgpu_gmc *mc);bool amdgpu_gmc_filter_faults (struct amdgpu_device *adev,uint64_t addr,uint16_t pasid,uint64_t timestamp); -int amdgpu_gmc_ras_late_init (struct amdgpu_device *adev, -void *ih_info);#endif
drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c new file +73 -0
73 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h +2 -0
@@ -55,6 +55,7 @@struct amdgpu_umc_funcs {void (*ras_init)(struct amdgpu_device *adev); +int (*ras_late_init)(struct amdgpu_device *adev,void *ras_ih_info);void (*query_ras_error_count)(struct amdgpu_device *adev,void *ras_error_status); void (*query_ras_error_address)(struct amdgpu_device *adev,
@@ -79,4 +80,5 @@ struct amdgpu_umc { const struct amdgpu_umc_funcs *funcs; }; +int amdgpu_umc_ras_late_init (struct amdgpu_device *adev,void *ras_ih_info);#endif
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +5 -3
@@ -793,9 +793,11 @@ static int gmc_v9_0_ecc_late_init(void *handle) .cb = gmc_v9_0_process_ras_data_cb, }; - r =amdgpu_gmc_ras_late_init (adev, &umc_ih_info); -if (r) -return r; +if (adev->umc.funcs && adev->umc.funcs->ras_late_init) { + r = adev->umc.funcs->ras_late_init (adev, &umc_ih_info); +if (r) +return r; + }if (adev->mmhub_funcs && adev->mmhub_funcs->ras_late_init) { r = adev->mmhub_funcs->ras_late_init (adev);
drivers/gpu/drm/amd/amdgpu/umc_v6_1.c +1 -0
@@ -273,6 +273,7 @@ static void umc_v6_1_ras_init(struct amdgpu_device *adev)const struct amdgpu_umc_funcs umc_v6_1_funcs = { .ras_init = umc_v6_1_ras_init, + .ras_late_init = amdgpu_umc_ras_late_init, .query_ras_error_count = umc_v6_1_query_ras_error_count, .query_ras_error_address = umc_v6_1_query_ras_error_address, .enable_umc_index_mode = umc_v6_1_enable_umc_index_mode,
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 2/3 drm/amdgpu: move umc ras init to umc block
move umc ras init from ras module to umc block, generic ras module should pay less attention to specific ras block.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 4 ---- drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +0 -4
@@ -1653,10 +1653,6 @@ int amdgpu_ras_init(struct amdgpu_device *adev)if (amdgpu_ras_fs_init (adev)) goto fs_out; -/* ras init for each ras block */ -if (adev->umc.funcs->ras_init) - adev->umc.funcs->ras_init (adev); -DRM_INFO ("RAS INFO: ras initialized successfully, " "hardware ability[%x] ras_mask[%x]\n" , con->hw_supported, con->supported);
drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c +4 -0
@@ -62,6 +62,10 @@ int amdgpu_umc_ras_late_init(struct amdgpu_device *adev, void *ras_ih_info) goto free; } +/* ras init of specific umc version */ +if (adev->umc.funcs && adev->umc.funcs->ras_init) + adev->umc.funcs->ras_init (adev); +return 0 ; late_fini:
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/3 drm/amdgpu: rename umc ras_init to err_cnt_init
In reply to a message not in the archivethis interface is related to specific version of umc, distinguish it from ras_late_init
--- drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 2 +- drivers/gpu/drm/amd/amdgpu/umc_v6_1.c | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c +2 -2
@@ -63,8 +63,8 @@ int amdgpu_umc_ras_late_init(struct amdgpu_device *adev, void *ras_ih_info) }/* ras init of specific umc version */ -if (adev->umc.funcs && adev->umc.funcs->ras_init) - adev->umc.funcs->ras_init (adev); +if (adev->umc.funcs && adev->umc.funcs->err_cnt_init) + adev->umc.funcs->err_cnt_init (adev);return 0 ;
drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h +1 -1
@@ -54,7 +54,7 @@ adev->umc.funcs->disable_umc_index_mode (adev);struct amdgpu_umc_funcs { -void (*ras_init)(struct amdgpu_device *adev); +void (*err_cnt_init)(struct amdgpu_device *adev);int (*ras_late_init)(struct amdgpu_device *adev,void *ras_ih_info);void (*query_ras_error_count)(struct amdgpu_device *adev,void *ras_error_status);
drivers/gpu/drm/amd/amdgpu/umc_v6_1.c +4 -4
@@ -234,7 +234,7 @@ static void umc_v6_1_query_ras_error_address(struct amdgpu_device *adev,amdgpu_umc_for_each_channel (umc_v6_1_query_error_address); } -static void umc_v6_1_ras_init_per_channel (struct amdgpu_device *adev, +static void umc_v6_1_err_cnt_init_per_channel (struct amdgpu_device *adev,struct ras_err_data *err_data,uint32_t umc_reg_offset,uint32_t channel_index) {
@@ -264,15 +264,15 @@ static void umc_v6_1_ras_init_per_channel(struct amdgpu_device *adev,WREG32 (ecc_err_cnt_addr + umc_reg_offset,UMC_V6_1_CE_CNT_INIT ); } -static void umc_v6_1_ras_init (struct amdgpu_device *adev) +static void umc_v6_1_err_cnt_init (struct amdgpu_device *adev) {void *ras_error_status =NULL ; -amdgpu_umc_for_each_channel (umc_v6_1_ras_init_per_channel); +amdgpu_umc_for_each_channel (umc_v6_1_err_cnt_init_per_channel); }const struct amdgpu_umc_funcs umc_v6_1_funcs = { - .ras_init = umc_v6_1_ras_init, + .err_cnt_init = umc_v6_1_err_cnt_init, .ras_late_init = amdgpu_umc_ras_late_init, .query_ras_error_count = umc_v6_1_query_ras_error_count, .query_ras_error_address = umc_v6_1_query_ras_error_address,
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
RE: [PATCH 3/3] drm/amdgpu: rename umc ras_init to err_cnt_init
Series is: Reviewed-by: Guchun Chen <[email protected]>
Regards,
Guchun
-----Original Message-----
From: Zhou1, Tao <[email protected]>
Sent: Tuesday, September 10, 2019 2:31 PM
To: [email protected]; Zhang, Hawking <[email protected]>; Chen, Guchun <[email protected]>
Cc: Zhou1, Tao <[email protected]>
Subject: [PATCH 3/3] drm/amdgpu: rename umc ras_init to err_cnt_init
this interface is related to specific version of umc, distinguish it from ras_late_init
--- drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 2 +- drivers/gpu/drm/amd/amdgpu/umc_v6_1.c | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c +2 -2
@@ -63,8 +63,8 @@ int amdgpu_umc_ras_late_init(struct amdgpu_device *adev, void *ras_ih_info) }/* ras init of specific umc version */ -if (adev->umc.funcs && adev->umc.funcs->ras_init) - adev->umc.funcs->ras_init (adev); +if (adev->umc.funcs && adev->umc.funcs->err_cnt_init) + adev->umc.funcs->err_cnt_init (adev);return 0 ;
drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h +1 -1
@@ -54,7 +54,7 @@ adev->umc.funcs->disable_umc_index_mode (adev);struct amdgpu_umc_funcs { -void (*ras_init)(struct amdgpu_device *adev); +void (*err_cnt_init)(struct amdgpu_device *adev);int (*ras_late_init)(struct amdgpu_device *adev,void *ras_ih_info);void (*query_ras_error_count)(struct amdgpu_device *adev,void *ras_error_status);
drivers/gpu/drm/amd/amdgpu/umc_v6_1.c +2 -1
@@ -234,7 +234,7 @@ static void umc_v6_1_query_ras_error_address(struct amdgpu_device *adev,amdgpu_umc_for_each_channel (umc_v6_1_query_error_address); } -static void umc_v6_1_ras_init_per_channel (struct amdgpu_device *adev, +static void umc_v6_1_err_cnt_init_per_channel (struct amdgpu_device +*adev,struct ras_err_data *err_data, uint32_t umc_reg_offset, uint32_t channel_index) { @@ -264,15 +264,15 @@ static void umc_v6_1_ras_init_per_channel(struct amdgpu_device *adev,
WREG32(ecc_err_cnt_addr + umc_reg_offset, UMC_V6_1_CE_CNT_INIT); }
-static void umc_v6_1_ras_init(struct amdgpu_device *adev) +static void umc_v6_1_err_cnt_init(struct amdgpu_device *adev)
{
void *ras_error_status = NULL;
- amdgpu_umc_for_each_channel(umc_v6_1_ras_init_per_channel);
+ amdgpu_umc_for_each_channel(umc_v6_1_err_cnt_init_per_channel);
}
const struct amdgpu_umc_funcs umc_v6_1_funcs = {
- .ras_init = umc_v6_1_ras_init,
+ .err_cnt_init = umc_v6_1_err_cnt_init,
.ras_late_init = amdgpu_umc_ras_late_init, .query_ras_error_count = umc_v6_1_query_ras_error_count, .query_ras_error_address = umc_v6_1_query_ras_error_address,
--
2.17.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Am 10.09.19 um 08:31 schrieb Zhou1, Tao:
Quoted 3 lines
umc late init is umc specific, it's more suitable to be put in umc block
Signed-off-by Tao Zhou <[email protected]>
Maybe rename amdgpu_ras.h into amdgpu_umc.h then, but apart from that Acked-by: Christian König <[email protected]> for this patch.
Quoted 213 lines
--- drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 48 ---------------- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 2 - drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 73 +++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 2 + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 8 ++- drivers/gpu/drm/amd/amdgpu/umc_v6_1.c | 1 + 7 files changed, 82 insertions(+), 54 deletions(-)create mode 100644
drivers/gpu/drm/amd/amdgpu/amdgpu_umc.cdrivers/gpu/drm/amd/amdgpu/Makefile +1
-1@@ -55,7 +55,7 @@ amdgpu-y += amdgpu_device.o amdgpu_kms.o \ amdgpu_vf_error.o amdgpu_sched.o amdgpu_debugfs.o amdgpu_ids.o \ amdgpu_gmc.o amdgpu_mmhub.o amdgpu_xgmi.o amdgpu_csa.o amdgpu_ras.o amdgpu_vm_cpu.o \ amdgpu_vm_sdma.o amdgpu_pmu.o amdgpu_discovery.o amdgpu_ras_eeprom.o amdgpu_nbio.o \ - smu_v11_0_i2c.o + amdgpu_umc.o smu_v11_0_i2c.o amdgpu-$(CONFIG_PERF_EVENTS) += amdgpu_pmu.odrivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +0
-48@@ -304,51 +304,3 @@ bool amdgpu_gmc_filter_faults(struct amdgpu_device *adev, uint64_t addr, gmc->fault_hash[hash].idx = gmc->last_fault++;return false; } - -int amdgpu_gmc_ras_late_init (struct amdgpu_device *adev, -void *ras_ih_info) -{ -int r; -struct ras_ih_if *ih_info = (struct ras_ih_if *)ras_ih_info; -struct ras_fs_if fs_info = { - .sysfs_name ="umc_err_count" , - .debugfs_name ="umc_err_inject" , - }; - -if (!ih_info) -return -EINVAL ; - -if (!adev->gmc.umc_ras_if) { - adev->gmc.umc_ras_if =kmalloc (sizeof (struct ras_common_if ),GFP_KERNEL ); -if (!adev->gmc.umc_ras_if) -return -ENOMEM ; - adev->gmc.umc_ras_if->block =AMDGPU_RAS_BLOCK__UMC ; - adev->gmc.umc_ras_if->type =AMDGPU_RAS_ERROR__MULTI_UNCORRECTABLE ; - adev->gmc.umc_ras_if->sub_block_index =0 ; -strcpy (adev->gmc.umc_ras_if->name,"umc" ); - } - ih_info->head = fs_info.head = *adev->gmc.umc_ras_if; - - r =amdgpu_ras_late_init (adev, adev->gmc.umc_ras_if, - &fs_info, ih_info); -if (r) - goto free; - -if (amdgpu_ras_is_supported (adev, adev->gmc.umc_ras_if->block)) { - r =amdgpu_irq_get (adev, &adev->gmc.ecc_irq,0 ); -if (r) - goto late_fini; - }else { - r =0 ; - goto free; - } - -return 0 ; - -late_fini: -amdgpu_ras_late_fini (adev, adev->gmc.umc_ras_if, ih_info); -free: -kfree (adev->gmc.umc_ras_if); - adev->gmc.umc_ras_if =NULL ; -return r; -}drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h +0
-2@@ -234,7 +234,5 @@ void amdgpu_gmc_agp_location(struct amdgpu_device *adev, struct amdgpu_gmc *mc);bool amdgpu_gmc_filter_faults (struct amdgpu_device *adev,uint64_t addr,uint16_t pasid,uint64_t timestamp); -int amdgpu_gmc_ras_late_init (struct amdgpu_device *adev, -void *ih_info);#endif drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c new file +73
-0@@ -0,0 +1,73 @@ +/* +* Copyright 2019 Advanced Micro Devices, Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +* OTHER DEALINGS IN THE SOFTWARE. +* +*/ + +#include "amdgpu.h" +#include "amdgpu_ras.h" + +int amdgpu_umc_ras_late_init (struct amdgpu_device *adev,void *ras_ih_info) +{ +int r; +struct ras_ih_if *ih_info = (struct ras_ih_if *)ras_ih_info; +struct ras_fs_if fs_info = { + .sysfs_name ="umc_err_count" , + .debugfs_name ="umc_err_inject" , + }; + +if (!ih_info) +return -EINVAL ; + +if (!adev->gmc.umc_ras_if) { + adev->gmc.umc_ras_if = +kmalloc (sizeof (struct ras_common_if ),GFP_KERNEL ); +if (!adev->gmc.umc_ras_if) +return -ENOMEM ; + adev->gmc.umc_ras_if->block =AMDGPU_RAS_BLOCK__UMC ; + adev->gmc.umc_ras_if->type =AMDGPU_RAS_ERROR__MULTI_UNCORRECTABLE ; + adev->gmc.umc_ras_if->sub_block_index =0 ; +strcpy (adev->gmc.umc_ras_if->name,"umc" ); + } + ih_info->head = fs_info.head = *adev->gmc.umc_ras_if; + + r =amdgpu_ras_late_init (adev, adev->gmc.umc_ras_if, + &fs_info, ih_info); +if (r) + goto free; + +if (amdgpu_ras_is_supported (adev, adev->gmc.umc_ras_if->block)) { + r =amdgpu_irq_get (adev, &adev->gmc.ecc_irq,0 ); +if (r) + goto late_fini; + }else { + r =0 ; + goto free; + } + +return 0 ; + +late_fini: +amdgpu_ras_late_fini (adev, adev->gmc.umc_ras_if, ih_info); +free: +kfree (adev->gmc.umc_ras_if); + adev->gmc.umc_ras_if =NULL ; +return r; +}drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h +2
-0@@ -55,6 +55,7 @@struct amdgpu_umc_funcs {void (*ras_init)(struct amdgpu_device *adev); +int (*ras_late_init)(struct amdgpu_device *adev,void *ras_ih_info);void (*query_ras_error_count)(struct amdgpu_device *adev,void *ras_error_status); void (*query_ras_error_address)(struct amdgpu_device *adev,@@ -79,4 +80,5 @@ struct amdgpu_umc { const struct amdgpu_umc_funcs *funcs; }; +int amdgpu_umc_ras_late_init (struct amdgpu_device *adev,void *ras_ih_info);#endif drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +5
-3@@ -793,9 +793,11 @@ static int gmc_v9_0_ecc_late_init(void *handle) .cb = gmc_v9_0_process_ras_data_cb, }; - r =amdgpu_gmc_ras_late_init (adev, &umc_ih_info); -if (r) -return r; +if (adev->umc.funcs && adev->umc.funcs->ras_late_init) { + r = adev->umc.funcs->ras_late_init (adev, &umc_ih_info); +if (r) +return r; + }if (adev->mmhub_funcs && adev->mmhub_funcs->ras_late_init) { r = adev->mmhub_funcs->ras_late_init (adev);drivers/gpu/drm/amd/amdgpu/umc_v6_1.c +0
-0
drivers/gpu/drm/amd/amdgpu/umc_v6_1.c static void umc_v6_1_ras_init(struct amdgpu_device *adev) · line 279
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/umc_v6_1.c +1
-0@@ -273,6 +273,7 @@ static void umc_v6_1_ras_init(struct amdgpu_device *adev)const struct amdgpu_umc_funcs umc_v6_1_funcs = { .ras_init = umc_v6_1_ras_init, + .ras_late_init = amdgpu_umc_ras_late_init, .query_ras_error_count = umc_v6_1_query_ras_error_count, .query_ras_error_address = umc_v6_1_query_ras_error_address, .enable_umc_index_mode = umc_v6_1_enable_umc_index_mode,
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx