2023-01-04 11:05:27

by Hector Martin

Subject: [PATCH 5/7] iommu: dart: Fix DART_PARAMS1/2 bit define names

They didn't have the PARAMS reg index in them, but they should.

Signed-off-by: Hector Martin <[email protected]>
---
drivers/iommu/apple-dart.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/iommu/apple-dart.c b/drivers/iommu/apple-dart.c
index 189487c1d978..03a3cb5638ba 100644
--- a/drivers/iommu/apple-dart.c
+++ b/drivers/iommu/apple-dart.c
@@ -40,10 +40,10 @@


#define DART_PARAMS1 0x00
-#define DART_PARAMS_PAGE_SHIFT GENMASK(27, 24)
+#define DART_PARAMS1_PAGE_SHIFT GENMASK(27, 24)

#define DART_PARAMS2 0x04
-#define DART_PARAMS_BYPASS_SUPPORT BIT(0)
+#define DART_PARAMS2_BYPASS_SUPPORT BIT(0)

#define DART_STREAM_COMMAND 0x20
#define DART_STREAM_COMMAND_BUSY BIT(2)
@@ -893,8 +893,8 @@ static int apple_dart_probe(struct platform_device *pdev)

dart_params[0] = readl(dart->regs + DART_PARAMS1);
dart_params[1] = readl(dart->regs + DART_PARAMS2);
- dart->pgsize = 1 << FIELD_GET(DART_PARAMS_PAGE_SHIFT, dart_params[0]);
- dart->supports_bypass = dart_params[1] & DART_PARAMS_BYPASS_SUPPORT;
+ dart->pgsize = 1 << FIELD_GET(DART_PARAMS1_PAGE_SHIFT, dart_params[0]);
+ dart->supports_bypass = dart_params[1] & DART_PARAMS2_BYPASS_SUPPORT;

dart->num_streams = dart->hw->max_sid_count;

--
2.35.1

2023-01-04 13:33:53

by Sven Peter

Subject: Re: [PATCH 5/7] iommu: dart: Fix DART_PARAMS1/2 bit define names

On Wed, Jan 4, 2023, at 12:00, Hector Martin wrote:
> They didn't have the PARAMS reg index in them, but they should.
>
> Signed-off-by: Hector Martin <[email protected]>
> ---

Reviewed-by: Sven Peter <[email protected]>