From patchwork Mon Apr 3 23:39:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 78792 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2653796vqo; Mon, 3 Apr 2023 16:45:52 -0700 (PDT) X-Google-Smtp-Source: AKy350ZHDjjf+z3gELBrGymmts6QbQoA5YWVtikog0QakyuaQKW0prm+sT+jFZv7FMolfSRqRy6P X-Received: by 2002:a17:906:bc59:b0:93e:9362:75fa with SMTP id s25-20020a170906bc5900b0093e936275famr353120ejv.47.1680565552311; Mon, 03 Apr 2023 16:45:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680565552; cv=none; d=google.com; s=arc-20160816; b=USnpyZCB4fr2amCA3nNx79deisb55jKkaJebIvmQlNgVUs2hLUwyTLa199mGM9TwEZ 9jsmTuMNUVX6CHE3muxz+578VOYzkgHPqMae9XFV13nQU29CeffIp1WjIr46I2IQrHig lT62cLlGRpaJPJYoO+daRrIeR0LXVrFwBgBQAxsnBh2vAWD2ZGeNrrz+ciJz7iZbNf69 ID+e7m/k33ylYlL9+3qlk5ZVgGo3nlSDxpGgGxx82YPnuIGrZi0ZGB2omvFUgjAtJ3+8 u7eFhh2i74Jvu8sYxUw+7vin2KT+XJSAprryTUYzXOHkl3eHGs2LSgGQSg4cgBqWUvw8 1znw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=+VWH39BR0tD6TBtRTKZDQy+oD+lySCuKW3DMMxt3hqg=; b=qZLh/UFx77cSh/fK83Nj2lj92A+vmwglv9HHrI4h9csCkDPBhs1rPrplc2WAN5obo8 CyKU0VL3nD2d5RRDm078Yz8JKoKoFqZkNNP8nZdwwDTHekbup9o6OLGOW2gyfsIR/I+i qAl4RwRUltTaafsgGbUn4MNFw2BkhMNjMK43YspN3+LM6Q9xgGCpbK9zbHwSXL0CuDGD oUorSmY0YiY/br8/GP19rlJKcSX6MhYuJ0zFS3hSPZKg1qjCAjVmzl6OTJSxvsFn/DSl ZNQrnT37h7riEbELIHP5it79Sgu8R1oLvpIx6Gsqcms+CH78LTOgJMkupRA2Cv3roedG HXKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RxAH5qDL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f10-20020a170906560a00b008d4d102a7b8si306169ejq.365.2023.04.03.16.45.28; Mon, 03 Apr 2023 16:45:52 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RxAH5qDL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233775AbjDCXjW (ORCPT + 99 others); Mon, 3 Apr 2023 19:39:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56516 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231246AbjDCXjT (ORCPT ); Mon, 3 Apr 2023 19:39:19 -0400 Received: from mail-pl1-x632.google.com (mail-pl1-x632.google.com [IPv6:2607:f8b0:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A9E9AF3 for ; Mon, 3 Apr 2023 16:39:17 -0700 (PDT) Received: by mail-pl1-x632.google.com with SMTP id n14so13773772plc.8 for ; Mon, 03 Apr 2023 16:39:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680565157; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=+VWH39BR0tD6TBtRTKZDQy+oD+lySCuKW3DMMxt3hqg=; b=RxAH5qDLmYwGqJXMkUgVLQVRjMkXkXLckmIw9n6mxYJeoCP/UzVXGjVRzQ7XY851sM 0RX4dM5b7K1QpO0fui5gh/jCsAlXX9T/iBtK0ffusFBvd+uzd4U3LDYHHjFVHUyan2FP i3MqW5gf+WeUaxQOhfYttC8x0FsaJ6b8RWKyKBKbWZsjTJiLNhQMizVgu/3kp4/le+dk YLg4iItrnOOChEkkZRlXnI4iX8dTn9z+RBQM43yA/qiH4VqGNWa5iLIFiCyDAqo9AEnM VjvuTgNqF+FUZfHTvQsksWLoTCnpaoiK9My25RBCL8pnnut9fuXUyYsdRLG6a51o7oCI MFRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680565157; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=+VWH39BR0tD6TBtRTKZDQy+oD+lySCuKW3DMMxt3hqg=; b=Cgik8iYJm/hGBsRzKzqVNL2GqNAmFnz2uTbxjXL2mxMSzuTDWsPOja2gvg6dSbUaFN 9zKFfsGvFIV+/4IPj010GytmsXSq3Wj6GuxbocUSj6xGWTFxro1aX2CtHDsA1DaK7cRv BY9/G+htTLHxFgYxUbqDei3rLBchz4eQEkx/2rXRAz/mblbjtqNYFGcDaYCXXm59SWCk P9QeDBTu6xXLgTzaHRcqmMoyD4eullhkYdZ3lA2B9CAQx54FP9Fu34mOlxc7H39BqmSw LJzmciLaOWicyoaavsnFC6yhW57QdQ35EQlTZWWH6K3EGNPPwCGIaLzbpgiznCm5az24 +61w== X-Gm-Message-State: AAQBX9dJ2sHoaBG0G0qyJf8WhkwT5PB6IlbtV7oPrztVa218M1PCw9kB sLN/gdRuYoc9MzMJxwlrmiYRDzxd2GduuEXI/4g= X-Received: by 2002:a05:6a20:65a1:b0:cc:a8d7:ad7e with SMTP id p33-20020a056a2065a100b000cca8d7ad7emr328230pzh.60.1680565157151; Mon, 03 Apr 2023 16:39:17 -0700 (PDT) Received: from localhost ([122.172.85.8]) by smtp.gmail.com with ESMTPSA id c22-20020aa78816000000b005a8b28c644esm7526545pfo.4.2023.04.03.16.39.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Apr 2023 16:39:16 -0700 (PDT) From: Viresh Kumar To: "Rafael J. Wysocki" , Viresh Kumar Cc: linux-pm@vger.kernel.org, Vincent Guittot , Yajun Deng , linux-kernel@vger.kernel.org Subject: [PATCH V2] cpufreq: drivers with target_index() must set freq_table Date: Tue, 4 Apr 2023 05:09:10 +0530 Message-Id: <8c788b8029b3a11f012915dad6154e7cc481f997.1680563899.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.31.1.272.g89b43f80a514 MIME-Version: 1.0 X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1762200704607819818?= X-GMAIL-MSGID: =?utf-8?q?1762200704607819818?= Since the cpufreq core directly uses freq_table, for cpufreq drivers that set their target_index() callback, make it mandatory for them to set the same. Since this is set per policy and normally from policy->init(), do this from cpufreq_table_validate_and_sort() which gets called right after ->init(). Reported-by: Yajun Deng Signed-off-by: Viresh Kumar --- V2: Move declaration to cpufreq.h. drivers/cpufreq/cpufreq.c | 5 +++++ drivers/cpufreq/freq_table.c | 7 ++++++- include/linux/cpufreq.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 6d8fd3b8dcb5..09131c54703f 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -73,6 +73,11 @@ static inline bool has_target(void) return cpufreq_driver->target_index || cpufreq_driver->target; } +bool has_target_index(void) +{ + return !!cpufreq_driver->target_index; +} + /* internal prototypes */ static unsigned int __cpufreq_get(struct cpufreq_policy *policy); static int cpufreq_init_governor(struct cpufreq_policy *policy); diff --git a/drivers/cpufreq/freq_table.c b/drivers/cpufreq/freq_table.c index 90bfc27ed1ba..c4d4643b6ca6 100644 --- a/drivers/cpufreq/freq_table.c +++ b/drivers/cpufreq/freq_table.c @@ -355,8 +355,13 @@ int cpufreq_table_validate_and_sort(struct cpufreq_policy *policy) { int ret; - if (!policy->freq_table) + if (!policy->freq_table) { + /* Freq table must be passed by drivers with target_index() */ + if (has_target_index()) + return -EINVAL; + return 0; + } ret = cpufreq_frequency_table_cpuinfo(policy, policy->freq_table); if (ret) diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h index 65623233ab2f..541013487a0e 100644 --- a/include/linux/cpufreq.h +++ b/include/linux/cpufreq.h @@ -237,6 +237,7 @@ bool cpufreq_supports_freq_invariance(void); struct kobject *get_governor_parent_kobj(struct cpufreq_policy *policy); void cpufreq_enable_fast_switch(struct cpufreq_policy *policy); void cpufreq_disable_fast_switch(struct cpufreq_policy *policy); +bool has_target_index(void); #else static inline unsigned int cpufreq_get(unsigned int cpu) {