iommu/rockchip: Add support for multiple interface clocks
Subsystems (3)
v2 cover iommu/rockchip: Add support for multiple interface clocks
From: Chaoyi Chen <[email protected]>
Hi,
Some rockchip iommus require extra clocks besides aclk and interface clock, such as the iommus for NPU and RKVENC in RK3576.
Changes in v2:
- Link to v1: https://lore.kernel.org/all/[email protected]/
- Rewrite dt binding.
Chaoyi Chen (2):
dt-bindings: iommu: rockchip: Add support for multiple interface
clocks
iommu/rockchip: Use devm_clk_bulk_get_all() to get multiple iface
clock
.../bindings/iommu/rockchip,iommu.yaml | 52 ++++++++++++++++--- drivers/iommu/rockchip-iommu.c | 20 ++----- 2 files changed, 50 insertions(+), 22 deletions(-)
Signature · 1 line
2.51.1
PATCH v2 1/2 dt-bindings: iommu: rockchip: Add support for multiple interface clocks
From: Chaoyi Chen <[email protected]>
The iommu found on RK3576 NPU and RK3576 RKVDEC have 4 clock instead of 2 clock. Their clock names might differ, but I don't think that matters much.
Add support for them.
---
Changes in v2:
- Rewrite dt binding.
.../bindings/iommu/rockchip,iommu.yaml | 52 ++++++++++++++++--- 1 file changed, 46 insertions(+), 6 deletions(-)
Documentation/devicetree/bindings/iommu/rockchip,iommu.yaml +46 -6
@@ -27,6 +27,8 @@ properties: - enum: - rockchip,rk3576-iommu - rockchip,rk3588-iommu + - rockchip,rk3576-npu-iommu + - rockchip,rk3576-rkvdec-iommu - const: rockchip,rk3568-iommu reg:
@@ -42,14 +44,12 @@ properties: minItems: 1 clocks: - items: - - description: Core clock - - description: Interface clock + minItems: 2 + maxItems: 4 clock-names: - items: - - const: aclk - - const: iface + minItems: 2 + maxItems: 4 "#iommu-cells": const: 0
@@ -64,6 +64,46 @@ properties: Some mmu instances may produce unexpected results when the reset operation is used. +allOf: + - if: + properties: + compatible: + contains: + enum: + - rockchip,rk3576-npu-iommu + - rockchip,rk3576-rkvdec-iommu + then: + properties: + clocks: + minItems: 4 + clock-names: + minItems: 4 + - if: + properties: + compatible: + items: + - const: rockchip,iommu + - const: rockchip,rk3568-iommu + then: + properties: + clocks: + maxItems: 2 + clock-names: + maxItems: 2 + - if: + properties: + compatible: + contains: + enum: + - rockchip,rk3576-iommu + - rockchip,rk3588-iommu + then: + properties: + clocks: + maxItems: 2 + clock-names: + maxItems: 2 + required: - compatible - reg
Signature · 1 line
2.51.1
Rob Herring (Arm)
maintainerRe: [PATCH v2 1/2] dt-bindings: iommu: rockchip: Add support for multiple interface clocks
Quoted 8 lines · Chaoyi Chen
From: Chaoyi Chen <[email protected]>
The iommu found on RK3576 NPU and RK3576 RKVDEC have 4 clock instead of 2 clock. Their clock names might differ, but I don't think that matters much.
Add support for them.
Quoted 9 lines
Signed-off-by Chaoyi Chen <[email protected]>---
Changes in v2:
- Rewrite dt binding..../bindings/iommu/rockchip,iommu.yaml | 52 ++++++++++++++++--- 1 file changed, 46 insertions(+), 6 deletions(-)
My bot found errors running 'make dt_binding_check' on your patch:
yamllint warnings/errors:
dtschema/dtc warnings/errors:Documentation/devicetree/bindings/thermal/thermal-sensor.example.dtb: /example-0/soc/thermal-sensor@c263000: failed to match any schema with compatible: ['qcom,sdm845-tsens', 'qcom,tsens-v2'] Documentation/devicetree/bindings/thermal/thermal-sensor.example.dtb: /example-0/soc/thermal-sensor@c263000: failed to match any schema with compatible: ['qcom,sdm845-tsens', 'qcom,tsens-v2'] Documentation/devicetree/bindings/thermal/thermal-sensor.example.dtb: /example-0/soc/thermal-sensor@c265000: failed to match any schema with compatible: ['qcom,sdm845-tsens', 'qcom,tsens-v2'] Documentation/devicetree/bindings/thermal/thermal-sensor.example.dtb: /example-0/soc/thermal-sensor@c265000: failed to match any schema with compatible: ['qcom,sdm845-tsens', 'qcom,tsens-v2']
doc reference errors (make refcheckdocs):
See https://patchwork.ozlabs.org/project/devicetree-bindings/patch/[email protected]
The base for the series is generally the latest rc1. A different dependency should be noted in *this* patch.
If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure 'yamllint' is installed and dt-schema is up to date:
pip3 install dtschema --upgrade
Please check and re-submit after running the above command yourself. Note that DT_SCHEMA_FILES can be set to your schema file to speed up checking your schema. However, it must be unset to test all examples with your schema.
Re: [PATCH v2 1/2] dt-bindings: iommu: rockchip: Add support for multiple interface clocks
In reply to Chaoyi ChenQuoted 31 lines · Chaoyi Chen
From: Chaoyi Chen <[email protected]>
The iommu found on RK3576 NPU and RK3576 RKVDEC have 4 clock instead of 2 clock. Their clock names might differ, but I don't think that matters much.
Add support for them.
Signed-off-by Chaoyi Chen <[email protected]>---
Changes in v2:
- Rewrite dt binding..../bindings/iommu/rockchip,iommu.yaml | 52 ++++++++++++++++--- 1 file changed, 46 insertions(+), 6 deletions(-)Documentation/devicetree/bindings/iommu/rockchip,iommu.yaml +2
-0@@ -27,6 +27,8 @@ properties: - enum: - rockchip,rk3576-iommu - rockchip,rk3588-iommu + - rockchip,rk3576-npu-iommu + - rockchip,rk3576-rkvdec-iommu - const: rockchip,rk3568-iommu reg:
Documentation/devicetree/bindings/iommu/rockchip,iommu.yaml properties: · line 47
Quoted 6 lines
Documentation/devicetree/bindings/iommu/rockchip,iommu.yaml +0
-3@@ -42,14 +44,12 @@ properties: minItems: 1 clocks: - items: - - description: Core clock - - description: Interface clock
These go to specific variant if:then.
Documentation/devicetree/bindings/iommu/rockchip,iommu.yaml properties: · line 52
Quoted 9 lines
Documentation/devicetree/bindings/iommu/rockchip,iommu.yaml +4
-3+ minItems: 2 + maxItems: 4 clock-names: - items: - - const: aclk - - const: iface + minItems: 2 + maxItems: 4
So you just allow any names, like pink-pony.
No, define common list here. Actually same for clocks.
Quoted 21 lines
Documentation/devicetree/bindings/iommu/rockchip,iommu.yaml +14
-0"#iommu-cells": const: 0@@ -64,6 +64,46 @@ properties: Some mmu instances may produce unexpected results when the reset operation is used. +allOf: + - if: + properties: + compatible: + contains: + enum: + - rockchip,rk3576-npu-iommu + - rockchip,rk3576-rkvdec-iommu + then: + properties: + clocks: + minItems: 4 + clock-names: + minItems: 4
Documentation/devicetree/bindings/iommu/rockchip,iommu.yaml properties: · line 90
Quoted 10 lines
Documentation/devicetree/bindings/iommu/rockchip,iommu.yaml +10
-0+ - if: + properties: + compatible: + items: + - const: rockchip,iommu + - const: rockchip,rk3568-iommu + then: + properties: + clocks: + maxItems: 2
Why this is unspecific now? Please look at other examples how it is done, e.g. Samsung clocks.
Best regards,
Krzysztof
Re: [PATCH v2 1/2] dt-bindings: iommu: rockchip: Add support for multiple interface clocks
Hi Krzysztof,
Quoted 51 lines · Krzysztof Kozlowski
Quoted 31 lines · Chaoyi Chen
From: Chaoyi Chen <[email protected]>
The iommu found on RK3576 NPU and RK3576 RKVDEC have 4 clock instead of 2 clock. Their clock names might differ, but I don't think that matters much.
Add support for them.
Signed-off-by Chaoyi Chen <[email protected]>---
Changes in v2:
- Rewrite dt binding..../bindings/iommu/rockchip,iommu.yaml | 52 ++++++++++++++++--- 1 file changed, 46 insertions(+), 6 deletions(-)Documentation/devicetree/bindings/iommu/rockchip,iommu.yaml +2
-0@@ -27,6 +27,8 @@ properties: - enum: - rockchip,rk3576-iommu - rockchip,rk3588-iommu + - rockchip,rk3576-npu-iommu + - rockchip,rk3576-rkvdec-iommu - const: rockchip,rk3568-iommu reg:Documentation/devicetree/bindings/iommu/rockchip,iommu.yaml properties: · line 47
Quoted 6 lines
Documentation/devicetree/bindings/iommu/rockchip,iommu.yaml +0
-3@@ -42,14 +44,12 @@ properties: minItems: 1 clocks: - items: - - description: Core clock - - description: Interface clockThese go to specific variant if:then.
Documentation/devicetree/bindings/iommu/rockchip,iommu.yaml properties: · line 52
Quoted 9 lines
Documentation/devicetree/bindings/iommu/rockchip,iommu.yaml +4
-3+ minItems: 2 + maxItems: 4 clock-names: - items: - - const: aclk - - const: iface + minItems: 2 + maxItems: 4
Quoted 3 lines
So you just allow any names, like pink-pony.
No, define common list here. Actually same for clocks.
Will fix in v3.
Quoted 27 lines
Quoted 27 lines
Documentation/devicetree/bindings/iommu/rockchip,iommu.yaml +19
-0"#iommu-cells": const: 0@@ -64,6 +64,46 @@ properties: Some mmu instances may produce unexpected results when the reset operation is used. +allOf: + - if: + properties: + compatible: + contains: + enum: + - rockchip,rk3576-npu-iommu + - rockchip,rk3576-rkvdec-iommu + then: + properties: + clocks: + minItems: 4 + clock-names: + minItems: 4 + - if: + properties: + compatible: + items: + - const: rockchip,iommu
Quoted 8 lines
Documentation/devicetree/bindings/iommu/rockchip,iommu.yaml properties: · line 90
Quoted 5 lines
Documentation/devicetree/bindings/iommu/rockchip,iommu.yaml +5
-0+ - const: rockchip,rk3568-iommu + then: + properties: + clocks: + maxItems: 2Why this is unspecific now? Please look at other examples how it is done, e.g. Samsung clocks.
I looked at some examples. Maybe it need to set both minItems and maxItems here? I'm not sure I understood your point.
Quoted 6 lines
Best regards,
Krzysztof
Signature · 2 lines
Best, Chaoyi
Re: [PATCH v2 1/2] dt-bindings: iommu: rockchip: Add support for multiple interface clocks
Quoted 11 lines · Chaoyi Chen
Quoted 11 lines
Quoted 10 lines
Documentation/devicetree/bindings/iommu/rockchip,iommu.yaml +10
-0+ - if: + properties: + compatible: + items: + - const: rockchip,iommu + - const: rockchip,rk3568-iommu + then: + properties: + clocks: + maxItems: 2
Quoted 5 lines
Quoted 2 lines
Why this is unspecific now? Please look at other examples how it is done, e.g. Samsung clocks.
I looked at some examples. Maybe it need to set both minItems and maxItems here? I'm not sure I understood your point.
Individual items were described before. Now they are not, so first item can be anything.
You need to define the list. If the devices have completely different clocks, then you would go with Samsung approach. But devices should not have completely different clocks, so you should define common parts in top-level and just narrow number of items here. maxItems is enough in such case.
Best regards,
Krzysztof
Re: [PATCH v2 1/2] dt-bindings: iommu: rockchip: Add support for multiple interface clocks
Quoted 18 lines · Krzysztof Kozlowski
Quoted 11 lines · Chaoyi Chen
Quoted 11 lines
Quoted 10 lines
Documentation/devicetree/bindings/iommu/rockchip,iommu.yaml +10
-0+ - if: + properties: + compatible: + items: + - const: rockchip,iommu + - const: rockchip,rk3568-iommu + then: + properties: + clocks: + maxItems: 2Quoted 5 lines
Quoted 2 lines
Why this is unspecific now? Please look at other examples how it is done, e.g. Samsung clocks.
I looked at some examples. Maybe it need to set both minItems and maxItems here? I'm not sure I understood your point.
Quoted 8 lines
Individual items were described before. Now they are not, so first item can be anything.
You need to define the list. If the devices have completely different clocks, then you would go with Samsung approach. But devices should not have completely different clocks, so you should define common parts in top-level and just narrow number of items here. maxItems is enough in such case.
Ah, it looks like Samsung's clock bindings rarely have common parts. At present, there are indeed some common parts for the IOMMU clock, but I'm not sure how other variants will change.
I'll give this a try, thank you!
Signature · 2 lines
Best, Chaoyi
PATCH v2 2/2 iommu/rockchip: Use devm_clk_bulk_get_all() to get multiple iface clock
In reply to Chaoyi ChenFrom: Chaoyi Chen <[email protected]>
The iommu found on RK3576 NPU and RK3576 RKVDEC contain 4 clock.
Just use devm_clk_bulk_get_all() to get all the clocks and use them.
---
Changes in v2:
- Change comment.
drivers/iommu/rockchip-iommu.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-)
drivers/iommu/rockchip-iommu.c +4 -16
@@ -93,11 +93,6 @@ struct rk_iommu_domain {struct iommu_domain domain; }; -/* list of clocks required by IOMMU */ -static const char *const rk_iommu_clocks[] = { -"aclk" ,"iface" , -}; -struct rk_iommu_ops {phys_addr_t (*pt_address)(u32 dte);u32 (*mk_dtentries)(dma_addr_t pt_dma);
@@ -1236,25 +1231,18 @@ static int rk_iommu_probe(struct platform_device *pdev) iommu->reset_disabled =device_property_read_bool (dev,"rockchip,disable-mmu-reset" ); - iommu->num_clocks =ARRAY_SIZE (rk_iommu_clocks); - iommu->clocks =devm_kcalloc (iommu->dev, iommu->num_clocks, -sizeof (*iommu->clocks),GFP_KERNEL ); -if (!iommu->clocks) -return -ENOMEM ; - -for (i =0 ; i < iommu->num_clocks; ++i) - iommu->clocks[i].id = rk_iommu_clocks[i]; -/* * iommu clocks should be present for all new devices and devicetrees * but there are older devicetrees without clocks out in the wild. * So clocks as optional for the time being. */ - err =devm_clk_bulk_get (iommu->dev, iommu->num_clocks, iommu->clocks); + err =devm_clk_bulk_get_all (dev, &iommu->clocks);if (err == -ENOENT ) iommu->num_clocks =0 ; -else if (err) +else if (err <0 )return err; +else + iommu->num_clocks = err; err =clk_bulk_prepare (iommu->num_clocks, iommu->clocks);if (err)
Signature · 1 line
2.51.1
Re: [PATCH v2 2/2] iommu/rockchip: Use devm_clk_bulk_get_all() to get multiple iface clock
Quoted 6 lines · Chaoyi Chen
From: Chaoyi Chen <[email protected]>
The iommu found on RK3576 NPU and RK3576 RKVDEC contain 4 clock.
Just use
devm_clk_bulk_get_all()to get all the clocks and use them.
Quoted 55 lines
Signed-off-by Chaoyi Chen <[email protected]>---
Changes in v2:
- Change comment.drivers/iommu/rockchip-iommu.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-)drivers/iommu/rockchip-iommu.c +4
-16@@ -93,11 +93,6 @@ struct rk_iommu_domain {struct iommu_domain domain; }; -/* list of clocks required by IOMMU */ -static const char *const rk_iommu_clocks[] = { -"aclk" ,"iface" , -}; -struct rk_iommu_ops {phys_addr_t (*pt_address)(u32 dte);u32 (*mk_dtentries)(dma_addr_t pt_dma);@@ -1236,25 +1231,18 @@ static int rk_iommu_probe(struct platform_device *pdev) iommu->reset_disabled =device_property_read_bool (dev,"rockchip,disable-mmu-reset" ); - iommu->num_clocks =ARRAY_SIZE (rk_iommu_clocks); - iommu->clocks =devm_kcalloc (iommu->dev, iommu->num_clocks, -sizeof (*iommu->clocks),GFP_KERNEL ); -if (!iommu->clocks) -return -ENOMEM ; - -for (i =0 ; i < iommu->num_clocks; ++i) - iommu->clocks[i].id = rk_iommu_clocks[i]; -/* * iommu clocks should be present for all new devices and devicetrees * but there are older devicetrees without clocks out in the wild. * So clocks as optional for the time being. */ - err =devm_clk_bulk_get (iommu->dev, iommu->num_clocks, iommu->clocks); + err =devm_clk_bulk_get_all (dev, &iommu->clocks);if (err == -ENOENT ) iommu->num_clocks =0 ; -else if (err) +else if (err <0 )return err; +else + iommu->num_clocks = err; err =clk_bulk_prepare (iommu->num_clocks, iommu->clocks);if (err)