Commit b3c76814 authored by Tao Zhou's avatar Tao Zhou Committed by Alex Deucher
Browse files

drm/amdgpu: add RAS fatal error interrupt handler 



The fatal error handler is independent from general ras interrupt
handler since there is no related IH ring.

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

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

+1 −14
Original line number Diff line number Diff line
@@ -193,20 +193,7 @@ static irqreturn_t amdgpu_irq_handler(int irq, void *arg) 
	if (ret == IRQ_HANDLED)

		pm_runtime_mark_last_busy(dev->dev);



	/* For the hardware that cannot enable bif ring for both ras_controller_irq

         * and ras_err_evnet_athub_irq ih cookies, the driver has to poll status

	 * register to check whether the interrupt is triggered or not, and properly

	 * ack the interrupt if it is there

	 */

	if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__PCIE_BIF)) {

		if (adev->nbio.ras &&

		    adev->nbio.ras->handle_ras_controller_intr_no_bifring)

			adev->nbio.ras->handle_ras_controller_intr_no_bifring(adev);



		if (adev->nbio.ras &&

		    adev->nbio.ras->handle_ras_err_event_athub_intr_no_bifring)

			adev->nbio.ras->handle_ras_err_event_athub_intr_no_bifring(adev);

	}

	amdgpu_ras_interrupt_fatal_error_handler(adev);



	return ret;

}

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

+20 −0
Original line number Diff line number Diff line
@@ -1515,6 +1515,26 @@ static int amdgpu_ras_fs_fini(struct amdgpu_device *adev) 
/* ras fs end */



/* ih begin */



/* For the hardware that cannot enable bif ring for both ras_controller_irq

 * and ras_err_evnet_athub_irq ih cookies, the driver has to poll status

 * register to check whether the interrupt is triggered or not, and properly

 * ack the interrupt if it is there

 */

void amdgpu_ras_interrupt_fatal_error_handler(struct amdgpu_device *adev)

{

	if (!amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__PCIE_BIF))

		return;



	if (adev->nbio.ras &&

	    adev->nbio.ras->handle_ras_controller_intr_no_bifring)

		adev->nbio.ras->handle_ras_controller_intr_no_bifring(adev);



	if (adev->nbio.ras &&

	    adev->nbio.ras->handle_ras_err_event_athub_intr_no_bifring)

		adev->nbio.ras->handle_ras_err_event_athub_intr_no_bifring(adev);

}



static void amdgpu_ras_interrupt_poison_consumption_handler(struct ras_manager *obj,

				struct amdgpu_iv_entry *entry)

{

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

+1 −0
Original line number Diff line number Diff line
@@ -683,4 +683,5 @@ int amdgpu_ras_set_context(struct amdgpu_device *adev, struct amdgpu_ras *ras_co 


int amdgpu_ras_register_ras_block(struct amdgpu_device *adev,

				struct amdgpu_ras_block_object *ras_block_obj);

void amdgpu_ras_interrupt_fatal_error_handler(struct amdgpu_device *adev);

#endif