[xen staging] xen/arm: smmuv1: Fixed stream matching register allocation

[patchbot@xxxxxxx]

commit 93fe1817e7ca8c80f93c098a191e1cc3483190df
Author:     Rahul Singh <rahul.singh@xxxxxxx>
AuthorDate: Fri Jun 25 17:37:26 2021 +0100
Commit:     Stefano Stabellini <sstabellini@xxxxxxxxxx>
CommitDate: Fri Jun 25 14:53:48 2021 -0700

    xen/arm: smmuv1: Fixed stream matching register allocation
    
    SMR allocation should be based on the number of supported stream
    matching register for each SMMU device.
    
    Issue introduced by commit 5e08586afbb90b2e2d56c175c07db77a4afa873c
    when backported the patches from Linux to XEN to fix the stream match
    conflict issue when two devices have the same stream-id.
    
    Acked-by: Stefano Stabellini <sstabellini@xxxxxxxxxx>
    Tested-by: Stefano Stabellini <sstabellini@xxxxxxxxxx>
    Signed-off-by: Rahul Singh <rahul.singh@xxxxxxx>
---
 xen/drivers/passthrough/arm/smmu.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/xen/drivers/passthrough/arm/smmu.c 
b/xen/drivers/passthrough/arm/smmu.c
index 1a68c2ab3b..05c2d238b3 100644
--- a/xen/drivers/passthrough/arm/smmu.c
+++ b/xen/drivers/passthrough/arm/smmu.c
@@ -149,6 +149,7 @@ typedef enum irqreturn irqreturn_t;
 #define kzalloc(size, flags)           _xzalloc(size, sizeof(void *))
 #define devm_kzalloc(dev, size, flags) _xzalloc(size, sizeof(void *))
 #define kmalloc_array(size, n, flags)  _xmalloc_array(size, sizeof(void *), n)
+#define kzalloc_array(size, n, flags)  _xzalloc_array(size, sizeof(void *), n)
 
 static void __iomem *devm_ioremap_resource(struct device *dev,
                                           struct resource *res)
@@ -2221,7 +2222,7 @@ static int arm_smmu_device_cfg_probe(struct 
arm_smmu_device *smmu)
                smmu->smr_mask_mask = smr >> SMR_MASK_SHIFT;
 
                /* Zero-initialised to mark as invalid */
-               smmu->smrs = devm_kzalloc(smmu->dev, sizeof(*smmu->smrs), 
GFP_KERNEL);
+               smmu->smrs = kzalloc_array(sizeof(*smmu->smrs), size, 
GFP_KERNEL);
                if (!smmu->smrs)
                        return -ENOMEM;
 
--
generated by git-patchbot for /home/xen/git/xen.git#staging