Re: [PATCH] cpufreq: dt-platdev: Fix creating device on OPPv1 platforms

[Viresh Kumar]

On 10-12-25, 06:17, Krzysztof Kozlowski wrote:
> Commit 6ea891a6dd37 ("cpufreq: dt-platdev: Simplify with
> of_machine_get_match_data()") broke several platforms which did not have
> OPPv2 proprety, because it incorrectly checked for device match data
> after first matching from "allowlist".  Almost all of "allowlist" match
> entries do not have match data and it is expected to create platform
> device for them with empty data.
> 
> Fix this by first checking if platform is on the allowlist with
> of_machine_device_match() and only then taking the match data.  This
> duplicates the number of checks (we match against the allowlist twice),
> but makes the code here much smaller.
> 
> Reported-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
> Closes: https://lore.kernel.org/all/CAMuHMdVJD4+J9QpUUs-sX0feKfuPD72CO0dcqN7shvF_UYpZ3Q@xxxxxxxxxxxxxx/
> Reported-by: Pavel Pisa <pisa@xxxxxxxxxxx>
> Closes: https://lore.kernel.org/all/6hnk7llbwdezh74h74fhvofbx4t4jihel5kvr6qwx2xuxxbjys@rmwbd7lkhrdz/
> Fixes: 6ea891a6dd37 ("cpufreq: dt-platdev: Simplify with of_machine_get_match_data()")
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxxxxxxxx>
> ---
>  drivers/cpufreq/cpufreq-dt-platdev.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/cpufreq/cpufreq-dt-platdev.c b/drivers/cpufreq/cpufreq-dt-platdev.c
> index a1d11ecd1ac8..b06a43143d23 100644
> --- a/drivers/cpufreq/cpufreq-dt-platdev.c
> +++ b/drivers/cpufreq/cpufreq-dt-platdev.c
> @@ -219,11 +219,12 @@ static bool __init cpu0_node_has_opp_v2_prop(void)
>  
>  static int __init cpufreq_dt_platdev_init(void)
>  {
> -	const void *data;
> +	const void *data = NULL;
>  
> -	data = of_machine_get_match_data(allowlist);
> -	if (data)
> +	if (of_machine_device_match(allowlist)) {
> +		data = of_machine_get_match_data(allowlist);
>  		goto create_pdev;
> +	}
>  
>  	if (cpu0_node_has_opp_v2_prop() && !of_machine_device_match(blocklist))
>  		goto create_pdev;

Pavel, please give this a try as well.

Since the original patch went via your tree, take this one too please:

Acked-by: Viresh Kumar <viresh.kumar@xxxxxxxxxx>

-- 
viresh