From patchwork Thu Mar 13 14:29:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kurt Borja X-Patchwork-Id: 14015198 Received: from mail-yb1-f176.google.com (mail-yb1-f176.google.com [209.85.219.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CA6BA2686B3; Thu, 13 Mar 2025 14:30:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741876218; cv=none; b=tOZiuayLDms5zQkl37S2BMCjuVbes+t7FDZUHpWO+gNydhIg9f5J4mu5XjFeSNB1BVb3PfOb8FFH4uk9weQqoAnZFAZjmTIV4CP3Iw6Y6BbDS5soBzDsiFprRjTAfxZU2TmeqFjEwFUfrF1cFuso0j91M3365snyu7qkZcF6hGg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741876218; c=relaxed/simple; bh=b6I4LW2lXRr4zSKyCgVo5hQkgsNPWVdZQx2aOlTduKg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=QNRVPmFJZibpD1DyNjHi0fr+AUcfZcK4zoLj+VUM04tWPlhapGossFk0CLOUNZbD8u7KUtsZIAicWO1AXu4TxbMNHUwx+yle8ed5g0XMYUV9eIhYrK3crmzDJ4noZFL0Rai1yj/xR6ma+oyIwa/is+EMh/bhhuE0oq5h2FN/qCM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=cD8zmSW7; arc=none smtp.client-ip=209.85.219.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="cD8zmSW7" Received: by mail-yb1-f176.google.com with SMTP id 3f1490d57ef6-e60ad903382so744401276.0; Thu, 13 Mar 2025 07:30:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741876215; x=1742481015; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=ki8JJlqvtQ1DWozBXa70s7Vleuhvzvt2Tgc/aHkAO4s=; b=cD8zmSW7YQ2PXbOUb4V8RU2h6iSgnVFwDN7yG1PfvNC4skbEb7bW49t0RfsMKv1uaR PkZ/19RevteYKN77KVG9RoDMVKBugD+zV2VFebryoUJnJ5QZptDLUP/sYhivDWjfTqoB 4j7t0UiKKbitMC8QkUSj9ohHhY1NqtxlJgGsi8MwukNe8oScC5EFdx/2v/g5fU1IMqB4 Gk3vArlPBinpBtclCpKYr3wa6Go2XkNnveEyMRj/Nt7gu0XxQt5DnHMsKgeLENQVkqMh 4hWny/NXvxEqAF9GmbSBXGM+Yh+tFD5YGRvJbm6mO0t/b1EwoyjMZ+GlxCWBXGUjKIvj 92Zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741876215; x=1742481015; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ki8JJlqvtQ1DWozBXa70s7Vleuhvzvt2Tgc/aHkAO4s=; b=Dpskix7CMFCHGT6BNauwsXHIcFckQ268ViYZi2dRdYkTO9FrTRLPTQWvUzs7Ozgz// BnJGdjk+T6ImCTzUWeD9ZpjfAFb3H9H0svfAPYRJK8X3d+yDNgiwq36Ufas7eM710pF+ 7dJDEJfvDYxUaw5Mk7htv1mExE8vxi7IEhwOslvQT9sNKJw4BLOykaDw0ET+un7TgPzt KRO/DOAlXChhtOGyiLLWZ5gP2qdrpxufUevHYOGC62d61Z4vtizJ7eSKMzP0iHtAo06P Kri+R2tnb7B6Ai124WxrjoYermCu7s869LZlwkPbTchAJRr6LQGuZESLxNqb4koP3BbE mr3A== X-Forwarded-Encrypted: i=1; AJvYcCW/qtGShk4MIBDHv+9HIu2lsHOrJW4E+hkBmzhJdf84oecQH/PNRhqkgTE9/e+taaMDFDOuKxychB23F+4xwNaJ4MkH+w==@vger.kernel.org, AJvYcCXGRI5Gghx4JA5MaxT7C7zvQAlTmjAGx6H5vfHisSfdRlTOTUOnjryGMyF3fgDNqfI3GlyIT4nTQSjT0JQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yxl5JmttDIRh4IgrnLE0CMSremJFQKdU7x22yDPEZEKQRYvKOyF k+S1O1MUiSxJ6K1jk224bIpidyQFNRRWW9aUUUNZFdxMciCqn3GaZFKK1EJ9 X-Gm-Gg: ASbGncuuiEwLsCpcybdYTIYJ7i3VnflcTdOuSLVJ/fL8xryF1HihUTugMEa4+lknykB Zb+KPOtiV81oPySSVvIxm0ULzcf5UIu6iFiYGFv8gA12OnsyswUm8Jqy/3/7cXb7MGtdaqfByNs zV4IYGpqourQF3NGHtekpZw2ppDnfaNEU8utaNvIxQCJ+eDI3POFfwnqT6QUcG8vqrKbuZsx4wr qEUrwMPiOIb72S3UJ4MuzzuJuDJ5cz9JwS4zBSJ8unFqjgWgBcO98BB9KN2rHuvtGAe7OShNKXn qXjlzlR8VK2TK4xLJ4yrDabNhyqJZqYu4g5lWO2xWrT9jQ== X-Google-Smtp-Source: AGHT+IE9Yxr71vz63KnzlDN5COkyvu0Pll9aV0OTCeuBIWylr62xLdvN+73SzaEC0T35f2N6EMXAAA== X-Received: by 2002:a05:6902:70a:b0:e5a:c5d6:3948 with SMTP id 3f1490d57ef6-e635bf1ed24mr32939717276.0.1741876215390; Thu, 13 Mar 2025 07:30:15 -0700 (PDT) Received: from [192.168.100.70] ([2800:bf0:82:3d2:9e61:1a62:1a8c:3e62]) by smtp.gmail.com with ESMTPSA id 3f1490d57ef6-e63e56718d0sm338938276.50.2025.03.13.07.30.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Mar 2025 07:30:14 -0700 (PDT) From: Kurt Borja Date: Thu, 13 Mar 2025 09:29:57 -0500 Subject: [PATCH v6 02/12] platform/x86: alienware-wmi-wmax: Refactor is_awcc_thermal_mode() Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250313-hwm-v6-2-17b57f787d77@gmail.com> References: <20250313-hwm-v6-0-17b57f787d77@gmail.com> In-Reply-To: <20250313-hwm-v6-0-17b57f787d77@gmail.com> To: =?utf-8?q?Ilpo_J=C3=A4rvinen?= , Armin Wolf Cc: Kurt Borja , Hans de Goede , platform-driver-x86@vger.kernel.org, Dell.Client.Kernel@dell.com, linux-kernel@vger.kernel.org X-Mailer: b4 0.14.2 Refactor is_awcc_thermal_mode() to use FIELD_GET() instead of bitwise operations. Drop the check for BIT(8) sensor flag and rename it to is_awcc_thermal_profile_id(). Reviewed-by: Armin Wolf Signed-off-by: Kurt Borja --- drivers/platform/x86/dell/alienware-wmi-wmax.c | 33 +++++++++++++------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/drivers/platform/x86/dell/alienware-wmi-wmax.c b/drivers/platform/x86/dell/alienware-wmi-wmax.c index ed70e12d73d7fe5d89f3364c5367820bf47e3c1e..80aefba5b22d6b4ac18aeb2ca356f8c911150abd 100644 --- a/drivers/platform/x86/dell/alienware-wmi-wmax.c +++ b/drivers/platform/x86/dell/alienware-wmi-wmax.c @@ -34,7 +34,8 @@ #define AWCC_FAILURE_CODE 0xFFFFFFFF #define AWCC_THERMAL_TABLE_MASK GENMASK(7, 4) #define AWCC_THERMAL_MODE_MASK GENMASK(3, 0) -#define AWCC_SENSOR_ID_MASK BIT(8) +/* Some IDs have a BIT(8) flag that we ignore */ +#define AWCC_RESOURCE_ID_MASK GENMASK(7, 0) static bool force_platform_profile; module_param_unsafe(force_platform_profile, bool, 0); @@ -168,8 +169,8 @@ enum AWCC_GAME_SHIFT_STATUS_OPERATIONS { }; enum AWCC_THERMAL_TABLES { - AWCC_THERMAL_TABLE_LEGACY = 0x90, - AWCC_THERMAL_TABLE_USTT = 0xA0, + AWCC_THERMAL_TABLE_LEGACY = 0x9, + AWCC_THERMAL_TABLE_USTT = 0xA, }; enum awcc_thermal_profile { @@ -445,20 +446,18 @@ const struct attribute_group wmax_deepsleep_attribute_group = { * Thermal Profile control * - Provides thermal profile control through the Platform Profile API */ -static bool is_awcc_thermal_mode(u32 code) +static bool is_awcc_thermal_profile_id(u8 code) { - if (code & AWCC_SENSOR_ID_MASK) + u8 table = FIELD_GET(AWCC_THERMAL_TABLE_MASK, code); + u8 mode = FIELD_GET(AWCC_THERMAL_MODE_MASK, code); + + if (mode >= AWCC_PROFILE_LAST) return false; - if ((code & AWCC_THERMAL_MODE_MASK) >= AWCC_PROFILE_LAST) - return false; - - if ((code & AWCC_THERMAL_TABLE_MASK) == AWCC_THERMAL_TABLE_LEGACY && - (code & AWCC_THERMAL_MODE_MASK) >= AWCC_PROFILE_LEGACY_QUIET) + if (table == AWCC_THERMAL_TABLE_LEGACY && mode >= AWCC_PROFILE_LEGACY_QUIET) return true; - if ((code & AWCC_THERMAL_TABLE_MASK) == AWCC_THERMAL_TABLE_USTT && - (code & AWCC_THERMAL_MODE_MASK) <= AWCC_PROFILE_USTT_LOW_POWER) + if (table == AWCC_THERMAL_TABLE_USTT && mode <= AWCC_PROFILE_USTT_LOW_POWER) return true; return false; @@ -548,7 +547,7 @@ static int awcc_platform_profile_get(struct device *dev, return 0; } - if (!is_awcc_thermal_mode(out_data)) + if (!is_awcc_thermal_profile_id(out_data)) return -ENODATA; out_data &= AWCC_THERMAL_MODE_MASK; @@ -597,6 +596,7 @@ static int awcc_platform_profile_probe(void *drvdata, unsigned long *choices) u32 first_mode; u32 out_data; int ret; + u8 id; ret = awcc_thermal_information(priv->wdev, AWCC_OP_GET_SYSTEM_DESCRIPTION, 0, (u32 *) &sys_desc); @@ -615,12 +615,13 @@ static int awcc_platform_profile_probe(void *drvdata, unsigned long *choices) if (ret == -EBADRQC) break; - if (!is_awcc_thermal_mode(out_data)) + id = FIELD_GET(AWCC_RESOURCE_ID_MASK, out_data); + if (!is_awcc_thermal_profile_id(id)) continue; - mode = out_data & AWCC_THERMAL_MODE_MASK; + mode = FIELD_GET(AWCC_THERMAL_MODE_MASK, id); profile = awcc_mode_to_platform_profile[mode]; - priv->supported_thermal_profiles[profile] = out_data; + priv->supported_thermal_profiles[profile] = id; set_bit(profile, choices); }