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

iommu: rockchip: rewrite command if failed for RV1109/RV1126

Browse Source 
On RV1109/RV1126, there is a rare risk that command would not take effect
for rkvenc_mmu. Rewrite command no more than 10 times. Only consider
enable/disable paging, enable/disable stall these 4 commands
which result can be checked through register RK_MMU_STATUS.

Change-Id: I508783821f05513b28392d5a3d3a55953917f910
Signed-off-by: Simon Xue <xxm@rock-chips.com>
This commit is contained in:
Simon Xue
2021-04-07 10:17:28 +08:00
committed by Tao Huang
parent 7f8158fb41
commit f5db486322
1 changed files with 35 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
drivers/iommu/rockchip-iommu.c
View File

@@ -77,6 +77,8 @@
#define DISABLE_FETCH_DTE_TIME_LIMIT BIT(31)
#define CMD_RETRY_COUNT 10
/*
* Support mapping any size that fits in one page table:
* 4 KiB to 4 MiB
@@ -137,6 +139,7 @@ struct rk_iommu {
bool skip_read; /* rk3126/rk3128 can't read vop iommu registers */
bool dlr_disable; /* avoid access iommu when runtime ops called */
bool fetch_dte_time_limit; /* if have fetch dte time limit */
bool cmd_retry;
struct iommu_device iommu;
struct list_head node; /* entry in rk_iommu_domain.iommus */
struct iommu_domain *domain; /* domain to which iommu is attached */
@@ -455,6 +458,7 @@ static int rk_iommu_enable_stall(struct rk_iommu *iommu)
{
int ret, i;
bool val;
int retry_count = 0;
if (iommu->skip_read)
goto read_wa;
@@ -474,10 +478,14 @@ read_wa:
ret = readx_poll_timeout(rk_iommu_is_stall_active, iommu, val,
val, RK_MMU_POLL_PERIOD_US,
RK_MMU_POLL_TIMEOUT_US);
if (ret)
if (ret) {
for (i = 0; i < iommu->num_mmu; i++)
dev_err(iommu->dev, "Enable stall request timed out, status: %#08x\n",
dev_err(iommu->dev, "Enable stall request timed out, retry_count = %d, status: %#08x\n",
retry_count,
rk_iommu_read(iommu->bases[i], RK_MMU_STATUS));
if (iommu->cmd_retry && (retry_count++ < CMD_RETRY_COUNT))
goto read_wa;
}
return ret;
}
@@ -486,6 +494,7 @@ static int rk_iommu_disable_stall(struct rk_iommu *iommu)
{
int ret, i;
bool val;
int retry_count = 0;
if (iommu->skip_read)
goto read_wa;
@@ -501,10 +510,14 @@ read_wa:
ret = readx_poll_timeout(rk_iommu_is_stall_active, iommu, val,
!val, RK_MMU_POLL_PERIOD_US,
RK_MMU_POLL_TIMEOUT_US);
if (ret)
if (ret) {
for (i = 0; i < iommu->num_mmu; i++)
dev_err(iommu->dev, "Disable stall request timed out, status: %#08x\n",
dev_err(iommu->dev, "Disable stall request timed out, retry_count = %d, status: %#08x\n",
retry_count,
rk_iommu_read(iommu->bases[i], RK_MMU_STATUS));
if (iommu->cmd_retry && (retry_count++ < CMD_RETRY_COUNT))
goto read_wa;
}
return ret;
}
@@ -513,6 +526,7 @@ static int rk_iommu_enable_paging(struct rk_iommu *iommu)
{
int ret, i;
bool val;
int retry_count = 0;
if (iommu->skip_read)
goto read_wa;
@@ -528,10 +542,14 @@ read_wa:
ret = readx_poll_timeout(rk_iommu_is_paging_enabled, iommu, val,
val, RK_MMU_POLL_PERIOD_US,
RK_MMU_POLL_TIMEOUT_US);
if (ret)
if (ret) {
for (i = 0; i < iommu->num_mmu; i++)
dev_err(iommu->dev, "Enable paging request timed out, status: %#08x\n",
dev_err(iommu->dev, "Enable paging request timed out, retry_count = %d, status: %#08x\n",
retry_count,
rk_iommu_read(iommu->bases[i], RK_MMU_STATUS));
if (iommu->cmd_retry && (retry_count++ < CMD_RETRY_COUNT))
goto read_wa;
}
return ret;
}
@@ -540,6 +558,7 @@ static int rk_iommu_disable_paging(struct rk_iommu *iommu)
{
int ret, i;
bool val;
int retry_count = 0;
if (iommu->skip_read)
goto read_wa;
@@ -555,10 +574,14 @@ read_wa:
ret = readx_poll_timeout(rk_iommu_is_paging_enabled, iommu, val,
!val, RK_MMU_POLL_PERIOD_US,
RK_MMU_POLL_TIMEOUT_US);
if (ret)
if (ret) {
for (i = 0; i < iommu->num_mmu; i++)
dev_err(iommu->dev, "Disable paging request timed out, status: %#08x\n",
dev_err(iommu->dev, "Disable paging request timed out, retry_count = %d, status: %#08x\n",
retry_count,
rk_iommu_read(iommu->bases[i], RK_MMU_STATUS));
if (iommu->cmd_retry && (retry_count++ < CMD_RETRY_COUNT))
goto read_wa;
}
return ret;
}
@@ -1655,8 +1678,11 @@ static int rk_iommu_probe(struct platform_device *pdev)
"rockchip,disable-device-link-resume");
if (of_machine_is_compatible("rockchip,rv1126") ||
of_machine_is_compatible("rockchip,rv1109"))
of_machine_is_compatible("rockchip,rv1109")) {
iommu->fetch_dte_time_limit = true;
iommu->cmd_retry = device_property_read_bool(dev,
"rockchip,enable-cmd-retry");
}
iommu->num_clocks = ARRAY_SIZE(rk_iommu_clocks);
iommu->clocks = devm_kcalloc(iommu->dev, iommu->num_clocks,