This patch is the work to fix the stream match conflict issue when two devices
have the same stream-id.

Approach taken is to merge the below commit from Linux driver to fix the
issue.

1. "iommu/arm-smmu: Handle stream IDs more dynamically"
    commit 21174240e4f4439bb8ed6c116cdbdc03eba2126e
2. "iommu/arm-smmu: Consolidate stream map entry state"
    commit 1f3d5ca43019bff1105838712d55be087d93c0da
3. "iommu/arm-smmu: Keep track of S2CR state"
    commit 8e8b203eabd8b9e96d02d6339e4abce3e5a7ea4b
4. "iommu/arm-smmu: Add a stream map entry iterator"
    commit d3097e39302083d58922a3d1032d7d59a63d263d
5. "iommu/arm-smmu: Intelligent SMR allocation"
    commit 588888a7399db352d2b1a41c9d5b3bf0fd482390

Rahul Singh (5):
  xen/arm: smmuv1: Handle stream IDs more dynamically
  xen/arm: smmuv1: Consolidate stream map entry state
  xen/arm: smmuv1: Keep track of S2CR state
  xen/arm: smmuv1: Add a stream map entry iterator
  xen/arm: smmuv1: Intelligent SMR allocation

 xen/drivers/passthrough/arm/smmu.c | 423 ++++++++++++++++++-----------
 1 file changed, 262 insertions(+), 161 deletions(-)

-- 
2.17.1

On Tue, 9 Mar 2021, Rahul Singh wrote:
> This patch is the work to fix the stream match conflict issue when two devices
> have the same stream-id.
> 
> Approach taken is to merge the below commit from Linux driver to fix the
> issue.
> 
> 1. "iommu/arm-smmu: Handle stream IDs more dynamically"
>     commit 21174240e4f4439bb8ed6c116cdbdc03eba2126e
> 2. "iommu/arm-smmu: Consolidate stream map entry state"
>     commit 1f3d5ca43019bff1105838712d55be087d93c0da
> 3. "iommu/arm-smmu: Keep track of S2CR state"
>     commit 8e8b203eabd8b9e96d02d6339e4abce3e5a7ea4b
> 4. "iommu/arm-smmu: Add a stream map entry iterator"
>     commit d3097e39302083d58922a3d1032d7d59a63d263d
> 5. "iommu/arm-smmu: Intelligent SMR allocation"
>     commit 588888a7399db352d2b1a41c9d5b3bf0fd482390
> 
> Rahul Singh (5):
>   xen/arm: smmuv1: Handle stream IDs more dynamically
>   xen/arm: smmuv1: Consolidate stream map entry state
>   xen/arm: smmuv1: Keep track of S2CR state
>   xen/arm: smmuv1: Add a stream map entry iterator
>   xen/arm: smmuv1: Intelligent SMR allocation
> 
>  xen/drivers/passthrough/arm/smmu.c | 423 ++++++++++++++++++-----------
>  1 file changed, 262 insertions(+), 161 deletions(-)

I didn't closely review the changes but I made sure that all patches
build and I also compared each patch with the original commit in Linux:
all changes correspond correctly.

For the whole series:

Acked-by: Stefano Stabellini <sstabellini@kernel.org>

Hi Rahul,

On 09/03/2021 18:19, Rahul Singh wrote:
> This patch is the work to fix the stream match conflict issue when two devices
> have the same stream-id.
> 
> Approach taken is to merge the below commit from Linux driver to fix the
> issue.
> 
> 1. "iommu/arm-smmu: Handle stream IDs more dynamically"
>      commit 21174240e4f4439bb8ed6c116cdbdc03eba2126e
> 2. "iommu/arm-smmu: Consolidate stream map entry state"
>      commit 1f3d5ca43019bff1105838712d55be087d93c0da
> 3. "iommu/arm-smmu: Keep track of S2CR state"
>      commit 8e8b203eabd8b9e96d02d6339e4abce3e5a7ea4b
> 4. "iommu/arm-smmu: Add a stream map entry iterator"
>      commit d3097e39302083d58922a3d1032d7d59a63d263d
> 5. "iommu/arm-smmu: Intelligent SMR allocation"
>      commit 588888a7399db352d2b1a41c9d5b3bf0fd482390

A couple of questions:
  * Are they backported verbatim from Linux upstream?
  * Did you check there was no bug fix afterwards?

Cheers,

-- 
Julien Grall

Hello Julien,

> On 16 Mar 2021, at 3:04 pm, Julien Grall <julien@xen.org> wrote:
> 
> Hi Rahul,
> 
> On 09/03/2021 18:19, Rahul Singh wrote:
>> This patch is the work to fix the stream match conflict issue when two devices
>> have the same stream-id.
>> Approach taken is to merge the below commit from Linux driver to fix the
>> issue.
>> 1. "iommu/arm-smmu: Handle stream IDs more dynamically"
>>     commit 21174240e4f4439bb8ed6c116cdbdc03eba2126e
>> 2. "iommu/arm-smmu: Consolidate stream map entry state"
>>     commit 1f3d5ca43019bff1105838712d55be087d93c0da
>> 3. "iommu/arm-smmu: Keep track of S2CR state"
>>     commit 8e8b203eabd8b9e96d02d6339e4abce3e5a7ea4b
>> 4. "iommu/arm-smmu: Add a stream map entry iterator"
>>     commit d3097e39302083d58922a3d1032d7d59a63d263d
>> 5. "iommu/arm-smmu: Intelligent SMR allocation"
>>     commit 588888a7399db352d2b1a41c9d5b3bf0fd482390
> 
> A couple of questions:
> * Are they backported verbatim from Linux upstream?

Yes all the patches are backported verbatim form Linux upstream.

> * Did you check there was no bug fix afterwards?

Yes I checked there is no bug afterwards related to the patches added.

Regards,
Rahul

> 
> Cheers,
> 
> -- 
> Julien Grall

Hi Rahul,

> On 9 Mar 2021, at 19:19, Rahul Singh <Rahul.Singh@arm.com> wrote:
> 
> This patch is the work to fix the stream match conflict issue when two devices
> have the same stream-id.
> 
> Approach taken is to merge the below commit from Linux driver to fix the
> issue.
> 
> 1. "iommu/arm-smmu: Handle stream IDs more dynamically"
>    commit 21174240e4f4439bb8ed6c116cdbdc03eba2126e
> 2. "iommu/arm-smmu: Consolidate stream map entry state"
>    commit 1f3d5ca43019bff1105838712d55be087d93c0da
> 3. "iommu/arm-smmu: Keep track of S2CR state"
>    commit 8e8b203eabd8b9e96d02d6339e4abce3e5a7ea4b
> 4. "iommu/arm-smmu: Add a stream map entry iterator"
>    commit d3097e39302083d58922a3d1032d7d59a63d263d
> 5. "iommu/arm-smmu: Intelligent SMR allocation"
>    commit 588888a7399db352d2b1a41c9d5b3bf0fd482390
> 
> Rahul Singh (5):
>  xen/arm: smmuv1: Handle stream IDs more dynamically
>  xen/arm: smmuv1: Consolidate stream map entry state
>  xen/arm: smmuv1: Keep track of S2CR state
>  xen/arm: smmuv1: Add a stream map entry iterator
>  xen/arm: smmuv1: Intelligent SMR allocation
> 
> xen/drivers/passthrough/arm/smmu.c | 423 ++++++++++++++++++-----------
> 1 file changed, 262 insertions(+), 161 deletions(-)

For the whole serie:

Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>

Cheers
Bertrand

> 
> -- 
> 2.17.1
>