Commit fec70a86 authored by Hawking Zhang's avatar Hawking Zhang Committed by Alex Deucher
Browse files

drm/amdgpu: Move mmhub ras block init to ras sw_init 



Initialize mmhub ras block only when mmhub ip block
supports ras features. Driver queries ras capabilities
after early_init, ras block init needs to be moved to
sw_init.

Signed-off-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: default avatarStanley Yang <Stanley.Yang@amd.com>
Reviewed-by: default avatarTao Zhou <tao.zhou1@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent af8312a3

drivers/gpu/drm/amd/amdgpu/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ amdgpu-y += amdgpu_device.o amdgpu_kms.o \ 
	amdgpu_ucode.o amdgpu_bo_list.o amdgpu_ctx.o amdgpu_sync.o \

	amdgpu_gtt_mgr.o amdgpu_preempt_mgr.o amdgpu_vram_mgr.o amdgpu_virt.o \

	amdgpu_atomfirmware.o amdgpu_vf_error.o amdgpu_sched.o \

	amdgpu_debugfs.o amdgpu_ids.o amdgpu_gmc.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_discovery.o amdgpu_ras_eeprom.o amdgpu_nbio.o \

	amdgpu_umc.o smu_v11_0_i2c.o amdgpu_fru_eeprom.o amdgpu_rap.o \

drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c

+5 −0
Original line number Diff line number Diff line
@@ -456,6 +456,11 @@ int amdgpu_gmc_ras_sw_init(struct amdgpu_device *adev) 
	if (r)

		return r;



	/* mmhub ras block */

	r = amdgpu_mmhub_ras_sw_init(adev);

	if (r)

		return r;



	if (!adev->gmc.xgmi.connected_to_cpu) {

		adev->gmc.xgmi.ras = &xgmi_ras;

		amdgpu_ras_register_ras_block(adev, &adev->gmc.xgmi.ras->ras_block);

drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c

0 → 100644
+46 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 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) 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_sw_init(struct amdgpu_device *adev)

{

	int err;

	struct amdgpu_mmhub_ras *ras;



	if (!adev->mmhub.ras)

		return 0;



	ras = adev->mmhub.ras;

	err = amdgpu_ras_register_ras_block(adev, &ras->ras_block);

	if (err) {

		dev_err(adev->dev, "Failed to register mmhub ras block!\n");

		return err;

	}



	strcpy(ras->ras_block.ras_comm.name, "mmhub");

	ras->ras_block.ras_comm.block = AMDGPU_RAS_BLOCK__MMHUB;

	ras->ras_block.ras_comm.type = AMDGPU_RAS_ERROR__MULTI_UNCORRECTABLE;

	adev->mmhub.ras_if = &ras->ras_block.ras_comm;



	/* mmhub ras follows amdgpu_ras_block_late_init_default for late init */

	return 0;

}

drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h

+2 −0
Original line number Diff line number Diff line
@@ -48,5 +48,7 @@ struct amdgpu_mmhub { 
	struct amdgpu_mmhub_ras  *ras;

};



int amdgpu_mmhub_ras_sw_init(struct amdgpu_device *adev);



#endif

drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c

+0 −9
Original line number Diff line number Diff line
@@ -1351,15 +1351,6 @@ static void gmc_v9_0_set_mmhub_ras_funcs(struct amdgpu_device *adev) 
		/* mmhub ras is not available */

		break;

	}



	if (adev->mmhub.ras) {

		amdgpu_ras_register_ras_block(adev, &adev->mmhub.ras->ras_block);



		strcpy(adev->mmhub.ras->ras_block.ras_comm.name, "mmhub");

		adev->mmhub.ras->ras_block.ras_comm.block = AMDGPU_RAS_BLOCK__MMHUB;

		adev->mmhub.ras->ras_block.ras_comm.type = AMDGPU_RAS_ERROR__MULTI_UNCORRECTABLE;

		adev->mmhub.ras_if = &adev->mmhub.ras->ras_block.ras_comm;

	}

}



static void gmc_v9_0_set_gfxhub_funcs(struct amdgpu_device *adev)