2023-11-26 16:20:38

by Sven Peter

Subject: [PATCH] iommu: dart: Use readl instead of readl_relaxed for consistency

While the readl_relaxed in apple_dart_suspend is correct the rest of the
driver uses the non-relaxed variants everywhere and the single
readl_relaxed is inconsistent and possibly confusing.

Signed-off-by: Sven Peter <[email protected]>
---
drivers/iommu/apple-dart.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/iommu/apple-dart.c b/drivers/iommu/apple-dart.c
index 59cf256bf40f..c7f047ce0a7a 100644
--- a/drivers/iommu/apple-dart.c
+++ b/drivers/iommu/apple-dart.c
@@ -1272,7 +1272,7 @@ static __maybe_unused int apple_dart_suspend(struct device *dev)
unsigned int sid, idx;

for (sid = 0; sid < dart->num_streams; sid++) {
- dart->save_tcr[sid] = readl_relaxed(dart->regs + DART_TCR(dart, sid));
+ dart->save_tcr[sid] = readl(dart->regs + DART_TCR(dart, sid));
for (idx = 0; idx < dart->hw->ttbr_count; idx++)
dart->save_ttbr[sid][idx] =
readl(dart->regs + DART_TTBR(dart, sid, idx));
--
2.34.1

2023-11-26 17:02:14

by Alyssa Rosenzweig

Subject: Re: [PATCH] iommu: dart: Use readl instead of readl_relaxed for consistency

r-b

On Sun, Nov 26, 2023 at 05:20:09PM +0100, Sven Peter wrote:
> While the readl_relaxed in apple_dart_suspend is correct the rest of the
> driver uses the non-relaxed variants everywhere and the single
> readl_relaxed is inconsistent and possibly confusing.
>
> Signed-off-by: Sven Peter <[email protected]>
> ---
> drivers/iommu/apple-dart.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/iommu/apple-dart.c b/drivers/iommu/apple-dart.c
> index 59cf256bf40f..c7f047ce0a7a 100644
> --- a/drivers/iommu/apple-dart.c
> +++ b/drivers/iommu/apple-dart.c
> @@ -1272,7 +1272,7 @@ static __maybe_unused int apple_dart_suspend(struct device *dev)
> unsigned int sid, idx;
>
> for (sid = 0; sid < dart->num_streams; sid++) {
> - dart->save_tcr[sid] = readl_relaxed(dart->regs + DART_TCR(dart, sid));
> + dart->save_tcr[sid] = readl(dart->regs + DART_TCR(dart, sid));
> for (idx = 0; idx < dart->hw->ttbr_count; idx++)
> dart->save_ttbr[sid][idx] =
> readl(dart->regs + DART_TTBR(dart, sid, idx));
> --
> 2.34.1
>

2023-11-26 17:32:08

by Neal Gompa

Subject: Re: [PATCH] iommu: dart: Use readl instead of readl_relaxed for consistency

On Sun, Nov 26, 2023 at 11:20 AM Sven Peter <[email protected]> wrote:
>
> While the readl_relaxed in apple_dart_suspend is correct the rest of the
> driver uses the non-relaxed variants everywhere and the single
> readl_relaxed is inconsistent and possibly confusing.
>
> Signed-off-by: Sven Peter <[email protected]>
> ---
> drivers/iommu/apple-dart.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/iommu/apple-dart.c b/drivers/iommu/apple-dart.c
> index 59cf256bf40f..c7f047ce0a7a 100644
> --- a/drivers/iommu/apple-dart.c
> +++ b/drivers/iommu/apple-dart.c
> @@ -1272,7 +1272,7 @@ static __maybe_unused int apple_dart_suspend(struct device *dev)
> unsigned int sid, idx;
>
> for (sid = 0; sid < dart->num_streams; sid++) {
> - dart->save_tcr[sid] = readl_relaxed(dart->regs + DART_TCR(dart, sid));
> + dart->save_tcr[sid] = readl(dart->regs + DART_TCR(dart, sid));
> for (idx = 0; idx < dart->hw->ttbr_count; idx++)
> dart->save_ttbr[sid][idx] =
> readl(dart->regs + DART_TTBR(dart, sid, idx));
> --
> 2.34.1
>
>

Reviewed-by: Neal Gompa <[email protected]>


--
真実はいつも一つ！/ Always, there's only one truth!

2023-11-27 05:59:26

by Hector Martin

Subject: Re: [PATCH] iommu: dart: Use readl instead of readl_relaxed for consistency

On 2023/11/27 1:20, Sven Peter wrote:
> While the readl_relaxed in apple_dart_suspend is correct the rest of the
> driver uses the non-relaxed variants everywhere and the single
> readl_relaxed is inconsistent and possibly confusing.
>
> Signed-off-by: Sven Peter <[email protected]>
> ---
> drivers/iommu/apple-dart.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/iommu/apple-dart.c b/drivers/iommu/apple-dart.c
> index 59cf256bf40f..c7f047ce0a7a 100644
> --- a/drivers/iommu/apple-dart.c
> +++ b/drivers/iommu/apple-dart.c
> @@ -1272,7 +1272,7 @@ static __maybe_unused int apple_dart_suspend(struct device *dev)
> unsigned int sid, idx;
>
> for (sid = 0; sid < dart->num_streams; sid++) {
> - dart->save_tcr[sid] = readl_relaxed(dart->regs + DART_TCR(dart, sid));
> + dart->save_tcr[sid] = readl(dart->regs + DART_TCR(dart, sid));
> for (idx = 0; idx < dart->hw->ttbr_count; idx++)
> dart->save_ttbr[sid][idx] =
> readl(dart->regs + DART_TTBR(dart, sid, idx));

Acked-by: Hector Martin <[email protected]>

- Hector

2023-11-27 10:18:23

by Joerg Roedel

Subject: Re: [PATCH] iommu: dart: Use readl instead of readl_relaxed for consistency

On Sun, Nov 26, 2023 at 05:20:09PM +0100, Sven Peter wrote:
> While the readl_relaxed in apple_dart_suspend is correct the rest of the
> driver uses the non-relaxed variants everywhere and the single
> readl_relaxed is inconsistent and possibly confusing.
>
> Signed-off-by: Sven Peter <[email protected]>
> ---
> drivers/iommu/apple-dart.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks.

In the future, can you please use "iommu/apple-dart:" as the prefix for
you patch subject-lines? That fits better into the overall convention in
the iommu-tree, thanks.

Regards,

Joerg