Re: [PATCH v6 2/6] iommu/arm-smmu: Add pm_runtime/sleep ops

[Vivek Gautam]

On 1/31/2018 5:53 PM, Robin Murphy wrote:
> On 19/01/18 11:43, Vivek Gautam wrote:
> > From: Sricharan R <sricharan@xxxxxxxxxxxxxx>
> >
> > The smmu needs to be functional only when the respective
> > master's using it are active. The device_link feature
> > helps to track such functional dependencies, so that the
> > iommu gets powered when the master device enables itself
> > using pm_runtime. So by adapting the smmu driver for
> > runtime pm, above said dependency can be addressed.
> >
> > This patch adds the pm runtime/sleep callbacks to the
> > driver and also the functions to parse the smmu clocks
> > from DT and enable them in resume/suspend.
> >
> > Signed-off-by: Sricharan R <sricharan@xxxxxxxxxxxxxx>
> > Signed-off-by: Archit Taneja <architt@xxxxxxxxxxxxxx>
> > [vivek: Clock rework to request bulk of clocks]
> > Signed-off-by: Vivek Gautam <vivek.gautam@xxxxxxxxxxxxxx>
> > ---
> > Â drivers/iommu/arm-smmu.c | 55 
> > ++++++++++++++++++++++++++++++++++++++++++++++--
> > Â 1 file changed, 53 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
> > index 78d4c6b8f1ba..21acffe91a1c 100644
> > --- a/drivers/iommu/arm-smmu.c
> > +++ b/drivers/iommu/arm-smmu.c
> > @@ -48,6 +48,7 @@
> > Â #include <linux/of_iommu.h>
> > Â #include <linux/pci.h>
> > Â #include <linux/platform_device.h>
> > +#include <linux/pm_runtime.h>
> > Â #include <linux/slab.h>
> > Â #include <linux/spinlock.h>
> > Â @@ -205,6 +206,9 @@ struct arm_smmu_device {
> > ÂÂÂÂÂ u32ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ num_global_irqs;
> > ÂÂÂÂÂ u32ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ num_context_irqs;
> > ÂÂÂÂÂ unsigned intÂÂÂÂÂÂÂÂÂÂÂ *irqs;
> > +ÂÂÂ struct clk_bulk_dataÂÂÂÂÂÂÂ *clocks;
> > +ÂÂÂ intÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ num_clks;
> > +ÂÂÂ const char * constÂÂÂÂÂÂÂ *clk_names;
>
> This seems unnecessary, as we use it a grand total of of once, during 
> initialisation when we have the source data directly to hand. Just 
> pass data->clks into arm_smmu_init_clks() as an additional argument.

Sure, will do that.
> Otherwise, I think this looks reasonable; it's about as unobtrusive as 
> it's going to get.

Thanks for reviewing.

regards
Vivek

> Robin.
>
> > ÂÂÂÂÂ u32ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ cavium_id_base; /* Specific to Cavium */
> > Â @@ -1685,6 +1689,25 @@ static int arm_smmu_id_size_to_bits(int size)
> > ÂÂÂÂÂ }
> > Â }
> > Â +static int arm_smmu_init_clocks(struct arm_smmu_device *smmu)
> > +{
> > +ÂÂÂ int i;
> > +ÂÂÂ int num = smmu->num_clks;
> > +
> > +ÂÂÂ if (num < 1)
> > +ÂÂÂÂÂÂÂ return 0;
> > +
> > +ÂÂÂ smmu->clocks = devm_kcalloc(smmu->dev, num,
> > +ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ sizeof(*smmu->clocks), GFP_KERNEL);
> > +ÂÂÂ if (!smmu->clocks)
> > +ÂÂÂÂÂÂÂ return -ENOMEM;
> > +
> > +ÂÂÂ for (i = 0; i < num; i++)
> > +ÂÂÂÂÂÂÂ smmu->clocks[i].id = smmu->clk_names[i];
> > +
> > +ÂÂÂ return devm_clk_bulk_get(smmu->dev, num, smmu->clocks);
> > +}
> > +
> > Â static int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu)
> > Â {
> > ÂÂÂÂÂ unsigned long size;
> > @@ -1897,10 +1920,12 @@ static int arm_smmu_device_cfg_probe(struct 
> > arm_smmu_device *smmu)
> > Â struct arm_smmu_match_data {
> > ÂÂÂÂÂ enum arm_smmu_arch_version version;
> > ÂÂÂÂÂ enum arm_smmu_implementation model;
> > +ÂÂÂ const char * const *clks;
> > +ÂÂÂ int num_clks;
> > Â };
> > Â Â #define ARM_SMMU_MATCH_DATA(name, ver, imp)ÂÂÂ \
> > -static struct arm_smmu_match_data name = { .version = ver, .model = 
> > imp }
> > +static const struct arm_smmu_match_data name = { .version = ver, 
> > .model = imp }
> > Â Â ARM_SMMU_MATCH_DATA(smmu_generic_v1, ARM_SMMU_V1, GENERIC_SMMU);
> > Â ARM_SMMU_MATCH_DATA(smmu_generic_v2, ARM_SMMU_V2, GENERIC_SMMU);
> > @@ -2001,6 +2026,8 @@ static int arm_smmu_device_dt_probe(struct 
> > platform_device *pdev,
> > ÂÂÂÂÂ data = of_device_get_match_data(dev);
> > ÂÂÂÂÂ smmu->version = data->version;
> > ÂÂÂÂÂ smmu->model = data->model;
> > +ÂÂÂ smmu->clk_names = data->clks;
> > +ÂÂÂ smmu->num_clks = data->num_clks;
> > Â ÂÂÂÂÂ parse_driver_options(smmu);
> > Â @@ -2099,6 +2126,10 @@ static int arm_smmu_device_probe(struct 
> > platform_device *pdev)
> > ÂÂÂÂÂÂÂÂÂ smmu->irqs[i] = irq;
> > ÂÂÂÂÂ }
> > Â +ÂÂÂ err = arm_smmu_init_clocks(smmu);
> > +ÂÂÂ if (err)
> > +ÂÂÂÂÂÂÂ return err;
> > +
> > ÂÂÂÂÂ err = arm_smmu_device_cfg_probe(smmu);
> > ÂÂÂÂÂ if (err)
> > ÂÂÂÂÂÂÂÂÂ return err;
> > @@ -2197,7 +2228,27 @@ static int __maybe_unused 
> > arm_smmu_pm_resume(struct device *dev)
> > ÂÂÂÂÂ return 0;
> > Â }
> > Â -static SIMPLE_DEV_PM_OPS(arm_smmu_pm_ops, NULL, arm_smmu_pm_resume);
> > +static int __maybe_unused arm_smmu_runtime_resume(struct device *dev)
> > +{
> > +ÂÂÂ struct arm_smmu_device *smmu = dev_get_drvdata(dev);
> > +
> > +ÂÂÂ return clk_bulk_prepare_enable(smmu->num_clks, smmu->clocks);
> > +}
> > +
> > +static int __maybe_unused arm_smmu_runtime_suspend(struct device *dev)
> > +{
> > +ÂÂÂ struct arm_smmu_device *smmu = dev_get_drvdata(dev);
> > +
> > +ÂÂÂ clk_bulk_disable_unprepare(smmu->num_clks, smmu->clocks);
> > +
> > +ÂÂÂ return 0;
> > +}
> > +
> > +static const struct dev_pm_ops arm_smmu_pm_ops = {
> > +ÂÂÂ SET_SYSTEM_SLEEP_PM_OPS(NULL, arm_smmu_pm_resume)
> > +ÂÂÂ SET_RUNTIME_PM_OPS(arm_smmu_runtime_suspend,
> > +ÂÂÂÂÂÂÂÂÂÂÂÂÂÂ arm_smmu_runtime_resume, NULL)
> > +};
> > Â Â static struct platform_driver arm_smmu_driver = {
> > ÂÂÂÂÂ .driverÂÂÂ = {