* [PATCH 1/4] iommu/rockchip: replace 4 with sizeof(u32)
@ 2021-12-04 15:24 Dafna Hirschfeld
2021-12-04 15:24 ` [PATCH 2/4] iommu/rockchip: remove redundant var dte_addr Dafna Hirschfeld
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Dafna Hirschfeld @ 2021-12-04 15:24 UTC (permalink / raw)
To: iommu
Cc: Dafna Hirschfeld, Joerg Roedel, Will Deacon, Heiko Stuebner,
moderated list:ARM/Rockchip SoC support,
open list:ARM/Rockchip SoC support, kernel
In log_iova, multiply by 4 is used to calculate the
addresses. In other places in this driver, sizeof(u3)
is used. So replace 4 with sizeof(u32) for consistency
Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
---
drivers/iommu/rockchip-iommu.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
index 5cb260820eda..bd22d0a6eaf0 100644
--- a/drivers/iommu/rockchip-iommu.c
+++ b/drivers/iommu/rockchip-iommu.c
@@ -580,14 +580,14 @@ static void log_iova(struct rk_iommu *iommu, int index, dma_addr_t iova)
mmu_dte_addr = rk_iommu_read(base, RK_MMU_DTE_ADDR);
mmu_dte_addr_phys = rk_ops->dte_addr_phys(mmu_dte_addr);
- dte_addr_phys = mmu_dte_addr_phys + (4 * dte_index);
+ dte_addr_phys = mmu_dte_addr_phys + sizeof(u32) * dte_index;
dte_addr = phys_to_virt(dte_addr_phys);
dte = *dte_addr;
if (!rk_dte_is_pt_valid(dte))
goto print_it;
- pte_addr_phys = rk_ops->pt_address(dte) + (pte_index * 4);
+ pte_addr_phys = rk_ops->pt_address(dte) + pte_index * sizeof(u32);
pte_addr = phys_to_virt(pte_addr_phys);
pte = *pte_addr;
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/4] iommu/rockchip: remove redundant var dte_addr
2021-12-04 15:24 [PATCH 1/4] iommu/rockchip: replace 4 with sizeof(u32) Dafna Hirschfeld
@ 2021-12-04 15:24 ` Dafna Hirschfeld
2021-12-04 15:24 ` [PATCH 3/4] iommu/rockchip: rename dte_index to dte Dafna Hirschfeld
2021-12-04 15:24 ` [PATCH 4/4] iommu/rockchip: replace pt_address cb with dma_addr_dte when setting dt addr Dafna Hirschfeld
2 siblings, 0 replies; 4+ messages in thread
From: Dafna Hirschfeld @ 2021-12-04 15:24 UTC (permalink / raw)
To: iommu
Cc: Dafna Hirschfeld, Joerg Roedel, Will Deacon, Heiko Stuebner,
moderated list:ARM/Rockchip SoC support,
open list:ARM/Rockchip SoC support, kernel
Using dte_addr as local var is redundant.
Instead acces rk_domain->dt[dte_index] directly.
Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
---
drivers/iommu/rockchip-iommu.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
index bd22d0a6eaf0..bd73cf9c54f5 100644
--- a/drivers/iommu/rockchip-iommu.c
+++ b/drivers/iommu/rockchip-iommu.c
@@ -744,7 +744,7 @@ static void rk_iommu_zap_iova_first_last(struct rk_iommu_domain *rk_domain,
static u32 *rk_dte_get_page_table(struct rk_iommu_domain *rk_domain,
dma_addr_t iova)
{
- u32 *page_table, *dte_addr;
+ u32 *page_table;
u32 dte_index, dte;
phys_addr_t pt_phys;
dma_addr_t pt_dma;
@@ -752,8 +752,8 @@ static u32 *rk_dte_get_page_table(struct rk_iommu_domain *rk_domain,
assert_spin_locked(&rk_domain->dt_lock);
dte_index = rk_iova_dte_index(iova);
- dte_addr = &rk_domain->dt[dte_index];
- dte = *dte_addr;
+ dte = rk_domain->dt[dte_index];
+
if (rk_dte_is_pt_valid(dte))
goto done;
@@ -769,7 +769,7 @@ static u32 *rk_dte_get_page_table(struct rk_iommu_domain *rk_domain,
}
dte = rk_ops->mk_dtentries(pt_dma);
- *dte_addr = dte;
+ rk_domain->dt[dte_index] = dte;
rk_table_flush(rk_domain,
rk_domain->dt_dma + dte_index * sizeof(u32), 1);
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 3/4] iommu/rockchip: rename dte_index to dte
2021-12-04 15:24 [PATCH 1/4] iommu/rockchip: replace 4 with sizeof(u32) Dafna Hirschfeld
2021-12-04 15:24 ` [PATCH 2/4] iommu/rockchip: remove redundant var dte_addr Dafna Hirschfeld
@ 2021-12-04 15:24 ` Dafna Hirschfeld
2021-12-04 15:24 ` [PATCH 4/4] iommu/rockchip: replace pt_address cb with dma_addr_dte when setting dt addr Dafna Hirschfeld
2 siblings, 0 replies; 4+ messages in thread
From: Dafna Hirschfeld @ 2021-12-04 15:24 UTC (permalink / raw)
To: iommu
Cc: Dafna Hirschfeld, Joerg Roedel, Will Deacon, Heiko Stuebner,
moderated list:ARM/Rockchip SoC support,
open list:ARM/Rockchip SoC support, kernel
In rk_iommu_map, the var dte_index is actually
set to the dte and not to the dte index. Rename it.
Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
---
drivers/iommu/rockchip-iommu.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
index bd73cf9c54f5..ba60f0faafcc 100644
--- a/drivers/iommu/rockchip-iommu.c
+++ b/drivers/iommu/rockchip-iommu.c
@@ -852,7 +852,7 @@ static int rk_iommu_map(struct iommu_domain *domain, unsigned long _iova,
unsigned long flags;
dma_addr_t pte_dma, iova = (dma_addr_t)_iova;
u32 *page_table, *pte_addr;
- u32 dte_index, pte_index;
+ u32 dte, pte_index;
int ret;
spin_lock_irqsave(&rk_domain->dt_lock, flags);
@@ -870,11 +870,11 @@ static int rk_iommu_map(struct iommu_domain *domain, unsigned long _iova,
return PTR_ERR(page_table);
}
- dte_index = rk_domain->dt[rk_iova_dte_index(iova)];
+ dte = rk_domain->dt[rk_iova_dte_index(iova)];
pte_index = rk_iova_pte_index(iova);
pte_addr = &page_table[pte_index];
- pte_dma = rk_ops->pt_address(dte_index) + pte_index * sizeof(u32);
+ pte_dma = rk_ops->pt_address(dte) + pte_index * sizeof(u32);
ret = rk_iommu_map_iova(rk_domain, pte_addr, pte_dma, iova,
paddr, size, prot);
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 4/4] iommu/rockchip: replace pt_address cb with dma_addr_dte when setting dt addr
2021-12-04 15:24 [PATCH 1/4] iommu/rockchip: replace 4 with sizeof(u32) Dafna Hirschfeld
2021-12-04 15:24 ` [PATCH 2/4] iommu/rockchip: remove redundant var dte_addr Dafna Hirschfeld
2021-12-04 15:24 ` [PATCH 3/4] iommu/rockchip: rename dte_index to dte Dafna Hirschfeld
@ 2021-12-04 15:24 ` Dafna Hirschfeld
2 siblings, 0 replies; 4+ messages in thread
From: Dafna Hirschfeld @ 2021-12-04 15:24 UTC (permalink / raw)
To: iommu
Cc: Dafna Hirschfeld, Joerg Roedel, Will Deacon, Heiko Stuebner,
moderated list:ARM/Rockchip SoC support,
open list:ARM/Rockchip SoC support, kernel
The dt address is calculated using the dma_addr_dte cb.
So when setting the dt address to the DTE_ADDR_DUMMY
that cb should be used instead of pt_address.
Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
---
drivers/iommu/rockchip-iommu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
index ba60f0faafcc..013f7608a2e6 100644
--- a/drivers/iommu/rockchip-iommu.c
+++ b/drivers/iommu/rockchip-iommu.c
@@ -510,7 +510,7 @@ static int rk_iommu_force_reset(struct rk_iommu *iommu)
* and verifying that upper 5 nybbles are read back.
*/
for (i = 0; i < iommu->num_mmu; i++) {
- dte_addr = rk_ops->pt_address(DTE_ADDR_DUMMY);
+ dte_addr = rk_ops->dma_addr_dte(DTE_ADDR_DUMMY);
rk_iommu_write(iommu->bases[i], RK_MMU_DTE_ADDR, dte_addr);
if (dte_addr != rk_iommu_read(iommu->bases[i], RK_MMU_DTE_ADDR)) {
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-12-04 15:26 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-04 15:24 [PATCH 1/4] iommu/rockchip: replace 4 with sizeof(u32) Dafna Hirschfeld
2021-12-04 15:24 ` [PATCH 2/4] iommu/rockchip: remove redundant var dte_addr Dafna Hirschfeld
2021-12-04 15:24 ` [PATCH 3/4] iommu/rockchip: rename dte_index to dte Dafna Hirschfeld
2021-12-04 15:24 ` [PATCH 4/4] iommu/rockchip: replace pt_address cb with dma_addr_dte when setting dt addr Dafna Hirschfeld
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).