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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 45CD9ECAAA3 for ; Fri, 26 Aug 2022 10:00:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245363AbiHZKAF (ORCPT ); Fri, 26 Aug 2022 06:00:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44130 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244784AbiHZKAB (ORCPT ); Fri, 26 Aug 2022 06:00:01 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BED8F1EC6A for ; Fri, 26 Aug 2022 02:59:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661507998; 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=+E3LbM7ed+47vjHtHyRjvNzJXzas9hjIMGvgg5lxouE=; b=aa9M4nC1nMoEIJ1dQrI5aIaciPg9UHV8P8yzhtxfa3s+k0UqimI3Fj/w2/qMUZiE3sONoP wr07U6d+SGoci0xAuwr2WRXHRIGQYbpSAFpEggeU/8Jo3Zyo3S5R0R4m8GJs6SiDs4081M 5V6FYMKYkXkGXAQuvNURwFaB5UnYQMs= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-536-6_63SJtaOamD0U6SnISVKA-1; Fri, 26 Aug 2022 05:59:57 -0400 X-MC-Unique: 6_63SJtaOamD0U6SnISVKA-1 Received: by mail-ej1-f70.google.com with SMTP id nc8-20020a1709071c0800b0073d9044ff27so426744ejc.4 for ; Fri, 26 Aug 2022 02:59:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc; bh=+E3LbM7ed+47vjHtHyRjvNzJXzas9hjIMGvgg5lxouE=; b=H8Rb6+xK1yCHgeNRLF//iXtI8EjXBrM9h+t3RHIdFJLHTIbzwLeIp9/mnYo1D3CskY PKy2rktWai3H3zjosRTjWWwazp64Yesg6zcLV6eg7uc7cuP9aPQVoPPOT/Oqb7cnBn9o ssrzLHxEsc8u2b5A3PSNpGClXt4vxnAKacTt0hgvSEyRJE/ybuDgZhAdmqytGZuMYTrs setAHcVNuv8bJsAmgs9jUAZvMsxT8j5K8k62SqcURK5Of5mBJ1Dg5LJi0SM6Ld+oHBKN MKrl6PkQH69mIhnRTiZQFRUfAJAib1bzaXtnKQLCoGCUHCQIuNJw5Ent4FCSlUcCBFgB gADg== X-Gm-Message-State: ACgBeo37D/obtP874Eu0f3zAmD9wllyRinn2bdlOvneraED92dekN63K rwYZjh3zfugPH/blkCwHlVtNEKYxJqYMLucOHZrzyetCZQqQo+peEEQDRmF4LhK5xX7GpCz3c2L d97YI2PKqFBqVGhahI6v7wuqJ X-Received: by 2002:a17:907:3faa:b0:73d:973e:4a10 with SMTP id hr42-20020a1709073faa00b0073d973e4a10mr4884572ejc.587.1661507996497; Fri, 26 Aug 2022 02:59:56 -0700 (PDT) X-Google-Smtp-Source: AA6agR4marFA5pmZ7WT1Sa7X4GkWGk5/6mb+SvtPf04fvLmACsTB7xICxkAP1V4VdB3Da408spFrZQ== X-Received: by 2002:a17:907:3faa:b0:73d:973e:4a10 with SMTP id hr42-20020a1709073faa00b0073d973e4a10mr4884562ejc.587.1661507996285; Fri, 26 Aug 2022 02:59:56 -0700 (PDT) Received: from ?IPV6:2001:1c00:c1e:bf00:d69d:5353:dba5:ee81? (2001-1c00-0c1e-bf00-d69d-5353-dba5-ee81.cable.dynamic.v6.ziggo.nl. [2001:1c00:c1e:bf00:d69d:5353:dba5:ee81]) by smtp.gmail.com with ESMTPSA id m4-20020aa7d344000000b004476c19d126sm1043823edr.38.2022.08.26.02.59.55 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 26 Aug 2022 02:59:55 -0700 (PDT) Message-ID: <4b196309-fb73-bc77-0096-81915ac9a97d@redhat.com> Date: Fri, 26 Aug 2022 11:59:55 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.12.0 Subject: Re: [PATCH v4 1/2] asus-wmi: Implement TUF laptop keyboard LED modes Content-Language: en-US To: Luke Jones Cc: markgross@kernel.org, platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, andy.shevchenko@gmail.com, pobrn@protonmail.com, pavel@ucw.cz References: <20220825232251.345893-1-luke@ljones.dev> <20220825232251.345893-2-luke@ljones.dev> <0a45a991-4123-a76c-174f-435523f6d348@redhat.com> From: Hans de Goede In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, On 8/26/22 11:56, Luke Jones wrote: > > > On Fri, Aug 26 2022 at 11:47:37 +0200, Hans de Goede wrote: >> Hi Luke, >> >> On 8/26/22 01:22, Luke D. Jones wrote: >>>  Adds support for changing the laptop keyboard LED mode and colour. >>> >>>  The modes are visible effects such as static, rainbow, pulsing, >>>  colour cycles. >>> >>>  These sysfs attributes are added to asus::kbd_backlight: >>>  - kbd_rgb_mode >>>  - kbd_rgb_mode_index >>> >>>  Signed-off-by: Luke D. Jones >>>  --- >>>   drivers/platform/x86/asus-wmi.c            | 76 +++++++++++++++++++++- >>>   include/linux/platform_data/x86/asus-wmi.h |  3 + >>>   2 files changed, 78 insertions(+), 1 deletion(-) >>> >>>  diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c >>>  index 0f9f79f249c7..92f16bb9b4ef 100644 >>>  --- a/drivers/platform/x86/asus-wmi.c >>>  +++ b/drivers/platform/x86/asus-wmi.c >>>  @@ -237,6 +237,8 @@ struct asus_wmi { >>>       bool dgpu_disable_available; >>>       bool gpu_mux_mode_available; >>> >>>  +    bool kbd_rgb_mode_available; >>>  + >>>       bool throttle_thermal_policy_available; >>>       u8 throttle_thermal_policy_mode; >>> >>>  @@ -720,6 +722,69 @@ static ssize_t gpu_mux_mode_store(struct device *dev, >>>   } >>>   static DEVICE_ATTR_RW(gpu_mux_mode); >>> >>>  +/* TUF Laptop Keyboard RGB Modes **********************************************/ >>>  +static ssize_t kbd_rgb_mode_store(struct device *dev, >>>  +                 struct device_attribute *attr, >>>  +                 const char *buf, size_t count) >>>  +{ >>>  +    u32 cmd, mode, r, g,  b,  speed; >>>  +    int err; >>>  + >>>  +    if (sscanf(buf, "%d %d %d %d %d %d", &cmd, &mode, &r, &g, &b, &speed) != 6) >>>  +        return -EINVAL; >>>  + >>>  +    cmd = !!cmd; >>>  + >>>  +    /* These are the known usable modes across all TUF/ROG */ >>>  +    if (mode >= 12 || mode == 9) >>>  +        mode = 10; >>>  + >>>  +    switch (speed) { >>>  +    case 0: >>>  +        speed = 0xe1; >>>  +        break; >>>  +    case 1: >>>  +        speed = 0xeb; >>>  +        break; >>>  +    case 2: >>>  +        speed = 0xf5; >>>  +        break; >>>  +    default: >>>  +        speed = 0xeb; >>>  +    } >>>  + >>>  +    err = asus_wmi_evaluate_method3(ASUS_WMI_METHODID_DEVS, ASUS_WMI_DEVID_TUF_RGB_MODE, >>>  +            cmd | (mode << 8) | (r << 16) | (g << 24), b | (speed << 8), NULL); >>>  +    if (err) >>>  +        return err; >>>  + >>>  +    return count; >>>  +} >>>  +static DEVICE_ATTR_WO(kbd_rgb_mode); >>>  + >>>  +static ssize_t kbd_rgb_mode_index_show(struct device *device, >>>  +                         struct device_attribute *attr, >>>  +                         char *buf) >>>  +{ >>>  +    return sysfs_emit(buf, "%s\n", "cmd mode red green blue speed"); >>>  +} >>>  +static DEVICE_ATTR_RO(kbd_rgb_mode_index); >>>  + >>>  +static struct attribute *kbd_rgb_mode_attrs[] = { >>>  +    &dev_attr_kbd_rgb_mode.attr, >>>  +    &dev_attr_kbd_rgb_mode_index.attr, >>>  +    NULL, >>>  +}; >>>  + >>>  +static const struct attribute_group kbd_rgb_mode_group = { >>>  +    .attrs = kbd_rgb_mode_attrs, >>>  +}; >>>  + >>>  +const struct attribute_group *kbd_rgb_mode_groups[] = { >>>  +    NULL, >>>  +    NULL, >>>  +}; >>>  + >>>   /* Battery ********************************************************************/ >>> >>>   /* The battery maximum charging percentage */ >>>  @@ -1038,7 +1103,10 @@ static void asus_wmi_led_exit(struct asus_wmi *asus) >>> >>>   static int asus_wmi_led_init(struct asus_wmi *asus) >>>   { >>>  -    int rv = 0, led_val; >>>  +    int rv = 0, num_rgb_groups = 0, led_val; >>>  + >>>  +    if (asus->kbd_rgb_mode_available) >>>  +        kbd_rgb_mode_groups[num_rgb_groups++] = &kbd_rgb_mode_group; >>> >>>       asus->led_workqueue = create_singlethread_workqueue("led_workqueue"); >>>       if (!asus->led_workqueue) >>>  @@ -1066,6 +1134,9 @@ static int asus_wmi_led_init(struct asus_wmi *asus) >>>           asus->kbd_led.brightness_get = kbd_led_get; >>>           asus->kbd_led.max_brightness = 3; >>> >>>  +        if (num_rgb_groups != 0) >>>  +            asus->kbd_led.groups = kbd_rgb_mode_groups; >>>  + >>>           rv = led_classdev_register(&asus->platform_device->dev, >>>                          &asus->kbd_led); >>>           if (rv) >>>  @@ -3253,6 +3324,8 @@ static umode_t asus_sysfs_is_visible(struct kobject *kobj, >>>           ok = asus->egpu_enable_available; >>>       else if (attr == &dev_attr_dgpu_disable.attr) >>>           ok = asus->dgpu_disable_available; >>>  +    else if (attr == &dev_attr_dgpu_disable.attr) >>>  +        ok = asus->dgpu_disable_available; >>>       else if (attr == &dev_attr_gpu_mux_mode.attr) >>>           ok = asus->gpu_mux_mode_available; >>>       else if (attr == &dev_attr_fan_boost_mode.attr) >> >> This patch-hunk looks like it is a (mangled) leftover from previous versions >> of the patch. > > Do you mean: > > +    else if (attr == &dev_attr_dgpu_disable.attr) > +        ok = asus->dgpu_disable_available; Yes, patch hunks or chunks are the parts of a patch between a "@@ ... @@" line and the next "@@ ... @@" line. Regards, Hans >>>  @@ -3519,6 +3592,7 @@ static int asus_wmi_add(struct platform_device *pdev) >>>       asus->egpu_enable_available = asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_EGPU); >>>       asus->dgpu_disable_available = asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_DGPU); >>>       asus->gpu_mux_mode_available = asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_GPU_MUX); >>>  +    asus->kbd_rgb_mode_available = asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_TUF_RGB_MODE); >>>       asus->panel_overdrive_available = asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_PANEL_OD); >>> >>>       err = fan_boost_mode_check_present(asus); >>>  diff --git a/include/linux/platform_data/x86/asus-wmi.h b/include/linux/platform_data/x86/asus-wmi.h >>>  index 6e8a95c10d17..3d861477cb20 100644 >>>  --- a/include/linux/platform_data/x86/asus-wmi.h >>>  +++ b/include/linux/platform_data/x86/asus-wmi.h >>>  @@ -103,6 +103,9 @@ >>>   /* gpu mux switch, 0 = dGPU, 1 = Optimus */ >>>   #define ASUS_WMI_DEVID_GPU_MUX        0x00090016 >>> >>>  +/* TUF laptop RGB modes/colours */ >>>  +#define ASUS_WMI_DEVID_TUF_RGB_MODE    0x00100056 >>>  + >>>   /* DSTS masks */ >>>   #define ASUS_WMI_DSTS_STATUS_BIT    0x00000001 >>>   #define ASUS_WMI_DSTS_UNKNOWN_BIT    0x00000002 >> > >