| Message ID | 1557226378-10131-17-git-send-email-suzuki.poulose@arm.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | coresight: Support for ACPI bindings | expand |
On Tue, May 07, 2019 at 11:52:43AM +0100, Suzuki K Poulose wrote: > So far we have hard coded the DT platform parsing code in > every driver. Introduce generic helper to parse the information > provided by the firmware in a platform agnostic manner, in preparation > for the ACPI support. > > Cc: Mathieu Poirier <mathieu.poirier@linaro.org> > Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com> > --- > Changes since v2: > - Use int error code for of_get_coresight_platform_data() [Mathieu] > --- > drivers/hwtracing/coresight/coresight-catu.c | 13 ++--- > drivers/hwtracing/coresight/coresight-etb10.c | 11 ++-- > drivers/hwtracing/coresight/coresight-etm3x.c | 12 ++--- > drivers/hwtracing/coresight/coresight-etm4x.c | 11 ++-- > drivers/hwtracing/coresight/coresight-funnel.c | 11 ++-- > drivers/hwtracing/coresight/coresight-platform.c | 58 ++++++++++++++++------ > drivers/hwtracing/coresight/coresight-replicator.c | 11 ++-- > drivers/hwtracing/coresight/coresight-stm.c | 11 ++-- > drivers/hwtracing/coresight/coresight-tmc.c | 13 ++--- > drivers/hwtracing/coresight/coresight-tpiu.c | 11 ++-- > include/linux/coresight.h | 7 +-- > 11 files changed, 83 insertions(+), 86 deletions(-) > > diff --git a/drivers/hwtracing/coresight/coresight-catu.c b/drivers/hwtracing/coresight/coresight-catu.c > index 63109c9..799ba1d 100644 > --- a/drivers/hwtracing/coresight/coresight-catu.c > +++ b/drivers/hwtracing/coresight/coresight-catu.c > @@ -503,17 +503,14 @@ static int catu_probe(struct amba_device *adev, const struct amba_id *id) > struct coresight_desc catu_desc; > struct coresight_platform_data *pdata = NULL; > struct device *dev = &adev->dev; > - struct device_node *np = dev->of_node; > void __iomem *base; > > - if (np) { > - pdata = of_get_coresight_platform_data(dev, np); > - if (IS_ERR(pdata)) { > - ret = PTR_ERR(pdata); > - goto out; > - } > - dev->platform_data = pdata; > + pdata = coresight_get_platform_data(dev); > + if (IS_ERR(pdata)) { > + ret = PTR_ERR(pdata); > + goto out; > } > + dev->platform_data = pdata; > > drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL); > if (!drvdata) { > diff --git a/drivers/hwtracing/coresight/coresight-etb10.c b/drivers/hwtracing/coresight/coresight-etb10.c > index 3b333fb..612f1e9 100644 > --- a/drivers/hwtracing/coresight/coresight-etb10.c > +++ b/drivers/hwtracing/coresight/coresight-etb10.c > @@ -725,14 +725,11 @@ static int etb_probe(struct amba_device *adev, const struct amba_id *id) > struct etb_drvdata *drvdata; > struct resource *res = &adev->res; > struct coresight_desc desc = { 0 }; > - struct device_node *np = adev->dev.of_node; > > - if (np) { > - pdata = of_get_coresight_platform_data(dev, np); > - if (IS_ERR(pdata)) > - return PTR_ERR(pdata); > - adev->dev.platform_data = pdata; > - } > + pdata = coresight_get_platform_data(dev); > + if (IS_ERR(pdata)) > + return PTR_ERR(pdata); > + adev->dev.platform_data = pdata; > > drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL); > if (!drvdata) > diff --git a/drivers/hwtracing/coresight/coresight-etm3x.c b/drivers/hwtracing/coresight/coresight-etm3x.c > index fa2f141..fa2164f 100644 > --- a/drivers/hwtracing/coresight/coresight-etm3x.c > +++ b/drivers/hwtracing/coresight/coresight-etm3x.c > @@ -790,20 +790,16 @@ static int etm_probe(struct amba_device *adev, const struct amba_id *id) > struct etm_drvdata *drvdata; > struct resource *res = &adev->res; > struct coresight_desc desc = { 0 }; > - struct device_node *np = adev->dev.of_node; > > drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL); > if (!drvdata) > return -ENOMEM; > > - if (np) { > - pdata = of_get_coresight_platform_data(dev, np); > - if (IS_ERR(pdata)) > - return PTR_ERR(pdata); > - > - adev->dev.platform_data = pdata; > - } > + pdata = coresight_get_platform_data(dev); > + if (IS_ERR(pdata)) > + return PTR_ERR(pdata); > > + adev->dev.platform_data = pdata; > drvdata->use_cp14 = fwnode_property_read_bool(dev->fwnode, "arm,cp14"); > dev_set_drvdata(dev, drvdata); > > diff --git a/drivers/hwtracing/coresight/coresight-etm4x.c b/drivers/hwtracing/coresight/coresight-etm4x.c > index 77d1d83..4355b2e 100644 > --- a/drivers/hwtracing/coresight/coresight-etm4x.c > +++ b/drivers/hwtracing/coresight/coresight-etm4x.c > @@ -1084,18 +1084,15 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id) > struct etmv4_drvdata *drvdata; > struct resource *res = &adev->res; > struct coresight_desc desc = { 0 }; > - struct device_node *np = adev->dev.of_node; > > drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL); > if (!drvdata) > return -ENOMEM; > > - if (np) { > - pdata = of_get_coresight_platform_data(dev, np); > - if (IS_ERR(pdata)) > - return PTR_ERR(pdata); > - adev->dev.platform_data = pdata; > - } > + pdata = coresight_get_platform_data(dev); > + if (IS_ERR(pdata)) > + return PTR_ERR(pdata); > + adev->dev.platform_data = pdata; > > dev_set_drvdata(dev, drvdata); > > diff --git a/drivers/hwtracing/coresight/coresight-funnel.c b/drivers/hwtracing/coresight/coresight-funnel.c > index 3423042..fc033fd 100644 > --- a/drivers/hwtracing/coresight/coresight-funnel.c > +++ b/drivers/hwtracing/coresight/coresight-funnel.c > @@ -187,14 +187,11 @@ static int funnel_probe(struct device *dev, struct resource *res) > struct coresight_platform_data *pdata = NULL; > struct funnel_drvdata *drvdata; > struct coresight_desc desc = { 0 }; > - struct device_node *np = dev->of_node; > > - if (np) { > - pdata = of_get_coresight_platform_data(dev, np); > - if (IS_ERR(pdata)) > - return PTR_ERR(pdata); > - dev->platform_data = pdata; > - } > + pdata = coresight_get_platform_data(dev); > + if (IS_ERR(pdata)) > + return PTR_ERR(pdata); > + dev->platform_data = pdata; > > if (is_of_node(dev_fwnode(dev)) && > of_device_is_compatible(dev->of_node, "arm,coresight-funnel")) > diff --git a/drivers/hwtracing/coresight/coresight-platform.c b/drivers/hwtracing/coresight/coresight-platform.c > index 4c31299..5d78f4f 100644 > --- a/drivers/hwtracing/coresight/coresight-platform.c > +++ b/drivers/hwtracing/coresight/coresight-platform.c > @@ -230,23 +230,16 @@ static int of_coresight_parse_endpoint(struct device *dev, > return ret; > } > > -struct coresight_platform_data * > -of_get_coresight_platform_data(struct device *dev, > - const struct device_node *node) > +static int of_get_coresight_platform_data(struct device *dev, > + struct coresight_platform_data *pdata) > { > int ret = 0; > - struct coresight_platform_data *pdata; > struct coresight_connection *conn; > struct device_node *ep = NULL; > const struct device_node *parent = NULL; > bool legacy_binding = false; > + struct device_node *node = dev->of_node; > > - pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL); > - if (!pdata) > - return ERR_PTR(-ENOMEM); > - > - /* Use device name as sysfs handle */ > - pdata->name = dev_name(dev); > pdata->cpu = of_coresight_get_cpu(node); > > /* Get the number of input and output port for this component */ > @@ -254,11 +247,11 @@ of_get_coresight_platform_data(struct device *dev, > > /* If there are no output connections, we are done */ > if (!pdata->nr_outport) > - return pdata; > + return 0; > > ret = coresight_alloc_conns(dev, pdata); > if (ret) > - return ERR_PTR(ret); > + return ret; > > parent = of_coresight_get_output_ports_node(node); > /* > @@ -292,11 +285,46 @@ of_get_coresight_platform_data(struct device *dev, > case 0: > break; > default: > - return ERR_PTR(ret); > + return ret; > } > } > > - return pdata; > + return 0; > +} > +#else > +static inline int > +of_get_coresight_platform_data(struct device *dev, > + struct coresight_platform_data *pdata) > +{ > + return -ENOENT; > } > -EXPORT_SYMBOL_GPL(of_get_coresight_platform_data); > #endif > + > +struct coresight_platform_data * > +coresight_get_platform_data(struct device *dev) > +{ > + int ret = -ENOENT; > + struct coresight_platform_data *pdata; > + struct fwnode_handle *fwnode = dev_fwnode(dev); > + > + if (IS_ERR_OR_NULL(fwnode)) > + goto error; > + > + pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL); > + if (!pdata) { > + ret = -ENOMEM; > + goto error; > + } > + > + /* Use device name as sysfs handle */ > + pdata->name = dev_name(dev); > + > + if (is_of_node(fwnode)) > + ret = of_get_coresight_platform_data(dev, pdata); > + > + if (!ret) > + return pdata; > +error: > + return ERR_PTR(ret); > +} > +EXPORT_SYMBOL_GPL(coresight_get_platform_data); > diff --git a/drivers/hwtracing/coresight/coresight-replicator.c b/drivers/hwtracing/coresight/coresight-replicator.c > index 7e05145..054b335 100644 > --- a/drivers/hwtracing/coresight/coresight-replicator.c > +++ b/drivers/hwtracing/coresight/coresight-replicator.c > @@ -177,15 +177,12 @@ static int replicator_probe(struct device *dev, struct resource *res) > struct coresight_platform_data *pdata = NULL; > struct replicator_drvdata *drvdata; > struct coresight_desc desc = { 0 }; > - struct device_node *np = dev->of_node; > void __iomem *base; > > - if (np) { > - pdata = of_get_coresight_platform_data(dev, np); > - if (IS_ERR(pdata)) > - return PTR_ERR(pdata); > - dev->platform_data = pdata; > - } > + pdata = coresight_get_platform_data(dev); > + if (IS_ERR(pdata)) > + return PTR_ERR(pdata); > + dev->platform_data = pdata; > > if (is_of_node(dev_fwnode(dev)) && > of_device_is_compatible(dev->of_node, "arm,coresight-replicator")) > diff --git a/drivers/hwtracing/coresight/coresight-stm.c b/drivers/hwtracing/coresight/coresight-stm.c > index 3992a35..9faa1ed 100644 > --- a/drivers/hwtracing/coresight/coresight-stm.c > +++ b/drivers/hwtracing/coresight/coresight-stm.c > @@ -809,14 +809,11 @@ static int stm_probe(struct amba_device *adev, const struct amba_id *id) > struct resource ch_res; > size_t bitmap_size; > struct coresight_desc desc = { 0 }; > - struct device_node *np = adev->dev.of_node; > > - if (np) { > - pdata = of_get_coresight_platform_data(dev, np); > - if (IS_ERR(pdata)) > - return PTR_ERR(pdata); > - adev->dev.platform_data = pdata; > - } > + pdata = coresight_get_platform_data(dev); > + if (IS_ERR(pdata)) > + return PTR_ERR(pdata); > + adev->dev.platform_data = pdata; > drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL); > if (!drvdata) > return -ENOMEM; > diff --git a/drivers/hwtracing/coresight/coresight-tmc.c b/drivers/hwtracing/coresight/coresight-tmc.c > index 9c5e615..be0bd98 100644 > --- a/drivers/hwtracing/coresight/coresight-tmc.c > +++ b/drivers/hwtracing/coresight/coresight-tmc.c > @@ -397,16 +397,13 @@ static int tmc_probe(struct amba_device *adev, const struct amba_id *id) > struct tmc_drvdata *drvdata; > struct resource *res = &adev->res; > struct coresight_desc desc = { 0 }; > - struct device_node *np = adev->dev.of_node; > > - if (np) { > - pdata = of_get_coresight_platform_data(dev, np); > - if (IS_ERR(pdata)) { > - ret = PTR_ERR(pdata); > - goto out; > - } > - adev->dev.platform_data = pdata; > + pdata = coresight_get_platform_data(dev); > + if (IS_ERR(pdata)) { > + ret = PTR_ERR(pdata); > + goto out; > } > + adev->dev.platform_data = pdata; > > ret = -ENOMEM; > drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL); > diff --git a/drivers/hwtracing/coresight/coresight-tpiu.c b/drivers/hwtracing/coresight/coresight-tpiu.c > index 4dd3e7f..aec0ed7 100644 > --- a/drivers/hwtracing/coresight/coresight-tpiu.c > +++ b/drivers/hwtracing/coresight/coresight-tpiu.c > @@ -124,14 +124,11 @@ static int tpiu_probe(struct amba_device *adev, const struct amba_id *id) > struct tpiu_drvdata *drvdata; > struct resource *res = &adev->res; > struct coresight_desc desc = { 0 }; > - struct device_node *np = adev->dev.of_node; > > - if (np) { > - pdata = of_get_coresight_platform_data(dev, np); > - if (IS_ERR(pdata)) > - return PTR_ERR(pdata); > - adev->dev.platform_data = pdata; > - } > + pdata = coresight_get_platform_data(dev); > + if (IS_ERR(pdata)) > + return PTR_ERR(pdata); > + dev->platform_data = pdata; > > drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL); > if (!drvdata) > diff --git a/include/linux/coresight.h b/include/linux/coresight.h > index 62a520d..e2b95e0 100644 > --- a/include/linux/coresight.h > +++ b/include/linux/coresight.h > @@ -294,14 +294,11 @@ static inline void coresight_disclaim_device_unlocked(void __iomem *base) {} > > #ifdef CONFIG_OF > extern int of_coresight_get_cpu(const struct device_node *node); > -extern struct coresight_platform_data * > -of_get_coresight_platform_data(struct device *dev, > - const struct device_node *node); > #else > static inline int of_coresight_get_cpu(const struct device_node *node) > { return 0; } > -static inline struct coresight_platform_data *of_get_coresight_platform_data( > - struct device *dev, const struct device_node *node) { return NULL; } > #endif > > +struct coresight_platform_data *coresight_get_platform_data(struct device *dev); > + > #endif Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org> > -- > 2.7.4 >
diff --git a/drivers/hwtracing/coresight/coresight-catu.c b/drivers/hwtracing/coresight/coresight-catu.c index 63109c9..799ba1d 100644 --- a/drivers/hwtracing/coresight/coresight-catu.c +++ b/drivers/hwtracing/coresight/coresight-catu.c @@ -503,17 +503,14 @@ static int catu_probe(struct amba_device *adev, const struct amba_id *id) struct coresight_desc catu_desc; struct coresight_platform_data *pdata = NULL; struct device *dev = &adev->dev; - struct device_node *np = dev->of_node; void __iomem *base; - if (np) { - pdata = of_get_coresight_platform_data(dev, np); - if (IS_ERR(pdata)) { - ret = PTR_ERR(pdata); - goto out; - } - dev->platform_data = pdata; + pdata = coresight_get_platform_data(dev); + if (IS_ERR(pdata)) { + ret = PTR_ERR(pdata); + goto out; } + dev->platform_data = pdata; drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL); if (!drvdata) { diff --git a/drivers/hwtracing/coresight/coresight-etb10.c b/drivers/hwtracing/coresight/coresight-etb10.c index 3b333fb..612f1e9 100644 --- a/drivers/hwtracing/coresight/coresight-etb10.c +++ b/drivers/hwtracing/coresight/coresight-etb10.c @@ -725,14 +725,11 @@ static int etb_probe(struct amba_device *adev, const struct amba_id *id) struct etb_drvdata *drvdata; struct resource *res = &adev->res; struct coresight_desc desc = { 0 }; - struct device_node *np = adev->dev.of_node; - if (np) { - pdata = of_get_coresight_platform_data(dev, np); - if (IS_ERR(pdata)) - return PTR_ERR(pdata); - adev->dev.platform_data = pdata; - } + pdata = coresight_get_platform_data(dev); + if (IS_ERR(pdata)) + return PTR_ERR(pdata); + adev->dev.platform_data = pdata; drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL); if (!drvdata) diff --git a/drivers/hwtracing/coresight/coresight-etm3x.c b/drivers/hwtracing/coresight/coresight-etm3x.c index fa2f141..fa2164f 100644 --- a/drivers/hwtracing/coresight/coresight-etm3x.c +++ b/drivers/hwtracing/coresight/coresight-etm3x.c @@ -790,20 +790,16 @@ static int etm_probe(struct amba_device *adev, const struct amba_id *id) struct etm_drvdata *drvdata; struct resource *res = &adev->res; struct coresight_desc desc = { 0 }; - struct device_node *np = adev->dev.of_node; drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL); if (!drvdata) return -ENOMEM; - if (np) { - pdata = of_get_coresight_platform_data(dev, np); - if (IS_ERR(pdata)) - return PTR_ERR(pdata); - - adev->dev.platform_data = pdata; - } + pdata = coresight_get_platform_data(dev); + if (IS_ERR(pdata)) + return PTR_ERR(pdata); + adev->dev.platform_data = pdata; drvdata->use_cp14 = fwnode_property_read_bool(dev->fwnode, "arm,cp14"); dev_set_drvdata(dev, drvdata); diff --git a/drivers/hwtracing/coresight/coresight-etm4x.c b/drivers/hwtracing/coresight/coresight-etm4x.c index 77d1d83..4355b2e 100644 --- a/drivers/hwtracing/coresight/coresight-etm4x.c +++ b/drivers/hwtracing/coresight/coresight-etm4x.c @@ -1084,18 +1084,15 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id) struct etmv4_drvdata *drvdata; struct resource *res = &adev->res; struct coresight_desc desc = { 0 }; - struct device_node *np = adev->dev.of_node; drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL); if (!drvdata) return -ENOMEM; - if (np) { - pdata = of_get_coresight_platform_data(dev, np); - if (IS_ERR(pdata)) - return PTR_ERR(pdata); - adev->dev.platform_data = pdata; - } + pdata = coresight_get_platform_data(dev); + if (IS_ERR(pdata)) + return PTR_ERR(pdata); + adev->dev.platform_data = pdata; dev_set_drvdata(dev, drvdata); diff --git a/drivers/hwtracing/coresight/coresight-funnel.c b/drivers/hwtracing/coresight/coresight-funnel.c index 3423042..fc033fd 100644 --- a/drivers/hwtracing/coresight/coresight-funnel.c +++ b/drivers/hwtracing/coresight/coresight-funnel.c @@ -187,14 +187,11 @@ static int funnel_probe(struct device *dev, struct resource *res) struct coresight_platform_data *pdata = NULL; struct funnel_drvdata *drvdata; struct coresight_desc desc = { 0 }; - struct device_node *np = dev->of_node; - if (np) { - pdata = of_get_coresight_platform_data(dev, np); - if (IS_ERR(pdata)) - return PTR_ERR(pdata); - dev->platform_data = pdata; - } + pdata = coresight_get_platform_data(dev); + if (IS_ERR(pdata)) + return PTR_ERR(pdata); + dev->platform_data = pdata; if (is_of_node(dev_fwnode(dev)) && of_device_is_compatible(dev->of_node, "arm,coresight-funnel")) diff --git a/drivers/hwtracing/coresight/coresight-platform.c b/drivers/hwtracing/coresight/coresight-platform.c index 4c31299..5d78f4f 100644 --- a/drivers/hwtracing/coresight/coresight-platform.c +++ b/drivers/hwtracing/coresight/coresight-platform.c @@ -230,23 +230,16 @@ static int of_coresight_parse_endpoint(struct device *dev, return ret; } -struct coresight_platform_data * -of_get_coresight_platform_data(struct device *dev, - const struct device_node *node) +static int of_get_coresight_platform_data(struct device *dev, + struct coresight_platform_data *pdata) { int ret = 0; - struct coresight_platform_data *pdata; struct coresight_connection *conn; struct device_node *ep = NULL; const struct device_node *parent = NULL; bool legacy_binding = false; + struct device_node *node = dev->of_node; - pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL); - if (!pdata) - return ERR_PTR(-ENOMEM); - - /* Use device name as sysfs handle */ - pdata->name = dev_name(dev); pdata->cpu = of_coresight_get_cpu(node); /* Get the number of input and output port for this component */ @@ -254,11 +247,11 @@ of_get_coresight_platform_data(struct device *dev, /* If there are no output connections, we are done */ if (!pdata->nr_outport) - return pdata; + return 0; ret = coresight_alloc_conns(dev, pdata); if (ret) - return ERR_PTR(ret); + return ret; parent = of_coresight_get_output_ports_node(node); /* @@ -292,11 +285,46 @@ of_get_coresight_platform_data(struct device *dev, case 0: break; default: - return ERR_PTR(ret); + return ret; } } - return pdata; + return 0; +} +#else +static inline int +of_get_coresight_platform_data(struct device *dev, + struct coresight_platform_data *pdata) +{ + return -ENOENT; } -EXPORT_SYMBOL_GPL(of_get_coresight_platform_data); #endif + +struct coresight_platform_data * +coresight_get_platform_data(struct device *dev) +{ + int ret = -ENOENT; + struct coresight_platform_data *pdata; + struct fwnode_handle *fwnode = dev_fwnode(dev); + + if (IS_ERR_OR_NULL(fwnode)) + goto error; + + pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL); + if (!pdata) { + ret = -ENOMEM; + goto error; + } + + /* Use device name as sysfs handle */ + pdata->name = dev_name(dev); + + if (is_of_node(fwnode)) + ret = of_get_coresight_platform_data(dev, pdata); + + if (!ret) + return pdata; +error: + return ERR_PTR(ret); +} +EXPORT_SYMBOL_GPL(coresight_get_platform_data); diff --git a/drivers/hwtracing/coresight/coresight-replicator.c b/drivers/hwtracing/coresight/coresight-replicator.c index 7e05145..054b335 100644 --- a/drivers/hwtracing/coresight/coresight-replicator.c +++ b/drivers/hwtracing/coresight/coresight-replicator.c @@ -177,15 +177,12 @@ static int replicator_probe(struct device *dev, struct resource *res) struct coresight_platform_data *pdata = NULL; struct replicator_drvdata *drvdata; struct coresight_desc desc = { 0 }; - struct device_node *np = dev->of_node; void __iomem *base; - if (np) { - pdata = of_get_coresight_platform_data(dev, np); - if (IS_ERR(pdata)) - return PTR_ERR(pdata); - dev->platform_data = pdata; - } + pdata = coresight_get_platform_data(dev); + if (IS_ERR(pdata)) + return PTR_ERR(pdata); + dev->platform_data = pdata; if (is_of_node(dev_fwnode(dev)) && of_device_is_compatible(dev->of_node, "arm,coresight-replicator")) diff --git a/drivers/hwtracing/coresight/coresight-stm.c b/drivers/hwtracing/coresight/coresight-stm.c index 3992a35..9faa1ed 100644 --- a/drivers/hwtracing/coresight/coresight-stm.c +++ b/drivers/hwtracing/coresight/coresight-stm.c @@ -809,14 +809,11 @@ static int stm_probe(struct amba_device *adev, const struct amba_id *id) struct resource ch_res; size_t bitmap_size; struct coresight_desc desc = { 0 }; - struct device_node *np = adev->dev.of_node; - if (np) { - pdata = of_get_coresight_platform_data(dev, np); - if (IS_ERR(pdata)) - return PTR_ERR(pdata); - adev->dev.platform_data = pdata; - } + pdata = coresight_get_platform_data(dev); + if (IS_ERR(pdata)) + return PTR_ERR(pdata); + adev->dev.platform_data = pdata; drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL); if (!drvdata) return -ENOMEM; diff --git a/drivers/hwtracing/coresight/coresight-tmc.c b/drivers/hwtracing/coresight/coresight-tmc.c index 9c5e615..be0bd98 100644 --- a/drivers/hwtracing/coresight/coresight-tmc.c +++ b/drivers/hwtracing/coresight/coresight-tmc.c @@ -397,16 +397,13 @@ static int tmc_probe(struct amba_device *adev, const struct amba_id *id) struct tmc_drvdata *drvdata; struct resource *res = &adev->res; struct coresight_desc desc = { 0 }; - struct device_node *np = adev->dev.of_node; - if (np) { - pdata = of_get_coresight_platform_data(dev, np); - if (IS_ERR(pdata)) { - ret = PTR_ERR(pdata); - goto out; - } - adev->dev.platform_data = pdata; + pdata = coresight_get_platform_data(dev); + if (IS_ERR(pdata)) { + ret = PTR_ERR(pdata); + goto out; } + adev->dev.platform_data = pdata; ret = -ENOMEM; drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL); diff --git a/drivers/hwtracing/coresight/coresight-tpiu.c b/drivers/hwtracing/coresight/coresight-tpiu.c index 4dd3e7f..aec0ed7 100644 --- a/drivers/hwtracing/coresight/coresight-tpiu.c +++ b/drivers/hwtracing/coresight/coresight-tpiu.c @@ -124,14 +124,11 @@ static int tpiu_probe(struct amba_device *adev, const struct amba_id *id) struct tpiu_drvdata *drvdata; struct resource *res = &adev->res; struct coresight_desc desc = { 0 }; - struct device_node *np = adev->dev.of_node; - if (np) { - pdata = of_get_coresight_platform_data(dev, np); - if (IS_ERR(pdata)) - return PTR_ERR(pdata); - adev->dev.platform_data = pdata; - } + pdata = coresight_get_platform_data(dev); + if (IS_ERR(pdata)) + return PTR_ERR(pdata); + dev->platform_data = pdata; drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL); if (!drvdata) diff --git a/include/linux/coresight.h b/include/linux/coresight.h index 62a520d..e2b95e0 100644 --- a/include/linux/coresight.h +++ b/include/linux/coresight.h @@ -294,14 +294,11 @@ static inline void coresight_disclaim_device_unlocked(void __iomem *base) {} #ifdef CONFIG_OF extern int of_coresight_get_cpu(const struct device_node *node); -extern struct coresight_platform_data * -of_get_coresight_platform_data(struct device *dev, - const struct device_node *node); #else static inline int of_coresight_get_cpu(const struct device_node *node) { return 0; } -static inline struct coresight_platform_data *of_get_coresight_platform_data( - struct device *dev, const struct device_node *node) { return NULL; } #endif +struct coresight_platform_data *coresight_get_platform_data(struct device *dev); + #endif
So far we have hard coded the DT platform parsing code in every driver. Introduce generic helper to parse the information provided by the firmware in a platform agnostic manner, in preparation for the ACPI support. Cc: Mathieu Poirier <mathieu.poirier@linaro.org> Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com> --- Changes since v2: - Use int error code for of_get_coresight_platform_data() [Mathieu] --- drivers/hwtracing/coresight/coresight-catu.c | 13 ++--- drivers/hwtracing/coresight/coresight-etb10.c | 11 ++-- drivers/hwtracing/coresight/coresight-etm3x.c | 12 ++--- drivers/hwtracing/coresight/coresight-etm4x.c | 11 ++-- drivers/hwtracing/coresight/coresight-funnel.c | 11 ++-- drivers/hwtracing/coresight/coresight-platform.c | 58 ++++++++++++++++------ drivers/hwtracing/coresight/coresight-replicator.c | 11 ++-- drivers/hwtracing/coresight/coresight-stm.c | 11 ++-- drivers/hwtracing/coresight/coresight-tmc.c | 13 ++--- drivers/hwtracing/coresight/coresight-tpiu.c | 11 ++-- include/linux/coresight.h | 7 +-- 11 files changed, 83 insertions(+), 86 deletions(-) -- 2.7.4