| Message ID | 20230123131931.263024-1-manivannan.sadhasivam@linaro.org |
|---|---|
| Headers | show |
| Series | Fix SMMU on SDX55 and SDX65 | expand |
On 23.01.2023 14:19, Manivannan Sadhasivam wrote: > SDX65 uses the Qcom version of the SMMU-500 IP. So use "qcom,smmu-500" > compatible as the fallback to the SoC specific compatible. > > Cc: <stable@vger.kernel.org> # 5.19 > Fixes: 98187f7b74bf ("ARM: dts: qcom: sdx65: Enable ARM SMMU") > Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > --- Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> Konrad > arch/arm/boot/dts/qcom-sdx65.dtsi | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm/boot/dts/qcom-sdx65.dtsi b/arch/arm/boot/dts/qcom-sdx65.dtsi > index b073e0c63df4..408c4b87d44b 100644 > --- a/arch/arm/boot/dts/qcom-sdx65.dtsi > +++ b/arch/arm/boot/dts/qcom-sdx65.dtsi > @@ -455,7 +455,7 @@ pil-reloc@94c { > }; > > apps_smmu: iommu@15000000 { > - compatible = "qcom,sdx65-smmu-500", "arm,mmu-500"; > + compatible = "qcom,sdx65-smmu-500", "qcom,smmu-500", "arm,mmu-500"; > reg = <0x15000000 0x40000>; > #iommu-cells = <2>; > #global-interrupts = <1>;
On Mon, 23 Jan 2023 18:49:28 +0530, Manivannan Sadhasivam wrote: > Both SDX55 and SDX65 SoCs are using the Qcom version of the ARM SMMU-500 > IP. Even though the SoC specfic compatibles were being used in devicetree, > the compatibles were not added to the arm-smmu-qcom driver. So they end up > using the generic ARM SMMU-500 driver instead. > > Spotting this discrepancy, the recent arm,smmu bindings change moved these > SoCs under the non-qcom implementation of the SMMU. > > [...] Applied bindings change to will (for-joerg/arm-smmu/bindings), thanks! [1/3] dt-bindings: arm-smmu: Fix binding for SDX55 and SDX65 https://git.kernel.org/will/c/eb9181a3ae60 Cheers,
Hi, Both SDX55 and SDX65 SoCs are using the Qcom version of the ARM SMMU-500 IP. Even though the SoC specfic compatibles were being used in devicetree, the compatibles were not added to the arm-smmu-qcom driver. So they end up using the generic ARM SMMU-500 driver instead. Spotting this discrepancy, the recent arm,smmu bindings change moved these SoCs under the non-qcom implementation of the SMMU. This series fixes the binding by moving the compatibles under qcom impl. and also adding the "qcom,smmu-500" fallback compatible to the devicetree so that the qcom implementation can be used without adding SoC specific entries to the driver. Thanks, Mani Manivannan Sadhasivam (3): dt-bindings: arm-smmu: Fix binding for SDX55 and SDX65 ARM: dts: qcom: sdx55: Add Qcom SMMU-500 as the fallback for IOMMU node ARM: dts: qcom: sdx65: Add Qcom SMMU-500 as the fallback for IOMMU node Documentation/devicetree/bindings/iommu/arm,smmu.yaml | 10 ++-------- arch/arm/boot/dts/qcom-sdx55.dtsi | 2 +- arch/arm/boot/dts/qcom-sdx65.dtsi | 2 +- 3 files changed, 4 insertions(+), 10 deletions(-)