* [Patch v15 1/5] iommu/arm-smmu: Add pm_runtime/sleep ops
2018-08-27 10:55 [Patch v15 0/5] iommu/arm-smmu: Add runtime pm/sleep support Vivek Gautam
@ 2018-08-27 10:55 ` Vivek Gautam
2018-08-27 10:55 ` [Patch v15 2/5] iommu/arm-smmu: Invoke pm_runtime during probe, add/remove device Vivek Gautam
` (3 subsequent siblings)
4 siblings, 0 replies; 14+ messages in thread
From: Vivek Gautam @ 2018-08-27 10:55 UTC (permalink / raw)
To: joro, robh+dt, robin.murphy, will.deacon, iommu, devicetree,
linux-kernel, freedreno
Cc: alex.williamson, mark.rutland, rjw, robdclark, andy.gross,
linux-pm, sboyd, tfiga, jcrouse, sricharan, m.szyprowski,
architt, linux-arm-msm, Vivek Gautam
From: Sricharan R <sricharan@codeaurora.org>
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.
Also, while we enable the runtime pm add a pm sleep suspend
callback that pushes devices to low power state by turning
the clocks off in a system sleep.
Also add corresponding clock enable path in resume callback.
Signed-off-by: Sricharan R <sricharan@codeaurora.org>
Signed-off-by: Archit Taneja <architt@codeaurora.org>
[vivek: rework for clock and pm ops]
Signed-off-by: Vivek Gautam <vivek.gautam@codeaurora.org>
Reviewed-by: Tomasz Figa <tfiga@chromium.org>
Tested-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
---
Changes since v14:
- none.
drivers/iommu/arm-smmu.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 74 insertions(+), 3 deletions(-)
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index fd1b80ef9490..a81224bc6637 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,8 @@ struct arm_smmu_device {
u32 num_global_irqs;
u32 num_context_irqs;
unsigned int *irqs;
+ struct clk_bulk_data *clks;
+ int num_clks;
u32 cavium_id_base; /* Specific to Cavium */
@@ -1896,10 +1899,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);
@@ -1918,6 +1923,23 @@ static const struct of_device_id arm_smmu_of_match[] = {
};
MODULE_DEVICE_TABLE(of, arm_smmu_of_match);
+static void arm_smmu_fill_clk_data(struct arm_smmu_device *smmu,
+ const char * const *clks)
+{
+ int i;
+
+ if (smmu->num_clks < 1)
+ return;
+
+ smmu->clks = devm_kcalloc(smmu->dev, smmu->num_clks,
+ sizeof(*smmu->clks), GFP_KERNEL);
+ if (!smmu->clks)
+ return;
+
+ for (i = 0; i < smmu->num_clks; i++)
+ smmu->clks[i].id = clks[i];
+}
+
#ifdef CONFIG_ACPI
static int acpi_smmu_get_data(u32 model, struct arm_smmu_device *smmu)
{
@@ -2000,6 +2022,9 @@ 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->num_clks = data->num_clks;
+
+ arm_smmu_fill_clk_data(smmu, data->clks);
parse_driver_options(smmu);
@@ -2098,6 +2123,14 @@ static int arm_smmu_device_probe(struct platform_device *pdev)
smmu->irqs[i] = irq;
}
+ err = devm_clk_bulk_get(smmu->dev, smmu->num_clks, smmu->clks);
+ if (err)
+ return err;
+
+ err = clk_bulk_prepare(smmu->num_clks, smmu->clks);
+ if (err)
+ return err;
+
err = arm_smmu_device_cfg_probe(smmu);
if (err)
return err;
@@ -2184,6 +2217,9 @@ static int arm_smmu_device_remove(struct platform_device *pdev)
/* Turn the thing off */
writel(sCR0_CLIENTPD, ARM_SMMU_GR0_NS(smmu) + ARM_SMMU_GR0_sCR0);
+
+ clk_bulk_unprepare(smmu->num_clks, smmu->clks);
+
return 0;
}
@@ -2192,15 +2228,50 @@ static void arm_smmu_device_shutdown(struct platform_device *pdev)
arm_smmu_device_remove(pdev);
}
-static int __maybe_unused arm_smmu_pm_resume(struct device *dev)
+static int __maybe_unused arm_smmu_runtime_resume(struct device *dev)
{
struct arm_smmu_device *smmu = dev_get_drvdata(dev);
+ int ret;
+
+ ret = clk_bulk_enable(smmu->num_clks, smmu->clks);
+ if (ret)
+ return ret;
arm_smmu_device_reset(smmu);
+
return 0;
}
-static SIMPLE_DEV_PM_OPS(arm_smmu_pm_ops, NULL, arm_smmu_pm_resume);
+static int __maybe_unused arm_smmu_runtime_suspend(struct device *dev)
+{
+ struct arm_smmu_device *smmu = dev_get_drvdata(dev);
+
+ clk_bulk_disable(smmu->num_clks, smmu->clks);
+
+ return 0;
+}
+
+static int __maybe_unused arm_smmu_pm_resume(struct device *dev)
+{
+ if (pm_runtime_suspended(dev))
+ return 0;
+
+ return arm_smmu_runtime_resume(dev);
+}
+
+static int __maybe_unused arm_smmu_pm_suspend(struct device *dev)
+{
+ if (pm_runtime_suspended(dev))
+ return 0;
+
+ return arm_smmu_runtime_suspend(dev);
+}
+
+static const struct dev_pm_ops arm_smmu_pm_ops = {
+ SET_SYSTEM_SLEEP_PM_OPS(arm_smmu_pm_suspend, 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 = {
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [Patch v15 2/5] iommu/arm-smmu: Invoke pm_runtime during probe, add/remove device
2018-08-27 10:55 [Patch v15 0/5] iommu/arm-smmu: Add runtime pm/sleep support Vivek Gautam
2018-08-27 10:55 ` [Patch v15 1/5] iommu/arm-smmu: Add pm_runtime/sleep ops Vivek Gautam
@ 2018-08-27 10:55 ` Vivek Gautam
2018-08-30 9:22 ` Vivek Gautam
2018-08-27 10:55 ` [Patch v15 3/5] iommu/arm-smmu: Add the device_link between masters and smmu Vivek Gautam
` (2 subsequent siblings)
4 siblings, 1 reply; 14+ messages in thread
From: Vivek Gautam @ 2018-08-27 10:55 UTC (permalink / raw)
To: joro, robh+dt, robin.murphy, will.deacon, iommu, devicetree,
linux-kernel, freedreno
Cc: alex.williamson, mark.rutland, rjw, robdclark, andy.gross,
linux-pm, sboyd, tfiga, jcrouse, sricharan, m.szyprowski,
architt, linux-arm-msm, Vivek Gautam
From: Sricharan R <sricharan@codeaurora.org>
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 <sricharan@codeaurora.org>
[vivek: Cleanup pm runtime calls]
Signed-off-by: Vivek Gautam <vivek.gautam@codeaurora.org>
Reviewed-by: Tomasz Figa <tfiga@chromium.org>
Tested-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
---
Changes since v14:
- none.
drivers/iommu/arm-smmu.c | 101 +++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 93 insertions(+), 8 deletions(-)
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index a81224bc6637..23b4a60149b6 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
@@ -1226,33 +1251,50 @@ static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev)
dev_err(dev,
"cannot attach to SMMU %s whilst already attached to domain on SMMU %s\n",
dev_name(smmu_domain->smmu->dev), dev_name(smmu->dev));
- return -EINVAL;
+ ret = -EINVAL;
+ goto rpm_put;
}
/* 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_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_device *smmu = to_smmu_domain(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,7 +1449,13 @@ 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);
+ arm_smmu_rpm_put(smmu);
+
if (ret)
goto out_cfg_free;
@@ -1427,7 +1475,7 @@ static void arm_smmu_remove_device(struct device *dev)
struct iommu_fwspec *fwspec = dev->iommu_fwspec;
struct arm_smmu_master_cfg *cfg;
struct arm_smmu_device *smmu;
-
+ int ret;
if (!fwspec || fwspec->ops != &arm_smmu_ops)
return;
@@ -1435,8 +1483,15 @@ static void arm_smmu_remove_device(struct device *dev)
cfg = fwspec->iommu_priv;
smmu = cfg->smmu;
+ ret = arm_smmu_rpm_get(smmu);
+ if (ret < 0)
+ return;
+
iommu_device_unlink(&smmu->iommu, dev);
arm_smmu_master_free_smes(fwspec);
+
+ arm_smmu_rpm_put(smmu);
+
iommu_group_remove_device(dev);
kfree(fwspec->iommu_priv);
iommu_fwspec_free(dev);
@@ -2123,6 +2178,8 @@ static int arm_smmu_device_probe(struct platform_device *pdev)
smmu->irqs[i] = irq;
}
+ platform_set_drvdata(pdev, smmu);
+
err = devm_clk_bulk_get(smmu->dev, smmu->num_clks, smmu->clks);
if (err)
return err;
@@ -2131,6 +2188,26 @@ static int arm_smmu_device_probe(struct platform_device *pdev)
if (err)
return err;
+ /*
+ * We want to avoid touching dev->power.lock in fastpaths unless
+ * it's really going to do something useful - pm_runtime_enabled()
+ * can serve as an ideal proxy for that decision. So, conditionally
+ * enable pm_runtime.
+ */
+ if (dev->pm_domain)
+ pm_runtime_enable(dev);
+
+ err = arm_smmu_rpm_get(smmu);
+ if (err < 0)
+ return err;
+
+ /* Enable clocks explicitly if runtime PM is disabled */
+ if (!pm_runtime_enabled(dev)) {
+ err = clk_bulk_enable(smmu->num_clks, smmu->clks);
+ if (err)
+ return err;
+ }
+
err = arm_smmu_device_cfg_probe(smmu);
if (err)
return err;
@@ -2176,10 +2253,11 @@ static int arm_smmu_device_probe(struct platform_device *pdev)
return err;
}
- platform_set_drvdata(pdev, smmu);
arm_smmu_device_reset(smmu);
arm_smmu_test_smr_masks(smmu);
+ arm_smmu_rpm_put(smmu);
+
/*
* For ACPI and generic DT bindings, an SMMU will be probed before
* any device which might need it, so we want the bus ops in place
@@ -2215,8 +2293,15 @@ static int arm_smmu_device_remove(struct platform_device *pdev)
if (!bitmap_empty(smmu->context_map, ARM_SMMU_MAX_CBS))
dev_err(&pdev->dev, "removing device with active domains!\n");
+ arm_smmu_rpm_get(smmu);
/* Turn the thing off */
writel(sCR0_CLIENTPD, ARM_SMMU_GR0_NS(smmu) + ARM_SMMU_GR0_sCR0);
+ arm_smmu_rpm_put(smmu);
+
+ if (pm_runtime_enabled(smmu->dev))
+ pm_runtime_force_suspend(smmu->dev);
+ else
+ clk_bulk_disable(smmu->num_clks, smmu->clks);
clk_bulk_unprepare(smmu->num_clks, smmu->clks);
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [Patch v15 2/5] iommu/arm-smmu: Invoke pm_runtime during probe, add/remove device
2018-08-27 10:55 ` [Patch v15 2/5] iommu/arm-smmu: Invoke pm_runtime during probe, add/remove device Vivek Gautam
@ 2018-08-30 9:22 ` Vivek Gautam
2018-08-30 9:33 ` Tomasz Figa
0 siblings, 1 reply; 14+ messages in thread
From: Vivek Gautam @ 2018-08-30 9:22 UTC (permalink / raw)
To: Joerg Roedel, robh+dt, Robin Murphy, Will Deacon,
list@263.net:IOMMU DRIVERS
<iommu@lists.linux-foundation.org>,
Joerg Roedel <joro@8bytes.org>,,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
open list, freedreno
Cc: Mark Rutland, Linux PM, sboyd, Rafael J. Wysocki,
alex.williamson, linux-arm-msm, Andy Gross
On Mon, Aug 27, 2018 at 4:27 PM Vivek Gautam
<vivek.gautam@codeaurora.org> wrote:
>
> From: Sricharan R <sricharan@codeaurora.org>
>
> 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 <sricharan@codeaurora.org>
> [vivek: Cleanup pm runtime calls]
> Signed-off-by: Vivek Gautam <vivek.gautam@codeaurora.org>
> Reviewed-by: Tomasz Figa <tfiga@chromium.org>
> Tested-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
> ---
>
> Changes since v14:
> - none.
>
> drivers/iommu/arm-smmu.c | 101 +++++++++++++++++++++++++++++++++++++++++++----
> 1 file changed, 93 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
> index a81224bc6637..23b4a60149b6 100644
> --- a/drivers/iommu/arm-smmu.c
> +++ b/drivers/iommu/arm-smmu.c
[snip]
> @@ -2131,6 +2188,26 @@ static int arm_smmu_device_probe(struct platform_device *pdev)
> if (err)
> return err;
>
> + /*
> + * We want to avoid touching dev->power.lock in fastpaths unless
> + * it's really going to do something useful - pm_runtime_enabled()
> + * can serve as an ideal proxy for that decision. So, conditionally
> + * enable pm_runtime.
> + */
> + if (dev->pm_domain)
> + pm_runtime_enable(dev);
> +
> + err = arm_smmu_rpm_get(smmu);
We shouldn't be doing a runtime_get() yet, as this eventually calls
arm_smmu_device_reset().
arm_smmu_device_reset() should be called only after arm_smmu_device_cfg_probe().
So, I plan to replace the pm_runtime_get/put() calls in probe() with
simple clk_bulk_enable()
to let the driver initialize smmu, and at the end of the probe we can
disable the clocks and
enable runtime pm over the device to let it take care of the device further-on.
> + if (err < 0)
> + return err;
> +
> + /* Enable clocks explicitly if runtime PM is disabled */
> + if (!pm_runtime_enabled(dev)) {
> + err = clk_bulk_enable(smmu->num_clks, smmu->clks);
> + if (err)
> + return err;
> + }
> +
> err = arm_smmu_device_cfg_probe(smmu);
> if (err)
> return err;
[snip]
Best regards
Vivek
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [Patch v15 2/5] iommu/arm-smmu: Invoke pm_runtime during probe, add/remove device
2018-08-30 9:22 ` Vivek Gautam
@ 2018-08-30 9:33 ` Tomasz Figa
2018-08-30 13:59 ` Vivek Gautam
0 siblings, 1 reply; 14+ messages in thread
From: Tomasz Figa @ 2018-08-30 9:33 UTC (permalink / raw)
To: Vivek Gautam
Cc: list@263.net:IOMMU DRIVERS
<iommu@lists.linux-foundation.org>,
Joerg Roedel <joro@8bytes.org>,,
Rob Herring, Robin Murphy, Will Deacon,
list@263.net:IOMMU DRIVERS
<iommu@lists.linux-foundation.org>,
Joerg Roedel <joro@8bytes.org>,,
devicetree, Linux Kernel Mailing List, freedreno, Mark Rutland,
Linux PM, sboyd, linux-arm-msm, Rafael J. Wysocki,
Alex Williamson, Andy Gross
On Thu, Aug 30, 2018 at 6:22 PM Vivek Gautam
<vivek.gautam@codeaurora.org> wrote:
>
> On Mon, Aug 27, 2018 at 4:27 PM Vivek Gautam
> <vivek.gautam@codeaurora.org> wrote:
> >
> > From: Sricharan R <sricharan@codeaurora.org>
> >
> > 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 <sricharan@codeaurora.org>
> > [vivek: Cleanup pm runtime calls]
> > Signed-off-by: Vivek Gautam <vivek.gautam@codeaurora.org>
> > Reviewed-by: Tomasz Figa <tfiga@chromium.org>
> > Tested-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
> > ---
> >
> > Changes since v14:
> > - none.
> >
> > drivers/iommu/arm-smmu.c | 101 +++++++++++++++++++++++++++++++++++++++++++----
> > 1 file changed, 93 insertions(+), 8 deletions(-)
> >
> > diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
> > index a81224bc6637..23b4a60149b6 100644
> > --- a/drivers/iommu/arm-smmu.c
> > +++ b/drivers/iommu/arm-smmu.c
>
> [snip]
>
> > @@ -2131,6 +2188,26 @@ static int arm_smmu_device_probe(struct platform_device *pdev)
> > if (err)
> > return err;
> >
> > + /*
> > + * We want to avoid touching dev->power.lock in fastpaths unless
> > + * it's really going to do something useful - pm_runtime_enabled()
> > + * can serve as an ideal proxy for that decision. So, conditionally
> > + * enable pm_runtime.
> > + */
> > + if (dev->pm_domain)
> > + pm_runtime_enable(dev);
> > +
> > + err = arm_smmu_rpm_get(smmu);
>
> We shouldn't be doing a runtime_get() yet, as this eventually calls
> arm_smmu_device_reset().
> arm_smmu_device_reset() should be called only after arm_smmu_device_cfg_probe().
> So, I plan to replace the pm_runtime_get/put() calls in probe() with
> simple clk_bulk_enable()
> to let the driver initialize smmu, and at the end of the probe we can
> disable the clocks and
> enable runtime pm over the device to let it take care of the device further-on.
>
We can avoid the explicit clock disable by just calling
pm_runtime_set_active() before pm_runtime_enable(), assuming that what
probe does is symmetrical with the suspend callback, which would be
called after the latter.
Best regards,
Tomasz
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [Patch v15 2/5] iommu/arm-smmu: Invoke pm_runtime during probe, add/remove device
2018-08-30 9:33 ` Tomasz Figa
@ 2018-08-30 13:59 ` Vivek Gautam
0 siblings, 0 replies; 14+ messages in thread
From: Vivek Gautam @ 2018-08-30 13:59 UTC (permalink / raw)
To: Tomasz Figa
Cc: Mark Rutland,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
alex.williamson, Linux PM, sboyd, freedreno, Will Deacon,
open list,
list@263.net:IOMMU DRIVERS
<iommu@lists.linux-foundation.org>,
Joerg Roedel <joro@8bytes.org>,,
robh+dt, Rafael J. Wysocki, linux-arm-msm, Andy Gross,
Robin Murphy
On Thu, Aug 30, 2018 at 3:04 PM Tomasz Figa <tfiga@chromium.org> wrote:
>
> On Thu, Aug 30, 2018 at 6:22 PM Vivek Gautam
> <vivek.gautam@codeaurora.org> wrote:
> >
> > On Mon, Aug 27, 2018 at 4:27 PM Vivek Gautam
> > <vivek.gautam@codeaurora.org> wrote:
> > >
> > > From: Sricharan R <sricharan@codeaurora.org>
> > >
> > > 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 <sricharan@codeaurora.org>
> > > [vivek: Cleanup pm runtime calls]
> > > Signed-off-by: Vivek Gautam <vivek.gautam@codeaurora.org>
> > > Reviewed-by: Tomasz Figa <tfiga@chromium.org>
> > > Tested-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
> > > ---
> > >
> > > Changes since v14:
> > > - none.
> > >
> > > drivers/iommu/arm-smmu.c | 101 +++++++++++++++++++++++++++++++++++++++++++----
> > > 1 file changed, 93 insertions(+), 8 deletions(-)
> > >
> > > diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
> > > index a81224bc6637..23b4a60149b6 100644
> > > --- a/drivers/iommu/arm-smmu.c
> > > +++ b/drivers/iommu/arm-smmu.c
> >
> > [snip]
> >
> > > @@ -2131,6 +2188,26 @@ static int arm_smmu_device_probe(struct platform_device *pdev)
> > > if (err)
> > > return err;
> > >
> > > + /*
> > > + * We want to avoid touching dev->power.lock in fastpaths unless
> > > + * it's really going to do something useful - pm_runtime_enabled()
> > > + * can serve as an ideal proxy for that decision. So, conditionally
> > > + * enable pm_runtime.
> > > + */
> > > + if (dev->pm_domain)
> > > + pm_runtime_enable(dev);
> > > +
> > > + err = arm_smmu_rpm_get(smmu);
> >
> > We shouldn't be doing a runtime_get() yet, as this eventually calls
> > arm_smmu_device_reset().
> > arm_smmu_device_reset() should be called only after arm_smmu_device_cfg_probe().
> > So, I plan to replace the pm_runtime_get/put() calls in probe() with
> > simple clk_bulk_enable()
> > to let the driver initialize smmu, and at the end of the probe we can
> > disable the clocks and
> > enable runtime pm over the device to let it take care of the device further-on.
> >
>
> We can avoid the explicit clock disable by just calling
> pm_runtime_set_active() before pm_runtime_enable(), assuming that what
> probe does is symmetrical with the suspend callback, which would be
> called after the latter.
Sure, that sounds reasonable. Will use pm_runtime_set_active() instead
of explicitly disabling the clocks.Thanks.
Best regards
Vivek
>
> Best regards,
> Tomasz
> _______________________________________________
> iommu mailing list
> iommu@lists.linux-foundation.org
> https://lists.linuxfoundation.org/mailman/listinfo/iommu
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
^ permalink raw reply [flat|nested] 14+ messages in thread
* [Patch v15 3/5] iommu/arm-smmu: Add the device_link between masters and smmu
2018-08-27 10:55 [Patch v15 0/5] iommu/arm-smmu: Add runtime pm/sleep support Vivek Gautam
2018-08-27 10:55 ` [Patch v15 1/5] iommu/arm-smmu: Add pm_runtime/sleep ops Vivek Gautam
2018-08-27 10:55 ` [Patch v15 2/5] iommu/arm-smmu: Invoke pm_runtime during probe, add/remove device Vivek Gautam
@ 2018-08-27 10:55 ` Vivek Gautam
2018-08-27 10:55 ` [Patch v15 4/5] dt-bindings: arm-smmu: Add bindings for qcom,smmu-v2 Vivek Gautam
2018-08-27 10:55 ` [Patch v15 5/5] iommu/arm-smmu: Add support for qcom,smmu-v2 variant Vivek Gautam
4 siblings, 0 replies; 14+ messages in thread
From: Vivek Gautam @ 2018-08-27 10:55 UTC (permalink / raw)
To: joro, robh+dt, robin.murphy, will.deacon, iommu, devicetree,
linux-kernel, freedreno
Cc: alex.williamson, mark.rutland, rjw, robdclark, andy.gross,
linux-pm, sboyd, tfiga, jcrouse, sricharan, m.szyprowski,
architt, linux-arm-msm, Vivek Gautam
From: Sricharan R <sricharan@codeaurora.org>
Finally add the device link between the master device and
smmu, so that the smmu gets runtime enabled/disabled only when the
master needs it. This is done from add_device callback which gets
called once when the master is added to the smmu.
Signed-off-by: Sricharan R <sricharan@codeaurora.org>
Signed-off-by: Vivek Gautam <vivek.gautam@codeaurora.org>
Reviewed-by: Tomasz Figa <tfiga@chromium.org>
Tested-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
---
Changes since v14:
- none.
drivers/iommu/arm-smmu.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index 23b4a60149b6..b5e7f72d418c 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -1461,6 +1461,9 @@ static int arm_smmu_add_device(struct device *dev)
iommu_device_link(&smmu->iommu, dev);
+ device_link_add(dev, smmu->dev,
+ DL_FLAG_PM_RUNTIME | DL_FLAG_AUTOREMOVE_SUPPLIER);
+
return 0;
out_cfg_free:
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [Patch v15 4/5] dt-bindings: arm-smmu: Add bindings for qcom,smmu-v2
2018-08-27 10:55 [Patch v15 0/5] iommu/arm-smmu: Add runtime pm/sleep support Vivek Gautam
` (2 preceding siblings ...)
2018-08-27 10:55 ` [Patch v15 3/5] iommu/arm-smmu: Add the device_link between masters and smmu Vivek Gautam
@ 2018-08-27 10:55 ` Vivek Gautam
2018-08-28 20:34 ` Rob Herring
2018-08-27 10:55 ` [Patch v15 5/5] iommu/arm-smmu: Add support for qcom,smmu-v2 variant Vivek Gautam
4 siblings, 1 reply; 14+ messages in thread
From: Vivek Gautam @ 2018-08-27 10:55 UTC (permalink / raw)
To: joro, robh+dt, robin.murphy, will.deacon, iommu, devicetree,
linux-kernel, freedreno
Cc: alex.williamson, mark.rutland, rjw, robdclark, andy.gross,
linux-pm, sboyd, tfiga, jcrouse, sricharan, m.szyprowski,
architt, linux-arm-msm, Vivek Gautam
Add bindings doc for Qcom's smmu-v2 implementation.
Signed-off-by: Vivek Gautam <vivek.gautam@codeaurora.org>
Reviewed-by: Tomasz Figa <tfiga@chromium.org>
Tested-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
---
Changes since v14:
- This is a new patch added in v15 after noticing the new
checkpatch warning for separate dt-bindings doc.
- This patch also addresses comments given by Rob and Robin to add
a list of valid values of '<soc>' in "qcom,<soc>-smmu-v2"
compatible string.
.../devicetree/bindings/iommu/arm,smmu.txt | 47 ++++++++++++++++++++++
1 file changed, 47 insertions(+)
diff --git a/Documentation/devicetree/bindings/iommu/arm,smmu.txt b/Documentation/devicetree/bindings/iommu/arm,smmu.txt
index 8a6ffce12af5..52198a539606 100644
--- a/Documentation/devicetree/bindings/iommu/arm,smmu.txt
+++ b/Documentation/devicetree/bindings/iommu/arm,smmu.txt
@@ -17,10 +17,24 @@ conditions.
"arm,mmu-401"
"arm,mmu-500"
"cavium,smmu-v2"
+ "qcom,<soc>-smmu-v2", "qcom,smmu-v2"
depending on the particular implementation and/or the
version of the architecture implemented.
+ A number of Qcom SoCs use qcom,smmu-v2 version of the IP.
+ "qcom,<soc>-smmu-v2" represents a soc specific compatible
+ string that should be present along with the "qcom,smmu-v2"
+ to facilitate SoC specific clocks/power connections and to
+ address specific bug fixes.
+ '<soc>' string in "qcom,<soc>-smmu-v2" should be one of the
+ following:
+ msm8996 - for msm8996 Qcom SoC.
+ sdm845 - for sdm845 Qcom Soc.
+
+ An example string would be -
+ "qcom,msm8996-smmu-v2", "qcom,smmu-v2".
+
- reg : Base address and size of the SMMU.
- #global-interrupts : The number of global interrupts exposed by the
@@ -71,6 +85,22 @@ conditions.
or using stream matching with #iommu-cells = <2>, and
may be ignored if present in such cases.
+- clock-names: List of the names of clocks input to the device. The
+ required list depends on particular implementation and
+ is as follows:
+ - for "qcom,smmu-v2":
+ - "bus": clock required for downstream bus access and
+ for the smmu ptw,
+ - "iface": clock required to access smmu's registers
+ through the TCU's programming interface.
+ - unspecified for other implementations.
+
+- clocks: Specifiers for all clocks listed in the clock-names property,
+ as per generic clock bindings.
+
+- power-domains: Specifiers for power domains required to be powered on for
+ the SMMU to operate, as per generic power domain bindings.
+
** Deprecated properties:
- mmu-masters (deprecated in favour of the generic "iommus" binding) :
@@ -137,3 +167,20 @@ conditions.
iommu-map = <0 &smmu3 0 0x400>;
...
};
+
+ /* Qcom's arm,smmu-v2 implementation */
+ smmu4: iommu {
+ compatible = "qcom,msm8996-smmu-v2", "qcom,smmu-v2";
+ reg = <0xd00000 0x10000>;
+
+ #global-interrupts = <1>;
+ interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH>;
+ #iommu-cells = <1>;
+ power-domains = <&mmcc MDSS_GDSC>;
+
+ clocks = <&mmcc SMMU_MDP_AXI_CLK>,
+ <&mmcc SMMU_MDP_AHB_CLK>;
+ clock-names = "bus", "iface";
+ };
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [Patch v15 4/5] dt-bindings: arm-smmu: Add bindings for qcom,smmu-v2
2018-08-27 10:55 ` [Patch v15 4/5] dt-bindings: arm-smmu: Add bindings for qcom,smmu-v2 Vivek Gautam
@ 2018-08-28 20:34 ` Rob Herring
2018-08-29 8:35 ` Vivek Gautam
0 siblings, 1 reply; 14+ messages in thread
From: Rob Herring @ 2018-08-28 20:34 UTC (permalink / raw)
To: Vivek Gautam
Cc: joro, robin.murphy, will.deacon, iommu, devicetree, linux-kernel,
freedreno, alex.williamson, mark.rutland, rjw, robdclark,
andy.gross, linux-pm, sboyd, tfiga, jcrouse, sricharan,
m.szyprowski, architt, linux-arm-msm
On Mon, Aug 27, 2018 at 04:25:50PM +0530, Vivek Gautam wrote:
> Add bindings doc for Qcom's smmu-v2 implementation.
>
> Signed-off-by: Vivek Gautam <vivek.gautam@codeaurora.org>
> Reviewed-by: Tomasz Figa <tfiga@chromium.org>
> Tested-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
> ---
>
> Changes since v14:
> - This is a new patch added in v15 after noticing the new
> checkpatch warning for separate dt-bindings doc.
> - This patch also addresses comments given by Rob and Robin to add
> a list of valid values of '<soc>' in "qcom,<soc>-smmu-v2"
> compatible string.
>
> .../devicetree/bindings/iommu/arm,smmu.txt | 47 ++++++++++++++++++++++
> 1 file changed, 47 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/iommu/arm,smmu.txt b/Documentation/devicetree/bindings/iommu/arm,smmu.txt
> index 8a6ffce12af5..52198a539606 100644
> --- a/Documentation/devicetree/bindings/iommu/arm,smmu.txt
> +++ b/Documentation/devicetree/bindings/iommu/arm,smmu.txt
> @@ -17,10 +17,24 @@ conditions.
> "arm,mmu-401"
> "arm,mmu-500"
> "cavium,smmu-v2"
> + "qcom,<soc>-smmu-v2", "qcom,smmu-v2"
The v2 in the compatible string is kind of redundant unless the SoC has
other SMMU types.
>
> depending on the particular implementation and/or the
> version of the architecture implemented.
>
> + A number of Qcom SoCs use qcom,smmu-v2 version of the IP.
> + "qcom,<soc>-smmu-v2" represents a soc specific compatible
> + string that should be present along with the "qcom,smmu-v2"
> + to facilitate SoC specific clocks/power connections and to
> + address specific bug fixes.
> + '<soc>' string in "qcom,<soc>-smmu-v2" should be one of the
> + following:
> + msm8996 - for msm8996 Qcom SoC.
> + sdm845 - for sdm845 Qcom Soc.
Rather than all this prose, it would be simpler to just add 2 lines with
the full compatibles rather than <soc>. The <soc> thing is not going to
work when/if we move bindings to json-schema also.
> +
> + An example string would be -
> + "qcom,msm8996-smmu-v2", "qcom,smmu-v2".
> +
> - reg : Base address and size of the SMMU.
>
> - #global-interrupts : The number of global interrupts exposed by the
> @@ -71,6 +85,22 @@ conditions.
> or using stream matching with #iommu-cells = <2>, and
> may be ignored if present in such cases.
>
> +- clock-names: List of the names of clocks input to the device. The
> + required list depends on particular implementation and
> + is as follows:
> + - for "qcom,smmu-v2":
> + - "bus": clock required for downstream bus access and
> + for the smmu ptw,
> + - "iface": clock required to access smmu's registers
> + through the TCU's programming interface.
> + - unspecified for other implementations.
> +
> +- clocks: Specifiers for all clocks listed in the clock-names property,
> + as per generic clock bindings.
> +
> +- power-domains: Specifiers for power domains required to be powered on for
> + the SMMU to operate, as per generic power domain bindings.
> +
> ** Deprecated properties:
>
> - mmu-masters (deprecated in favour of the generic "iommus" binding) :
> @@ -137,3 +167,20 @@ conditions.
> iommu-map = <0 &smmu3 0 0x400>;
> ...
> };
> +
> + /* Qcom's arm,smmu-v2 implementation */
> + smmu4: iommu {
Needs a unit-address.
> + compatible = "qcom,msm8996-smmu-v2", "qcom,smmu-v2";
> + reg = <0xd00000 0x10000>;
> +
> + #global-interrupts = <1>;
> + interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>,
> + <GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH>,
> + <GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH>;
> + #iommu-cells = <1>;
> + power-domains = <&mmcc MDSS_GDSC>;
> +
> + clocks = <&mmcc SMMU_MDP_AXI_CLK>,
> + <&mmcc SMMU_MDP_AHB_CLK>;
> + clock-names = "bus", "iface";
> + };
> --
> QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
> of Code Aurora Forum, hosted by The Linux Foundation
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [Patch v15 4/5] dt-bindings: arm-smmu: Add bindings for qcom,smmu-v2
2018-08-28 20:34 ` Rob Herring
@ 2018-08-29 8:35 ` Vivek Gautam
2018-08-29 11:23 ` Vivek Gautam
0 siblings, 1 reply; 14+ messages in thread
From: Vivek Gautam @ 2018-08-29 8:35 UTC (permalink / raw)
To: Rob Herring
Cc: joro, robin.murphy, will.deacon, iommu, devicetree, linux-kernel,
freedreno, alex.williamson, mark.rutland, rjw, robdclark,
andy.gross, linux-pm, sboyd, tfiga, jcrouse, sricharan,
m.szyprowski, architt, linux-arm-msm
Hi Rob,
On 8/29/2018 2:04 AM, Rob Herring wrote:
> On Mon, Aug 27, 2018 at 04:25:50PM +0530, Vivek Gautam wrote:
>> Add bindings doc for Qcom's smmu-v2 implementation.
>>
>> Signed-off-by: Vivek Gautam <vivek.gautam@codeaurora.org>
>> Reviewed-by: Tomasz Figa <tfiga@chromium.org>
>> Tested-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
>> ---
>>
>> Changes since v14:
>> - This is a new patch added in v15 after noticing the new
>> checkpatch warning for separate dt-bindings doc.
>> - This patch also addresses comments given by Rob and Robin to add
>> a list of valid values of '<soc>' in "qcom,<soc>-smmu-v2"
>> compatible string.
>>
>> .../devicetree/bindings/iommu/arm,smmu.txt | 47 ++++++++++++++++++++++
>> 1 file changed, 47 insertions(+)
>>
>> diff --git a/Documentation/devicetree/bindings/iommu/arm,smmu.txt b/Documentation/devicetree/bindings/iommu/arm,smmu.txt
>> index 8a6ffce12af5..52198a539606 100644
>> --- a/Documentation/devicetree/bindings/iommu/arm,smmu.txt
>> +++ b/Documentation/devicetree/bindings/iommu/arm,smmu.txt
>> @@ -17,10 +17,24 @@ conditions.
>> "arm,mmu-401"
>> "arm,mmu-500"
>> "cavium,smmu-v2"
>> + "qcom,<soc>-smmu-v2", "qcom,smmu-v2"
> The v2 in the compatible string is kind of redundant unless the SoC has
> other SMMU types.
sdm845 has smmu-v2, and smmu-500 [1].
>>
>> depending on the particular implementation and/or the
>> version of the architecture implemented.
>>
>> + A number of Qcom SoCs use qcom,smmu-v2 version of the IP.
>> + "qcom,<soc>-smmu-v2" represents a soc specific compatible
>> + string that should be present along with the "qcom,smmu-v2"
>> + to facilitate SoC specific clocks/power connections and to
>> + address specific bug fixes.
>> + '<soc>' string in "qcom,<soc>-smmu-v2" should be one of the
>> + following:
>> + msm8996 - for msm8996 Qcom SoC.
>> + sdm845 - for sdm845 Qcom Soc.
> Rather than all this prose, it would be simpler to just add 2 lines with
> the full compatibles rather than <soc>. The <soc> thing is not going to
> work when/if we move bindings to json-schema also.
then we keep adding
"qcom,msm8996-smmu-v2", "qcom,smmu-v2"
"qcom,msm8998-smmu-v2", "qcom,smmu-v2"
"qcom,sdm845-smmu-v2", "qcom,smmu-v2",
and from [1]
"qcom,sdm845-smmu-500", "arm,mmu-500", etc.
for each SoCs?
>
>> +
>> + An example string would be -
>> + "qcom,msm8996-smmu-v2", "qcom,smmu-v2".
>> +
>> - reg : Base address and size of the SMMU.
>>
>> - #global-interrupts : The number of global interrupts exposed by the
>> @@ -71,6 +85,22 @@ conditions.
>> or using stream matching with #iommu-cells = <2>, and
>> may be ignored if present in such cases.
>>
>> +- clock-names: List of the names of clocks input to the device. The
>> + required list depends on particular implementation and
>> + is as follows:
>> + - for "qcom,smmu-v2":
>> + - "bus": clock required for downstream bus access and
>> + for the smmu ptw,
>> + - "iface": clock required to access smmu's registers
>> + through the TCU's programming interface.
>> + - unspecified for other implementations.
>> +
>> +- clocks: Specifiers for all clocks listed in the clock-names property,
>> + as per generic clock bindings.
>> +
>> +- power-domains: Specifiers for power domains required to be powered on for
>> + the SMMU to operate, as per generic power domain bindings.
>> +
>> ** Deprecated properties:
>>
>> - mmu-masters (deprecated in favour of the generic "iommus" binding) :
>> @@ -137,3 +167,20 @@ conditions.
>> iommu-map = <0 &smmu3 0 0x400>;
>> ...
>> };
>> +
>> + /* Qcom's arm,smmu-v2 implementation */
>> + smmu4: iommu {
> Needs a unit-address.
I went in symmetry with another example in this file for 'smmu1'. I will
add the address here.
And if you would like, I can squash a change for 'smmu1' too in this
patch, although that will be trivial.
[1] https://patchwork.kernel.org/patch/10565291/
Best regards
Vivek
[snip]
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [Patch v15 4/5] dt-bindings: arm-smmu: Add bindings for qcom,smmu-v2
2018-08-29 8:35 ` Vivek Gautam
@ 2018-08-29 11:23 ` Vivek Gautam
2018-08-30 0:43 ` Rob Herring
0 siblings, 1 reply; 14+ messages in thread
From: Vivek Gautam @ 2018-08-29 11:23 UTC (permalink / raw)
To: Rob Herring
Cc: Mark Rutland,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
alex.williamson, Rafael J. Wysocki, sboyd, freedreno, Linux PM,
Will Deacon, open list,
list@263.net:IOMMU DRIVERS
<iommu@lists.linux-foundation.org>,
Joerg Roedel <joro@8bytes.org>,,
linux-arm-msm, Andy Gross, Robin Murphy
On Wed, Aug 29, 2018 at 2:05 PM Vivek Gautam
<vivek.gautam@codeaurora.org> wrote:
>
> Hi Rob,
>
>
> On 8/29/2018 2:04 AM, Rob Herring wrote:
> > On Mon, Aug 27, 2018 at 04:25:50PM +0530, Vivek Gautam wrote:
> >> Add bindings doc for Qcom's smmu-v2 implementation.
> >>
> >> Signed-off-by: Vivek Gautam <vivek.gautam@codeaurora.org>
> >> Reviewed-by: Tomasz Figa <tfiga@chromium.org>
> >> Tested-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
> >> ---
> >>
> >> Changes since v14:
> >> - This is a new patch added in v15 after noticing the new
> >> checkpatch warning for separate dt-bindings doc.
> >> - This patch also addresses comments given by Rob and Robin to add
> >> a list of valid values of '<soc>' in "qcom,<soc>-smmu-v2"
> >> compatible string.
> >>
> >> .../devicetree/bindings/iommu/arm,smmu.txt | 47 ++++++++++++++++++++++
> >> 1 file changed, 47 insertions(+)
> >>
> >> diff --git a/Documentation/devicetree/bindings/iommu/arm,smmu.txt b/Documentation/devicetree/bindings/iommu/arm,smmu.txt
> >> index 8a6ffce12af5..52198a539606 100644
> >> --- a/Documentation/devicetree/bindings/iommu/arm,smmu.txt
> >> +++ b/Documentation/devicetree/bindings/iommu/arm,smmu.txt
> >> @@ -17,10 +17,24 @@ conditions.
> >> "arm,mmu-401"
> >> "arm,mmu-500"
> >> "cavium,smmu-v2"
> >> + "qcom,<soc>-smmu-v2", "qcom,smmu-v2"
> > The v2 in the compatible string is kind of redundant unless the SoC has
> > other SMMU types.
>
> sdm845 has smmu-v2, and smmu-500 [1].
>
> >>
> >> depending on the particular implementation and/or the
> >> version of the architecture implemented.
> >>
> >> + A number of Qcom SoCs use qcom,smmu-v2 version of the IP.
> >> + "qcom,<soc>-smmu-v2" represents a soc specific compatible
> >> + string that should be present along with the "qcom,smmu-v2"
> >> + to facilitate SoC specific clocks/power connections and to
> >> + address specific bug fixes.
> >> + '<soc>' string in "qcom,<soc>-smmu-v2" should be one of the
> >> + following:
> >> + msm8996 - for msm8996 Qcom SoC.
> >> + sdm845 - for sdm845 Qcom Soc.
> > Rather than all this prose, it would be simpler to just add 2 lines with
> > the full compatibles rather than <soc>. The <soc> thing is not going to
> > work when/if we move bindings to json-schema also.
>
> then we keep adding
> "qcom,msm8996-smmu-v2", "qcom,smmu-v2"
> "qcom,msm8998-smmu-v2", "qcom,smmu-v2"
> "qcom,sdm845-smmu-v2", "qcom,smmu-v2",
> and from [1]
> "qcom,sdm845-smmu-500", "arm,mmu-500", etc.
> for each SoCs?
How about following diff on top of this patch?
diff --git a/Documentation/devicetree/bindings/iommu/arm,smmu.txt
b/Documentation/devicetree/bindings/iommu/arm,smmu.txt
index 52198a539606..5e6c04876533 100644
--- a/Documentation/devicetree/bindings/iommu/arm,smmu.txt
+++ b/Documentation/devicetree/bindings/iommu/arm,smmu.txt
@@ -17,23 +17,18 @@ conditions.
"arm,mmu-401"
"arm,mmu-500"
"cavium,smmu-v2"
- "qcom,<soc>-smmu-v2", "qcom,smmu-v2"
+ "qcom,smmu-v2"
depending on the particular implementation and/or the
version of the architecture implemented.
- A number of Qcom SoCs use qcom,smmu-v2 version of the IP.
- "qcom,<soc>-smmu-v2" represents a soc specific compatible
- string that should be present along with the "qcom,smmu-v2"
- to facilitate SoC specific clocks/power connections and to
- address specific bug fixes.
- '<soc>' string in "qcom,<soc>-smmu-v2" should be one of the
- following:
- msm8996 - for msm8996 Qcom SoC.
- sdm845 - for sdm845 Qcom Soc.
-
- An example string would be -
- "qcom,msm8996-smmu-v2", "qcom,smmu-v2".
+ Qcom SoCs using qcom,smmu-v2 must have soc specific
+ compatible string attached to "qcom,smmu-v2" to take care
+ of SoC specific clocks/power connections and to address
+ specific bug fixes.
+ Precisely, it should be one of the following:
+ "qcom,msm8996-smmu-v2", "qcom,smmu-v2",
+ "qcom,sdm845-smmu-v2", "qcom,smmu-v2".
Thanks!
Best regards
Vivek
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [Patch v15 4/5] dt-bindings: arm-smmu: Add bindings for qcom,smmu-v2
2018-08-29 11:23 ` Vivek Gautam
@ 2018-08-30 0:43 ` Rob Herring
2018-08-31 9:51 ` Vivek Gautam
0 siblings, 1 reply; 14+ messages in thread
From: Rob Herring @ 2018-08-30 0:43 UTC (permalink / raw)
To: Vivek Gautam
Cc: Mark Rutland, devicetree, alex.williamson, Rafael J. Wysocki,
Stephen Boyd, freedreno, open list:THERMAL, Will Deacon,
linux-kernel, Linux IOMMU, linux-arm-msm, Andy Gross,
Robin Murphy
On Wed, Aug 29, 2018 at 6:23 AM Vivek Gautam
<vivek.gautam@codeaurora.org> wrote:
>
> On Wed, Aug 29, 2018 at 2:05 PM Vivek Gautam
> <vivek.gautam@codeaurora.org> wrote:
> >
> > Hi Rob,
> >
> >
> > On 8/29/2018 2:04 AM, Rob Herring wrote:
> > > On Mon, Aug 27, 2018 at 04:25:50PM +0530, Vivek Gautam wrote:
> > >> Add bindings doc for Qcom's smmu-v2 implementation.
> > >>
> > >> Signed-off-by: Vivek Gautam <vivek.gautam@codeaurora.org>
> > >> Reviewed-by: Tomasz Figa <tfiga@chromium.org>
> > >> Tested-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
> > >> ---
> > >>
> > >> Changes since v14:
> > >> - This is a new patch added in v15 after noticing the new
> > >> checkpatch warning for separate dt-bindings doc.
> > >> - This patch also addresses comments given by Rob and Robin to add
> > >> a list of valid values of '<soc>' in "qcom,<soc>-smmu-v2"
> > >> compatible string.
> > >>
> > >> .../devicetree/bindings/iommu/arm,smmu.txt | 47 ++++++++++++++++++++++
> > >> 1 file changed, 47 insertions(+)
> > >>
> > >> diff --git a/Documentation/devicetree/bindings/iommu/arm,smmu.txt b/Documentation/devicetree/bindings/iommu/arm,smmu.txt
> > >> index 8a6ffce12af5..52198a539606 100644
> > >> --- a/Documentation/devicetree/bindings/iommu/arm,smmu.txt
> > >> +++ b/Documentation/devicetree/bindings/iommu/arm,smmu.txt
> > >> @@ -17,10 +17,24 @@ conditions.
> > >> "arm,mmu-401"
> > >> "arm,mmu-500"
> > >> "cavium,smmu-v2"
> > >> + "qcom,<soc>-smmu-v2", "qcom,smmu-v2"
> > > The v2 in the compatible string is kind of redundant unless the SoC has
> > > other SMMU types.
> >
> > sdm845 has smmu-v2, and smmu-500 [1].
> >
> > >>
> > >> depending on the particular implementation and/or the
> > >> version of the architecture implemented.
> > >>
> > >> + A number of Qcom SoCs use qcom,smmu-v2 version of the IP.
> > >> + "qcom,<soc>-smmu-v2" represents a soc specific compatible
> > >> + string that should be present along with the "qcom,smmu-v2"
> > >> + to facilitate SoC specific clocks/power connections and to
> > >> + address specific bug fixes.
> > >> + '<soc>' string in "qcom,<soc>-smmu-v2" should be one of the
> > >> + following:
> > >> + msm8996 - for msm8996 Qcom SoC.
> > >> + sdm845 - for sdm845 Qcom Soc.
> > > Rather than all this prose, it would be simpler to just add 2 lines with
> > > the full compatibles rather than <soc>. The <soc> thing is not going to
> > > work when/if we move bindings to json-schema also.
> >
> > then we keep adding
> > "qcom,msm8996-smmu-v2", "qcom,smmu-v2"
> > "qcom,msm8998-smmu-v2", "qcom,smmu-v2"
> > "qcom,sdm845-smmu-v2", "qcom,smmu-v2",
> > and from [1]
> > "qcom,sdm845-smmu-500", "arm,mmu-500", etc.
> > for each SoCs?
>
> How about following diff on top of this patch?
>
> diff --git a/Documentation/devicetree/bindings/iommu/arm,smmu.txt
> b/Documentation/devicetree/bindings/iommu/arm,smmu.txt
> index 52198a539606..5e6c04876533 100644
> --- a/Documentation/devicetree/bindings/iommu/arm,smmu.txt
> +++ b/Documentation/devicetree/bindings/iommu/arm,smmu.txt
> @@ -17,23 +17,18 @@ conditions.
> "arm,mmu-401"
> "arm,mmu-500"
> "cavium,smmu-v2"
> - "qcom,<soc>-smmu-v2", "qcom,smmu-v2"
> + "qcom,smmu-v2"
>
> depending on the particular implementation and/or the
> version of the architecture implemented.
>
> - A number of Qcom SoCs use qcom,smmu-v2 version of the IP.
> - "qcom,<soc>-smmu-v2" represents a soc specific compatible
> - string that should be present along with the "qcom,smmu-v2"
> - to facilitate SoC specific clocks/power connections and to
> - address specific bug fixes.
> - '<soc>' string in "qcom,<soc>-smmu-v2" should be one of the
> - following:
> - msm8996 - for msm8996 Qcom SoC.
> - sdm845 - for sdm845 Qcom Soc.
> -
> - An example string would be -
> - "qcom,msm8996-smmu-v2", "qcom,smmu-v2".
> + Qcom SoCs using qcom,smmu-v2 must have soc specific
> + compatible string attached to "qcom,smmu-v2" to take care
> + of SoC specific clocks/power connections and to address
> + specific bug fixes.
> + Precisely, it should be one of the following:
> + "qcom,msm8996-smmu-v2", "qcom,smmu-v2",
> + "qcom,sdm845-smmu-v2", "qcom,smmu-v2".
We don't need an explanation of why we need specific compatibles in
each binding document (though maybe we need a better explanation
somewhere). We just need to know what are valid values for compatibles
and this includes any combinations. Generally, this is just a list of
combinations.
The Renesas folks have figured out how to do this and they have lots
of SoCs. Yes, it makes for a lot of patches, but they are all mostly 1
liners and are dead simple to review. With QCom, I'm tired of having
the same damn discussion with every new binding.
Rob
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [Patch v15 4/5] dt-bindings: arm-smmu: Add bindings for qcom,smmu-v2
2018-08-30 0:43 ` Rob Herring
@ 2018-08-31 9:51 ` Vivek Gautam
0 siblings, 0 replies; 14+ messages in thread
From: Vivek Gautam @ 2018-08-31 9:51 UTC (permalink / raw)
To: Rob Herring
Cc: Mark Rutland, devicetree, alex.williamson, Rafael J. Wysocki,
Stephen Boyd, freedreno, open list:THERMAL, Will Deacon,
linux-kernel, Linux IOMMU, linux-arm-msm, Andy Gross,
Robin Murphy
Hi Rob,
On 8/30/2018 6:13 AM, Rob Herring wrote:
> On Wed, Aug 29, 2018 at 6:23 AM Vivek Gautam
> <vivek.gautam@codeaurora.org> wrote:
>> On Wed, Aug 29, 2018 at 2:05 PM Vivek Gautam
>> <vivek.gautam@codeaurora.org> wrote:
>>> Hi Rob,
>>>
>>>
>>> On 8/29/2018 2:04 AM, Rob Herring wrote:
>>>> On Mon, Aug 27, 2018 at 04:25:50PM +0530, Vivek Gautam wrote:
>>>>> Add bindings doc for Qcom's smmu-v2 implementation.
>>>>>
>>>>> Signed-off-by: Vivek Gautam <vivek.gautam@codeaurora.org>
>>>>> Reviewed-by: Tomasz Figa <tfiga@chromium.org>
>>>>> Tested-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
>>>>> ---
>>>>>
>>>>> Changes since v14:
>>>>> - This is a new patch added in v15 after noticing the new
>>>>> checkpatch warning for separate dt-bindings doc.
>>>>> - This patch also addresses comments given by Rob and Robin to add
>>>>> a list of valid values of '<soc>' in "qcom,<soc>-smmu-v2"
>>>>> compatible string.
>>>>>
>>>>> .../devicetree/bindings/iommu/arm,smmu.txt | 47 ++++++++++++++++++++++
>>>>> 1 file changed, 47 insertions(+)
>>>>>
>>>>> diff --git a/Documentation/devicetree/bindings/iommu/arm,smmu.txt b/Documentation/devicetree/bindings/iommu/arm,smmu.txt
>>>>> index 8a6ffce12af5..52198a539606 100644
>>>>> --- a/Documentation/devicetree/bindings/iommu/arm,smmu.txt
>>>>> +++ b/Documentation/devicetree/bindings/iommu/arm,smmu.txt
>>>>> @@ -17,10 +17,24 @@ conditions.
>>>>> "arm,mmu-401"
>>>>> "arm,mmu-500"
>>>>> "cavium,smmu-v2"
>>>>> + "qcom,<soc>-smmu-v2", "qcom,smmu-v2"
>>>> The v2 in the compatible string is kind of redundant unless the SoC has
>>>> other SMMU types.
>>> sdm845 has smmu-v2, and smmu-500 [1].
>>>
>>>>> depending on the particular implementation and/or the
>>>>> version of the architecture implemented.
>>>>>
>>>>> + A number of Qcom SoCs use qcom,smmu-v2 version of the IP.
>>>>> + "qcom,<soc>-smmu-v2" represents a soc specific compatible
>>>>> + string that should be present along with the "qcom,smmu-v2"
>>>>> + to facilitate SoC specific clocks/power connections and to
>>>>> + address specific bug fixes.
>>>>> + '<soc>' string in "qcom,<soc>-smmu-v2" should be one of the
>>>>> + following:
>>>>> + msm8996 - for msm8996 Qcom SoC.
>>>>> + sdm845 - for sdm845 Qcom Soc.
>>>> Rather than all this prose, it would be simpler to just add 2 lines with
>>>> the full compatibles rather than <soc>. The <soc> thing is not going to
>>>> work when/if we move bindings to json-schema also.
>>> then we keep adding
>>> "qcom,msm8996-smmu-v2", "qcom,smmu-v2"
>>> "qcom,msm8998-smmu-v2", "qcom,smmu-v2"
>>> "qcom,sdm845-smmu-v2", "qcom,smmu-v2",
>>> and from [1]
>>> "qcom,sdm845-smmu-500", "arm,mmu-500", etc.
>>> for each SoCs?
>> How about following diff on top of this patch?
>>
>> diff --git a/Documentation/devicetree/bindings/iommu/arm,smmu.txt
>> b/Documentation/devicetree/bindings/iommu/arm,smmu.txt
>> index 52198a539606..5e6c04876533 100644
>> --- a/Documentation/devicetree/bindings/iommu/arm,smmu.txt
>> +++ b/Documentation/devicetree/bindings/iommu/arm,smmu.txt
>> @@ -17,23 +17,18 @@ conditions.
>> "arm,mmu-401"
>> "arm,mmu-500"
>> "cavium,smmu-v2"
>> - "qcom,<soc>-smmu-v2", "qcom,smmu-v2"
>> + "qcom,smmu-v2"
>>
>> depending on the particular implementation and/or the
>> version of the architecture implemented.
>>
>> - A number of Qcom SoCs use qcom,smmu-v2 version of the IP.
>> - "qcom,<soc>-smmu-v2" represents a soc specific compatible
>> - string that should be present along with the "qcom,smmu-v2"
>> - to facilitate SoC specific clocks/power connections and to
>> - address specific bug fixes.
>> - '<soc>' string in "qcom,<soc>-smmu-v2" should be one of the
>> - following:
>> - msm8996 - for msm8996 Qcom SoC.
>> - sdm845 - for sdm845 Qcom Soc.
>> -
>> - An example string would be -
>> - "qcom,msm8996-smmu-v2", "qcom,smmu-v2".
>> + Qcom SoCs using qcom,smmu-v2 must have soc specific
>> + compatible string attached to "qcom,smmu-v2" to take care
>> + of SoC specific clocks/power connections and to address
>> + specific bug fixes.
>> + Precisely, it should be one of the following:
>> + "qcom,msm8996-smmu-v2", "qcom,smmu-v2",
>> + "qcom,sdm845-smmu-v2", "qcom,smmu-v2".
> We don't need an explanation of why we need specific compatibles in
> each binding document (though maybe we need a better explanation
> somewhere). We just need to know what are valid values for compatibles
> and this includes any combinations. Generally, this is just a list of
> combinations.
[snip]
Fixed this in v16. Thanks.
Best regards
Vivek
^ permalink raw reply [flat|nested] 14+ messages in thread
* [Patch v15 5/5] iommu/arm-smmu: Add support for qcom,smmu-v2 variant
2018-08-27 10:55 [Patch v15 0/5] iommu/arm-smmu: Add runtime pm/sleep support Vivek Gautam
` (3 preceding siblings ...)
2018-08-27 10:55 ` [Patch v15 4/5] dt-bindings: arm-smmu: Add bindings for qcom,smmu-v2 Vivek Gautam
@ 2018-08-27 10:55 ` Vivek Gautam
4 siblings, 0 replies; 14+ messages in thread
From: Vivek Gautam @ 2018-08-27 10:55 UTC (permalink / raw)
To: joro, robh+dt, robin.murphy, will.deacon, iommu, devicetree,
linux-kernel, freedreno
Cc: alex.williamson, mark.rutland, rjw, robdclark, andy.gross,
linux-pm, sboyd, tfiga, jcrouse, sricharan, m.szyprowski,
architt, linux-arm-msm, Vivek Gautam
qcom,smmu-v2 is an arm,smmu-v2 implementation with specific
clock and power requirements.
On msm8996, multiple cores, viz. mdss, video, etc. use this
smmu. On sdm845, this smmu is used with gpu.
Add bindings for the same.
Signed-off-by: Vivek Gautam <vivek.gautam@codeaurora.org>
Reviewed-by: Rob Herring <robh@kernel.org>
Reviewed-by: Tomasz Figa <tfiga@chromium.org>
Tested-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
---
Changes since v14:
- Moved out dt-bindings change to separate patch.
drivers/iommu/arm-smmu.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index b5e7f72d418c..c0177ea32678 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -119,6 +119,7 @@ enum arm_smmu_implementation {
GENERIC_SMMU,
ARM_MMU500,
CAVIUM_SMMUV2,
+ QCOM_SMMUV2,
};
struct arm_smmu_s2cr {
@@ -1970,6 +1971,17 @@ ARM_SMMU_MATCH_DATA(arm_mmu401, ARM_SMMU_V1_64K, GENERIC_SMMU);
ARM_SMMU_MATCH_DATA(arm_mmu500, ARM_SMMU_V2, ARM_MMU500);
ARM_SMMU_MATCH_DATA(cavium_smmuv2, ARM_SMMU_V2, CAVIUM_SMMUV2);
+static const char * const qcom_smmuv2_clks[] = {
+ "bus", "iface",
+};
+
+static const struct arm_smmu_match_data qcom_smmuv2 = {
+ .version = ARM_SMMU_V2,
+ .model = QCOM_SMMUV2,
+ .clks = qcom_smmuv2_clks,
+ .num_clks = ARRAY_SIZE(qcom_smmuv2_clks),
+};
+
static const struct of_device_id arm_smmu_of_match[] = {
{ .compatible = "arm,smmu-v1", .data = &smmu_generic_v1 },
{ .compatible = "arm,smmu-v2", .data = &smmu_generic_v2 },
@@ -1977,6 +1989,7 @@ static const struct of_device_id arm_smmu_of_match[] = {
{ .compatible = "arm,mmu-401", .data = &arm_mmu401 },
{ .compatible = "arm,mmu-500", .data = &arm_mmu500 },
{ .compatible = "cavium,smmu-v2", .data = &cavium_smmuv2 },
+ { .compatible = "qcom,smmu-v2", .data = &qcom_smmuv2 },
{ },
};
MODULE_DEVICE_TABLE(of, arm_smmu_of_match);
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
^ permalink raw reply related [flat|nested] 14+ messages in thread