From: Mathieu Poirier <mathieu.poirier@linaro.org>
To: Suzuki K Poulose <suzuki.poulose@arm.com>
Cc: coresight@lists.linaro.org, rjw@rjwysocki.net,
linux-kernel@vger.kernel.org, robert.walker@arm.com,
linux-arm-kernel@lists.infradead.org, mike.leach@linaro.org
Subject: Re: [PATCH v2 19/36] coresight: Introduce generic platform data helper
Date: Mon, 22 Apr 2019 12:09:57 -0600 [thread overview]
Message-ID: <20190422180957.GC6402@xps15> (raw)
In-Reply-To: <1555344260-12375-20-git-send-email-suzuki.poulose@arm.com>
Hi Suzuki,
On Mon, Apr 15, 2019 at 05:04:02PM +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>
> ---
> 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 | 36 ++++++++++++++++------
> drivers/hwtracing/coresight/coresight-replicator.c | 12 +++-----
> 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, 66 insertions(+), 82 deletions(-)
>
> diff --git a/drivers/hwtracing/coresight/coresight-catu.c b/drivers/hwtracing/coresight/coresight-catu.c
> index 14d1cf5..65b86ec 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 6e6e9aa..cd61b54 100644
> --- a/drivers/hwtracing/coresight/coresight-etb10.c
> +++ b/drivers/hwtracing/coresight/coresight-etb10.c
> @@ -681,14 +681,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 75b923f..998b9f3 100644
> --- a/drivers/hwtracing/coresight/coresight-etm4x.c
> +++ b/drivers/hwtracing/coresight/coresight-etm4x.c
> @@ -976,18 +976,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 1085f31..2590744 100644
> --- a/drivers/hwtracing/coresight/coresight-funnel.c
> +++ b/drivers/hwtracing/coresight/coresight-funnel.c
> @@ -185,14 +185,11 @@ static int funnel_probe(struct amba_device *adev, const struct amba_id *id)
> struct funnel_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-platform.c b/drivers/hwtracing/coresight/coresight-platform.c
> index 4c31299..25a1838 100644
> --- a/drivers/hwtracing/coresight/coresight-platform.c
> +++ b/drivers/hwtracing/coresight/coresight-platform.c
> @@ -230,23 +230,17 @@ static int of_coresight_parse_endpoint(struct device *dev,
> return ret;
> }
>
> -struct coresight_platform_data *
> +static struct coresight_platform_data *
> of_get_coresight_platform_data(struct device *dev,
> - const struct device_node *node)
> + 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 */
> @@ -298,5 +292,27 @@ of_get_coresight_platform_data(struct device *dev,
>
> return pdata;
> }
> -EXPORT_SYMBOL_GPL(of_get_coresight_platform_data);
> #endif
> +
> +struct coresight_platform_data *
> +coresight_get_platform_data(struct device *dev)
> +{
> + struct coresight_platform_data *pdata;
> + struct fwnode_handle *fwnode = dev_fwnode(dev);
> +
> + if (IS_ERR_OR_NULL(fwnode))
> + return NULL;
> +
> + 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);
> +
> + if (is_of_node(fwnode))
> + return of_get_coresight_platform_data(dev, pdata);
Now that I'm looking a patch 26, returning a coresight_platform_data pointer is
a little weird here. Function of_get_coresight_platform_data() simply fills in
the pdata and should probably be returning an error code rather than a
pointer. If of_get_coresight_platform_data() returns 0 then pdata is returned.
Mathieu
> +
> + return ERR_PTR(-ENOENT);
> +}
> +EXPORT_SYMBOL_GPL(coresight_get_platform_data);
> diff --git a/drivers/hwtracing/coresight/coresight-replicator.c b/drivers/hwtracing/coresight/coresight-replicator.c
> index 8bbb008..7eb3bf7 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;
>
> drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL);
> if (!drvdata)
> @@ -213,7 +210,6 @@ static int replicator_probe(struct device *dev, struct resource *res)
> }
>
> dev_set_drvdata(dev, drvdata);
> -
> desc.type = CORESIGHT_DEV_TYPE_LINK;
> desc.subtype.link_subtype = CORESIGHT_DEV_SUBTYPE_LINK_SPLIT;
> desc.ops = &replicator_cs_ops;
> diff --git a/drivers/hwtracing/coresight/coresight-stm.c b/drivers/hwtracing/coresight/coresight-stm.c
> index a0690be..eae0094 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 c470b81..7dbdf59 100644
> --- a/drivers/hwtracing/coresight/coresight-tmc.c
> +++ b/drivers/hwtracing/coresight/coresight-tmc.c
> @@ -395,16 +395,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 96af7d5..eea7fd1 100644
> --- a/drivers/hwtracing/coresight/coresight-tpiu.c
> +++ b/drivers/hwtracing/coresight/coresight-tpiu.c
> @@ -120,14 +120,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 7b87965..5b29255 100644
> --- a/include/linux/coresight.h
> +++ b/include/linux/coresight.h
> @@ -293,14 +293,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
> --
> 2.7.4
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
WARNING: multiple messages have this Message-ID (diff)
From: Mathieu Poirier <mathieu.poirier@linaro.org>
To: Suzuki K Poulose <suzuki.poulose@arm.com>
Cc: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, coresight@lists.linaro.org,
mike.leach@linaro.org, rjw@rjwysocki.net, robert.walker@arm.com
Subject: Re: [PATCH v2 19/36] coresight: Introduce generic platform data helper
Date: Mon, 22 Apr 2019 12:09:57 -0600 [thread overview]
Message-ID: <20190422180957.GC6402@xps15> (raw)
In-Reply-To: <1555344260-12375-20-git-send-email-suzuki.poulose@arm.com>
Hi Suzuki,
On Mon, Apr 15, 2019 at 05:04:02PM +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>
> ---
> 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 | 36 ++++++++++++++++------
> drivers/hwtracing/coresight/coresight-replicator.c | 12 +++-----
> 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, 66 insertions(+), 82 deletions(-)
>
> diff --git a/drivers/hwtracing/coresight/coresight-catu.c b/drivers/hwtracing/coresight/coresight-catu.c
> index 14d1cf5..65b86ec 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 6e6e9aa..cd61b54 100644
> --- a/drivers/hwtracing/coresight/coresight-etb10.c
> +++ b/drivers/hwtracing/coresight/coresight-etb10.c
> @@ -681,14 +681,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 75b923f..998b9f3 100644
> --- a/drivers/hwtracing/coresight/coresight-etm4x.c
> +++ b/drivers/hwtracing/coresight/coresight-etm4x.c
> @@ -976,18 +976,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 1085f31..2590744 100644
> --- a/drivers/hwtracing/coresight/coresight-funnel.c
> +++ b/drivers/hwtracing/coresight/coresight-funnel.c
> @@ -185,14 +185,11 @@ static int funnel_probe(struct amba_device *adev, const struct amba_id *id)
> struct funnel_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-platform.c b/drivers/hwtracing/coresight/coresight-platform.c
> index 4c31299..25a1838 100644
> --- a/drivers/hwtracing/coresight/coresight-platform.c
> +++ b/drivers/hwtracing/coresight/coresight-platform.c
> @@ -230,23 +230,17 @@ static int of_coresight_parse_endpoint(struct device *dev,
> return ret;
> }
>
> -struct coresight_platform_data *
> +static struct coresight_platform_data *
> of_get_coresight_platform_data(struct device *dev,
> - const struct device_node *node)
> + 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 */
> @@ -298,5 +292,27 @@ of_get_coresight_platform_data(struct device *dev,
>
> return pdata;
> }
> -EXPORT_SYMBOL_GPL(of_get_coresight_platform_data);
> #endif
> +
> +struct coresight_platform_data *
> +coresight_get_platform_data(struct device *dev)
> +{
> + struct coresight_platform_data *pdata;
> + struct fwnode_handle *fwnode = dev_fwnode(dev);
> +
> + if (IS_ERR_OR_NULL(fwnode))
> + return NULL;
> +
> + 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);
> +
> + if (is_of_node(fwnode))
> + return of_get_coresight_platform_data(dev, pdata);
Now that I'm looking a patch 26, returning a coresight_platform_data pointer is
a little weird here. Function of_get_coresight_platform_data() simply fills in
the pdata and should probably be returning an error code rather than a
pointer. If of_get_coresight_platform_data() returns 0 then pdata is returned.
Mathieu
> +
> + return ERR_PTR(-ENOENT);
> +}
> +EXPORT_SYMBOL_GPL(coresight_get_platform_data);
> diff --git a/drivers/hwtracing/coresight/coresight-replicator.c b/drivers/hwtracing/coresight/coresight-replicator.c
> index 8bbb008..7eb3bf7 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;
>
> drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL);
> if (!drvdata)
> @@ -213,7 +210,6 @@ static int replicator_probe(struct device *dev, struct resource *res)
> }
>
> dev_set_drvdata(dev, drvdata);
> -
> desc.type = CORESIGHT_DEV_TYPE_LINK;
> desc.subtype.link_subtype = CORESIGHT_DEV_SUBTYPE_LINK_SPLIT;
> desc.ops = &replicator_cs_ops;
> diff --git a/drivers/hwtracing/coresight/coresight-stm.c b/drivers/hwtracing/coresight/coresight-stm.c
> index a0690be..eae0094 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 c470b81..7dbdf59 100644
> --- a/drivers/hwtracing/coresight/coresight-tmc.c
> +++ b/drivers/hwtracing/coresight/coresight-tmc.c
> @@ -395,16 +395,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 96af7d5..eea7fd1 100644
> --- a/drivers/hwtracing/coresight/coresight-tpiu.c
> +++ b/drivers/hwtracing/coresight/coresight-tpiu.c
> @@ -120,14 +120,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 7b87965..5b29255 100644
> --- a/include/linux/coresight.h
> +++ b/include/linux/coresight.h
> @@ -293,14 +293,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
> --
> 2.7.4
>
next prev parent reply other threads:[~2019-04-22 18:10 UTC|newest]
Thread overview: 148+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-15 16:03 [PATCH v2 00/36] coresight: Support for ACPI bindings Suzuki K Poulose
2019-04-15 16:03 ` Suzuki K Poulose
2019-04-15 16:03 ` [PATCH v2 01/36] coresight: Fix freeing up the coresight connections Suzuki K Poulose
2019-04-15 16:03 ` Suzuki K Poulose
2019-04-15 16:03 ` [PATCH v2 02/36] coresight: etb10: Cleanup power management Suzuki K Poulose
2019-04-15 16:03 ` Suzuki K Poulose
2019-04-15 16:03 ` [PATCH v2 03/36] coresight: tpiu: " Suzuki K Poulose
2019-04-15 16:03 ` Suzuki K Poulose
2019-04-15 16:03 ` [PATCH v2 04/36] coresight: catu: " Suzuki K Poulose
2019-04-15 16:03 ` Suzuki K Poulose
2019-04-15 16:03 ` [PATCH v2 05/36] coresight: tmc: " Suzuki K Poulose
2019-04-15 16:03 ` Suzuki K Poulose
2019-04-17 20:03 ` Mathieu Poirier
2019-04-17 20:03 ` Mathieu Poirier
2019-04-23 9:33 ` Suzuki K Poulose
2019-04-23 9:33 ` Suzuki K Poulose
2019-04-15 16:03 ` [PATCH v2 06/36] coresight: funnel: Clean up device book keeping Suzuki K Poulose
2019-04-15 16:03 ` Suzuki K Poulose
2019-04-17 20:14 ` Mathieu Poirier
2019-04-17 20:14 ` Mathieu Poirier
2019-04-15 16:03 ` [PATCH v2 07/36] coresight: replicator: Cleanup device tracking Suzuki K Poulose
2019-04-15 16:03 ` Suzuki K Poulose
2019-04-17 20:34 ` Mathieu Poirier
2019-04-17 20:34 ` Mathieu Poirier
2019-04-15 16:03 ` [PATCH v2 08/36] coresight: tmc: Clean up device specific data Suzuki K Poulose
2019-04-15 16:03 ` Suzuki K Poulose
2019-04-17 21:23 ` Mathieu Poirier
2019-04-17 21:23 ` Mathieu Poirier
2019-05-03 17:13 ` Suzuki K Poulose
2019-05-03 17:13 ` Suzuki K Poulose
2019-04-15 16:03 ` [PATCH v2 09/36] coresight: catu: Cleanup " Suzuki K Poulose
2019-04-15 16:03 ` Suzuki K Poulose
2019-04-17 21:40 ` Mathieu Poirier
2019-04-17 21:40 ` Mathieu Poirier
2019-04-15 16:03 ` [PATCH v2 10/36] coresight: tpiu: Clean up " Suzuki K Poulose
2019-04-15 16:03 ` Suzuki K Poulose
2019-04-17 21:41 ` Mathieu Poirier
2019-04-17 21:41 ` Mathieu Poirier
2019-04-15 16:03 ` [PATCH v2 11/36] coresight: stm: Cleanup " Suzuki K Poulose
2019-04-15 16:03 ` Suzuki K Poulose
2019-04-18 16:50 ` Mathieu Poirier
2019-04-18 16:50 ` Mathieu Poirier
2019-04-15 16:03 ` [PATCH v2 12/36] coresight: etm: Clean up " Suzuki K Poulose
2019-04-15 16:03 ` Suzuki K Poulose
2019-04-15 16:03 ` [PATCH v2 13/36] coresight: etb10: " Suzuki K Poulose
2019-04-15 16:03 ` Suzuki K Poulose
2019-04-15 16:03 ` [PATCH v2 14/36] coresight: Rename of_coresight to coresight-platform Suzuki K Poulose
2019-04-15 16:03 ` Suzuki K Poulose
2019-04-18 17:22 ` Mathieu Poirier
2019-04-18 17:22 ` Mathieu Poirier
2019-04-15 16:03 ` [PATCH v2 15/36] coresight: etm3x: Rearrange cp14 access detection Suzuki K Poulose
2019-04-15 16:03 ` Suzuki K Poulose
2019-04-15 16:03 ` [PATCH v2 16/36] coresight: stm: Rearrange probing the stimulus area Suzuki K Poulose
2019-04-15 16:03 ` Suzuki K Poulose
2019-04-15 16:04 ` [PATCH v2 17/36] coresight: tmc-etr: Rearrange probing default buffer size Suzuki K Poulose
2019-04-15 16:04 ` Suzuki K Poulose
2019-04-15 16:04 ` [PATCH v2 18/36] coresight: platform: Make memory allocation helper generic Suzuki K Poulose
2019-04-15 16:04 ` Suzuki K Poulose
2019-04-15 16:04 ` [PATCH v2 19/36] coresight: Introduce generic platform data helper Suzuki K Poulose
2019-04-15 16:04 ` Suzuki K Poulose
2019-04-22 18:09 ` Mathieu Poirier [this message]
2019-04-22 18:09 ` Mathieu Poirier
2019-04-23 9:43 ` Suzuki K Poulose
2019-04-23 9:43 ` Suzuki K Poulose
2019-04-15 16:04 ` [PATCH v2 20/36] coresight: Make device to CPU mapping generic Suzuki K Poulose
2019-04-15 16:04 ` Suzuki K Poulose
2019-04-18 18:14 ` Mathieu Poirier
2019-04-18 18:14 ` Mathieu Poirier
2019-04-15 16:04 ` [PATCH v2 21/36] coresight: Remove cpu field from platform data Suzuki K Poulose
2019-04-15 16:04 ` Suzuki K Poulose
2019-04-15 16:04 ` [PATCH v2 22/36] coresight: Remove name from platform description Suzuki K Poulose
2019-04-15 16:04 ` Suzuki K Poulose
2019-04-15 16:04 ` [PATCH v2 23/36] coresight: Cleanup coresight_remove_conns Suzuki K Poulose
2019-04-15 16:04 ` Suzuki K Poulose
2019-04-15 16:04 ` [PATCH v2 24/36] coresight: Reuse platform data structure for connection tracking Suzuki K Poulose
2019-04-15 16:04 ` Suzuki K Poulose
2019-04-22 17:06 ` Mathieu Poirier
2019-04-22 17:06 ` Mathieu Poirier
2019-04-15 16:04 ` [PATCH v2 25/36] coresight: Rearrange platform data probing Suzuki K Poulose
2019-04-15 16:04 ` Suzuki K Poulose
2019-04-22 17:16 ` Mathieu Poirier
2019-04-22 17:16 ` Mathieu Poirier
2019-04-25 17:12 ` Suzuki K Poulose
2019-04-25 17:12 ` Suzuki K Poulose
2019-04-15 16:04 ` [PATCH v2 26/36] coresight: Add support for releasing platform specific data Suzuki K Poulose
2019-04-15 16:04 ` Suzuki K Poulose
2019-04-15 16:04 ` [PATCH v2 27/36] drivers: Add a generic helper to match device by fwnode handle Suzuki K Poulose
2019-04-15 16:04 ` Suzuki K Poulose
2019-04-16 10:20 ` Rafael J. Wysocki
2019-04-16 10:20 ` Rafael J. Wysocki
2019-04-16 10:34 ` Suzuki K Poulose
2019-04-16 10:34 ` Suzuki K Poulose
2019-04-16 10:45 ` Rafael J. Wysocki
2019-04-16 10:45 ` Rafael J. Wysocki
2019-04-16 10:39 ` [RESEND][PATCH " Suzuki K Poulose
2019-04-16 10:39 ` Suzuki K Poulose
2019-04-16 10:48 ` Rafael J. Wysocki
2019-04-16 10:48 ` Rafael J. Wysocki
2019-04-16 10:56 ` Suzuki K Poulose
2019-04-16 10:56 ` Suzuki K Poulose
2019-04-18 14:39 ` Rafael J. Wysocki
2019-04-18 14:39 ` Rafael J. Wysocki
2019-04-18 15:18 ` Suzuki K Poulose
2019-04-18 15:18 ` Suzuki K Poulose
2019-04-15 16:04 ` [PATCH v2 28/36] coresight: platform: Use fwnode handle for device search Suzuki K Poulose
2019-04-15 16:04 ` Suzuki K Poulose
2019-04-23 16:17 ` Mathieu Poirier
2019-04-23 16:17 ` Mathieu Poirier
2019-04-15 16:04 ` [PATCH v2 29/36] coresight: Use fwnode handle instead of device names Suzuki K Poulose
2019-04-15 16:04 ` Suzuki K Poulose
2019-04-23 16:14 ` Mathieu Poirier
2019-04-23 16:14 ` Mathieu Poirier
2019-04-15 16:04 ` [PATCH v2 30/36] coresight: Use platform agnostic names Suzuki K Poulose
2019-04-15 16:04 ` Suzuki K Poulose
2019-04-23 17:38 ` Mathieu Poirier
2019-04-23 17:38 ` Mathieu Poirier
2019-04-15 16:04 ` [PATCH v2 31/36] coresight: stm: ACPI support for parsing stimulus base Suzuki K Poulose
2019-04-15 16:04 ` Suzuki K Poulose
2019-04-23 17:59 ` Mathieu Poirier
2019-04-23 17:59 ` Mathieu Poirier
2019-04-25 16:17 ` Suzuki K Poulose
2019-04-25 16:17 ` Suzuki K Poulose
2019-04-15 16:04 ` [PATCH v2 32/36] coresight: Support for ACPI bindings Suzuki K Poulose
2019-04-15 16:04 ` Suzuki K Poulose
2019-04-25 16:50 ` Mathieu Poirier
2019-04-25 16:50 ` Mathieu Poirier
2019-04-25 17:30 ` Suzuki K Poulose
2019-04-25 17:30 ` Suzuki K Poulose
2019-04-15 16:04 ` [PATCH v2 33/36] coresight: acpi: Support for components Suzuki K Poulose
2019-04-15 16:04 ` Suzuki K Poulose
2019-04-25 17:45 ` Mathieu Poirier
2019-04-25 17:45 ` Mathieu Poirier
2019-04-29 8:54 ` Suzuki K Poulose
2019-04-29 8:54 ` Suzuki K Poulose
2019-04-15 16:04 ` [PATCH v2 34/36] [RFC] coresight: Pass coresight_device for coresight_release_platform_data Suzuki K Poulose
2019-04-15 16:04 ` Suzuki K Poulose
2019-04-29 17:40 ` Mathieu Poirier
2019-04-29 17:40 ` Mathieu Poirier
2019-04-15 16:04 ` [PATCH v2 35/36] [RFC] coresight: add return value for fixup connections Suzuki K Poulose
2019-04-15 16:04 ` Suzuki K Poulose
2019-04-29 17:44 ` Mathieu Poirier
2019-04-29 17:44 ` Mathieu Poirier
2019-04-15 16:04 ` [PATCH v2 36/36] [RFC] coresight: Expose device connections via sysfs Suzuki K Poulose
2019-04-15 16:04 ` Suzuki K Poulose
2019-04-29 20:50 ` Mathieu Poirier
2019-04-29 20:50 ` Mathieu Poirier
2019-04-15 16:04 ` [TEST PATCH 37/36][EDK2] edk2-platform: juno: Update ACPI CoreSight Bindings Suzuki K Poulose
2019-04-15 16:04 ` Suzuki K Poulose
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190422180957.GC6402@xps15 \
--to=mathieu.poirier@linaro.org \
--cc=coresight@lists.linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mike.leach@linaro.org \
--cc=rjw@rjwysocki.net \
--cc=robert.walker@arm.com \
--cc=suzuki.poulose@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.