Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <990b948f-11b3-2463-2d0c-be9d30d10328@arm.com>
Date:   Thu, 5 Jan 2023 13:55:40 +0000
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.4.2
Subject: Re: [PATCH] coresight: cti: Add PM runtime call in enable_store
Content-Language: en-US
From:   James Clark <james.clark@arm.com>
To:     Mao Jinlong <quic_jinlmao@quicinc.com>
Cc:     coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org,
        linux-kernel@vger.kernel.org, Tingwei <quic_tingweiz@quicinc.com>,
        Yuanfang Zhang <quic_yuanfang@quicinc.com>,
        Tao Zhang <quic_taozha@quicinc.com>,
        Hao Zhang <quic_hazha@quicinc.com>,
        linux-arm-msm@vger.kernel.org,
        Mathieu Poirier <mathieu.poirier@linaro.org>,
        Mike Leach <mike.leach@linaro.org>,
        Alexander Shishkin <alexander.shishkin@linux.intel.com>
References: <20221224141700.20891-1-quic_jinlmao@quicinc.com>
 <9a86f7cd-2dce-f27a-af21-d64318ca3ef7@arm.com>
In-Reply-To: <9a86f7cd-2dce-f27a-af21-d64318ca3ef7@arm.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk


On 04/01/2023 13:11, James Clark wrote:
> 
> 
> On 24/12/2022 14:17, Mao Jinlong wrote:
>> In commit 6746eae4bbad ("coresight: cti: Fix hang in cti_disable_hw()")
>> PM runtime calls are removed from cti_enable_hw/cti_disable_hw. When
>> enabling CTI by writing enable sysfs node, clock for accessing CTI
>> register won't be enabled. Device will crash due to register access
>> issue. Add PM runtime call in enable_store to fix this issue.
>>
>> Signed-off-by: Mao Jinlong <quic_jinlmao@quicinc.com>
>> ---
>>  drivers/hwtracing/coresight/coresight-cti-sysfs.c | 11 +++++++++--
>>  1 file changed, 9 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/hwtracing/coresight/coresight-cti-sysfs.c b/drivers/hwtracing/coresight/coresight-cti-sysfs.c
>> index 6d59c815ecf5..b1ed424ae043 100644
>> --- a/drivers/hwtracing/coresight/coresight-cti-sysfs.c
>> +++ b/drivers/hwtracing/coresight/coresight-cti-sysfs.c
>> @@ -108,10 +108,17 @@ static ssize_t enable_store(struct device *dev,
>>  	if (ret)
>>  		return ret;
>>  
>> -	if (val)
>> +	if (val) {
>> +		ret = pm_runtime_resume_and_get(dev->parent);
>> +		if (ret)
>> +			return ret;
>>  		ret = cti_enable(drvdata->csdev);
>> -	else
>> +		if (ret)
>> +			pm_runtime_put(dev->parent);
>> +	} else {
>>  		ret = cti_disable(drvdata->csdev);
>> +		pm_runtime_put(dev->parent);
> 
> Hi Jinlong,
> 
> This new pm_runtime_put() causes this when writing 0 to enable:
> 
>   [  483.253814] coresight-cti 23020000.cti: Runtime PM usage count
> underflow!
> 
> Maybe we can modify cti_disable_hw() to return a value to indicate that
> the disable actually happened, and only then call pm_runtime_put().
> 
> I suppose you could also check in the store function if it was already
> enabled first, but then I don't know what kind of locking that would
> need? cti_disable_hw() already seems to have a couple of locks, so maybe
> the return value solution is easiest.
> 

We've also just seen another issue where multiple calls to
cti_disable_hw() can cause enable_req_count to go negative. I'm going to
work on a few fixes (including yours) to make sure that it's complete
and post it shortly.

James