From: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
To: iommu@lists.linux-foundation.org
Cc: Heiko Stuebner <heiko@sntech.de>,
"open list:ARM/Rockchip SoC support"
<linux-rockchip@lists.infradead.org>,
kernel@collabora.com, Will Deacon <will@kernel.org>,
"moderated list:ARM/Rockchip SoC support"
<linux-arm-kernel@lists.infradead.org>
Subject: [PATCH 4/4] iommu/rockchip: replace pt_address cb with dma_addr_dte when setting dt addr
Date: Sat, 4 Dec 2021 17:24:28 +0200 [thread overview]
Message-ID: <20211204152428.13899-4-dafna.hirschfeld@collabora.com> (raw)
In-Reply-To: <20211204152428.13899-1-dafna.hirschfeld@collabora.com>
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
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
WARNING: multiple messages have this Message-ID (diff)
From: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
To: iommu@lists.linux-foundation.org
Cc: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>,
Joerg Roedel <joro@8bytes.org>, Will Deacon <will@kernel.org>,
Heiko Stuebner <heiko@sntech.de>,
linux-arm-kernel@lists.infradead.org (moderated
list:ARM/Rockchip SoC support),
linux-rockchip@lists.infradead.org (open list:ARM/Rockchip SoC
support),
kernel@collabora.com
Subject: [PATCH 4/4] iommu/rockchip: replace pt_address cb with dma_addr_dte when setting dt addr
Date: Sat, 4 Dec 2021 17:24:28 +0200 [thread overview]
Message-ID: <20211204152428.13899-4-dafna.hirschfeld@collabora.com> (raw)
In-Reply-To: <20211204152428.13899-1-dafna.hirschfeld@collabora.com>
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-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
WARNING: multiple messages have this Message-ID (diff)
From: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
To: iommu@lists.linux-foundation.org
Cc: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>,
Joerg Roedel <joro@8bytes.org>, Will Deacon <will@kernel.org>,
Heiko Stuebner <heiko@sntech.de>,
linux-arm-kernel@lists.infradead.org (moderated
list:ARM/Rockchip SoC support),
linux-rockchip@lists.infradead.org (open list:ARM/Rockchip SoC
support),
kernel@collabora.com
Subject: [PATCH 4/4] iommu/rockchip: replace pt_address cb with dma_addr_dte when setting dt addr
Date: Sat, 4 Dec 2021 17:24:28 +0200 [thread overview]
Message-ID: <20211204152428.13899-4-dafna.hirschfeld@collabora.com> (raw)
In-Reply-To: <20211204152428.13899-1-dafna.hirschfeld@collabora.com>
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
next prev parent reply other threads:[~2021-12-04 15:24 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
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 ` 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 ` 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
2021-12-04 15:24 ` Dafna Hirschfeld
2021-12-04 15:24 ` Dafna Hirschfeld [this message]
2021-12-04 15:24 ` [PATCH 4/4] iommu/rockchip: replace pt_address cb with dma_addr_dte when setting dt addr Dafna Hirschfeld
2021-12-04 15:24 ` Dafna Hirschfeld
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211204152428.13899-4-dafna.hirschfeld@collabora.com \
--to=dafna.hirschfeld@collabora.com \
--cc=heiko@sntech.de \
--cc=iommu@lists.linux-foundation.org \
--cc=kernel@collabora.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.