Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32;
Message-ID: <e299ee44-7de1-4542-828d-a0c86b217fb4@linux.intel.com>
Date:   Wed, 15 Nov 2023 13:14:36 +0200
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH v3 02/25] i2c: designware: Fix PM calls order in
 dw_i2c_plat_probe()
Content-Language: en-US
To:     Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
        Mario Limonciello <mario.limonciello@amd.com>,
        Herbert Xu <herbert@gondor.apana.org.au>,
        Wolfram Sang <wsa@kernel.org>, linux-i2c@vger.kernel.org,
        linux-kernel@vger.kernel.org
Cc:     Mika Westerberg <mika.westerberg@linux.intel.com>,
        Jan Dabros <jsd@semihalf.com>,
        Andi Shyti <andi.shyti@kernel.org>,
        Philipp Zabel <p.zabel@pengutronix.de>,
        Hans de Goede <hdegoede@redhat.com>
References: <20231110182304.3894319-1-andriy.shevchenko@linux.intel.com>
 <20231110182304.3894319-3-andriy.shevchenko@linux.intel.com>
From:   Jarkko Nikula <jarkko.nikula@linux.intel.com>
In-Reply-To: <20231110182304.3894319-3-andriy.shevchenko@linux.intel.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 11/10/23 20:11, Andy Shevchenko wrote:
> We should not mix managed calls with non-managed. This will break
> the calls order at the error path and ->remove() stages. Fix this
> by wrapping PM ops to become managed one.
> 
> Fixes: 36d48fb5766a ("i2c: designware-platdrv: enable RuntimePM before registering to the core")
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

I fail to see what was broken in above commit and how this patch fixes it?

> ---
>   drivers/i2c/busses/i2c-designware-platdrv.c | 28 ++++++++++++---------
>   1 file changed, 16 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c
> index 855b698e99c0..8b0099e1bc26 100644
> --- a/drivers/i2c/busses/i2c-designware-platdrv.c
> +++ b/drivers/i2c/busses/i2c-designware-platdrv.c
> @@ -177,14 +177,26 @@ static int txgbe_i2c_request_regs(struct dw_i2c_dev *dev)
>   	return 0;
>   }
>   
> -static void dw_i2c_plat_pm_cleanup(struct dw_i2c_dev *dev)
> +static void dw_i2c_plat_pm_cleanup(void *data)
>   {
> +	struct dw_i2c_dev *dev = data;
> +
>   	pm_runtime_disable(dev->dev);
>   
>   	if (dev->shared_with_punit)
>   		pm_runtime_put_noidle(dev->dev);
>   }
>   
> +static int dw_i2c_plat_pm_setup(struct dw_i2c_dev *dev)
> +{
> +	if (dev->shared_with_punit)
> +		pm_runtime_get_noresume(dev->dev);
> +
> +	pm_runtime_enable(dev->dev);
> +
> +	return devm_add_action_or_reset(dev->dev, dw_i2c_plat_pm_cleanup, dev);
> +}
> +
>   static int dw_i2c_plat_request_regs(struct dw_i2c_dev *dev)
>   {
>   	struct platform_device *pdev = to_platform_device(dev->dev);
> @@ -381,19 +393,12 @@ static int dw_i2c_plat_probe(struct platform_device *pdev)
>   	pm_runtime_use_autosuspend(&pdev->dev);
>   	pm_runtime_set_active(&pdev->dev);
>   
> -	if (dev->shared_with_punit)
> -		pm_runtime_get_noresume(&pdev->dev);
> -
> -	pm_runtime_enable(&pdev->dev);
> -
> -	ret = i2c_dw_probe(dev);
> +	ret = dw_i2c_plat_pm_setup(dev);
>   	if (ret)
> -		goto exit_probe;
> +		goto exit_reset;
>   
> -	return ret;
> +	return i2c_dw_probe(dev);
>   
> -exit_probe:
> -	dw_i2c_plat_pm_cleanup(dev);
>   exit_reset:
>   	reset_control_assert(dev->rst);
>   	return ret;

Is it intended change the reset isn't asserted after this patch in case 
i2c_dw_probe() fails?