.../bindings/iommu/mediatek,iommu.yaml | 17 +++++++ arch/arm64/boot/dts/mediatek/mt2712e.dtsi | 2 + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 1 + drivers/iommu/mtk_iommu.c | 50 +++++++++++-------- 4 files changed, 49 insertions(+), 21 deletions(-)
The IOMMU has registers in the infracfg and/or pericfg iospaces: as for the currently supported SoCs, MT2712 and MT8173 need a phandle to infracfg, while MT8195 needs one to pericfg. Before this change, the driver was checking for a SoC-specific infra/peri compatible but, sooner or later, these lists are going to grow a lot... ...and this is why it was chosen to add phandles (as it was done with some other drivers already - look at mtk-pm-domains, mt8192-afe Please note that, while it was necessary to update the devicetrees for MT8173 and MT2712e, there was no update for MT8195 because there is no IOMMU node in there yet. Changes in v4: - Dropped changes introducing mediatek,pericfg handle - Fixed required property in IOMMU example in patch [1/5] - Added a pericfg lookup flow cleanup commit Changes in v3: - Different squashing of dt-bindings patches (sorry for misunderstanding!) - Removed legacy devicetree print Changes in v2: - Squashed dt-bindings patches as suggested by Matthias - Removed quotes from infra/peri phandle refs - Changed dev_warn to dev_info in patches [2/7], [3/7] AngeloGioacchino Del Regno (5): dt-bindings: iommu: mediatek: Add mediatek,infracfg phandle iommu/mediatek: Lookup phandle to retrieve syscon to infracfg arm64: dts: mediatek: mt8173: Add mediatek,infracfg phandle for IOMMU arm64: dts: mediatek: mt2712e: Add mediatek,infracfg phandle for IOMMU iommu/mediatek: Cleanup pericfg lookup flow .../bindings/iommu/mediatek,iommu.yaml | 17 +++++++ arch/arm64/boot/dts/mediatek/mt2712e.dtsi | 2 + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 1 + drivers/iommu/mtk_iommu.c | 50 +++++++++++-------- 4 files changed, 49 insertions(+), 21 deletions(-) -- 2.35.1
On Thu, Jun 16, 2022 at 01:08:25PM +0200, AngeloGioacchino Del Regno wrote: > AngeloGioacchino Del Regno (5): > dt-bindings: iommu: mediatek: Add mediatek,infracfg phandle > iommu/mediatek: Lookup phandle to retrieve syscon to infracfg > arm64: dts: mediatek: mt8173: Add mediatek,infracfg phandle for IOMMU > arm64: dts: mediatek: mt2712e: Add mediatek,infracfg phandle for IOMMU > iommu/mediatek: Cleanup pericfg lookup flow > > .../bindings/iommu/mediatek,iommu.yaml | 17 +++++++ > arch/arm64/boot/dts/mediatek/mt2712e.dtsi | 2 + > arch/arm64/boot/dts/mediatek/mt8173.dtsi | 1 + > drivers/iommu/mtk_iommu.c | 50 +++++++++++-------- > 4 files changed, 49 insertions(+), 21 deletions(-) Applied, thanks.
Hi Joerg, On 22/06/2022 15:44, Joerg Roedel wrote: > On Thu, Jun 16, 2022 at 01:08:25PM +0200, AngeloGioacchino Del Regno wrote: >> AngeloGioacchino Del Regno (5): >> dt-bindings: iommu: mediatek: Add mediatek,infracfg phandle >> iommu/mediatek: Lookup phandle to retrieve syscon to infracfg >> arm64: dts: mediatek: mt8173: Add mediatek,infracfg phandle for IOMMU >> arm64: dts: mediatek: mt2712e: Add mediatek,infracfg phandle for IOMMU >> iommu/mediatek: Cleanup pericfg lookup flow >> >> .../bindings/iommu/mediatek,iommu.yaml | 17 +++++++ >> arch/arm64/boot/dts/mediatek/mt2712e.dtsi | 2 + >> arch/arm64/boot/dts/mediatek/mt8173.dtsi | 1 + >> drivers/iommu/mtk_iommu.c | 50 +++++++++++-------- >> 4 files changed, 49 insertions(+), 21 deletions(-) > > Applied, thanks. I wanted to check if you took also 3 and 4, as these should go through my tree. Unfortunately you haven't pushed your tree (yet). In case you took the whole series, can you please drop the dts patches. I'll apply them now on my v5.19-next/dts64 branch. Regards. Matthias
Hi Matthias, On Wed, Jun 22, 2022 at 04:12:47PM +0200, Matthias Brugger wrote: > I wanted to check if you took also 3 and 4, as these should go through my > tree. Unfortunately you haven't pushed your tree (yet). In case you took the > whole series, can you please drop the dts patches. I'll apply them now on my > v5.19-next/dts64 branch. Yes, I applied the whole series, will drop patches 3 and 4 now. Thanks, Joerg
Hi Joerg, On 22/06/2022 15:44, Joerg Roedel wrote: > On Thu, Jun 16, 2022 at 01:08:25PM +0200, AngeloGioacchino Del Regno wrote: >> AngeloGioacchino Del Regno (5): >> dt-bindings: iommu: mediatek: Add mediatek,infracfg phandle >> iommu/mediatek: Lookup phandle to retrieve syscon to infracfg >> arm64: dts: mediatek: mt8173: Add mediatek,infracfg phandle for IOMMU >> arm64: dts: mediatek: mt2712e: Add mediatek,infracfg phandle for IOMMU >> iommu/mediatek: Cleanup pericfg lookup flow >> >> .../bindings/iommu/mediatek,iommu.yaml | 17 +++++++ >> arch/arm64/boot/dts/mediatek/mt2712e.dtsi | 2 + >> arch/arm64/boot/dts/mediatek/mt8173.dtsi | 1 + >> drivers/iommu/mtk_iommu.c | 50 +++++++++++-------- >> 4 files changed, 49 insertions(+), 21 deletions(-) > > Applied, thanks. I wanted to check if you took also 3 and 4, as these should go through my tree. Unfortunately you haven't pushed your tree (yet). In case you took the whole series, can you please drop the dts patches. I'll apply them now on my v5.19-next/dts64 branch. Regards. Matthias
© 2016 - 2024 Red Hat, Inc.