subject:"Re\: \[PATCH v9 3\/5\] iommu\/arm\-smmu\: Invoke pm_runtime during probe, add\/remove device"

Re: [PATCH v9 3/5] iommu/arm-smmu: Invoke pm_runtime during probe, add/remove device

2018-03-20 Thread Vivek Gautam


Hi Robin,


On 3/14/2018 11:16 PM, Robin Murphy wrote:

On 13/03/18 08:55, Vivek Gautam wrote:

From: Sricharan R 

The smmu device probe/remove and add/remove master device callbacks
gets called when the smmu is not linked to its master, that is without
the context of the master device. So calling runtime apis in those 
places

separately.

Signed-off-by: Sricharan R 
[vivek: Cleanup pm runtime calls]
Signed-off-by: Vivek Gautam 
Reviewed-by: Tomasz Figa 
---
  drivers/iommu/arm-smmu.c | 95 


  1 file changed, 87 insertions(+), 8 deletions(-)

diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index d5873d545024..56a04ae80bf3 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -268,6 +268,20 @@ static struct arm_smmu_option_prop 
arm_smmu_options[] = {

  { 0, NULL},
  };
  +static inline int arm_smmu_rpm_get(struct arm_smmu_device *smmu)
+{
+    if (pm_runtime_enabled(smmu->dev))
+    return pm_runtime_get_sync(smmu->dev);
+
+    return 0;
+}
+
+static inline void arm_smmu_rpm_put(struct arm_smmu_device *smmu)
+{
+    if (pm_runtime_enabled(smmu->dev))
+    pm_runtime_put(smmu->dev);
+}
+
  static struct arm_smmu_domain *to_smmu_domain(struct iommu_domain 
*dom)

  {
  return container_of(dom, struct arm_smmu_domain, domain);
@@ -913,11 +927,15 @@ static void 
arm_smmu_destroy_domain_context(struct iommu_domain *domain)

  struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
  struct arm_smmu_device *smmu = smmu_domain->smmu;
  struct arm_smmu_cfg *cfg = &smmu_domain->cfg;
-    int irq;
+    int ret, irq;
    if (!smmu || domain->type == IOMMU_DOMAIN_IDENTITY)
  return;
  +    ret = arm_smmu_rpm_get(smmu);
+    if (ret < 0)
+    return;
+
  /*
   * Disable the context bank and free the page tables before 
freeing

   * it.
@@ -932,6 +950,8 @@ static void 
arm_smmu_destroy_domain_context(struct iommu_domain *domain)

    free_io_pgtable_ops(smmu_domain->pgtbl_ops);
  __arm_smmu_free_bitmap(smmu->context_map, cfg->cbndx);
+
+    arm_smmu_rpm_put(smmu);
  }
    static struct iommu_domain *arm_smmu_domain_alloc(unsigned type)
@@ -1213,10 +1233,15 @@ static int arm_smmu_attach_dev(struct 
iommu_domain *domain, struct device *dev)

  return -ENODEV;
    smmu = fwspec_smmu(fwspec);
+
+    ret = arm_smmu_rpm_get(smmu);
+    if (ret < 0)
+    return ret;
+
  /* Ensure that the domain is finalised */
  ret = arm_smmu_init_domain_context(domain, smmu);
  if (ret < 0)
-    return ret;
+    goto rpm_put;
    /*
   * Sanity check the domain. We don't support domains across
@@ -1230,29 +1255,47 @@ static int arm_smmu_attach_dev(struct 
iommu_domain *domain, struct device *dev)

  }
    /* Looks ok, so add the device to the domain */
-    return arm_smmu_domain_add_master(smmu_domain, fwspec);
+    ret = arm_smmu_domain_add_master(smmu_domain, fwspec);
+
+rpm_put:
+    arm_smmu_rpm_put(smmu);
+    return ret;
  }
    static int arm_smmu_map(struct iommu_domain *domain, unsigned 
long iova,

  phys_addr_t paddr, size_t size, int prot)
  {
  struct io_pgtable_ops *ops = to_smmu_domain(domain)->pgtbl_ops;
+    struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
+    struct arm_smmu_device *smmu = smmu_domain->smmu;


Nit: please use arm_smmu_domain for ops as well (as it was before 
523d7423e21b), or consistently elide it for smmu - the mixture of both 
methods is just a horrible mess (here and in unmap).


Sure, will make it consistent for arm_smmu_device (in both places - 
map/unmap)


 struct arm_smmu_device *smmu = to_smmu_domain(domain)->smmu;




+    int ret;
    if (!ops)
  return -ENODEV;
  -    return ops->map(ops, iova, paddr, size, prot);
+    arm_smmu_rpm_get(smmu);
+    ret = ops->map(ops, iova, paddr, size, prot);
+    arm_smmu_rpm_put(smmu);
+
+    return ret;
  }
    static size_t arm_smmu_unmap(struct iommu_domain *domain, 
unsigned long iova,

   size_t size)
  {
  struct io_pgtable_ops *ops = to_smmu_domain(domain)->pgtbl_ops;
+    struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
+    struct arm_smmu_device *smmu = smmu_domain->smmu;
+    size_t ret;
    if (!ops)
  return 0;
  -    return ops->unmap(ops, iova, size);
+    arm_smmu_rpm_get(smmu);
+    ret = ops->unmap(ops, iova, size);
+    arm_smmu_rpm_put(smmu);
+
+    return ret;
  }
    static void arm_smmu_iotlb_sync(struct iommu_domain *domain)
@@ -1407,14 +1450,22 @@ static int arm_smmu_add_device(struct device 
*dev)

  while (i--)
  cfg->smendx[i] = INVALID_SMENDX;
  +    ret = arm_smmu_rpm_get(smmu);
+    if (ret < 0)
+    goto out_cfg_free;
+
  ret = arm_smmu_master_alloc_smes(dev);


Nit: it would be easier to just do the rpm_put here; then you don't 
need to mess with the cleanup path.


Sure, will do that. It will be cleaner.

Re: [PATCH v9 3/5] iommu/arm-smmu: Invoke pm_runtime during probe, add/remove device

2018-03-15 Thread Tomasz Figa

On Thu, Mar 15, 2018 at 2:46 AM, Robin Murphy  wrote:
> On 13/03/18 08:55, Vivek Gautam wrote:
>>
>> From: Sricharan R 
>>
>> The smmu device probe/remove and add/remove master device callbacks
>> gets called when the smmu is not linked to its master, that is without
>> the context of the master device. So calling runtime apis in those places
>> separately.
>>
>> Signed-off-by: Sricharan R 
>> [vivek: Cleanup pm runtime calls]
>> Signed-off-by: Vivek Gautam 
>> Reviewed-by: Tomasz Figa 
>> ---
>>   drivers/iommu/arm-smmu.c | 95
>> 
>>   1 file changed, 87 insertions(+), 8 deletions(-)
>>
>> diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
>> index d5873d545024..56a04ae80bf3 100644
>> --- a/drivers/iommu/arm-smmu.c
>> +++ b/drivers/iommu/arm-smmu.c
>> @@ -268,6 +268,20 @@ static struct arm_smmu_option_prop arm_smmu_options[]
>> = {
>> { 0, NULL},
>>   };
>>   +static inline int arm_smmu_rpm_get(struct arm_smmu_device *smmu)
>> +{
>> +   if (pm_runtime_enabled(smmu->dev))
>> +   return pm_runtime_get_sync(smmu->dev);
>> +
>> +   return 0;
>> +}
>> +
>> +static inline void arm_smmu_rpm_put(struct arm_smmu_device *smmu)
>> +{
>> +   if (pm_runtime_enabled(smmu->dev))
>> +   pm_runtime_put(smmu->dev);
>> +}
>> +
>>   static struct arm_smmu_domain *to_smmu_domain(struct iommu_domain *dom)
>>   {
>> return container_of(dom, struct arm_smmu_domain, domain);
>> @@ -913,11 +927,15 @@ static void arm_smmu_destroy_domain_context(struct
>> iommu_domain *domain)
>> struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
>> struct arm_smmu_device *smmu = smmu_domain->smmu;
>> struct arm_smmu_cfg *cfg = &smmu_domain->cfg;
>> -   int irq;
>> +   int ret, irq;
>> if (!smmu || domain->type == IOMMU_DOMAIN_IDENTITY)
>> return;
>>   + ret = arm_smmu_rpm_get(smmu);
>> +   if (ret < 0)
>> +   return;
>> +
>> /*
>>  * Disable the context bank and free the page tables before
>> freeing
>>  * it.
>> @@ -932,6 +950,8 @@ static void arm_smmu_destroy_domain_context(struct
>> iommu_domain *domain)
>> free_io_pgtable_ops(smmu_domain->pgtbl_ops);
>> __arm_smmu_free_bitmap(smmu->context_map, cfg->cbndx);
>> +
>> +   arm_smmu_rpm_put(smmu);
>>   }
>> static struct iommu_domain *arm_smmu_domain_alloc(unsigned type)
>> @@ -1213,10 +1233,15 @@ static int arm_smmu_attach_dev(struct iommu_domain
>> *domain, struct device *dev)
>> return -ENODEV;
>> smmu = fwspec_smmu(fwspec);
>> +
>> +   ret = arm_smmu_rpm_get(smmu);
>> +   if (ret < 0)
>> +   return ret;
>> +
>> /* Ensure that the domain is finalised */
>> ret = arm_smmu_init_domain_context(domain, smmu);
>> if (ret < 0)
>> -   return ret;
>> +   goto rpm_put;
>> /*
>>  * Sanity check the domain. We don't support domains across
>> @@ -1230,29 +1255,47 @@ static int arm_smmu_attach_dev(struct iommu_domain
>> *domain, struct device *dev)
>> }
>> /* Looks ok, so add the device to the domain */
>> -   return arm_smmu_domain_add_master(smmu_domain, fwspec);
>> +   ret = arm_smmu_domain_add_master(smmu_domain, fwspec);
>> +
>> +rpm_put:
>> +   arm_smmu_rpm_put(smmu);
>> +   return ret;
>>   }
>> static int arm_smmu_map(struct iommu_domain *domain, unsigned long
>> iova,
>> phys_addr_t paddr, size_t size, int prot)
>>   {
>> struct io_pgtable_ops *ops = to_smmu_domain(domain)->pgtbl_ops;
>> +   struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
>> +   struct arm_smmu_device *smmu = smmu_domain->smmu;
>
>
> Nit: please use arm_smmu_domain for ops as well (as it was before
> 523d7423e21b), or consistently elide it for smmu - the mixture of both
> methods is just a horrible mess (here and in unmap).
>
>
>> +   int ret;
>> if (!ops)
>> return -ENODEV;
>>   - return ops->map(ops, iova, paddr, size, prot);
>> +   arm_smmu_rpm_get(smmu);
>> +   ret = ops->map(ops, iova, paddr, size, prot);
>> +   arm_smmu_rpm_put(smmu);
>> +
>> +   return ret;
>>   }
>> static size_t arm_smmu_unmap(struct iommu_domain *domain, unsigned
>> long iova,
>>  size_t size)
>>   {
>> struct io_pgtable_ops *ops = to_smmu_domain(domain)->pgtbl_ops;
>> +   struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
>> +   struct arm_smmu_device *smmu = smmu_domain->smmu;
>> +   size_t ret;
>> if (!ops)
>> return 0;
>>   - return ops->unmap(ops, iova, size);
>> +   arm_smmu_rpm_get(smmu);
>> +   ret = ops->unmap(ops, iova, size);
>> +   arm_smmu_rpm_put(smmu);
>> +
>> +   return ret;
>>   }
>> static void arm_smmu_iotlb_sync(struct iommu_domain *domain)
>>

Re: [PATCH v9 3/5] iommu/arm-smmu: Invoke pm_runtime during probe, add/remove device

2018-03-14 Thread Robin Murphy


On 13/03/18 08:55, Vivek Gautam wrote:

From: Sricharan R 

The smmu device probe/remove and add/remove master device callbacks
gets called when the smmu is not linked to its master, that is without
the context of the master device. So calling runtime apis in those places
separately.

Signed-off-by: Sricharan R 
[vivek: Cleanup pm runtime calls]
Signed-off-by: Vivek Gautam 
Reviewed-by: Tomasz Figa 
---
  drivers/iommu/arm-smmu.c | 95 
  1 file changed, 87 insertions(+), 8 deletions(-)

diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index d5873d545024..56a04ae80bf3 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -268,6 +268,20 @@ static struct arm_smmu_option_prop arm_smmu_options[] = {
{ 0, NULL},
  };
  
+static inline int arm_smmu_rpm_get(struct arm_smmu_device *smmu)

+{
+   if (pm_runtime_enabled(smmu->dev))
+   return pm_runtime_get_sync(smmu->dev);
+
+   return 0;
+}
+
+static inline void arm_smmu_rpm_put(struct arm_smmu_device *smmu)
+{
+   if (pm_runtime_enabled(smmu->dev))
+   pm_runtime_put(smmu->dev);
+}
+
  static struct arm_smmu_domain *to_smmu_domain(struct iommu_domain *dom)
  {
return container_of(dom, struct arm_smmu_domain, domain);
@@ -913,11 +927,15 @@ static void arm_smmu_destroy_domain_context(struct 
iommu_domain *domain)
struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
struct arm_smmu_device *smmu = smmu_domain->smmu;
struct arm_smmu_cfg *cfg = &smmu_domain->cfg;
-   int irq;
+   int ret, irq;
  
  	if (!smmu || domain->type == IOMMU_DOMAIN_IDENTITY)

return;
  
+	ret = arm_smmu_rpm_get(smmu);

+   if (ret < 0)
+   return;
+
/*
 * Disable the context bank and free the page tables before freeing
 * it.
@@ -932,6 +950,8 @@ static void arm_smmu_destroy_domain_context(struct 
iommu_domain *domain)
  
  	free_io_pgtable_ops(smmu_domain->pgtbl_ops);

__arm_smmu_free_bitmap(smmu->context_map, cfg->cbndx);
+
+   arm_smmu_rpm_put(smmu);
  }
  
  static struct iommu_domain *arm_smmu_domain_alloc(unsigned type)

@@ -1213,10 +1233,15 @@ static int arm_smmu_attach_dev(struct iommu_domain 
*domain, struct device *dev)
return -ENODEV;
  
  	smmu = fwspec_smmu(fwspec);

+
+   ret = arm_smmu_rpm_get(smmu);
+   if (ret < 0)
+   return ret;
+
/* Ensure that the domain is finalised */
ret = arm_smmu_init_domain_context(domain, smmu);
if (ret < 0)
-   return ret;
+   goto rpm_put;
  
  	/*

 * Sanity check the domain. We don't support domains across
@@ -1230,29 +1255,47 @@ static int arm_smmu_attach_dev(struct iommu_domain 
*domain, struct device *dev)
}
  
  	/* Looks ok, so add the device to the domain */

-   return arm_smmu_domain_add_master(smmu_domain, fwspec);
+   ret = arm_smmu_domain_add_master(smmu_domain, fwspec);
+
+rpm_put:
+   arm_smmu_rpm_put(smmu);
+   return ret;
  }
  
  static int arm_smmu_map(struct iommu_domain *domain, unsigned long iova,

phys_addr_t paddr, size_t size, int prot)
  {
struct io_pgtable_ops *ops = to_smmu_domain(domain)->pgtbl_ops;
+   struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
+   struct arm_smmu_device *smmu = smmu_domain->smmu;


Nit: please use arm_smmu_domain for ops as well (as it was before 
523d7423e21b), or consistently elide it for smmu - the mixture of both 
methods is just a horrible mess (here and in unmap).



+   int ret;
  
  	if (!ops)

return -ENODEV;
  
-	return ops->map(ops, iova, paddr, size, prot);

+   arm_smmu_rpm_get(smmu);
+   ret = ops->map(ops, iova, paddr, size, prot);
+   arm_smmu_rpm_put(smmu);
+
+   return ret;
  }
  
  static size_t arm_smmu_unmap(struct iommu_domain *domain, unsigned long iova,

 size_t size)
  {
struct io_pgtable_ops *ops = to_smmu_domain(domain)->pgtbl_ops;
+   struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
+   struct arm_smmu_device *smmu = smmu_domain->smmu;
+   size_t ret;
  
  	if (!ops)

return 0;
  
-	return ops->unmap(ops, iova, size);

+   arm_smmu_rpm_get(smmu);
+   ret = ops->unmap(ops, iova, size);
+   arm_smmu_rpm_put(smmu);
+
+   return ret;
  }
  
  static void arm_smmu_iotlb_sync(struct iommu_domain *domain)

@@ -1407,14 +1450,22 @@ static int arm_smmu_add_device(struct device *dev)
while (i--)
cfg->smendx[i] = INVALID_SMENDX;
  
+	ret = arm_smmu_rpm_get(smmu);

+   if (ret < 0)
+   goto out_cfg_free;
+
ret = arm_smmu_master_alloc_smes(dev);


Nit: it would be easier to just do the rpm_put here; then you don't need 
to mess with the cleanup path.



if (ret)
-   goto out_cfg_free;

Re: [PATCH v9 3/5] iommu/arm-smmu: Invoke pm_runtime during probe, add/remove device

Re: [PATCH v9 3/5] iommu/arm-smmu: Invoke pm_runtime during probe, add/remove device

Re: [PATCH v9 3/5] iommu/arm-smmu: Invoke pm_runtime during probe, add/remove device

3 matches

Site Navigation

Mail list logo

Footer information