[PATCH] Revert "dt-bindings: PCI: qcom: Add iommu-map properties"

[PATCH] Revert "dt-bindings: PCI: qcom: Add iommu-map properties"

[Manivannan Sadhasivam]

This reverts commit 6ebfa40b63ae65eac20834ef4f45355fc5ef6899.

"iommu-map" property is already documented in commit
("dt-bindings: PCI: qcom: Add SM8550 compatible") along with the "iommus"
property.

So let's revert the commit that just added "iommu-map" to avoid
duplication.

Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
---
 Documentation/devicetree/bindings/pci/qcom,pcie.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Documentation/devicetree/bindings/pci/qcom,pcie.yaml b/Documentation/devicetree/bindings/pci/qcom,pcie.yaml
index 5d236bac99b6..a1318a4ecadf 100644
--- a/Documentation/devicetree/bindings/pci/qcom,pcie.yaml
+++ b/Documentation/devicetree/bindings/pci/qcom,pcie.yaml
@@ -78,8 +78,6 @@ properties:
 
   dma-coherent: true
 
-  iommu-map: true
-
   interconnects:
     maxItems: 2
 
-- 
2.25.1

Re: [PATCH] Revert "dt-bindings: PCI: qcom: Add iommu-map properties"

[Lorenzo Pieralisi]

On Tue, 11 Apr 2023 17:45:33 +0530, Manivannan Sadhasivam wrote:
> This reverts commit 6ebfa40b63ae65eac20834ef4f45355fc5ef6899.
> 
> "iommu-map" property is already documented in commit
> ("dt-bindings: PCI: qcom: Add SM8550 compatible") along with the "iommus"
> property.
> 
> So let's revert the commit that just added "iommu-map" to avoid
> duplication.
> 
> [...]

Applied to controller/qcom, thanks!

[1/1] Revert "dt-bindings: PCI: qcom: Add iommu-map properties"
      https://git.kernel.org/pci/pci/c/dc8d33452b36

Thanks,
Lorenzo

Re: [PATCH] Revert "dt-bindings: PCI: qcom: Add iommu-map properties"

[Rob Herring]

On Tue, Apr 11, 2023 at 05:45:33PM +0530, Manivannan Sadhasivam wrote:
> This reverts commit 6ebfa40b63ae65eac20834ef4f45355fc5ef6899.
> 
> "iommu-map" property is already documented in commit

Need the commit hash here.

> ("dt-bindings: PCI: qcom: Add SM8550 compatible") along with the "iommus"
> property.

Shouldn't there be a patch removing "iommus" as discussed?

> 
> So let's revert the commit that just added "iommu-map" to avoid
> duplication.
> 
> Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
> ---
>  Documentation/devicetree/bindings/pci/qcom,pcie.yaml | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/pci/qcom,pcie.yaml b/Documentation/devicetree/bindings/pci/qcom,pcie.yaml
> index 5d236bac99b6..a1318a4ecadf 100644
> --- a/Documentation/devicetree/bindings/pci/qcom,pcie.yaml
> +++ b/Documentation/devicetree/bindings/pci/qcom,pcie.yaml
> @@ -78,8 +78,6 @@ properties:
>  
>    dma-coherent: true
>  
> -  iommu-map: true
> -
>    interconnects:
>      maxItems: 2
>  
> -- 
> 2.25.1
> 

Re: [PATCH] Revert "dt-bindings: PCI: qcom: Add iommu-map properties"

[Manivannan Sadhasivam]

On Tue, Apr 11, 2023 at 12:47:42PM -0500, Rob Herring wrote:
> On Tue, Apr 11, 2023 at 05:45:33PM +0530, Manivannan Sadhasivam wrote:
> > This reverts commit 6ebfa40b63ae65eac20834ef4f45355fc5ef6899.
> > 
> > "iommu-map" property is already documented in commit
> 
> Need the commit hash here.
> 
> > ("dt-bindings: PCI: qcom: Add SM8550 compatible") along with the "iommus"
> > property.
> 
> Shouldn't there be a patch removing "iommus" as discussed?
> 

Yeah, that was my intention after the dts patches were merged. And since the
dts patches are in linux-next now, I could finally send the patch.

- Mani

> > 
> > So let's revert the commit that just added "iommu-map" to avoid
> > duplication.
> > 
> > Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
> > ---
> >  Documentation/devicetree/bindings/pci/qcom,pcie.yaml | 2 --
> >  1 file changed, 2 deletions(-)
> > 
> > diff --git a/Documentation/devicetree/bindings/pci/qcom,pcie.yaml b/Documentation/devicetree/bindings/pci/qcom,pcie.yaml
> > index 5d236bac99b6..a1318a4ecadf 100644
> > --- a/Documentation/devicetree/bindings/pci/qcom,pcie.yaml
> > +++ b/Documentation/devicetree/bindings/pci/qcom,pcie.yaml
> > @@ -78,8 +78,6 @@ properties:
> >  
> >    dma-coherent: true
> >  
> > -  iommu-map: true
> > -
> >    interconnects:
> >      maxItems: 2
> >  
> > -- 
> > 2.25.1
> > 

-- 
மணிவண்ணன் சதாசிவம்

Re: [PATCH] Revert "dt-bindings: PCI: qcom: Add iommu-map properties"

[Lorenzo Pieralisi]

On Wed, Apr 12, 2023 at 12:12:31AM +0530, Manivannan Sadhasivam wrote:
> On Tue, Apr 11, 2023 at 12:47:42PM -0500, Rob Herring wrote:
> > On Tue, Apr 11, 2023 at 05:45:33PM +0530, Manivannan Sadhasivam wrote:
> > > This reverts commit 6ebfa40b63ae65eac20834ef4f45355fc5ef6899.
> > > 
> > > "iommu-map" property is already documented in commit
> > 
> > Need the commit hash here.
> > 
> > > ("dt-bindings: PCI: qcom: Add SM8550 compatible") along with the "iommus"
> > > property.
> > 
> > Shouldn't there be a patch removing "iommus" as discussed?
> > 
> 
> Yeah, that was my intention after the dts patches were merged. And since the
> dts patches are in linux-next now, I could finally send the patch.

I don't understand what's the plan here. By the way, instead of merging
this revert I just dropped the commit that this patch is reverting from
the controller/qcom branch, please have a look to check if everything is
what you expect it to be there.

Lorenzo

> - Mani
> 
> > > 
> > > So let's revert the commit that just added "iommu-map" to avoid
> > > duplication.
> > > 
> > > Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
> > > ---
> > >  Documentation/devicetree/bindings/pci/qcom,pcie.yaml | 2 --
> > >  1 file changed, 2 deletions(-)
> > > 
> > > diff --git a/Documentation/devicetree/bindings/pci/qcom,pcie.yaml b/Documentation/devicetree/bindings/pci/qcom,pcie.yaml
> > > index 5d236bac99b6..a1318a4ecadf 100644
> > > --- a/Documentation/devicetree/bindings/pci/qcom,pcie.yaml
> > > +++ b/Documentation/devicetree/bindings/pci/qcom,pcie.yaml
> > > @@ -78,8 +78,6 @@ properties:
> > >  
> > >    dma-coherent: true
> > >  
> > > -  iommu-map: true
> > > -
> > >    interconnects:
> > >      maxItems: 2
> > >  
> > > -- 
> > > 2.25.1
> > > 
> 
> -- 
> மணிவண்ணன் சதாசிவம்

Re: [PATCH] Revert "dt-bindings: PCI: qcom: Add iommu-map properties"

[Manivannan Sadhasivam]

On Wed, Apr 12, 2023 at 10:15:53AM +0200, Lorenzo Pieralisi wrote:
> On Wed, Apr 12, 2023 at 12:12:31AM +0530, Manivannan Sadhasivam wrote:
> > On Tue, Apr 11, 2023 at 12:47:42PM -0500, Rob Herring wrote:
> > > On Tue, Apr 11, 2023 at 05:45:33PM +0530, Manivannan Sadhasivam wrote:
> > > > This reverts commit 6ebfa40b63ae65eac20834ef4f45355fc5ef6899.
> > > > 
> > > > "iommu-map" property is already documented in commit
> > > 
> > > Need the commit hash here.
> > > 
> > > > ("dt-bindings: PCI: qcom: Add SM8550 compatible") along with the "iommus"
> > > > property.
> > > 
> > > Shouldn't there be a patch removing "iommus" as discussed?
> > > 
> > 
> > Yeah, that was my intention after the dts patches were merged. And since the
> > dts patches are in linux-next now, I could finally send the patch.
> 
> I don't understand what's the plan here. By the way, instead of merging
> this revert I just dropped the commit that this patch is reverting from
> the controller/qcom branch, please have a look to check if everything is
> what you expect it to be there.
> 

This is fine. The plan is to remove the "iommus" property from Qcom PCI binding
since we have removed the usage of that property from devicetree [1]. Initially
the iommu properties were not documented at all in the binding. But commit,
"dt-bindings: PCI: qcom: Add SM8550 compatible" added them to the binding to
satisfy dtbs check. But in parallel, the patch removing "iommus" property from
dts got merged to qcom tree.

So now we have 2 options here:

1. Amend the commit "dt-bindings: PCI: qcom: Add SM8550 compatible" to remove
the "iommus" property.

2. I will submit a separate patch removing that property.

Lorenzo, let me know what works for you. Sorry for the mess! Confusion happened
due to patches getting applied without sync.

- Mani

[1] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=6340b391e15094575911ab0d96bfff09deadafba

> Lorenzo
> 
> > - Mani
> > 
> > > > 
> > > > So let's revert the commit that just added "iommu-map" to avoid
> > > > duplication.
> > > > 
> > > > Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
> > > > ---
> > > >  Documentation/devicetree/bindings/pci/qcom,pcie.yaml | 2 --
> > > >  1 file changed, 2 deletions(-)
> > > > 
> > > > diff --git a/Documentation/devicetree/bindings/pci/qcom,pcie.yaml b/Documentation/devicetree/bindings/pci/qcom,pcie.yaml
> > > > index 5d236bac99b6..a1318a4ecadf 100644
> > > > --- a/Documentation/devicetree/bindings/pci/qcom,pcie.yaml
> > > > +++ b/Documentation/devicetree/bindings/pci/qcom,pcie.yaml
> > > > @@ -78,8 +78,6 @@ properties:
> > > >  
> > > >    dma-coherent: true
> > > >  
> > > > -  iommu-map: true
> > > > -
> > > >    interconnects:
> > > >      maxItems: 2
> > > >  
> > > > -- 
> > > > 2.25.1
> > > > 
> > 
> > -- 
> > மணிவண்ணன் சதாசிவம்

-- 
மணிவண்ணன் சதாசிவம்

Re: [PATCH] Revert "dt-bindings: PCI: qcom: Add iommu-map properties"

[Lorenzo Pieralisi]

On Wed, Apr 12, 2023 at 03:41:12PM +0530, Manivannan Sadhasivam wrote:
> On Wed, Apr 12, 2023 at 10:15:53AM +0200, Lorenzo Pieralisi wrote:
> > On Wed, Apr 12, 2023 at 12:12:31AM +0530, Manivannan Sadhasivam wrote:
> > > On Tue, Apr 11, 2023 at 12:47:42PM -0500, Rob Herring wrote:
> > > > On Tue, Apr 11, 2023 at 05:45:33PM +0530, Manivannan Sadhasivam wrote:
> > > > > This reverts commit 6ebfa40b63ae65eac20834ef4f45355fc5ef6899.
> > > > > 
> > > > > "iommu-map" property is already documented in commit
> > > > 
> > > > Need the commit hash here.
> > > > 
> > > > > ("dt-bindings: PCI: qcom: Add SM8550 compatible") along with the "iommus"
> > > > > property.
> > > > 
> > > > Shouldn't there be a patch removing "iommus" as discussed?
> > > > 
> > > 
> > > Yeah, that was my intention after the dts patches were merged. And since the
> > > dts patches are in linux-next now, I could finally send the patch.
> > 
> > I don't understand what's the plan here. By the way, instead of merging
> > this revert I just dropped the commit that this patch is reverting from
> > the controller/qcom branch, please have a look to check if everything is
> > what you expect it to be there.
> > 
> 
> This is fine. The plan is to remove the "iommus" property from Qcom PCI binding
> since we have removed the usage of that property from devicetree [1]. Initially
> the iommu properties were not documented at all in the binding. But commit,
> "dt-bindings: PCI: qcom: Add SM8550 compatible" added them to the binding to
> satisfy dtbs check. But in parallel, the patch removing "iommus" property from
> dts got merged to qcom tree.
> 
> So now we have 2 options here:
> 
> 1. Amend the commit "dt-bindings: PCI: qcom: Add SM8550 compatible" to remove
> the "iommus" property.
> 
> 2. I will submit a separate patch removing that property.
> 
> Lorenzo, let me know what works for you. Sorry for the mess! Confusion happened
> due to patches getting applied without sync.

You can inline a diff here for (1), I will amend the commit.

Thanks,
Lorenzo

> - Mani
> 
> [1] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=6340b391e15094575911ab0d96bfff09deadafba
> 
> > Lorenzo
> > 
> > > - Mani
> > > 
> > > > > 
> > > > > So let's revert the commit that just added "iommu-map" to avoid
> > > > > duplication.
> > > > > 
> > > > > Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
> > > > > ---
> > > > >  Documentation/devicetree/bindings/pci/qcom,pcie.yaml | 2 --
> > > > >  1 file changed, 2 deletions(-)
> > > > > 
> > > > > diff --git a/Documentation/devicetree/bindings/pci/qcom,pcie.yaml b/Documentation/devicetree/bindings/pci/qcom,pcie.yaml
> > > > > index 5d236bac99b6..a1318a4ecadf 100644
> > > > > --- a/Documentation/devicetree/bindings/pci/qcom,pcie.yaml
> > > > > +++ b/Documentation/devicetree/bindings/pci/qcom,pcie.yaml
> > > > > @@ -78,8 +78,6 @@ properties:
> > > > >  
> > > > >    dma-coherent: true
> > > > >  
> > > > > -  iommu-map: true
> > > > > -
> > > > >    interconnects:
> > > > >      maxItems: 2
> > > > >  
> > > > > -- 
> > > > > 2.25.1
> > > > > 
> > > 
> > > -- 
> > > மணிவண்ணன் சதாசிவம்
> 
> -- 
> மணிவண்ணன் சதாசிவம்

Re: [PATCH] Revert "dt-bindings: PCI: qcom: Add iommu-map properties"

[Manivannan Sadhasivam]

On Wed, Apr 12, 2023 at 12:46:33PM +0200, Lorenzo Pieralisi wrote:
> On Wed, Apr 12, 2023 at 03:41:12PM +0530, Manivannan Sadhasivam wrote:
> > On Wed, Apr 12, 2023 at 10:15:53AM +0200, Lorenzo Pieralisi wrote:
> > > On Wed, Apr 12, 2023 at 12:12:31AM +0530, Manivannan Sadhasivam wrote:
> > > > On Tue, Apr 11, 2023 at 12:47:42PM -0500, Rob Herring wrote:
> > > > > On Tue, Apr 11, 2023 at 05:45:33PM +0530, Manivannan Sadhasivam wrote:
> > > > > > This reverts commit 6ebfa40b63ae65eac20834ef4f45355fc5ef6899.
> > > > > > 
> > > > > > "iommu-map" property is already documented in commit
> > > > > 
> > > > > Need the commit hash here.
> > > > > 
> > > > > > ("dt-bindings: PCI: qcom: Add SM8550 compatible") along with the "iommus"
> > > > > > property.
> > > > > 
> > > > > Shouldn't there be a patch removing "iommus" as discussed?
> > > > > 
> > > > 
> > > > Yeah, that was my intention after the dts patches were merged. And since the
> > > > dts patches are in linux-next now, I could finally send the patch.
> > > 
> > > I don't understand what's the plan here. By the way, instead of merging
> > > this revert I just dropped the commit that this patch is reverting from
> > > the controller/qcom branch, please have a look to check if everything is
> > > what you expect it to be there.
> > > 
> > 
> > This is fine. The plan is to remove the "iommus" property from Qcom PCI binding
> > since we have removed the usage of that property from devicetree [1]. Initially
> > the iommu properties were not documented at all in the binding. But commit,
> > "dt-bindings: PCI: qcom: Add SM8550 compatible" added them to the binding to
> > satisfy dtbs check. But in parallel, the patch removing "iommus" property from
> > dts got merged to qcom tree.
> > 
> > So now we have 2 options here:
> > 
> > 1. Amend the commit "dt-bindings: PCI: qcom: Add SM8550 compatible" to remove
> > the "iommus" property.
> > 
> > 2. I will submit a separate patch removing that property.
> > 
> > Lorenzo, let me know what works for you. Sorry for the mess! Confusion happened
> > due to patches getting applied without sync.
> 
> You can inline a diff here for (1), I will amend the commit.
> 

Here you go:

diff --git a/Documentation/devicetree/bindings/pci/qcom,pcie.yaml b/Documentation/devicetree/bindings/pci/qcom,pcie.yaml
index a1318a4ecadf..1548a7114732 100644
--- a/Documentation/devicetree/bindings/pci/qcom,pcie.yaml
+++ b/Documentation/devicetree/bindings/pci/qcom,pcie.yaml
@@ -60,9 +60,6 @@ properties:
     minItems: 1
     maxItems: 8
 
-  iommus:
-    maxItems: 1
-
   iommu-map:
     maxItems: 2
 

- Mani

> Thanks,
> Lorenzo
> 
> > - Mani
> > 
> > [1] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=6340b391e15094575911ab0d96bfff09deadafba
> > 
> > > Lorenzo
> > > 
> > > > - Mani
> > > > 
> > > > > > 
> > > > > > So let's revert the commit that just added "iommu-map" to avoid
> > > > > > duplication.
> > > > > > 
> > > > > > Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
> > > > > > ---
> > > > > >  Documentation/devicetree/bindings/pci/qcom,pcie.yaml | 2 --
> > > > > >  1 file changed, 2 deletions(-)
> > > > > > 
> > > > > > diff --git a/Documentation/devicetree/bindings/pci/qcom,pcie.yaml b/Documentation/devicetree/bindings/pci/qcom,pcie.yaml
> > > > > > index 5d236bac99b6..a1318a4ecadf 100644
> > > > > > --- a/Documentation/devicetree/bindings/pci/qcom,pcie.yaml
> > > > > > +++ b/Documentation/devicetree/bindings/pci/qcom,pcie.yaml
> > > > > > @@ -78,8 +78,6 @@ properties:
> > > > > >  
> > > > > >    dma-coherent: true
> > > > > >  
> > > > > > -  iommu-map: true
> > > > > > -
> > > > > >    interconnects:
> > > > > >      maxItems: 2
> > > > > >  
> > > > > > -- 
> > > > > > 2.25.1
> > > > > > 
> > > > 
> > > > -- 
> > > > மணிவண்ணன் சதாசிவம்
> > 
> > -- 
> > மணிவண்ணன் சதாசிவம்

-- 
மணிவண்ணன் சதாசிவம்

Re: [PATCH] Revert "dt-bindings: PCI: qcom: Add iommu-map properties"

[Lorenzo Pieralisi]

On Wed, Apr 12, 2023 at 04:59:18PM +0530, Manivannan Sadhasivam wrote:

[...]

> > > This is fine. The plan is to remove the "iommus" property from Qcom PCI binding
> > > since we have removed the usage of that property from devicetree [1]. Initially
> > > the iommu properties were not documented at all in the binding. But commit,
> > > "dt-bindings: PCI: qcom: Add SM8550 compatible" added them to the binding to
> > > satisfy dtbs check. But in parallel, the patch removing "iommus" property from
> > > dts got merged to qcom tree.
> > > 
> > > So now we have 2 options here:
> > > 
> > > 1. Amend the commit "dt-bindings: PCI: qcom: Add SM8550 compatible" to remove
> > > the "iommus" property.
> > > 
> > > 2. I will submit a separate patch removing that property.
> > > 
> > > Lorenzo, let me know what works for you. Sorry for the mess! Confusion happened
> > > due to patches getting applied without sync.
> > 
> > You can inline a diff here for (1), I will amend the commit.
> > 
> 
> Here you go:
> 
> diff --git a/Documentation/devicetree/bindings/pci/qcom,pcie.yaml b/Documentation/devicetree/bindings/pci/qcom,pcie.yaml
> index a1318a4ecadf..1548a7114732 100644
> --- a/Documentation/devicetree/bindings/pci/qcom,pcie.yaml
> +++ b/Documentation/devicetree/bindings/pci/qcom,pcie.yaml
> @@ -60,9 +60,6 @@ properties:
>      minItems: 1
>      maxItems: 8
>  
> -  iommus:
> -    maxItems: 1
> -
>    iommu-map:
>      maxItems: 2

Done, please check, thanks.

Lorenzo

Re: [PATCH] Revert "dt-bindings: PCI: qcom: Add iommu-map properties"

[Manivannan Sadhasivam]

On Wed, Apr 12, 2023 at 03:27:24PM +0200, Lorenzo Pieralisi wrote:
> On Wed, Apr 12, 2023 at 04:59:18PM +0530, Manivannan Sadhasivam wrote:
> 
> [...]
> 
> > > > This is fine. The plan is to remove the "iommus" property from Qcom PCI binding
> > > > since we have removed the usage of that property from devicetree [1]. Initially
> > > > the iommu properties were not documented at all in the binding. But commit,
> > > > "dt-bindings: PCI: qcom: Add SM8550 compatible" added them to the binding to
> > > > satisfy dtbs check. But in parallel, the patch removing "iommus" property from
> > > > dts got merged to qcom tree.
> > > > 
> > > > So now we have 2 options here:
> > > > 
> > > > 1. Amend the commit "dt-bindings: PCI: qcom: Add SM8550 compatible" to remove
> > > > the "iommus" property.
> > > > 
> > > > 2. I will submit a separate patch removing that property.
> > > > 
> > > > Lorenzo, let me know what works for you. Sorry for the mess! Confusion happened
> > > > due to patches getting applied without sync.
> > > 
> > > You can inline a diff here for (1), I will amend the commit.
> > > 
> > 
> > Here you go:
> > 
> > diff --git a/Documentation/devicetree/bindings/pci/qcom,pcie.yaml b/Documentation/devicetree/bindings/pci/qcom,pcie.yaml
> > index a1318a4ecadf..1548a7114732 100644
> > --- a/Documentation/devicetree/bindings/pci/qcom,pcie.yaml
> > +++ b/Documentation/devicetree/bindings/pci/qcom,pcie.yaml
> > @@ -60,9 +60,6 @@ properties:
> >      minItems: 1
> >      maxItems: 8
> >  
> > -  iommus:
> > -    maxItems: 1
> > -
> >    iommu-map:
> >      maxItems: 2
> 
> Done, please check, thanks.
> 

LGTM, thanks!

- Mani

> Lorenzo

-- 
மணிவண்ணன் சதாசிவம்