From patchwork Mon Apr 13 21:06:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Garrett X-Patchwork-Id: 11486239 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3FF6214DD for ; Mon, 13 Apr 2020 21:06:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 27ACC206E9 for ; Mon, 13 Apr 2020 21:06:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="FNC5deBe" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388744AbgDMVGx (ORCPT ); Mon, 13 Apr 2020 17:06:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44672 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388723AbgDMVGw (ORCPT ); Mon, 13 Apr 2020 17:06:52 -0400 Received: from mail-pj1-x1049.google.com (mail-pj1-x1049.google.com [IPv6:2607:f8b0:4864:20::1049]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7F3F7C0A3BDC for ; Mon, 13 Apr 2020 14:06:52 -0700 (PDT) Received: by mail-pj1-x1049.google.com with SMTP id d11so11292858pjh.4 for ; Mon, 13 Apr 2020 14:06:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=IV0jCGjY4W6KdLiLfKem198qqlhSCntJsgHYVO+E6jU=; b=FNC5deBelKjQu9FQsxeDOLK8dE9RzOssihuoDJkcERxLh1LBzR9As37XDqlykamblH H6sOT/wtr0SQv9/3+IXDT1GHWnoT8ecRaYNvy//giJCXMGeGJ3wd/7Ya/Eq3ppTD1a2u f8iT3ZcSVqBTzNOvszdjAIWlt1GukNnhAZdmCbEevZXhG6s7079smKzUzbX90zSv8gY0 e7iwZNYwqtAPweHkrfy9hVFLEl5xw4Pjklvq9cgZrAJMoyr8JDFXl+txh8YK22uDEaXE 1/3oxX/THgt0KyBGSXepiXq+nLDgl8LqoQ0tTPoUh87+rgezNp/GZkhbggIfvZsNhVKO u5kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=IV0jCGjY4W6KdLiLfKem198qqlhSCntJsgHYVO+E6jU=; b=Hu34RaHFuoNSJ3LIGaCG1llWkGBOBcf1OdK0JPo98b08OPKPkUBekKw6ZfaUL/dETd weqLh/XPAQTbyP8i0qhX3cD33PYrqjLhvIrg5ltBbHtUzqq8X0jcoai5jNZPdYDmAzPz 4epUH3AOIbeohmTnxHOcoAGmi4C9AX799CjWc4o3i8JfgrNY32ei1eCpHh6cWqv7B6Ie gu0wP62lH77anQPeBimTzBHGG9evxjDKMLB8LuhzhOLJgk3jLPKZfE1l/6s0gA2W9B4n gyajCjtBn6mQeWNDgFFfErq2EoHFDUf8p73TBi1m6xN8+cn6bdOg8TD7NbTLZzOArghR nkaQ== X-Gm-Message-State: AGi0Pua5nPhCroL2wLrQ5z2OhaGn1Rfs1aIwgink9p36rUSsi7sOH+Lj 1V/tGws6uquAqA2oQgXHj+dsXCDVLxtKTRUQRzMfqA== X-Google-Smtp-Source: APiQypIJh3M/I5cOHqVYEHsnkdDtigtwOiciiePxgVDuJ8OG5dy1ncDxT6Fx/Pgv+rzuviXoXgvVVwmVfpKywghiEC6XQg== X-Received: by 2002:a17:90a:65c8:: with SMTP id i8mr23517001pjs.156.1586812011717; Mon, 13 Apr 2020 14:06:51 -0700 (PDT) Date: Mon, 13 Apr 2020 14:06:42 -0700 Message-Id: <20200413210644.201801-1-matthewgarrett@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.26.0.110.g2183baf09c-goog Subject: [PATCH 1/3] thermal/int340x_thermal: Export GDDV From: Matthew Garrett To: linux-kernel@vger.kernel.org Cc: linux-pm@vger.kernel.org, rui.zhang@intel.com, nisha.aram@intel.com, Matthew Garrett Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org From: Matthew Garrett Implementing DPTF properly requires making use of firmware-provided information associated with the INT3400 device. Calling GDDV provides a buffer of information which userland can then interpret to determine appropriate DPTF policy. Signed-off-by: Matthew Garrett --- .../intel/int340x_thermal/int3400_thermal.c | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c index ceef89c956bd4..00a7732724cd0 100644 --- a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c +++ b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c @@ -52,6 +52,25 @@ struct int3400_thermal_priv { u8 uuid_bitmap; int rel_misc_dev_res; int current_uuid_index; + char *data_vault; +}; + +static ssize_t data_vault_read(struct file *file, struct kobject *kobj, + struct bin_attribute *attr, char *buf, loff_t off, size_t count) +{ + memcpy(buf, attr->private + off, count); + return count; +} + +static BIN_ATTR_RO(data_vault, 0); + +static struct bin_attribute *data_attributes[] = { + &bin_attr_data_vault, + NULL, +}; + +static const struct attribute_group data_attribute_group = { + .bin_attrs = data_attributes, }; static ssize_t available_uuids_show(struct device *dev, @@ -278,6 +297,32 @@ static struct thermal_zone_params int3400_thermal_params = { .no_hwmon = true, }; +static void int3400_setup_gddv(struct int3400_thermal_priv *priv) +{ + struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; + union acpi_object *obj; + acpi_status status; + + status = acpi_evaluate_object(priv->adev->handle, "GDDV", NULL, + &buffer); + if (ACPI_FAILURE(status) || !buffer.length) + return; + + obj = buffer.pointer; + if (obj->type != ACPI_TYPE_PACKAGE || obj->package.count != 1 + || obj->package.elements[0].type != ACPI_TYPE_BUFFER) { + kfree(buffer.pointer); + return; + } + + priv->data_vault = kmemdup(obj->package.elements[0].buffer.pointer, + obj->package.elements[0].buffer.length, + GFP_KERNEL); + bin_attr_data_vault.private = priv->data_vault; + bin_attr_data_vault.size = obj->package.elements[0].buffer.length; + kfree(buffer.pointer); +} + static int int3400_thermal_probe(struct platform_device *pdev) { struct acpi_device *adev = ACPI_COMPANION(&pdev->dev); @@ -309,6 +354,8 @@ static int int3400_thermal_probe(struct platform_device *pdev) platform_set_drvdata(pdev, priv); + int3400_setup_gddv(priv); + int3400_thermal_ops.get_mode = int3400_thermal_get_mode; int3400_thermal_ops.set_mode = int3400_thermal_set_mode; @@ -327,6 +374,13 @@ static int int3400_thermal_probe(struct platform_device *pdev) if (result) goto free_rel_misc; + if (priv->data_vault) { + result = sysfs_create_group(&pdev->dev.kobj, + &data_attribute_group); + if (result) + goto free_uuid; + } + result = acpi_install_notify_handler( priv->adev->handle, ACPI_DEVICE_NOTIFY, int3400_notify, (void *)priv); @@ -336,6 +390,9 @@ static int int3400_thermal_probe(struct platform_device *pdev) return 0; free_sysfs: + if (priv->data_vault) + sysfs_remove_group(&pdev->dev.kobj, &data_attribute_group); +free_uuid: sysfs_remove_group(&pdev->dev.kobj, &uuid_attribute_group); free_rel_misc: if (!priv->rel_misc_dev_res) @@ -360,8 +417,11 @@ static int int3400_thermal_remove(struct platform_device *pdev) if (!priv->rel_misc_dev_res) acpi_thermal_rel_misc_device_remove(priv->adev->handle); + if (priv->data_vault) + sysfs_remove_group(&pdev->dev.kobj, &data_attribute_group); sysfs_remove_group(&pdev->dev.kobj, &uuid_attribute_group); thermal_zone_device_unregister(priv->thermal); + kfree(priv->data_vault); kfree(priv->trts); kfree(priv->arts); kfree(priv); From patchwork Mon Apr 13 21:06:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Garrett X-Patchwork-Id: 11486241 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 64860912 for ; Mon, 13 Apr 2020 21:07:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 43256206E9 for ; Mon, 13 Apr 2020 21:07:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="JDqXIxNw" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388754AbgDMVG4 (ORCPT ); Mon, 13 Apr 2020 17:06:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44684 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388743AbgDMVGy (ORCPT ); Mon, 13 Apr 2020 17:06:54 -0400 Received: from mail-pg1-x54a.google.com (mail-pg1-x54a.google.com [IPv6:2607:f8b0:4864:20::54a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C6213C0A3BDC for ; Mon, 13 Apr 2020 14:06:54 -0700 (PDT) Received: by mail-pg1-x54a.google.com with SMTP id s19so262742pgq.1 for ; Mon, 13 Apr 2020 14:06:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=5YCqTBP5K2PN6mZ2OCe5wiMOpXtvJ48+Gdsr/3Jn0Y4=; b=JDqXIxNwPCmICqv0wsuTvKAuqwhtovNaeTjajcd30ZRMx/M9NpuVnxKu4l+BwyJDMD Sxm4gDM9xuRaZKHPNzBySB5qlkU14KnEFhsxi1guJOTQiW4rNQNlUGcUxVeD4vp47F9K sf/7tpiD8xdiaKLqSlWfpx9uGUYm8RGK0ce+STF2c6RBel6PUTZNgpoQogr7w6SIjKq4 kiEDnusnR222jGjGgtebAUXGPvpMkwuYB/vQs/8jKgjRxu6amt5pcQDD4VVHJGs6bpuJ a+AHtUJFjlB8hF0xPUMIPWBmOtSQojCY9CQhmFnaC68M995iBKq/orVOeDbCHoLoN/e+ 2o4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=5YCqTBP5K2PN6mZ2OCe5wiMOpXtvJ48+Gdsr/3Jn0Y4=; b=Hwb9oTrbs906/z62yy80eh7v9+r4YU9K9CCyvVf/ZiBQt+MrdJ836JbDMIFGWjSGVL WhjczsZ5RX+MfWq8OHb2qxTX9K+DcB3pFegtjD6RoVWh8GMCabjrjRL1/2zTlBQyXyjL tbpX/qWHMPQSMFRX8RoOBLSOIZ5gXg9ZQ2Rgm5x1Ue7z2c/GHA1JTklD3AcIlOVXWfEy Ytr8AboAOFgcSQgdPAUcRI+GDjiMeVSETJsBlnVlLmqORRmelU8dJQhWxt1UyHl7C3SP G5FAlDk9GoC6DYtvdmD6SJ1sKFOLqHfQkCVH1gT0pboVMEdntQHLcki+0rdG4Mx57ETo BynQ== X-Gm-Message-State: AGi0PuYTV3sl0ToC61nwvRrIxKHjnzneYPmBShhgYSUFvZ97aQuTuczQ 2DDJAxkhVikkReSfzl+fwl4m65Nu5EGqzPjji49Ikw== X-Google-Smtp-Source: APiQypJNdv10Jq0jwXqhoBKSFdxmVPBJJ1Mo0D3jceJ/qxk7LWisMRsbF5yd6lUE+pJTLP+/CKvM0QKbtZnNoyqxtMx6pQ== X-Received: by 2002:a17:90a:2170:: with SMTP id a103mr24300989pje.181.1586812014151; Mon, 13 Apr 2020 14:06:54 -0700 (PDT) Date: Mon, 13 Apr 2020 14:06:43 -0700 In-Reply-To: <20200413210644.201801-1-matthewgarrett@google.com> Message-Id: <20200413210644.201801-2-matthewgarrett@google.com> Mime-Version: 1.0 References: <20200413210644.201801-1-matthewgarrett@google.com> X-Mailer: git-send-email 2.26.0.110.g2183baf09c-goog Subject: [PATCH 2/3] thermal/int340x_thermal: Export OEM vendor variables From: Matthew Garrett To: linux-kernel@vger.kernel.org Cc: linux-pm@vger.kernel.org, rui.zhang@intel.com, nisha.aram@intel.com, Matthew Garrett Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org From: Matthew Garrett The platform vendor may expose an array of OEM-specific values to be used in determining DPTF policy. These are obtained via the ODVP method, and then simply exposed in sysfs. In addition, they are updated when a notification is received or when the DPTF policy is changed by userland. Signed-off-by: Matthew Garrett --- .../intel/int340x_thermal/int3400_thermal.c | 132 +++++++++++++++++- 1 file changed, 131 insertions(+), 1 deletion(-) diff --git a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c index 00a7732724cd0..f36e3e9d246ea 100644 --- a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c +++ b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c @@ -13,6 +13,7 @@ #include "acpi_thermal_rel.h" #define INT3400_THERMAL_TABLE_CHANGED 0x83 +#define INT3400_ODVP_CHANGED 0x88 enum int3400_thermal_uuid { INT3400_THERMAL_PASSIVE_1, @@ -41,8 +42,11 @@ static char *int3400_thermal_uuids[INT3400_THERMAL_MAXIMUM_UUID] = { "BE84BABF-C4D4-403D-B495-3128FD44dAC1", }; +struct odvp_attr; + struct int3400_thermal_priv { struct acpi_device *adev; + struct platform_device *pdev; struct thermal_zone_device *thermal; int mode; int art_count; @@ -53,6 +57,17 @@ struct int3400_thermal_priv { int rel_misc_dev_res; int current_uuid_index; char *data_vault; + int odvp_count; + int *odvp; + struct odvp_attr *odvp_attrs; +}; + +static int evaluate_odvp(struct int3400_thermal_priv *priv); + +struct odvp_attr { + int odvp; + struct int3400_thermal_priv *priv; + struct kobj_attribute attr; }; static ssize_t data_vault_read(struct file *file, struct kobject *kobj, @@ -210,9 +225,110 @@ static int int3400_thermal_run_osc(acpi_handle handle, result = -EPERM; kfree(context.ret.pointer); + return result; } +static ssize_t odvp_show(struct kobject *kobj, struct kobj_attribute *attr, + char *buf) +{ + struct odvp_attr *odvp_attr; + + odvp_attr = container_of(attr, struct odvp_attr, attr); + + return sprintf(buf, "%d\n", odvp_attr->priv->odvp[odvp_attr->odvp]); +} + +static void cleanup_odvp(struct int3400_thermal_priv *priv) +{ + int i; + + if (priv->odvp_attrs) { + for (i = 0; i < priv->odvp_count; i++) { + sysfs_remove_file(&priv->pdev->dev.kobj, + &priv->odvp_attrs[i].attr.attr); + kfree(priv->odvp_attrs[i].attr.attr.name); + } + kfree(priv->odvp_attrs); + } + kfree(priv->odvp); + priv->odvp_count = 0; +} + +static int evaluate_odvp(struct int3400_thermal_priv *priv) +{ + struct acpi_buffer odvp = { ACPI_ALLOCATE_BUFFER, NULL }; + union acpi_object *obj = NULL; + acpi_status status; + int i, ret; + + status = acpi_evaluate_object(priv->adev->handle, "ODVP", NULL, &odvp); + if (ACPI_FAILURE(status)) { + ret = -EINVAL; + goto out_err; + } + + obj = odvp.pointer; + if (obj->type != ACPI_TYPE_PACKAGE) { + ret = -EINVAL; + goto out_err; + } + + if (priv->odvp == NULL) { + priv->odvp_count = obj->package.count; + priv->odvp = kmalloc_array(priv->odvp_count, sizeof(int), + GFP_KERNEL); + if (!priv->odvp) { + ret = -ENOMEM; + goto out_err; + } + } + + if (priv->odvp_attrs == NULL) { + priv->odvp_attrs = kcalloc(priv->odvp_count, + sizeof(struct odvp_attr), + GFP_KERNEL); + if (!priv->odvp_attrs) { + ret = -ENOMEM; + goto out_err; + } + for (i = 0; i < priv->odvp_count; i++) { + struct odvp_attr *odvp = &priv->odvp_attrs[i]; + + sysfs_attr_init(attr->attr); + odvp->priv = priv; + odvp->odvp = i; + odvp->attr.attr.name = kasprintf(GFP_KERNEL, + "odvp%d", i); + + if (!odvp->attr.attr.name) { + ret = -ENOMEM; + goto out_err; + } + odvp->attr.attr.mode = 0444; + odvp->attr.show = odvp_show; + odvp->attr.store = NULL; + ret = sysfs_create_file(&priv->pdev->dev.kobj, + &odvp->attr.attr); + if (ret) + goto out_err; + } + } + + for (i = 0; i < obj->package.count; i++) { + if (obj->package.elements[i].type == ACPI_TYPE_INTEGER) + priv->odvp[i] = obj->package.elements[i].integer.value; + } + + kfree(obj); + return 0; + +out_err: + cleanup_odvp(priv); + kfree(obj); + return ret; +} + static void int3400_notify(acpi_handle handle, u32 event, void *data) @@ -236,6 +352,9 @@ static void int3400_notify(acpi_handle handle, kobject_uevent_env(&priv->thermal->device.kobj, KOBJ_CHANGE, thermal_prop); break; + case INT3400_ODVP_CHANGED: + evaluate_odvp(priv); + break; default: /* Ignore unknown notification codes sent to INT3400 device */ break; @@ -285,6 +404,9 @@ static int int3400_thermal_set_mode(struct thermal_zone_device *thermal, priv->current_uuid_index, enable); } + + evaluate_odvp(priv); + return result; } @@ -336,6 +458,7 @@ static int int3400_thermal_probe(struct platform_device *pdev) if (!priv) return -ENOMEM; + priv->pdev = pdev; priv->adev = adev; result = int3400_thermal_get_uuids(priv); @@ -356,6 +479,8 @@ static int int3400_thermal_probe(struct platform_device *pdev) int3400_setup_gddv(priv); + evaluate_odvp(priv); + int3400_thermal_ops.get_mode = int3400_thermal_get_mode; int3400_thermal_ops.set_mode = int3400_thermal_set_mode; @@ -390,8 +515,11 @@ static int int3400_thermal_probe(struct platform_device *pdev) return 0; free_sysfs: - if (priv->data_vault) + cleanup_odvp(priv); + if (priv->data_vault) { sysfs_remove_group(&pdev->dev.kobj, &data_attribute_group); + kfree(priv->data_vault); + } free_uuid: sysfs_remove_group(&pdev->dev.kobj, &uuid_attribute_group); free_rel_misc: @@ -414,6 +542,8 @@ static int int3400_thermal_remove(struct platform_device *pdev) priv->adev->handle, ACPI_DEVICE_NOTIFY, int3400_notify); + cleanup_odvp(priv); + if (!priv->rel_misc_dev_res) acpi_thermal_rel_misc_device_remove(priv->adev->handle); From patchwork Mon Apr 13 21:06:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Garrett X-Patchwork-Id: 11486243 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9894B912 for ; Mon, 13 Apr 2020 21:07:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8032F206DA for ; Mon, 13 Apr 2020 21:07:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="eBBGEhSw" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388765AbgDMVHA (ORCPT ); Mon, 13 Apr 2020 17:07:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44694 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388759AbgDMVG5 (ORCPT ); Mon, 13 Apr 2020 17:06:57 -0400 Received: from mail-pg1-x549.google.com (mail-pg1-x549.google.com [IPv6:2607:f8b0:4864:20::549]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 28334C0A3BDC for ; Mon, 13 Apr 2020 14:06:57 -0700 (PDT) Received: by mail-pg1-x549.google.com with SMTP id e22so9529425pgm.22 for ; Mon, 13 Apr 2020 14:06:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=HSxjufempazlx5EL6Oqz0WzuegPQO1JBIjf6VYFe9Lg=; b=eBBGEhSwmUtbM/28R1jPRtSlGoaZjrh5Iw30aQEybCW1f1TsI2w2+Qy0VWPC2m97ZO JMok85CQUNXRhH+16KHF/vM6RGhmirRuYun9Moz78tVUxpMP6OxQrbRd2btFZrBIXtre xqlCj9t3+qlmQzeYstPxszQwbROImI5htMdCYhSNzR24TbaK8Bokor57AJm0sv1ChxMv a9XyUjj6+JoGQvkzN3FWOYrPaWYhWptZreUxY1axoCVDImtsibhIxuG6eEkNUn7XUVLC s4dJ7/i/7OxBLcqYZtmApixSQe85DAB0mzV5Cu2Fm3c/c/+5FFJcij5Ja/nYnzL9kJKG QJmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=HSxjufempazlx5EL6Oqz0WzuegPQO1JBIjf6VYFe9Lg=; b=RViF05O9iv096o9UbhDAGg3jdfAXa4IJMurZD+kOsZBP75ssrOWn+z1u8b5aWbfzwR AgRnmJtqjB5N0kbB2EjRYGmfXYU0e5gdqbqtA/HDqS859QfSh+wUHLOtMQ8s/8iD9Hy+ I+MCwA88JD6d2M7hjxUSBJc16knSiRax6uMyEKID6kJwDCGcPNOP4zqgydqKbXg9vR2X gE1CXjC1q4IXcb6dt3sC9fXYIBprBc8hRlXOQSvZaiTDoS90hYb+TKIeSGhrEm5R6hlE DGYQKSGmey+k45oiXRUd7cUjjeBGTKdH5CkysQW5Ap3Uhj58lvGtBwxees0YUuZymXit 7Z2Q== X-Gm-Message-State: AGi0PuahQZJ+sm7GJmUPwvWN4sirWIjaOOPGltJNEW2La2LevntSqvvY aFJzL2eiO3zmq4d7QH7XQZw/ymNcH36ifzebTm4aag== X-Google-Smtp-Source: APiQypLj2wxTeXWWD/akXvUHZhHVqCJxN8UAQy1avGH0RwTxLR0YBDSDF0srfJAh7ctMWC0hfTGONqJkcAD2wa1lC0/KAg== X-Received: by 2002:a17:90a:858a:: with SMTP id m10mr21257991pjn.178.1586812016579; Mon, 13 Apr 2020 14:06:56 -0700 (PDT) Date: Mon, 13 Apr 2020 14:06:44 -0700 In-Reply-To: <20200413210644.201801-1-matthewgarrett@google.com> Message-Id: <20200413210644.201801-3-matthewgarrett@google.com> Mime-Version: 1.0 References: <20200413210644.201801-1-matthewgarrett@google.com> X-Mailer: git-send-email 2.26.0.110.g2183baf09c-goog Subject: [PATCH 3/3] thermal/int340x_thermal: Don't require IDSP to exist From: Matthew Garrett To: linux-kernel@vger.kernel.org Cc: linux-pm@vger.kernel.org, rui.zhang@intel.com, nisha.aram@intel.com, Matthew Garrett Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org From: Matthew Garrett The IDSP method doesn't appear to exist on the most recent Intel platforms: instead, the IDSP data is included in the GDDV blob. Since we probably don't want to decompress and parse that in-kernel, just allow any UUID to be written if IDSP is missing. Signed-off-by: Matthew Garrett --- .../intel/int340x_thermal/int3400_thermal.c | 30 ++++++++++++++----- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c index f36e3e9d246ea..bece011451e17 100644 --- a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c +++ b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c @@ -96,6 +96,9 @@ static ssize_t available_uuids_show(struct device *dev, int i; int length = 0; + if (!priv->uuid_bitmap) + return sprintf(buf, "UNKNOWN\n"); + for (i = 0; i < INT3400_THERMAL_MAXIMUM_UUID; i++) { if (priv->uuid_bitmap & (1 << i)) if (PAGE_SIZE - length > 0) @@ -113,11 +116,11 @@ static ssize_t current_uuid_show(struct device *dev, { struct int3400_thermal_priv *priv = dev_get_drvdata(dev); - if (priv->uuid_bitmap & (1 << priv->current_uuid_index)) - return sprintf(buf, "%s\n", - int3400_thermal_uuids[priv->current_uuid_index]); - else + if (priv->current_uuid_index == -1) return sprintf(buf, "INVALID\n"); + + return sprintf(buf, "%s\n", + int3400_thermal_uuids[priv->current_uuid_index]); } static ssize_t current_uuid_store(struct device *dev, @@ -128,9 +131,16 @@ static ssize_t current_uuid_store(struct device *dev, int i; for (i = 0; i < INT3400_THERMAL_MAXIMUM_UUID; ++i) { - if ((priv->uuid_bitmap & (1 << i)) && - !(strncmp(buf, int3400_thermal_uuids[i], - sizeof(int3400_thermal_uuids[i]) - 1))) { + if (!strncmp(buf, int3400_thermal_uuids[i], + sizeof(int3400_thermal_uuids[i]) - 1)) { + /* + * If we have a list of supported UUIDs, make sure + * this one is supported. + */ + if (priv->uuid_bitmap && + !(priv->uuid_bitmap & (1 << i))) + return -EINVAL; + priv->current_uuid_index = i; return count; } @@ -462,9 +472,13 @@ static int int3400_thermal_probe(struct platform_device *pdev) priv->adev = adev; result = int3400_thermal_get_uuids(priv); - if (result) + + /* Missing IDSP isn't fatal */ + if (result && result != -ENODEV) goto free_priv; + priv->current_uuid_index = -1; + result = acpi_parse_art(priv->adev->handle, &priv->art_count, &priv->arts, true); if (result)