From patchwork Fri Feb 7 15:45:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kurt Borja X-Patchwork-Id: 13965339 Received: from mail-vs1-f47.google.com (mail-vs1-f47.google.com [209.85.217.47]) (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 696752475C8; Fri, 7 Feb 2025 15:46:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.217.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738943214; cv=none; b=o0dbeNhFNpx5I7oi/K4c/75xMEvuy9SLFdq9X4AzlFUVNsNFsWQjOUNw6+0koySKuVe+xcJcNCHkDXAHgHYuiivEcgKM2UZx3n7XoDwWIli6/zpds2aVvxat5dNa2dSequgeEj//NFUlLGw8HIyzVvIUTVuGPtGaq0H7mjxi/os= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738943214; c=relaxed/simple; bh=pFOd5OL2a6LO2xbS7qts8y3TQPrzRuVcyofMbUr0fok=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BkuyDm8HDxP3WvievrAoVbyXcvviaxT/ayaVchhmw5eTk8nnfpwMxHZC1nWVHsESBr8iqDiQ+aFvXVOYLHoBf1e4/vYreArcPO+q9VnR36Df38iz+mXz5lYq1HfIYHx4KjduGBBGGo/ClYWwia9v1NgW3t3jQJxkzxyN2+msYXM= 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=gKKmdrj0; arc=none smtp.client-ip=209.85.217.47 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="gKKmdrj0" Received: by mail-vs1-f47.google.com with SMTP id ada2fe7eead31-4ba7a9c17c0so992052137.0; Fri, 07 Feb 2025 07:46:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738943211; x=1739548011; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SA+zyldD3XpeByN7bIqz8d5mixA6TM9KjPHEPee9EzA=; b=gKKmdrj08AAgSjacNUCsHcpx783DiMjWiMTtpnP7vbbX9JVH+j/jS88Cb3guKP1pDf M5ECilEJKMpbiArnnMFUkQv20ZZwdkfNeYgFJ/PQELJlwRCGhfwI1EVH2XK/JJBN9YUy P4NVdTxy5ioVXlyOVTIxudfgVA1umZ8NJFSVm021e4RTUS5ijE8iIehrSQjKRrJaiSQ9 YmxJ4oSRvEo3s45tp0u4kTvMCRj7ilIr60afaY2b1j6X03p1ExVaUVpy8o6iJEBtbk/h 6Pu3G1ZELrHZNDMSKbx6N36EDSlWRSRllUWsCC80zef/oIXHnvlBiQ7AulcQiDTYccZI oTLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738943211; x=1739548011; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SA+zyldD3XpeByN7bIqz8d5mixA6TM9KjPHEPee9EzA=; b=dh0aMRyAjHP348qfDQGEC+BOBkTCJvf9Bl0Q4CxUQyM+KqyWfOQnsp5Xq/TaT6I91U 8XO/ExpYM0OIELP/KtLjqnyXIoTxsEznpPlwXt26HCQGi8jpYGJRdMPua1OXRwPR+hIo vfZNy1CN+vjGDNWyn9YWosLer/r3asdVYLhN/82pUFrXrEiAlqA516nwNTPXh70zMljF c4A3Sr2M+jHQPZNCt0c062pDi+8l4teY61DfM+r3qwfUiZiPHzasiRYglFopaiA3L61D 9PePAz1r5PTTtLItpJ1jQC0i/kiswZtHINntIU96ouhuBbkL5NRaBIKWRqHHAMetVPAx /9lw== X-Forwarded-Encrypted: i=1; AJvYcCUGA+8S2YusF2/WzcBU6A+KvaUvYWdOoJDiGhDKeXxrkiJrVircTEJa1k+tJvjgp064OKVBh+/+e+Arbu4=@vger.kernel.org X-Gm-Message-State: AOJu0Yx4TUTwbkINeJ5GW+B+z7uRIJecvsWerm0GOLtHZjOENB6+PwM+ 0L5reOIiASuafIaWuankKahraqF19CA6Rl/01FZxl1A2yEn6UsgyvhbkAQ== X-Gm-Gg: ASbGncvI8AQpwfwOgIGAYUa0/LhyhoB27WDUpysNBhaD3cmkIG0h06vjf6wZfslwnkQ TKDhkWKRli5B1jDhJgvDtzwm+PQFMbbw2I8V5XfFc1hZ9Pgvh0afyzGgAEI2Eg9fQztGpTS/IZL 9PTjBQkwj7EM4lHiIzOg3djcgBlefI8tFFPYER3lv37EsEt3QHGDCMMm+6tFDkAiXZrDLk5yCCD pvRl7AeuXx2Ardu5FlXLo/D+53AJoAv6qHvqmQZH9GSRZ+XTmvlFBukhkZG/A7oKaiJAsKDMTqR CBOymyV4ZQj2d5xNbXIbE5I= X-Google-Smtp-Source: AGHT+IHtiWJJMSpqvbe7yL8FC2fanMfda3w6fubFYTD+4YjUogDBqtI2yxEjpOpPjj5HE8yWrXgdPw== X-Received: by 2002:a05:6102:82d2:b0:4b5:c302:37b3 with SMTP id ada2fe7eead31-4ba71f8cffcmr5148617137.5.1738943211079; Fri, 07 Feb 2025 07:46:51 -0800 (PST) Received: from localhost.localdomain ([2800:bf0:82:3d2:4207:a956:ebad:2a64]) by smtp.gmail.com with ESMTPSA id ada2fe7eead31-4ba76cb8e44sm768456137.0.2025.02.07.07.46.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Feb 2025 07:46:50 -0800 (PST) From: Kurt Borja To: platform-driver-x86@vger.kernel.org Cc: =?utf-8?q?Ilpo_J=C3=A4rvinen?= , "Armin Wolf" , "Mario Limonciello" , "Hans de Goede" , Dell.Client.Kernel@dell.com, linux-kernel@vger.kernel.org, "Kurt Borja" Subject: [PATCH v10 02/14] platform/x86: alienware-wmi: Add WMI Drivers Date: Fri, 7 Feb 2025 10:45:58 -0500 Message-ID: <20250207154610.13675-3-kuurtb@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250207154610.13675-1-kuurtb@gmail.com> References: <20250207154610.13675-1-kuurtb@gmail.com> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Add WMI drivers for LEGACY and WMAX devices. This involves moving the platform device registration to a helper function that is now called from the driver's preferred WMI device driver probe. In the case of the WMAX this is done only if `!quirks->thermal` because the newer WMAX interface doesn't support any of the LED features of this driver. This also eliminates the need to check for `quirks->num_zones > 0` inside alienfx_probe(). Only one WMI driver is registered on module initialization to prevent registering a duplicate platform device. Additionally, create_thermal_profile() now takes wmi_device * instead of platform_device *. Reviewed-by: Armin Wolf Signed-off-by: Kurt Borja --- drivers/platform/x86/dell/alienware-wmi.c | 177 ++++++++++++++++------ 1 file changed, 134 insertions(+), 43 deletions(-) diff --git a/drivers/platform/x86/dell/alienware-wmi.c b/drivers/platform/x86/dell/alienware-wmi.c index ab86deb1adb9..506c096553e8 100644 --- a/drivers/platform/x86/dell/alienware-wmi.c +++ b/drivers/platform/x86/dell/alienware-wmi.c @@ -15,6 +15,7 @@ #include #include #include +#include #define LEGACY_CONTROL_GUID "A90597CE-A997-11DA-B012-B622A1EF5492" #define LEGACY_POWER_CONTROL_GUID "A80593CE-A997-11DA-B012-B622A1EF5492" @@ -39,8 +40,6 @@ MODULE_AUTHOR("Mario Limonciello "); MODULE_DESCRIPTION("Alienware special feature control"); MODULE_LICENSE("GPL"); -MODULE_ALIAS("wmi:" LEGACY_CONTROL_GUID); -MODULE_ALIAS("wmi:" WMAX_CONTROL_GUID); static bool force_platform_profile; module_param_unsafe(force_platform_profile, bool, 0); @@ -421,7 +420,10 @@ struct alienfx_priv { u8 lighting_control_state; }; -static struct platform_device *platform_device; +struct alienfx_platdata { + struct wmi_device *wdev; +}; + static enum wmax_thermal_mode supported_thermal_profiles[PLATFORM_PROFILE_LAST]; static u8 interface; @@ -801,7 +803,7 @@ static DEVICE_ATTR_RW(source); static bool hdmi_group_visible(struct kobject *kobj) { - return quirks->hdmi_mux; + return interface == WMAX && quirks->hdmi_mux; } DEFINE_SIMPLE_SYSFS_GROUP_VISIBLE(hdmi); @@ -848,7 +850,7 @@ static DEVICE_ATTR_RO(status); static bool amplifier_group_visible(struct kobject *kobj) { - return quirks->amplifier; + return interface == WMAX && quirks->amplifier; } DEFINE_SIMPLE_SYSFS_GROUP_VISIBLE(amplifier); @@ -917,7 +919,7 @@ static DEVICE_ATTR_RW(deepsleep); static bool deepsleep_group_visible(struct kobject *kobj) { - return quirks->deepslp; + return interface == WMAX && quirks->deepslp; } DEFINE_SIMPLE_SYSFS_GROUP_VISIBLE(deepsleep); @@ -1136,11 +1138,11 @@ static const struct platform_profile_ops awcc_platform_profile_ops = { .profile_set = thermal_profile_set, }; -static int create_thermal_profile(struct platform_device *platform_device) +static int create_thermal_profile(struct wmi_device *wdev) { struct device *ppdev; - ppdev = devm_platform_profile_register(&platform_device->dev, "alienware-wmi", + ppdev = devm_platform_profile_register(&wdev->dev, "alienware-wmi", NULL, &awcc_platform_profile_ops); return PTR_ERR_OR_ZERO(ppdev); @@ -1153,9 +1155,6 @@ static int alienfx_probe(struct platform_device *pdev) { struct alienfx_priv *priv; - if (!quirks->num_zones) - return -ENODEV; - priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); if (!priv) return -ENOMEM; @@ -1192,18 +1191,118 @@ static struct platform_driver platform_driver = { .probe = alienfx_probe, }; -static int __init alienware_wmi_init(void) +static void alienware_alienfx_remove(void *data) { + struct platform_device *pdev = data; + + platform_device_unregister(pdev); +} + +static int alienware_alienfx_setup(struct alienfx_platdata *pdata) +{ + struct device *dev = &pdata->wdev->dev; + struct platform_device *pdev; int ret; - if (wmi_has_guid(LEGACY_CONTROL_GUID)) - interface = LEGACY; - else if (wmi_has_guid(WMAX_CONTROL_GUID)) - interface = WMAX; - else { - pr_warn("alienware-wmi: No known WMI GUID found\n"); - return -ENODEV; - } + pdev = platform_device_register_data(NULL, "alienware-wmi", + PLATFORM_DEVID_NONE, pdata, + sizeof(*pdata)); + if (IS_ERR(pdev)) + return PTR_ERR(pdev); + + dev_set_drvdata(dev, pdev); + ret = devm_add_action_or_reset(dev, alienware_alienfx_remove, pdev); + if (ret) + return ret; + + return 0; +} + +/* + * Legacy WMI driver + */ +static int legacy_wmi_probe(struct wmi_device *wdev, const void *context) +{ + struct alienfx_platdata pdata = { + .wdev = wdev, + }; + + return alienware_alienfx_setup(&pdata); +} + +static const struct wmi_device_id alienware_legacy_device_id_table[] = { + { LEGACY_CONTROL_GUID, NULL }, + { }, +}; +MODULE_DEVICE_TABLE(wmi, alienware_legacy_device_id_table); + +static struct wmi_driver alienware_legacy_wmi_driver = { + .driver = { + .name = "alienware-wmi-alienfx", + .probe_type = PROBE_PREFER_ASYNCHRONOUS, + }, + .id_table = alienware_legacy_device_id_table, + .probe = legacy_wmi_probe, + .no_singleton = true, +}; + +static int __init alienware_legacy_wmi_init(void) +{ + return wmi_driver_register(&alienware_legacy_wmi_driver); +} + +static void __exit alienware_legacy_wmi_exit(void) +{ + wmi_driver_unregister(&alienware_legacy_wmi_driver); +} + +/* + * WMAX WMI driver + */ +static int wmax_wmi_probe(struct wmi_device *wdev, const void *context) +{ + struct alienfx_platdata pdata = { + .wdev = wdev, + }; + int ret; + + if (quirks->thermal) + ret = create_thermal_profile(wdev); + else + ret = alienware_alienfx_setup(&pdata); + + return ret; +} + +static const struct wmi_device_id alienware_wmax_device_id_table[] = { + { WMAX_CONTROL_GUID, NULL }, + { }, +}; +MODULE_DEVICE_TABLE(wmi, alienware_wmax_device_id_table); + +static struct wmi_driver alienware_wmax_wmi_driver = { + .driver = { + .name = "alienware-wmi-wmax", + .probe_type = PROBE_PREFER_ASYNCHRONOUS, + }, + .id_table = alienware_wmax_device_id_table, + .probe = wmax_wmi_probe, + .no_singleton = true, +}; + +static int __init alienware_wmax_wmi_init(void) +{ + return wmi_driver_register(&alienware_wmax_wmi_driver); +} + +static void __exit alienware_wmax_wmi_exit(void) +{ + wmi_driver_unregister(&alienware_wmax_wmi_driver); +} + +static int __init alienware_wmi_init(void) +{ + int ret; dmi_check_system(alienware_quirks); if (quirks == NULL) @@ -1220,32 +1319,20 @@ static int __init alienware_wmi_init(void) } ret = platform_driver_register(&platform_driver); - if (ret) - goto fail_platform_driver; - platform_device = platform_device_alloc("alienware-wmi", PLATFORM_DEVID_NONE); - if (!platform_device) { - ret = -ENOMEM; - goto fail_platform_device1; - } - ret = platform_device_add(platform_device); - if (ret) - goto fail_platform_device2; + if (ret < 0) + return ret; - if (quirks->thermal) { - ret = create_thermal_profile(platform_device); - if (ret) - goto fail_prep_thermal_profile; + if (wmi_has_guid(WMAX_CONTROL_GUID)) { + interface = WMAX; + ret = alienware_wmax_wmi_init(); + } else { + interface = LEGACY; + ret = alienware_legacy_wmi_init(); } - return 0; + if (ret < 0) + platform_driver_unregister(&platform_driver); -fail_prep_thermal_profile: - platform_device_del(platform_device); -fail_platform_device2: - platform_device_put(platform_device); -fail_platform_device1: - platform_driver_unregister(&platform_driver); -fail_platform_driver: return ret; } @@ -1253,7 +1340,11 @@ module_init(alienware_wmi_init); static void __exit alienware_wmi_exit(void) { - platform_device_unregister(platform_device); + if (interface == WMAX) + alienware_wmax_wmi_exit(); + else + alienware_legacy_wmi_exit(); + platform_driver_unregister(&platform_driver); }