shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 10:58:48 +09:00
Code Issues Packages Projects Releases Wiki Activity

driver: rknpu: close pd stuff until iommu disabled

Browse Source 
Test on RV1106
Before:
initcall rknpu_init+0x1/0x10 [rknpu] returned 0 after 66724 usecs
After:
initcall rknpu_init+0x1/0x10 [rknpu] returned 0 after 2579 usecs

Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: I382c55ed7df3aab6974c025a8871fa25905d622e
This commit is contained in:
Ziyuan Xu
2022-04-20 16:28:04 +08:00
committed by Tao Huang
parent 61756ba5e9
commit d2786053e4
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/rknpu/rknpu_drv.c
View File

@@ -32,6 +32,7 @@
#include <linux/pm_runtime.h>
#include <linux/devfreq_cooling.h>
#include <linux/regmap.h>
#include <soc/rockchip/rockchip_iommu.h>
#ifndef FPGA_PLATFORM
#include <soc/rockchip/rockchip_opp_select.h>
@@ -58,6 +59,8 @@
#endif
#define POWER_DOWN_FREQ 200000000
#define NPU_MMU_DISABLED_POLL_PERIOD_US 1000
#define NPU_MMU_DISABLED_POLL_TIMEOUT_US 20000
static int bypass_irq_handler;
module_param(bypass_irq_handler, int, 0644);
@@ -674,6 +677,8 @@ out:
static int rknpu_power_off(struct rknpu_device *rknpu_dev)
{
struct device *dev = rknpu_dev->dev;
int ret;
bool val;
rockchip_monitor_volt_adjust_lock(rknpu_dev->mdev_info);
@@ -684,9 +689,20 @@ static int rknpu_power_off(struct rknpu_device *rknpu_dev)
* So it may be executed after the NPU is turned off after PD/CLK/VD,
* and the runtime suspend callback has a register access.
* If the PD/VD/CLK is closed, the register access will crash.
* So add a delay to avoid this problem.
* As a workaround, it's safe to close pd stuff until iommu disabled.
* If pm runtime framework can handle this issue in the future, remove
* this.
*/
msleep(20);
ret = readx_poll_timeout(rockchip_iommu_is_enabled, dev, val,
!val, NPU_MMU_DISABLED_POLL_PERIOD_US,
NPU_MMU_DISABLED_POLL_TIMEOUT_US);
if (ret) {
dev_err(dev, "iommu still enabled\n");
pm_runtime_get_sync(dev);
rockchip_monitor_volt_adjust_unlock(rknpu_dev->mdev_info);
return ret;
}
if (rknpu_dev->multiple_domains) {
if (rknpu_dev->genpd_dev_npu2)