From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-21.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 049DFC4338F for ; Mon, 16 Aug 2021 08:33:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D6A9861B21 for ; Mon, 16 Aug 2021 08:33:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234314AbhHPIdj (ORCPT ); Mon, 16 Aug 2021 04:33:39 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:28478 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234025AbhHPIdj (ORCPT ); Mon, 16 Aug 2021 04:33:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629102787; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bx1TcCFFLxqAZketNCVhx6k5xMXaylEpGz+3Cg9SPZk=; b=cWNaIypxz68siBSdPuqKoIkcmGgb+0HZGyCL5bhf/Kq+kUR7fUL+RXhm+1HrUZ7frmmn3H b0hER3X++ngV9tCZ4Dy+X5lce16TusaQU8ImcsQp4AoPxSXNrr/iflENnOa0KWL+a6AbZ4 CAV6hWB4mLzTOkRUdaqb8rvM6Fs2oQ8= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-3-DZCr3m64M7CNG39gCwvNcw-1; Mon, 16 Aug 2021 04:32:02 -0400 X-MC-Unique: DZCr3m64M7CNG39gCwvNcw-1 Received: by mail-ed1-f69.google.com with SMTP id j15-20020aa7c40f0000b02903be5fbe68a9so8475638edq.2 for ; Mon, 16 Aug 2021 01:32:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=bx1TcCFFLxqAZketNCVhx6k5xMXaylEpGz+3Cg9SPZk=; b=VHM2DureXXxpWHAI2NZWXHMdme2wKjYg+b5dnoAp0coHd5K4UyVjuxnBmJlKzvqYVh fGIYCmY4hVFdWJC+IGJZ5eDd2RJPXxgY0Lh4uMWe+DYhbgDgIcSsLYStFBfBUjYH9CaD KSvxizID2I+onXNcF/dNDIZ/TQGmLwx2xRooE/44jBjmhsgPlzTehJQd0Op0fNOtlphe wA4CirDG7RYdudmA5NZEQ7IJiLS9JukKOBlcIEennYR16HSCY7/LNsKuYIkvW2eVqAm8 6UC8ZZyefESaIerO49HLl1hZkk233F+js1LOmSrMLf2Ly+4h9diT7LHGXUbJqkVmks74 ZrHg== X-Gm-Message-State: AOAM531vzrscY3H40Chhn4BRdD9mSSc/8G0juu5GOmwyPrnJXCYczLQ/ beh+nlMnApV2+AsQsxBrIjweJYHBca/OS5KM4Llq+4U2Y2GILVbY8g66h4ledNbJkjS5nEhXIgR b8od1CHNtvO5H+IeHgomCzyQ35pnZUBzv0h3jMKqsDmiAMGMPpbpZF3hZcVwk0/irleGSjnp7Ph PJt5d4D7Gb0w== X-Received: by 2002:a05:6402:2749:: with SMTP id z9mr18367171edd.58.1629102721648; Mon, 16 Aug 2021 01:32:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJycwgxgGV6AkDNg8gfPHVsMs+e7fC4MJ6GpMdVxyFq1hAOmDz4IxrRmkOer7CNX5ns4TxIL/g== X-Received: by 2002:a05:6402:2749:: with SMTP id z9mr18367141edd.58.1629102721417; Mon, 16 Aug 2021 01:32:01 -0700 (PDT) Received: from x1.localdomain ([81.30.35.201]) by smtp.gmail.com with ESMTPSA id d3sm4499456edv.48.2021.08.16.01.32.01 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 16 Aug 2021 01:32:01 -0700 (PDT) Subject: Re: [PATCH v4 1/1] asus-wmi: Add support for platform_profile To: "Luke D. Jones" , linux-kernel@vger.kernel.org Cc: hadess@hadess.net, platform-driver-x86@vger.kernel.org References: <20210815230558.5860-1-luke@ljones.dev> <20210815230558.5860-2-luke@ljones.dev> From: Hans de Goede Message-ID: <01f2f52e-e41f-4fce-480e-ab5fcd6c7b40@redhat.com> Date: Mon, 16 Aug 2021 10:32:00 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <20210815230558.5860-2-luke@ljones.dev> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org Hi Luke, I have a couple of small remarks once those are resolved in v5 then this should be ready for merging. On 8/16/21 1:05 AM, Luke D. Jones wrote: > Add initial support for platform_profile where the support is > based on availability of ASUS_THROTTLE_THERMAL_POLICY. > > Because throttle_thermal_policy is used by platform_profile and is > writeable separately to platform_profile any userspace changes to > throttle_thermal_policy need to notify platform_profile. > > In future throttle_thermal_policy sysfs should be removed so that > only one method controls the laptop power profile. > > Signed-off-by: Luke D. Jones > --- > drivers/platform/x86/Kconfig | 1 + > drivers/platform/x86/asus-wmi.c | 138 +++++++++++++++++++++++++++++++- > 2 files changed, 135 insertions(+), 4 deletions(-) > > diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig > index d12db6c316ea..46dec48a36c1 100644 > --- a/drivers/platform/x86/Kconfig > +++ b/drivers/platform/x86/Kconfig > @@ -281,6 +281,7 @@ config ASUS_WMI > select INPUT_SPARSEKMAP > select LEDS_CLASS > select NEW_LEDS > + select ACPI_PLATFORM_PROFILE > help > Say Y here if you have a WMI aware Asus laptop (like Eee PCs or new > Asus Notebooks). > diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c > index 90a6a0d00deb..c11ce06073d1 100644 > --- a/drivers/platform/x86/asus-wmi.c > +++ b/drivers/platform/x86/asus-wmi.c > @@ -11,6 +11,7 @@ > * Copyright (C) 2005 Dmitry Torokhov > */ > > +#include This is a weird place to add an include, also please use linux/errno.h. But this is not necessary at all, because the 2 if-s using -ENODATA which need this can be dropped (see below) so please just drop this all together. > #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > > #include > @@ -26,6 +27,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -219,6 +221,9 @@ struct asus_wmi { > bool throttle_thermal_policy_available; > u8 throttle_thermal_policy_mode; > > + struct platform_profile_handler platform_profile_handler; > + bool platform_profile_support; > + > // The RSOC controls the maximum charging percentage. > bool battery_rsoc_available; > > @@ -2103,12 +2108,23 @@ static int throttle_thermal_policy_set_default(struct asus_wmi *asus) > static int throttle_thermal_policy_switch_next(struct asus_wmi *asus) > { > u8 new_mode = asus->throttle_thermal_policy_mode + 1; > + int err; > > if (new_mode > ASUS_THROTTLE_THERMAL_POLICY_SILENT) > new_mode = ASUS_THROTTLE_THERMAL_POLICY_DEFAULT; > > asus->throttle_thermal_policy_mode = new_mode; > - return throttle_thermal_policy_write(asus); > + err = throttle_thermal_policy_write(asus); > + if (err) > + return err; > + > + /* > + * Ensure that platform_profile updates userspace with the change to ensure > + * that platform_profile and throttle_thermal_policy_mode are in sync. > + */ > + platform_profile_notify(); > + > + return 0; > } > > static ssize_t throttle_thermal_policy_show(struct device *dev, > @@ -2124,9 +2140,10 @@ static ssize_t throttle_thermal_policy_store(struct device *dev, > struct device_attribute *attr, > const char *buf, size_t count) > { > - int result; > - u8 new_mode; > struct asus_wmi *asus = dev_get_drvdata(dev); > + u8 new_mode; > + int result; > + int err; > > result = kstrtou8(buf, 10, &new_mode); > if (result < 0) > @@ -2136,7 +2153,15 @@ static ssize_t throttle_thermal_policy_store(struct device *dev, > return -EINVAL; > > asus->throttle_thermal_policy_mode = new_mode; > - throttle_thermal_policy_write(asus); > + err = throttle_thermal_policy_write(asus); > + if (err) > + return err; > + > + /* > + * Ensure that platform_profile updates userspace with the change to ensure > + * that platform_profile and throttle_thermal_policy_mode are in sync. > + */ > + platform_profile_notify(); > > return count; > } > @@ -2144,6 +2169,101 @@ static ssize_t throttle_thermal_policy_store(struct device *dev, > // Throttle thermal policy: 0 - default, 1 - overboost, 2 - silent > static DEVICE_ATTR_RW(throttle_thermal_policy); > > +/* Platform profile ***********************************************************/ > +static int platform_profile_get(struct platform_profile_handler *pprof, > + enum platform_profile_option *profile) > +{ > + struct asus_wmi *asus; > + int tp; > + > + asus = container_of(pprof, struct asus_wmi, platform_profile_handler); > + > + if (!asus->throttle_thermal_policy_available) { > + return -ENODATA; > + } Please don't use {} for an if before a single statement. Also platform_profile_get() only gets used if platform_profile_setup() proceeds beyond the same check which never happens, so this entire check is not necessary, please just drop the entire check. > + tp = asus->throttle_thermal_policy_mode; > + > + if (tp < 0) > + return tp; > + > + switch (tp) { > + case ASUS_THROTTLE_THERMAL_POLICY_DEFAULT: > + *profile = PLATFORM_PROFILE_BALANCED; > + break; > + case ASUS_THROTTLE_THERMAL_POLICY_OVERBOOST: > + *profile = PLATFORM_PROFILE_PERFORMANCE; > + break; > + case ASUS_THROTTLE_THERMAL_POLICY_SILENT: > + *profile = PLATFORM_PROFILE_QUIET; > + break; > + default: > + return -EINVAL; > + } > + > + return 0; > +} > + > +static int platform_profile_set(struct platform_profile_handler *pprof, > + enum platform_profile_option profile) > +{ > + struct asus_wmi *asus; > + int tp; > + > + asus = container_of(pprof, struct asus_wmi, platform_profile_handler); > + > + /* All possible toggles like throttle_thermal_policy here */ This comment seems to be a left-over from when you considered also adding fan-boost-mode, please drop. > + if (!asus->throttle_thermal_policy_available) { > + return -ENODATA; > + } As above, please drop. > + > + switch (profile) { > + case PLATFORM_PROFILE_PERFORMANCE: > + tp = ASUS_THROTTLE_THERMAL_POLICY_OVERBOOST; > + break; > + case PLATFORM_PROFILE_BALANCED: > + tp = ASUS_THROTTLE_THERMAL_POLICY_DEFAULT; > + break; > + case PLATFORM_PROFILE_QUIET: > + tp = ASUS_THROTTLE_THERMAL_POLICY_SILENT; > + break; > + default: > + return -EOPNOTSUPP; > + } > + > + asus->throttle_thermal_policy_mode = tp; > + return throttle_thermal_policy_write(asus); > +} > + > +static int platform_profile_setup(struct asus_wmi *asus) > +{ > + int err; > + > + if (!asus->throttle_thermal_policy_available) { > + /* > + * Not an error if a component platform_profile relies on is unavailable > + * so early return, skipping the setup of platform_profile. > + */ > + return 0; > + } > + dev_info("Using throttle_thermal_policy for platform_profile support\n"); > + > + asus->platform_profile_handler.profile_get = platform_profile_get; > + asus->platform_profile_handler.profile_set = platform_profile_set; > + > + set_bit(PLATFORM_PROFILE_QUIET, asus->platform_profile_handler.choices); > + set_bit(PLATFORM_PROFILE_BALANCED, > + asus->platform_profile_handler.choices); > + set_bit(PLATFORM_PROFILE_PERFORMANCE, > + asus->platform_profile_handler.choices); > + > + err = platform_profile_register(&asus->platform_profile_handler); > + if (err) > + return err; > + > + asus->platform_profile_support = true; > + return 0; > +} > + > /* Backlight ******************************************************************/ > > static int read_backlight_power(struct asus_wmi *asus) > @@ -2904,6 +3024,10 @@ static int asus_wmi_add(struct platform_device *pdev) > else > throttle_thermal_policy_set_default(asus); > > + err = platform_profile_setup(asus); > + if (err) > + goto fail_platform_profile_setup; > + > err = panel_od_check_present(asus); > if (err) > goto fail_panel_od; > @@ -2993,6 +3117,9 @@ static int asus_wmi_add(struct platform_device *pdev) > asus_wmi_sysfs_exit(asus->platform_device); > fail_sysfs: > fail_throttle_thermal_policy: > +fail_platform_profile_setup: > + if (asus->platform_profile_support) > + platform_profile_remove(); > fail_fan_boost_mode: > fail_egpu_enable: > fail_dgpu_disable: > @@ -3017,6 +3144,9 @@ static int asus_wmi_remove(struct platform_device *device) > asus_fan_set_auto(asus); > asus_wmi_battery_exit(asus); > > + if (asus->platform_profile_support) > + platform_profile_remove(); > + > kfree(asus); > return 0; > } > Regards, Hans