5e67bba301
1.Modify mmhub block to fit for the unified ras block data and ops. 2.Change amdgpu_mmhub_ras_funcs to amdgpu_mmhub_ras, and the corresponding variable name remove _funcs suffix. 3.Remove the const flag of mmhub ras variable so that mmhub ras block can be able to be inserted into amdgpu device ras block link list. 4.Invoke amdgpu_ras_register_ras_block function to register mmhub ras block into amdgpu device ras block link list. 5.Remove the redundant code about mmhub in amdgpu_ras.c after using the unified ras block. 5.Remove the redundant code about mmhub in amdgpu_ras.c after using the unified ras block. 6.Fill unified ras block .name .block .ras_late_init and .ras_fini for all of mmhub versions. If .ras_late_init and .ras_fini had been defined by the selected mmhub version, the defined functions will take effect; if not defined, default fill them with amdgpu_mmhub_ras_late_init and amdgpu_mmhub_ras_fini. Signed-off-by: yipechai <YiPeng.Chai@amd.com> Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com> Reviewed-by: John Clements <john.clements@amd.com> Reviewed-by: Tao Zhou <tao.zhou1@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
68 lines
2.2 KiB
C
68 lines
2.2 KiB
C
/*
|
|
* 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_mmhub_ras_late_init(struct amdgpu_device *adev, void *ras_info)
|
|
{
|
|
int r;
|
|
struct ras_ih_if ih_info = {
|
|
.cb = NULL,
|
|
};
|
|
struct ras_fs_if fs_info = {
|
|
.sysfs_name = "mmhub_err_count",
|
|
};
|
|
|
|
if (!adev->mmhub.ras_if) {
|
|
adev->mmhub.ras_if = kmalloc(sizeof(struct ras_common_if), GFP_KERNEL);
|
|
if (!adev->mmhub.ras_if)
|
|
return -ENOMEM;
|
|
adev->mmhub.ras_if->block = AMDGPU_RAS_BLOCK__MMHUB;
|
|
adev->mmhub.ras_if->type = AMDGPU_RAS_ERROR__MULTI_UNCORRECTABLE;
|
|
adev->mmhub.ras_if->sub_block_index = 0;
|
|
}
|
|
ih_info.head = fs_info.head = *adev->mmhub.ras_if;
|
|
r = amdgpu_ras_late_init(adev, adev->mmhub.ras_if,
|
|
&fs_info, &ih_info);
|
|
if (r || !amdgpu_ras_is_supported(adev, adev->mmhub.ras_if->block)) {
|
|
kfree(adev->mmhub.ras_if);
|
|
adev->mmhub.ras_if = NULL;
|
|
}
|
|
|
|
return r;
|
|
}
|
|
|
|
void amdgpu_mmhub_ras_fini(struct amdgpu_device *adev)
|
|
{
|
|
if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__MMHUB) &&
|
|
adev->mmhub.ras_if) {
|
|
struct ras_common_if *ras_if = adev->mmhub.ras_if;
|
|
struct ras_ih_if ih_info = {
|
|
.cb = NULL,
|
|
};
|
|
|
|
amdgpu_ras_late_fini(adev, ras_if, &ih_info);
|
|
kfree(ras_if);
|
|
}
|
|
}
|