Received: by 2002:ab2:60d1:0:b0:1f7:5705:b850 with SMTP id i17csp753774lqm; Wed, 1 May 2024 14:59:46 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCULwDc88SfPn2YOJkmDIc57MV3hlYPyB5bph3E9w3WqbEd5ksCv68lN6iCT7Gqhe5UywS1Mz9OP7tTTQkSTzjF8EIHhXxt1QXohkQxNVA== X-Google-Smtp-Source: AGHT+IEVMcu25If0Gkv49w02xaZJioLlqZYqy/NcFfZc3EPTZDhaLX4XP80/Ff6qiUO/nFPuCVno X-Received: by 2002:a05:6214:1883:b0:6a0:e571:b6bd with SMTP id cx3-20020a056214188300b006a0e571b6bdmr1886571qvb.17.1714600786068; Wed, 01 May 2024 14:59:46 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1714600786; cv=pass; d=google.com; s=arc-20160816; b=uqQh3x/9fdEYlMvsEf8S+QurtfuD4UltROzGYEM3BASVlX6OA+VSYOvZmBSCD0XvE/ p7ZFBNWpOB2tyq1LjGmfpn95Wb5v85heD0plnoGNoin787z4+r7eOD3KZ+oONlXM+2vk 92uxS9feFjofxOge5UQwP6KTraCWiyzxkZ6GIijHwqfRplzCnupTlC62Ued4oVW6XYx8 Th0eRSUb7NfR5r80fNpmPY6j1E+NmRoxsTZ8I6CV0mMtP1wEgheS48U6RDPF/eKrHjn2 bQZPQ/FAy6F5KgSaAt8nLXC+N+zqx4+IGNbNK4jDgaWxvCfA15nCyJRcew7P/TbVElwG pEgw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:feedback-id:dkim-signature:dkim-signature; bh=5/mH0UZHlaHdh4QANhWB/vr5uM41k6jiMyqqsyfJ6E8=; fh=4E49qX14Ho5l1nK71yJsXOIakmLYepFjurCmC4fORB0=; b=0GePdjwBF0kplNw2DDkP9cKbj8EnhZg4BiBPLQHdVfZUwfKIWegycdO7NXDzrpbCX9 m4BPRPkCTq2w0MZ6FfNlLwsLFGefYhvUYQ7nLRUPo6WwwsKRrpQFQNi5Zu2vgKEU8s8y DWiAVbSbRMoQxJp8y1OJQQRE5dNyACZ7D2LVo9is4pJx/NZrW13nI28CcOeFEgEzdPaI AxBCxjbiUDXIgzRqS0jQValOM5HM2W+sqNU3ELQk/vknJDNLWA8j2kqgxZTGkacUdAMY suYsjGdokrICtEkWzGgU3UnV5iCgwb7OYlcJ+X1II9tVY0tW66NMX5CcJm35VTCI0Eqf sy5Q==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@lyndeno.ca header.s=fm2 header.b=JgKmz7AW; dkim=pass header.i=@messagingengine.com header.s=fm3 header.b=KNbTW+r2; arc=pass (i=1 spf=pass spfdomain=lyndeno.ca dkim=pass dkdomain=lyndeno.ca dkim=pass dkdomain=messagingengine.com dmarc=pass fromdomain=lyndeno.ca); spf=pass (google.com: domain of linux-kernel+bounces-165781-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-165781-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=lyndeno.ca Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id kk16-20020a056214509000b006a0d5a55648si6427252qvb.357.2024.05.01.14.59.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 May 2024 14:59:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-165781-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@lyndeno.ca header.s=fm2 header.b=JgKmz7AW; dkim=pass header.i=@messagingengine.com header.s=fm3 header.b=KNbTW+r2; arc=pass (i=1 spf=pass spfdomain=lyndeno.ca dkim=pass dkdomain=lyndeno.ca dkim=pass dkdomain=messagingengine.com dmarc=pass fromdomain=lyndeno.ca); spf=pass (google.com: domain of linux-kernel+bounces-165781-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-165781-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=lyndeno.ca Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id A52BB1C231EB for ; Wed, 1 May 2024 21:59:45 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A43F6165FCE; Wed, 1 May 2024 21:59:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=lyndeno.ca header.i=@lyndeno.ca header.b="JgKmz7AW"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="KNbTW+r2" Received: from wfhigh2-smtp.messagingengine.com (wfhigh2-smtp.messagingengine.com [64.147.123.153]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ECCBE4D5BF; Wed, 1 May 2024 21:59:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=64.147.123.153 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714600777; cv=none; b=Ms8BkQGwMciuPvpUoli3glBNOJTFJr0ALkKPJBGuV5WBTGVwssdY8v1Qeliaj4Fb5OO1WBqRVFG/gG+B3yqxYJYT2u36BybfHZWZQ577ENQFg2KK5SmieU9WwfG8qvZwjLfjSrYZ0lBDut8j9pM7oJYrL0j89q2OXckfO8+LryY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714600777; c=relaxed/simple; bh=YmxSrrVkED9CvyLNXE3yVnD/wnmyaggdKiB59rAjRYU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RbzKPG2gvOSL+9Wson2CCrNaM8/OYNstgpR/YmLGcuWbhAwJS0hncy0yRhHT8f1h9CjylHu9HLCRFV4BG1QmvhWTNbRib0RgWl88laQ3YTckV/2PwwZAW/wVe5QpVs73hfcn2L92z5w1FilOvxwZuSfs0Oquz6XOPgYtl7vaxFo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=lyndeno.ca; spf=pass smtp.mailfrom=lyndeno.ca; dkim=pass (2048-bit key) header.d=lyndeno.ca header.i=@lyndeno.ca header.b=JgKmz7AW; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=KNbTW+r2; arc=none smtp.client-ip=64.147.123.153 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=lyndeno.ca Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=lyndeno.ca Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailfhigh.west.internal (Postfix) with ESMTP id 2065C18001B3; Wed, 1 May 2024 17:59:31 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute7.internal (MEProxy); Wed, 01 May 2024 17:59:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lyndeno.ca; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1714600770; x= 1714687170; bh=5/mH0UZHlaHdh4QANhWB/vr5uM41k6jiMyqqsyfJ6E8=; b=J gKmz7AWe0qdlZ9qZFFd+lXtetnhOuPJJIbO1Ga/o6uUVnkKnTBOSvXA+dTROhVsz L9E5z/Nn0iCgklAW9o1HajcwZYAMYlvQqe92xGrotYI+sEO1TVs2hdgMqOV0DQlu oU6j84vuJC73n0qAOQzwBS/yLzDKnzoPT0xnG+Bk16Kkw0+4ZfZBP+seqTsIdFAt nMS/k8GU2grSXPlzLsC7F955P/wxZIoQyNM7RH2/r418IJpkLKSB9I0kvXaskSPQ tctKxlVYxz7Gj6K9MmQPTHzpjZ0zYL/Bd+KxYR6qtoxKNIRA9opFlRsLV7qR8bCF yJwPBKOKMXj/RexnH1X5w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1714600770; x= 1714687170; bh=5/mH0UZHlaHdh4QANhWB/vr5uM41k6jiMyqqsyfJ6E8=; b=K NbTW+r2DWUfsIvIeglK1NxgaH61r/JITyxFUekvYKUsTPyQxa41CRViGZNqMkxlQ oWEhs7gVQeihqpYxCovYjf1+RSkf+AQG2SW4657DJzErW+HY6ykOq5GLYQjUJK0Y gpp0wuxW/S+LCcwZqUazEBtmt8AbdVnyn4Jmd3PD7iSnB7qoadVux9TTLCMRTo83 YUbvfAg6RSeC8FVxjtFBLngazIgdU5Hlmr6io8U9FFZJbtf1jf1Gk5It3srGeONa xMHVIasGE3yObpIC0IpdzOW8YPgyIOAVVLADeko34l69bT3x84dvvxGrYOnV6WI9 J1C9FEgOCHRYBwujRdFCg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrvddujedgtdehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne goteeftdduqddtudculdduhedmnecujfgurhephffvvefufffkofgjfhgggfestdekredt redttdenucfhrhhomhepnfihnhguohhnucfurghntghhvgcuoehlshgrnhgthhgvsehlhi hnuggvnhhordgtrgeqnecuggftrfgrthhtvghrnheplefhieffkedtledugfetgfegfeeh hfethffhffeuvefhtdekvdeikeehleejieetnecuvehluhhsthgvrhfuihiivgeptdenuc frrghrrghmpehmrghilhhfrhhomheplhhsrghntghhvgeslhihnhguvghnohdrtggr X-ME-Proxy: Feedback-ID: i1719461a:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 1 May 2024 17:59:29 -0400 (EDT) From: Lyndon Sanche To: lsanche@lyndeno.ca Cc: mario.limonciello@amd.com, pali@kernel.org, W_Armin@gmx.de, srinivas.pandruvada@linux.intel.com, ilpo.jarvinen@linux.intel.com, lkp@intel.com, Hans de Goede , Matthew Garrett , Jonathan Corbet , Heiner Kallweit , Vegard Nossum , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, Dell.Client.Kernel@dell.com Subject: [PATCH v5] platform/x86: dell-laptop: Implement platform_profile Date: Wed, 1 May 2024 15:58:03 -0600 Message-ID: <20240501215829.4991-2-lsanche@lyndeno.ca> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240425172758.67831-1-lsanche@lyndeno.ca> References: <20240425172758.67831-1-lsanche@lyndeno.ca> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Some Dell laptops support configuration of preset fan modes through smbios tables. If the platform supports these fan modes, set up platform_profile to change these modes. If not supported, skip enabling platform_profile. Signed-off-by: Lyndon Sanche --- v5: - Fix indent in smbios-thermal-ctl comment - Remove linux/wmi.h include - Add 'select ACPI_PLATFORM_PROFILE' to Dell KConfig v4: - Make thermal_init and thermal_cleanup static - Rearrange order of added includes, did not edit current includes - Include bits.h - Switch comment style - Return error if platform_profile registering failed - Add thermal calls to call_blacklist - Align defines with tabs - Correct separation of function and error handling - Propagate error codes up v3: - Convert smbios-thermal-ctl docs to multiline comment and wrap - Change thermal_mode_bits enum to directly be BIT() values - Convert related code to use this - Use FIELD_GET/PREP and GENNMASK for getting/setting thermal modes - Correct offset for getting current ACC mode, setting offset unchanged - Check if thermal_handler is allocated before freeing and unregistering platform_profile v2: - Wrap smbios-thermal-ctl comment - Return proper error code when invalid state returned - Simplify platform_profile_get returns - Propogate ENOMEM error --- drivers/platform/x86/dell/Kconfig | 1 + drivers/platform/x86/dell/dell-laptop.c | 238 +++++++++++++++++++ drivers/platform/x86/dell/dell-smbios-base.c | 1 + drivers/platform/x86/dell/dell-smbios.h | 1 + 4 files changed, 241 insertions(+) diff --git a/drivers/platform/x86/dell/Kconfig b/drivers/platform/x86/dell/Kconfig index bd9f445974cc..5195ad59b44d 100644 --- a/drivers/platform/x86/dell/Kconfig +++ b/drivers/platform/x86/dell/Kconfig @@ -57,6 +57,7 @@ config DELL_LAPTOP select POWER_SUPPLY select LEDS_CLASS select NEW_LEDS + select ACPI_PLATFORM_PROFILE help This driver adds support for rfkill and backlight control to Dell laptops (except for some models covered by the Compal driver). diff --git a/drivers/platform/x86/dell/dell-laptop.c b/drivers/platform/x86/dell/dell-laptop.c index 42f7de2b4522..dc530a4f5047 100644 --- a/drivers/platform/x86/dell/dell-laptop.c +++ b/drivers/platform/x86/dell/dell-laptop.c @@ -27,6 +27,9 @@ #include #include #include +#include +#include +#include #include #include "dell-rbtn.h" #include "dell-smbios.h" @@ -95,6 +98,7 @@ static struct backlight_device *dell_backlight_device; static struct rfkill *wifi_rfkill; static struct rfkill *bluetooth_rfkill; static struct rfkill *wwan_rfkill; +static struct platform_profile_handler *thermal_handler; static bool force_rfkill; static bool micmute_led_registered; static bool mute_led_registered; @@ -2199,6 +2203,232 @@ static int mute_led_set(struct led_classdev *led_cdev, return 0; } +/* Derived from smbios-thermal-ctl + * + * cbClass 17 + * cbSelect 19 + * User Selectable Thermal Tables(USTT) + * cbArg1 determines the function to be performed + * cbArg1 0x0 = Get Thermal Information + * cbRES1 Standard return codes (0, -1, -2) + * cbRES2, byte 0 Bitmap of supported thermal modes. A mode is supported if + * its bit is set to 1 + * Bit 0 Balanced + * Bit 1 Cool Bottom + * Bit 2 Quiet + * Bit 3 Performance + * cbRES2, byte 1 Bitmap of supported Active Acoustic Controller (AAC) modes. + * Each mode corresponds to the supported thermal modes in + * byte 0. A mode is supported if its bit is set to 1. + * Bit 0 AAC (Balanced) + * Bit 1 AAC (Cool Bottom + * Bit 2 AAC (Quiet) + * Bit 3 AAC (Performance) + * cbRes3, byte 0 Current Thermal Mode + * Bit 0 Balanced + * Bit 1 Cool Bottom + * Bit 2 Quiet + * Bit 3 Performanc + * cbRes3, byte 1 AAC Configuration type + * 0 Global (AAC enable/disable applies to all supported USTT modes) + * 1 USTT mode specific + * cbRes3, byte 2 Current Active Acoustic Controller (AAC) Mode + * If AAC Configuration Type is Global, + * 0 AAC mode disabled + * 1 AAC mode enabled + * If AAC Configuration Type is USTT mode specific (multiple bits may be set), + * Bit 0 AAC (Balanced) + * Bit 1 AAC (Cool Bottom + * Bit 2 AAC (Quiet) + * Bit 3 AAC (Performance) + * cbRes3, byte 3 Current Fan Failure Mode + * Bit 0 Minimal Fan Failure (at least one fan has failed, one fan working) + * Bit 1 Catastrophic Fan Failure (all fans have failed) + * + * cbArg1 0x1 (Set Thermal Information), both desired thermal mode and + * desired AAC mode shall be applied + * cbArg2, byte 0 Desired Thermal Mode to set + * (only one bit may be set for this parameter) + * Bit 0 Balanced + * Bit 1 Cool Bottom + * Bit 2 Quiet + * Bit 3 Performance + * cbArg2, byte 1 Desired Active Acoustic Controller (AAC) Mode to set + * If AAC Configuration Type is Global, + * 0 AAC mode disabled + * 1 AAC mode enabled + * If AAC Configuration Type is USTT mode specific + * (multiple bits may be set for this parameter), + * Bit 0 AAC (Balanced) + * Bit 1 AAC (Cool Bottom + * Bit 2 AAC (Quiet) + * Bit 3 AAC (Performance) + */ + +#define DELL_ACC_GET_FIELD GENMASK(19, 16) +#define DELL_ACC_SET_FIELD GENMASK(11, 8) +#define DELL_THERMAL_SUPPORTED GENMASK(3, 0) + +enum thermal_mode_bits { + DELL_BALANCED = BIT(0), + DELL_COOL_BOTTOM = BIT(1), + DELL_QUIET = BIT(2), + DELL_PERFORMANCE = BIT(3), +}; + +static int thermal_get_mode(void) +{ + struct calling_interface_buffer buffer; + int state; + int ret; + + dell_fill_request(&buffer, 0x0, 0, 0, 0); + ret = dell_send_request(&buffer, CLASS_INFO, SELECT_THERMAL_MANAGEMENT); + if (ret) + return ret; + state = buffer.output[2]; + if (state & DELL_BALANCED) + return DELL_BALANCED; + else if (state & DELL_COOL_BOTTOM) + return DELL_COOL_BOTTOM; + else if (state & DELL_QUIET) + return DELL_QUIET; + else if (state & DELL_PERFORMANCE) + return DELL_PERFORMANCE; + else + return -ENXIO; +} + +static int thermal_get_supported_modes(int *supported_bits) +{ + struct calling_interface_buffer buffer; + int ret; + + dell_fill_request(&buffer, 0x0, 0, 0, 0); + ret = dell_send_request(&buffer, CLASS_INFO, SELECT_THERMAL_MANAGEMENT); + if (ret) + return ret; + *supported_bits = FIELD_GET(DELL_THERMAL_SUPPORTED, buffer.output[1]); + return 0; +} + +static int thermal_get_acc_mode(int *acc_mode) +{ + struct calling_interface_buffer buffer; + int ret; + + dell_fill_request(&buffer, 0x0, 0, 0, 0); + ret = dell_send_request(&buffer, CLASS_INFO, SELECT_THERMAL_MANAGEMENT); + if (ret) + return ret; + *acc_mode = FIELD_GET(DELL_ACC_GET_FIELD, buffer.output[3]); + return 0; +} + +static int thermal_set_mode(enum thermal_mode_bits state) +{ + struct calling_interface_buffer buffer; + int ret; + int acc_mode; + + ret = thermal_get_acc_mode(&acc_mode); + if (ret) + return ret; + + dell_fill_request(&buffer, 0x1, FIELD_PREP(DELL_ACC_SET_FIELD, acc_mode) | state, 0, 0); + ret = dell_send_request(&buffer, CLASS_INFO, SELECT_THERMAL_MANAGEMENT); + return ret; +} + +static int thermal_platform_profile_set(struct platform_profile_handler *pprof, + enum platform_profile_option profile) +{ + switch (profile) { + case PLATFORM_PROFILE_BALANCED: + return thermal_set_mode(DELL_BALANCED); + case PLATFORM_PROFILE_PERFORMANCE: + return thermal_set_mode(DELL_PERFORMANCE); + case PLATFORM_PROFILE_QUIET: + return thermal_set_mode(DELL_QUIET); + case PLATFORM_PROFILE_COOL: + return thermal_set_mode(DELL_COOL_BOTTOM); + default: + return -EOPNOTSUPP; + } +} + +static int thermal_platform_profile_get(struct platform_profile_handler *pprof, + enum platform_profile_option *profile) +{ + int ret; + + ret = thermal_get_mode(); + if (ret < 0) + return ret; + + switch (ret) { + case DELL_BALANCED: + *profile = PLATFORM_PROFILE_BALANCED; + break; + case DELL_PERFORMANCE: + *profile = PLATFORM_PROFILE_PERFORMANCE; + break; + case DELL_COOL_BOTTOM: + *profile = PLATFORM_PROFILE_COOL; + break; + case DELL_QUIET: + *profile = PLATFORM_PROFILE_QUIET; + break; + default: + return -EINVAL; + } + + return 0; +} + +static int thermal_init(void) +{ + int ret; + int supported_modes; + + /* If thermal modes not supported, exit without error */ + ret = thermal_get_supported_modes(&supported_modes); + if (ret < 0) + return ret; + if (!supported_modes) + return 0; + + thermal_handler = kzalloc(sizeof(*thermal_handler), GFP_KERNEL); + if (!thermal_handler) + return -ENOMEM; + thermal_handler->profile_get = thermal_platform_profile_get; + thermal_handler->profile_set = thermal_platform_profile_set; + + if (supported_modes & DELL_QUIET) + set_bit(PLATFORM_PROFILE_QUIET, thermal_handler->choices); + if (supported_modes & DELL_COOL_BOTTOM) + set_bit(PLATFORM_PROFILE_COOL, thermal_handler->choices); + if (supported_modes & DELL_BALANCED) + set_bit(PLATFORM_PROFILE_BALANCED, thermal_handler->choices); + if (supported_modes & DELL_PERFORMANCE) + set_bit(PLATFORM_PROFILE_PERFORMANCE, thermal_handler->choices); + + /* Clean up if failed */ + ret = platform_profile_register(thermal_handler); + if (ret) + kfree(thermal_handler); + + return ret; +} + +static void thermal_cleanup(void) +{ + if (thermal_handler) { + platform_profile_remove(); + kfree(thermal_handler); + } +} + static struct led_classdev mute_led_cdev = { .name = "platform::mute", .max_brightness = 1, @@ -2238,6 +2468,11 @@ static int __init dell_init(void) goto fail_rfkill; } + /* Do not fail module if thermal modes not supported, just skip */ + ret = thermal_init(); + if (ret) + goto fail_thermal; + if (quirks && quirks->touchpad_led) touchpad_led_init(&platform_device->dev); @@ -2317,6 +2552,8 @@ static int __init dell_init(void) led_classdev_unregister(&mute_led_cdev); fail_led: dell_cleanup_rfkill(); +fail_thermal: + thermal_cleanup(); fail_rfkill: platform_device_del(platform_device); fail_platform_device2: @@ -2344,6 +2581,7 @@ static void __exit dell_exit(void) platform_device_unregister(platform_device); platform_driver_unregister(&platform_driver); } + thermal_cleanup(); } /* dell-rbtn.c driver export functions which will not work correctly (and could diff --git a/drivers/platform/x86/dell/dell-smbios-base.c b/drivers/platform/x86/dell/dell-smbios-base.c index e61bfaf8b5c4..5bc2e394dd1c 100644 --- a/drivers/platform/x86/dell/dell-smbios-base.c +++ b/drivers/platform/x86/dell/dell-smbios-base.c @@ -71,6 +71,7 @@ static struct smbios_call call_blacklist[] = { /* handled by kernel: dell-laptop */ {0x0000, CLASS_INFO, SELECT_RFKILL}, {0x0000, CLASS_KBD_BACKLIGHT, SELECT_KBD_BACKLIGHT}, + {0x0000, CLASS_INFO, SELECT_THERMAL_MANAGEMENT}, }; struct token_range { diff --git a/drivers/platform/x86/dell/dell-smbios.h b/drivers/platform/x86/dell/dell-smbios.h index eb341bf000c6..585d042f1779 100644 --- a/drivers/platform/x86/dell/dell-smbios.h +++ b/drivers/platform/x86/dell/dell-smbios.h @@ -19,6 +19,7 @@ /* Classes and selects used only in kernel drivers */ #define CLASS_KBD_BACKLIGHT 4 #define SELECT_KBD_BACKLIGHT 11 +#define SELECT_THERMAL_MANAGEMENT 19 /* Tokens used in kernel drivers, any of these * should be filtered from userspace access -- 2.42.0