lkml.org 
[lkml]   [2023]   [May]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH V5 1/6] coresight: etm4x: Allocate and device assign 'struct etmv4_drvdata' earlier
    Date
    Allocate and device assign 'struct etmv4_drvdata' earlier during the driver
    probe, ensuring that it can be retrieved in power management based runtime
    callbacks if required. This will also help in dropping iomem base address
    argument from the function etm4_probe() later.

    Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
    Cc: Suzuki K Poulose <suzuki.poulose@arm.com>
    Cc: Mike Leach <mike.leach@linaro.org>
    Cc: Leo Yan <leo.yan@linaro.org>
    Cc: coresight@lists.linaro.org
    Cc: linux-arm-kernel@lists.infradead.org
    Cc: linux-kernel@vger.kernel.org
    Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
    ---
    .../coresight/coresight-etm4x-core.c | 19 ++++++++++++++-----
    1 file changed, 14 insertions(+), 5 deletions(-)

    diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c
    index 4c15fae534f3..7e96293c638f 100644
    --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c
    +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c
    @@ -2046,17 +2046,14 @@ static int etm4_add_coresight_dev(struct etm4_init_arg *init_arg)

    static int etm4_probe(struct device *dev, void __iomem *base, u32 etm_pid)
    {
    - struct etmv4_drvdata *drvdata;
    + struct etmv4_drvdata *drvdata = dev_get_drvdata(dev);
    struct csdev_access access = { 0 };
    struct etm4_init_arg init_arg = { 0 };
    struct etm4_init_arg *delayed;

    - drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL);
    - if (!drvdata)
    + if (WARN_ON(!drvdata))
    return -ENOMEM;

    - dev_set_drvdata(dev, drvdata);
    -
    if (pm_save_enable == PARAM_PM_SAVE_FIRMWARE)
    pm_save_enable = coresight_loses_context_with_cpu(dev) ?
    PARAM_PM_SAVE_SELF_HOSTED : PARAM_PM_SAVE_NEVER;
    @@ -2108,6 +2105,7 @@ static int etm4_probe(struct device *dev, void __iomem *base, u32 etm_pid)

    static int etm4_probe_amba(struct amba_device *adev, const struct amba_id *id)
    {
    + struct etmv4_drvdata *drvdata;
    void __iomem *base;
    struct device *dev = &adev->dev;
    struct resource *res = &adev->res;
    @@ -2118,6 +2116,11 @@ static int etm4_probe_amba(struct amba_device *adev, const struct amba_id *id)
    if (IS_ERR(base))
    return PTR_ERR(base);

    + drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL);
    + if (!drvdata)
    + return -ENOMEM;
    +
    + dev_set_drvdata(dev, drvdata);
    ret = etm4_probe(dev, base, id->id);
    if (!ret)
    pm_runtime_put(&adev->dev);
    @@ -2127,8 +2130,14 @@ static int etm4_probe_amba(struct amba_device *adev, const struct amba_id *id)

    static int etm4_probe_platform_dev(struct platform_device *pdev)
    {
    + struct etmv4_drvdata *drvdata;
    int ret;

    + drvdata = devm_kzalloc(&pdev->dev, sizeof(*drvdata), GFP_KERNEL);
    + if (!drvdata)
    + return -ENOMEM;
    +
    + dev_set_drvdata(&pdev->dev, drvdata);
    pm_runtime_get_noresume(&pdev->dev);
    pm_runtime_set_active(&pdev->dev);
    pm_runtime_enable(&pdev->dev);
    --
    2.25.1
    \
     
     \ /
      Last update: 2023-05-29 08:28    [W:3.255 / U:0.132 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site