Commit e3caadf1 authored by Jacek Lawrynowicz's avatar Jacek Lawrynowicz
Browse files

accel/ivpu: Remove d3hot_after_power_off WA 



Always enter D3hot after entering D0i3 an all platforms.
This minimizes power usage.

Signed-off-by: default avatarJacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
Reviewed-by: default avatarJeffrey Hugo <quic_jhugo@quicinc.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240402104929.941186-3-jacek.lawrynowicz@linux.intel.com
parent f0cf7ffc

drivers/accel/ivpu/ivpu_drv.c

+10 −10
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (C) 2020-2023 Intel Corporation

 * Copyright (C) 2020-2024 Intel Corporation

 */



#include <linux/firmware.h>
@@ -387,12 +387,15 @@ int ivpu_shutdown(struct ivpu_device *vdev) 
{

	int ret;



	ivpu_prepare_for_reset(vdev);

	/* Save PCI state before powering down as it sometimes gets corrupted if NPU hangs */

	pci_save_state(to_pci_dev(vdev->drm.dev));



	ret = ivpu_hw_power_down(vdev);

	if (ret)

		ivpu_warn(vdev, "Failed to power down HW: %d\n", ret);



	pci_set_power_state(to_pci_dev(vdev->drm.dev), PCI_D3hot);



	return ret;

}
@@ -560,11 +563,11 @@ static int ivpu_dev_init(struct ivpu_device *vdev) 
	/* Power up early so the rest of init code can access VPU registers */

	ret = ivpu_hw_power_up(vdev);

	if (ret)

		goto err_power_down;

		goto err_shutdown;



	ret = ivpu_mmu_global_context_init(vdev);

	if (ret)

		goto err_power_down;

		goto err_shutdown;



	ret = ivpu_mmu_init(vdev);

	if (ret)
@@ -601,10 +604,8 @@ static int ivpu_dev_init(struct ivpu_device *vdev) 
	ivpu_mmu_reserved_context_fini(vdev);

err_mmu_gctx_fini:

	ivpu_mmu_global_context_fini(vdev);

err_power_down:

	ivpu_hw_power_down(vdev);

	if (IVPU_WA(d3hot_after_power_off))

		pci_set_power_state(to_pci_dev(vdev->drm.dev), PCI_D3hot);

err_shutdown:

	ivpu_shutdown(vdev);

err_xa_destroy:

	xa_destroy(&vdev->db_xa);

	xa_destroy(&vdev->submitted_jobs_xa);
@@ -628,9 +629,8 @@ static void ivpu_bo_unbind_all_user_contexts(struct ivpu_device *vdev) 
static void ivpu_dev_fini(struct ivpu_device *vdev)

{

	ivpu_pm_disable(vdev);

	ivpu_prepare_for_reset(vdev);

	ivpu_shutdown(vdev);

	if (IVPU_WA(d3hot_after_power_off))

		pci_set_power_state(to_pci_dev(vdev->drm.dev), PCI_D3hot);



	ivpu_jobs_abort_all(vdev);

	ivpu_job_done_consumer_fini(vdev);

drivers/accel/ivpu/ivpu_drv.h

+1 −2
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (C) 2020-2023 Intel Corporation

 * Copyright (C) 2020-2024 Intel Corporation

 */



#ifndef __IVPU_DRV_H__
@@ -90,7 +90,6 @@ 
struct ivpu_wa_table {

	bool punit_disabled;

	bool clear_runtime_mem;

	bool d3hot_after_power_off;

	bool interrupt_clear_with_0;

	bool disable_clock_relinquish;

	bool disable_d0i3_msg;

drivers/accel/ivpu/ivpu_hw_37xx.c

+1 −3
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (C) 2020-2023 Intel Corporation

 * Copyright (C) 2020-2024 Intel Corporation

 */



#include "ivpu_drv.h"
@@ -75,7 +75,6 @@ static void ivpu_hw_wa_init(struct ivpu_device *vdev) 
{

	vdev->wa.punit_disabled = false;

	vdev->wa.clear_runtime_mem = false;

	vdev->wa.d3hot_after_power_off = true;



	REGB_WR32(VPU_37XX_BUTTRESS_INTERRUPT_STAT, BUTTRESS_ALL_IRQ_MASK);

	if (REGB_RD32(VPU_37XX_BUTTRESS_INTERRUPT_STAT) == BUTTRESS_ALL_IRQ_MASK) {
@@ -86,7 +85,6 @@ static void ivpu_hw_wa_init(struct ivpu_device *vdev) 


	IVPU_PRINT_WA(punit_disabled);

	IVPU_PRINT_WA(clear_runtime_mem);

	IVPU_PRINT_WA(d3hot_after_power_off);

	IVPU_PRINT_WA(interrupt_clear_with_0);

}

drivers/accel/ivpu/ivpu_pm.c

+2 −5
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (C) 2020-2023 Intel Corporation

 * Copyright (C) 2020-2024 Intel Corporation

 */



#include <linux/highmem.h>
@@ -58,15 +58,12 @@ static int ivpu_suspend(struct ivpu_device *vdev) 
{

	int ret;



	/* Save PCI state before powering down as it sometimes gets corrupted if NPU hangs */

	pci_save_state(to_pci_dev(vdev->drm.dev));

	ivpu_prepare_for_reset(vdev);



	ret = ivpu_shutdown(vdev);

	if (ret)

		ivpu_err(vdev, "Failed to shutdown VPU: %d\n", ret);



	pci_set_power_state(to_pci_dev(vdev->drm.dev), PCI_D3hot);



	return ret;

}