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=-15.9 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,UNWANTED_LANGUAGE_BODY,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 482B5C07E9B for ; Tue, 6 Jul 2021 10:26:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2B98161958 for ; Tue, 6 Jul 2021 10:26:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231406AbhGFK3b (ORCPT ); Tue, 6 Jul 2021 06:29:31 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:41407 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231338AbhGFK3a (ORCPT ); Tue, 6 Jul 2021 06:29:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1625567211; 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=78Q0UqonffbOpVBh5TZWlfRZomth9MefDWO2m1Sy+1Q=; b=FYH1lqIn70Ru6o8aMK4becm0M9RJC4Z2d/t75LRcYq/dxW/MydSnzzJI9usv9k7rOtF6Mf lE5by94TH3FUPOa2Hq1mqtk53gKPfolAZUhfk2J9h6oZ3X0Pn5u9GOdCT7DrjAqRXjbUPP a4FqPtnx00VCLRrpi71GlrQC/bYRoHA= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-386-bTJZyVjBMGKe2LUli8WvLw-1; Tue, 06 Jul 2021 06:26:51 -0400 X-MC-Unique: bTJZyVjBMGKe2LUli8WvLw-1 Received: by mail-wm1-f71.google.com with SMTP id k8-20020a05600c1c88b02901b7134fb829so3510959wms.5 for ; Tue, 06 Jul 2021 03:26:50 -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=78Q0UqonffbOpVBh5TZWlfRZomth9MefDWO2m1Sy+1Q=; b=QKwK77ufXRtQ8YqlT34Z/hClmup9LEOsLHXFQrlnaq87P0aIix+fa0e/OVcPhrMu60 +HFjDrOKBKT4SZRh1xjDpC98W6kwGnE8BdU9TiUM8WnwVnx1XqdVs2vXVVefRWtxQnS4 7gddufovGFhEE5f+QbTOPyWZ13R31Yxy5vqxcmBECeQpH/MY9kTRF6t8JQS0yu/+MN4a i0MEFyyDCipza5CZgcRgwFaSWy3HGeQ3DwXzzdHUChJ1TEPqGqLCLd9xC1TPyb7LUD+N xrsJ6FFYmt2EG1ZaC7CTE5Ik5pZn5oiV4xM6DLc2jY6yhQYC66rm7qbaEVYifi8j4zVB dNHw== X-Gm-Message-State: AOAM530K3+s2nvbScLoHd9Vo6iDISby8iQ+yHbFTYgwboY1b6IhfPPF0 9zLFvJDeI/oOka7xVbIvIx9y298a5ppekfM3sFF7GULlsP/1M9g/1ut2U7qSQr5Gr1GG6dVoegd umrtb6dEvMp9mEdoWOb6r5mb+j8qnA3JOMqYKWlZcgi5/2htkpvyEs4gJAFN5UPyqikOg3CiYYR Fc X-Received: by 2002:a50:afe2:: with SMTP id h89mr22353576edd.308.1625566742969; Tue, 06 Jul 2021 03:19:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzRDZpUZm7ZlxsDKnBtGusgfGhNCONuwpQxsYyVaqlCZoYOlX5qsIV057xHH5btoj+B5H/ihA== X-Received: by 2002:a50:afe2:: with SMTP id h89mr22353551edd.308.1625566742816; Tue, 06 Jul 2021 03:19:02 -0700 (PDT) Received: from x1.localdomain (2001-1c00-0c1e-bf00-1054-9d19-e0f0-8214.cable.dynamic.v6.ziggo.nl. [2001:1c00:c1e:bf00:1054:9d19:e0f0:8214]) by smtp.gmail.com with ESMTPSA id mm27sm5445229ejb.67.2021.07.06.03.19.02 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 06 Jul 2021 03:19:02 -0700 (PDT) Subject: Re: [PATCH 3/3] asus-wmi: Add egpu enable method To: "Luke D. Jones" Cc: corentin.chary@gmail.com, mgross@linux.intel.com, jdelvare@suse.com, linux@roeck-us.net, platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org References: <20210704222148.880848-1-luke@ljones.dev> <20210704222148.880848-4-luke@ljones.dev> From: Hans de Goede Message-ID: <7b44bce2-9915-5d16-a0af-727759d29394@redhat.com> Date: Tue, 6 Jul 2021 12:19:01 +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: <20210704222148.880848-4-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: linux-kernel@vger.kernel.org Hi, On 7/5/21 12:21 AM, Luke D. Jones wrote: > The X13 Flow laptops can utilise an external GPU. This requires > toggling an ACPI method which will first disable the internal > dGPU, and then enable the eGPU. > > Signed-off-by: Luke D. Jones > --- > drivers/platform/x86/asus-wmi.c | 92 ++++++++++++++++++++++ > include/linux/platform_data/x86/asus-wmi.h | 3 + > 2 files changed, 95 insertions(+) > > diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c > index 8dc3f7ed021f..c9fe77456b7b 100644 > --- a/drivers/platform/x86/asus-wmi.c > +++ b/drivers/platform/x86/asus-wmi.c > @@ -210,6 +210,9 @@ struct asus_wmi { > u8 fan_boost_mode_mask; > u8 fan_boost_mode; > > + bool egpu_enable_available; // 0 = enable > + u8 egpu_enable_mode; > + > bool dgpu_disable_available; > u8 dgpu_disable_mode; > > @@ -430,6 +433,87 @@ static void lid_flip_tablet_mode_get_state(struct asus_wmi *asus) > } > } > > +/* eGPU ********************************************************************/ > +static int egpu_enable_check_present(struct asus_wmi *asus) > +{ > + u32 result; > + int err; > + > + asus->egpu_enable_available = false; > + > + err = asus_wmi_get_devstate(asus, ASUS_WMI_DEVID_EGPU, &result); > + if (err) { > + if (err == -ENODEV) > + return 0; > + return err; > + } > + > + if (result & ASUS_WMI_DSTS_PRESENCE_BIT) { > + asus->egpu_enable_available = true; > + asus->egpu_enable_mode = result & ASUS_WMI_DSTS_STATUS_BIT; > + } And now the braces are there (good) :) > + > + return 0; > +} > + > +static int egpu_enable_write(struct asus_wmi *asus) > +{ > + int err; > + u8 value; > + u32 retval; > + > + value = asus->egpu_enable_mode; > + > + err = asus_wmi_set_devstate(ASUS_WMI_DEVID_EGPU, value, &retval); > + > + sysfs_notify(&asus->platform_device->dev.kobj, NULL, "egpu_enable"); > + > + if (err) { > + pr_warn("Failed to set egpu disable: %d\n", err); > + return err; > + } > + > + if (retval > 1 || retval < 0) { > + pr_warn("Failed to set egpu disable (retval): 0x%x\n", retval); And all these now are on one line, good again :) > + return -EIO; > + } > + > + return 0; > +} > + > +static ssize_t egpu_enable_show(struct device *dev, > + struct device_attribute *attr, char *buf) > +{ > + struct asus_wmi *asus = dev_get_drvdata(dev); > + u8 mode = asus->egpu_enable_mode; > + > + return scnprintf(buf, PAGE_SIZE, "%d\n", mode); sysfs_emit() please. > +} > + > +static ssize_t egpu_enable_store(struct device *dev, > + struct device_attribute *attr, > + const char *buf, size_t count) > +{ > + int result; > + u8 disable; > + struct asus_wmi *asus = dev_get_drvdata(dev); > + > + result = kstrtou8(buf, 10, &disable); > + if (result < 0) > + return result; > + > + if (disable > 1 || disable < 0) > + return -EINVAL; Replace this with kstrtobool() ? or otherwise drop the disable < 0 check. > + > + asus->egpu_enable_mode = disable; > + > + egpu_enable_write(asus); > + > + return count; > +} > + > +static DEVICE_ATTR_RW(egpu_enable); > + > /* dGPU ********************************************************************/ > static int dgpu_disable_check_present(struct asus_wmi *asus) > { > @@ -2502,6 +2586,7 @@ static struct attribute *platform_attributes[] = { > &dev_attr_camera.attr, > &dev_attr_cardr.attr, > &dev_attr_touchpad.attr, > + &dev_attr_egpu_enable.attr, > &dev_attr_dgpu_disable.attr, > &dev_attr_lid_resume.attr, > &dev_attr_als_enable.attr, > @@ -2529,6 +2614,8 @@ static umode_t asus_sysfs_is_visible(struct kobject *kobj, > devid = ASUS_WMI_DEVID_LID_RESUME; > else if (attr == &dev_attr_als_enable.attr) > devid = ASUS_WMI_DEVID_ALS_ENABLE; > + else if (attr == &dev_attr_egpu_enable.attr) > + ok = asus->egpu_enable_available; > else if (attr == &dev_attr_dgpu_disable.attr) > ok = asus->dgpu_disable_available; > else if (attr == &dev_attr_fan_boost_mode.attr) > @@ -2792,6 +2879,10 @@ static int asus_wmi_add(struct platform_device *pdev) > if (err) > goto fail_platform; > > + err = egpu_enable_check_present(asus); > + if (err) > + goto fail_egpu_enable; > + > err = dgpu_disable_check_present(asus); > if (err) > goto fail_dgpu_disable; > @@ -2896,6 +2987,7 @@ static int asus_wmi_add(struct platform_device *pdev) > fail_sysfs: > fail_throttle_thermal_policy: > fail_fan_boost_mode: > +fail_egpu_enable: > fail_dgpu_disable: > fail_platform: > fail_panel_od: > diff --git a/include/linux/platform_data/x86/asus-wmi.h b/include/linux/platform_data/x86/asus-wmi.h > index a528f9d0e4b7..17dc5cb6f3f2 100644 > --- a/include/linux/platform_data/x86/asus-wmi.h > +++ b/include/linux/platform_data/x86/asus-wmi.h > @@ -90,6 +90,9 @@ > /* Keyboard dock */ > #define ASUS_WMI_DEVID_KBD_DOCK 0x00120063 > > +/* dgpu on/off */ > +#define ASUS_WMI_DEVID_EGPU 0x00090019 > + > /* dgpu on/off */ > #define ASUS_WMI_DEVID_DGPU 0x00090020 > > Otherwise this looks good to me. Regards, Hans