Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
Message-ID: <f1a5a345-422a-e46a-3a83-2de4023762a9@linaro.org>
Date:   Fri, 29 Apr 2022 13:52:41 -0500
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.7.0
Subject: Re: [PATCH] interconnect: Restore sync state by ignoring ipa-virt in
 provider count
Content-Language: en-US
To:     Georgi Djakov <djakov@kernel.org>,
        Stephen Boyd <swboyd@chromium.org>
Cc:     linux-kernel@vger.kernel.org, patches@lists.linux.dev,
        linux-pm@vger.kernel.org, linux-arm-msm@vger.kernel.org,
        Bjorn Andersson <bjorn.andersson@linaro.org>,
        Doug Anderson <dianders@chromium.org>,
        Taniya Das <quic_tdas@quicinc.com>,
        Mike Tipton <quic_mdtipton@quicinc.com>
References: <20220427013226.341209-1-swboyd@chromium.org>
 <fb1f9a17-9b27-b0ac-124d-66644851e204@linaro.org>
 <38149635-26ee-ab02-7c69-c5dd5f64fab5@kernel.org>
From:   Alex Elder <elder@linaro.org>
In-Reply-To: <38149635-26ee-ab02-7c69-c5dd5f64fab5@kernel.org>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
Precedence: bulk

On 4/27/22 3:52 PM, Georgi Djakov wrote:
> On 27.04.22 15:00, Alex Elder wrote:
>> On 4/26/22 8:32 PM, Stephen Boyd wrote:
>>> Ignore compatible strings for the IPA virt drivers that were removed in
>>> commits 2fb251c26560 ("interconnect: qcom: sdx55: Drop IP0
>>> interconnects") and 2f3724930eb4 ("interconnect: qcom: sc7180: Drop IP0
>>> interconnects") so that the sync state logic can kick in again.
>>> Otherwise all the interconnects in the system will stay pegged at max
>>> speeds because 'providers_count' is always going to be one larger than
>>> the number of drivers that will ever probe on sc7180 or sdx55. This
>>> fixes suspend on sc7180 and sdx55 devices when you don't have a
>>> devicetree patch to remove the ipa-virt compatible node.
>>>
>>> Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
>>> Cc: Doug Anderson <dianders@chromium.org>
>>> Cc: Alex Elder <elder@linaro.org>
>>> Cc: Taniya Das <quic_tdas@quicinc.com>
>>> Cc: Mike Tipton <quic_mdtipton@quicinc.com>
>>> Fixes: 2fb251c26560 ("interconnect: qcom: sdx55: Drop IP0 
>>> interconnects")
>>> Fixes: 2f3724930eb4 ("interconnect: qcom: sc7180: Drop IP0 
>>> interconnects")
>>> Signed-off-by: Stephen Boyd <swboyd@chromium.org>
>>
>> So of_count_icc_providers() counts the number of
>> interconnect providers defined in the DTB, regardless
>> of whether anything in the code supports it.
> 
> Yes, that's the case currently. There could be multiple provider drivers
> in different modules, and the modules may be loaded even not during boot,
> but later. So we rely on DT.

Georgi, do you have any other ideas about how to improve this?

What you say makes sense--you figure out the total number of
providers at init time based on what's defined in DT.

But when all is said and done, what if even *one* of those
has no provider driver?  Isn't that what causes the problem
here, that icc_sync_state assumes all providers specified in
DT will eventually have a driver that calls icc_sync_state()?

(I don't claim to know the interconnect code in detail, so
I might not be quite understanding how this works.)

					-Alex

> Thanks,
> Georgi
> 
>> This seems to be a more general problem, but I
>> suppose in practice it's not likely to occur.
>>
>> I think your solution looks fine, but I'm interested
>> in what Georgi has to say.
>>
>> Reviewed-by: Alex Elder <elder@linaro.org>
>>
>>
>>> ---
>>>   drivers/interconnect/core.c | 8 +++++++-
>>>   1 file changed, 7 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/interconnect/core.c b/drivers/interconnect/core.c
>>> index 9050ca1f4285..c52915a58b22 100644
>>> --- a/drivers/interconnect/core.c
>>> +++ b/drivers/interconnect/core.c
>>> @@ -1087,9 +1087,15 @@ static int of_count_icc_providers(struct 
>>> device_node *np)
>>>   {
>>>       struct device_node *child;
>>>       int count = 0;
>>> +    const struct of_device_id ignore_list[] = {
>>> +        { .compatible = "qcom,sc7180-ipa-virt" },
>>> +        { .compatible = "qcom,sdx55-ipa-virt" },
>>> +        {}
>>> +    };
>>>       for_each_available_child_of_node(np, child) {
>>> -        if (of_property_read_bool(child, "#interconnect-cells"))
>>> +        if (of_property_read_bool(child, "#interconnect-cells") &&
>>> +            likely(!of_match_node(ignore_list, child)))
>>>               count++;
>>>           count += of_count_icc_providers(child);
>>>       }
>>>
>>> base-commit: 2fb251c265608636fc961b7d38e1a03937e57371
>>
>