| Message ID | 20240320173736.2720778-2-linkmauve@linkmauve.fr (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Enable JPEG encoding on rk3588 | expand |
Hello Emmanuel, On Wed, Mar 20, 2024 at 06:37:30PM +0100, Emmanuel Gil Peyrot wrote: > The documentation got added in f8aa519976b38e67aae02d2db3e2998513305e80, > but it hasn’t been added to the driver so it was unused. > > Signed-off-by: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> > --- Everything is fine with f8aa519976b38e67aae02d2db3e2998513305e80 (well the patch description could be better :)) and this patch is just wrong. The documentation explicitly adds the combination of rk3588-iommu with rk3568-iommu as fallback. The idea is, that the driver handles it just like an rk3568 iommu. If some differences are found in the future, the driver can switch to handle the more specific compatible without any DT changes (which is ABI). I suggest watching this presentation: https://www.youtube.com/watch?v=6iguKSJJfxo Greetings, -- Sebastian > arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 2 +- > drivers/iommu/rockchip-iommu.c | 3 +++ > 2 files changed, 4 insertions(+), 1 deletion(-) > > diff --git a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi > index 87b83c87bd55..2a23b4dc36e4 100644 > --- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi > +++ b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi > @@ -704,7 +704,7 @@ vp3: port@3 { > }; > > vop_mmu: iommu@fdd97e00 { > - compatible = "rockchip,rk3588-iommu", "rockchip,rk3568-iommu"; > + compatible = "rockchip,rk3588-iommu"; > reg = <0x0 0xfdd97e00 0x0 0x100>, <0x0 0xfdd97f00 0x0 0x100>; > interrupts = <GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH 0>; > clocks = <&cru ACLK_VOP>, <&cru HCLK_VOP>; > diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c > index da79d9f4cf63..da0e93c139d1 100644 > --- a/drivers/iommu/rockchip-iommu.c > +++ b/drivers/iommu/rockchip-iommu.c > @@ -1361,6 +1361,9 @@ static const struct of_device_id rk_iommu_dt_ids[] = { > { .compatible = "rockchip,rk3568-iommu", > .data = &iommu_data_ops_v2, > }, > + { .compatible = "rockchip,rk3588-iommu", > + .data = &iommu_data_ops_v2, > + }, > { /* sentinel */ } > }; > > -- > 2.44.0 >
On 20/03/2024 18:37, Emmanuel Gil Peyrot wrote: > The documentation got added in f8aa519976b38e67aae02d2db3e2998513305e80, Please use commit SHA () syntax (see submitting patches). > but it hasn’t been added to the driver so it was unused. Eh? That's not how this works. > > Signed-off-by: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> > --- > arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 2 +- That's DTS, not bindings. > drivers/iommu/rockchip-iommu.c | 3 +++ Driver code cannot be combined with DTS in one patch. > 2 files changed, 4 insertions(+), 1 deletion(-) > > diff --git a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi > index 87b83c87bd55..2a23b4dc36e4 100644 > --- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi > +++ b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi > @@ -704,7 +704,7 @@ vp3: port@3 { > }; > > vop_mmu: iommu@fdd97e00 { > - compatible = "rockchip,rk3588-iommu", "rockchip,rk3568-iommu"; > + compatible = "rockchip,rk3588-iommu"; NAK. Best regards, Krzysztof
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi index 87b83c87bd55..2a23b4dc36e4 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi @@ -704,7 +704,7 @@ vp3: port@3 { }; vop_mmu: iommu@fdd97e00 { - compatible = "rockchip,rk3588-iommu", "rockchip,rk3568-iommu"; + compatible = "rockchip,rk3588-iommu"; reg = <0x0 0xfdd97e00 0x0 0x100>, <0x0 0xfdd97f00 0x0 0x100>; interrupts = <GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH 0>; clocks = <&cru ACLK_VOP>, <&cru HCLK_VOP>; diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c index da79d9f4cf63..da0e93c139d1 100644 --- a/drivers/iommu/rockchip-iommu.c +++ b/drivers/iommu/rockchip-iommu.c @@ -1361,6 +1361,9 @@ static const struct of_device_id rk_iommu_dt_ids[] = { { .compatible = "rockchip,rk3568-iommu", .data = &iommu_data_ops_v2, }, + { .compatible = "rockchip,rk3588-iommu", + .data = &iommu_data_ops_v2, + }, { /* sentinel */ } };
The documentation got added in f8aa519976b38e67aae02d2db3e2998513305e80, but it hasn’t been added to the driver so it was unused. Signed-off-by: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> --- arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 2 +- drivers/iommu/rockchip-iommu.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)