| Message ID | 20180307063219.14409-1-vivek.gautam@codeaurora.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Mar 7, 2018 at 12:32 AM, Vivek Gautam <vivek.gautam@codeaurora.org> wrote: > Qualcomm's arm-smmu 500 implementation supports runtime pm > so enable the same. That's a driver detail unrelated to the binding. > > Signed-off-by: Vivek Gautam <vivek.gautam@codeaurora.org> > --- > > Based on iommu/arm-smmu pm runtime support series [1]: > [PATCH v8 0/5] iommu/arm-smmu: Add runtime pm/sleep support > > Tested on sdm845 with necessary support to enable the smmu > and with necessary user. > > [1] https://lkml.org/lkml/2018/3/2/325 > > Documentation/devicetree/bindings/iommu/arm,smmu.txt | 14 ++++++++++++++ Please split bindings to separate patches. > drivers/iommu/arm-smmu.c | 8 ++++++++ > 2 files changed, 22 insertions(+) > > diff --git a/Documentation/devicetree/bindings/iommu/arm,smmu.txt b/Documentation/devicetree/bindings/iommu/arm,smmu.txt > index 6ea27bd4f785..0b5c6d2a9865 100644 > --- a/Documentation/devicetree/bindings/iommu/arm,smmu.txt > +++ b/Documentation/devicetree/bindings/iommu/arm,smmu.txt > @@ -18,6 +18,7 @@ conditions. > "arm,mmu-500" > "cavium,smmu-v2" > "qcom,<soc>-smmu-v2", "qcom,smmu-v2" I don't even see this one in the tree yet... > + "qcom,<soc>-smmu-500", "qcom,smmu-500" IIRC, the mmu-500 is SMMU v2 implementation, right? Having qcom,smmu-500 seems kind of pointless. Given that we're there's only 1 SoC for "qcom,<soc>-smmu-v2" and you're already on to a new genericish compatible, just do SoC specific compatible strings. Rob
diff --git a/Documentation/devicetree/bindings/iommu/arm,smmu.txt b/Documentation/devicetree/bindings/iommu/arm,smmu.txt index 6ea27bd4f785..0b5c6d2a9865 100644 --- a/Documentation/devicetree/bindings/iommu/arm,smmu.txt +++ b/Documentation/devicetree/bindings/iommu/arm,smmu.txt @@ -18,6 +18,7 @@ conditions. "arm,mmu-500" "cavium,smmu-v2" "qcom,<soc>-smmu-v2", "qcom,smmu-v2" + "qcom,<soc>-smmu-500", "qcom,smmu-500" depending on the particular implementation and/or the version of the architecture implemented. @@ -30,6 +31,10 @@ conditions. An example string would be - "qcom,msm8996-smmu-v2", "qcom,smmu-v2". + "qcom,smmu-500" is arm,mmu-500 implementation that supports + efficient power management by supporting smmu's state + retention. + - reg : Base address and size of the SMMU. - #global-interrupts : The number of global interrupts exposed by the @@ -179,3 +184,12 @@ conditions. <&mmcc SMMU_MDP_AHB_CLK>; clock-names = "bus", "iface"; }; + + smmu5: iommu { + compatible = "qcom,sdm845-smmu-500", "qcom,smmu-500"; + reg = <0x15000000 0x80000>; + #iommu-cells = <2>; + #global-interrupts = <1>; + + ... + }; diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index 7a96c924ae22..7f52456c6b25 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -2008,6 +2008,12 @@ static const char * const qcom_smmuv2_clks[] = { "bus", "iface", }; +static const struct arm_smmu_match_data qcom_smmu500 = { + .version = ARM_SMMU_V2, + .model = ARM_MMU500, + .rpm_supported = true, +}; + static const struct arm_smmu_match_data qcom_smmuv2 = { .version = ARM_SMMU_V2, .model = QCOM_SMMUV2, @@ -2024,6 +2030,7 @@ static const struct of_device_id arm_smmu_of_match[] = { { .compatible = "arm,mmu-500", .data = &arm_mmu500 }, { .compatible = "cavium,smmu-v2", .data = &cavium_smmuv2 }, { .compatible = "qcom,smmu-v2", .data = &qcom_smmuv2 }, + { .compatible = "qcom,smmu-500", .data = &qcom_smmu500 }, { }, }; MODULE_DEVICE_TABLE(of, arm_smmu_of_match); @@ -2394,6 +2401,7 @@ IOMMU_OF_DECLARE(arm_mmu401, "arm,mmu-401"); IOMMU_OF_DECLARE(arm_mmu500, "arm,mmu-500"); IOMMU_OF_DECLARE(cavium_smmuv2, "cavium,smmu-v2"); IOMMU_OF_DECLARE(qcom_smmuv2, "qcom,smmu-v2"); +IOMMU_OF_DECLARE(qcom_smmu500, "qcom,smmu-500"); MODULE_DESCRIPTION("IOMMU API for ARM architected SMMU implementations"); MODULE_AUTHOR("Will Deacon <will.deacon@arm.com>");
Qualcomm's arm-smmu 500 implementation supports runtime pm so enable the same. Signed-off-by: Vivek Gautam <vivek.gautam@codeaurora.org> --- Based on iommu/arm-smmu pm runtime support series [1]: [PATCH v8 0/5] iommu/arm-smmu: Add runtime pm/sleep support Tested on sdm845 with necessary support to enable the smmu and with necessary user. [1] https://lkml.org/lkml/2018/3/2/325 Documentation/devicetree/bindings/iommu/arm,smmu.txt | 14 ++++++++++++++ drivers/iommu/arm-smmu.c | 8 ++++++++ 2 files changed, 22 insertions(+)