From nobody Sun Feb 8 11:44:27 2026 Received: from mail-yw1-f175.google.com (mail-yw1-f175.google.com [209.85.128.175]) (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 53A0F2206BB; Fri, 7 Feb 2025 14:08:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738937297; cv=none; b=MDAnIyVfHFt11voFDDxLlxvHVSjYCkKN7kikUPQVKX/rELU2At6JQzgRtSBOWOoQLwooMnix7FV7eOL9J6YUudBtPlwGw/KxAZIkhHpZQfTn09kn7DzbQGrX5HlY+Jf1ikMpsiJNBzcKHPs7rMULsfqbn/ohCtqEq5Mw4qEDpX4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738937297; c=relaxed/simple; bh=qRYy/r/XEIn6bETnvu6Yn5nbRR5ag52p7PQHk8zmJfo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=e+RdIAuLELgGohNOgpxqEwViUThKMRPxo8Knhd53k13hZgJolHdu8Oi9nOh0jfeV80fhuwrayUeQpdFKtGStPq2lPgES3B23oKG8Qon4V90vCgJXGpUZfLZQBoQBo7pgDy5rHZAwK7kRDq4WtNZS+BRk2J3txaxbpny0ULycO6w= 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=gMM0p1VV; arc=none smtp.client-ip=209.85.128.175 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="gMM0p1VV" Received: by mail-yw1-f175.google.com with SMTP id 00721157ae682-6f9b8291c49so4847677b3.1; Fri, 07 Feb 2025 06:08:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738937294; x=1739542094; 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=2nYctGPSzCHBlA4oNi+PZAVP+DCpxvNXbv6MyrcOof0=; b=gMM0p1VViOp0ujuLxKpUIepw5CJHXpBmz2M6MqfKdXWS7hLv6SnRG/D8LHWCZbCLre b1R7qibQrn1m+Cvfzu1VihqHqOGSBRubFU2hFdo9I6gofHT7bgqvqcAgqKxt9QKAVZF5 Xfgf8rjwZyPrvrjHKYRIZLH+rZXBZPlfXF64NT+Y9rTNBLZjEe5v3jvtixgtL9R/JtRm 9xmtgZLU8QixGVyWOz+mAdUEREPI28hFBBCl6T3a5WzZV1Ra5/i4Nq1UhpD/4z0jbhta YrGlyI9L2ifVnI2bPBtlV0zLcorSFL0IWNysyeLdHKnAGo+ITmItHcybD5zsxdWXnLB4 kZrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738937294; x=1739542094; 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=2nYctGPSzCHBlA4oNi+PZAVP+DCpxvNXbv6MyrcOof0=; b=WQOAvgf5q88O0rGj70Kme65M3mdMGnDrzt97axXYNXFY0VZlPa/bOs28+9J/2/JKvl S0P6/OXFyx2guiqe4Sbk8hKHeMmqoNaQYZigVRh91/dWmxt5uiwdRHyqUnfkGKWRK/Lt gVUPNGltIQmE8sQkIybK4uajSr3XOGt2usUYVpZRvTlkt2E3V3l5G2WO4aWvpoKuD0Al y3FsAEgYK6hZKulO8iO9XsGyCvpKqvrH9ILykm7lQULRyh33RPtwOmX4zMD1lY4jAfGP 53Z5U+wAErGccpVeHG/dqKF6kwyTi2kM+WgK8q0A6d+Ujoa4y2ezX6CiJ/s9p6ADMs9W lxHA== X-Forwarded-Encrypted: i=1; AJvYcCU2cv8aXpS5lfl6Iff5Yy7buk7gXUYsj7EN7hHMTM0IBNFpSDFVK77qUFf0cPbeoF0v1kY4tJdvivBlMog=@vger.kernel.org X-Gm-Message-State: AOJu0YxMULQvLTLr9UgGSaN98JVqnR+1fzxzmJmWnsPxncbR+bO5AjK6 xrfYac9+sB5NWf+yF40qYpPim1M5x/PVxyyWdC/2N9tx3Fq9MmpGA/6vuw== X-Gm-Gg: ASbGnctQAYrDAT4eBVa0qAHe3JDN4Oi4ThZwZL2IHMB2G5OrUC5Stfyq5IEVerJ+cBo zZ7Wlb3Rk3I7cVWJZ9llCjJTxN9QttIo5pN7WdAgNYzyneohhdnPKU82UXS5dGMZ7X33U2VRBG6 y4Wj9k77kPBoPTdiW3zQ4bT+c2MW12MVswXoP7B7h8qU3dyUaFVu8W+hY7hD55n6SLp+Lvchy7I RWqxzVJE2aoHz6/Z46c6rqmoaHkKUHNS5HRVZCCuG7jPR2hF/RhFwBuOBkKLzXaOobSm9UUc1Iw qqLiSJG3gOuC40trAOoxPho= X-Google-Smtp-Source: AGHT+IHMTl1GMR9FKLzrKKxdB45NoadNMBsPTsGmTLAXBVTabWSxUcnEO3RPOUpyibWYS9GG38+wKw== X-Received: by 2002:a05:690c:6502:b0:6f9:8d47:35b8 with SMTP id 00721157ae682-6f9b284d948mr30477397b3.13.1738937293967; Fri, 07 Feb 2025 06:08:13 -0800 (PST) Received: from localhost.localdomain ([2800:bf0:82:3d2:4207:a956:ebad:2a64]) by smtp.gmail.com with ESMTPSA id 00721157ae682-6f9a000f577sm5525607b3.118.2025.02.07.06.08.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Feb 2025 06:08:13 -0800 (PST) From: Kurt Borja To: platform-driver-x86@vger.kernel.org Cc: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , "Armin Wolf" , "Mario Limonciello" , "Hans de Goede" , Dell.Client.Kernel@dell.com, linux-kernel@vger.kernel.org, "Kurt Borja" Subject: [PATCH v9 04/14] platform/x86: alienware-wmi: Refactor LED control methods Date: Fri, 7 Feb 2025 09:07:33 -0500 Message-ID: <20250207140743.16822-5-kuurtb@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250207140743.16822-1-kuurtb@gmail.com> References: <20250207140743.16822-1-kuurtb@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Both WMI devices handled by this module specify a distinct interface for LED control. Previously this module handled this by dynamically adapting arguments passed to wmi_evaluate_method() based on the `interface` global variable. To avoid the use of global variables, and enable the migration to non-deprecated WMI methods, let the WMI drivers define upd_led and upd_brightness operations, which completely replace alienware_update_led() and wmax_brightness(). Also define alienware_wmi_command(), which serves as a wrapper for wmidev_evaluate_method(). This new method is very similar to alienware_wmax_command() but is WMI device agnostic. Reviewed-by: Armin Wolf Signed-off-by: Kurt Borja --- drivers/platform/x86/dell/alienware-wmi.c | 166 ++++++++++++++-------- 1 file changed, 104 insertions(+), 62 deletions(-) diff --git a/drivers/platform/x86/dell/alienware-wmi.c b/drivers/platform/x= 86/dell/alienware-wmi.c index 9512143c82ec..525d25a1fa6c 100644 --- a/drivers/platform/x86/dell/alienware-wmi.c +++ b/drivers/platform/x86/dell/alienware-wmi.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -426,12 +427,43 @@ struct alienfx_priv { u8 lighting_control_state; }; =20 +struct alienfx_ops { + int (*upd_led)(struct alienfx_priv *priv, struct wmi_device *wdev, + u8 location); + int (*upd_brightness)(struct alienfx_priv *priv, struct wmi_device *wdev, + u8 brightness); +}; + struct alienfx_platdata { struct wmi_device *wdev; + struct alienfx_ops ops; }; =20 static u8 interface; =20 +static int alienware_wmi_command(struct wmi_device *wdev, u32 method_id, + void *in_args, size_t in_size, u32 *out_data) +{ + struct acpi_buffer out =3D {ACPI_ALLOCATE_BUFFER, NULL}; + struct acpi_buffer in =3D {in_size, in_args}; + acpi_status ret; + + ret =3D wmidev_evaluate_method(wdev, 0, method_id, &in, out_data ? &out := NULL); + if (ACPI_FAILURE(ret)) + return -EIO; + + union acpi_object *obj __free(kfree) =3D out.pointer; + + if (out_data) { + if (obj && obj->type =3D=3D ACPI_TYPE_INTEGER) + *out_data =3D (u32)obj->integer.value; + else + return -ENOMSG; + } + + return 0; +} + /* * Helpers used for zone control */ @@ -462,46 +494,6 @@ static int parse_rgb(const char *buf, struct color_pla= tform *colors) /* * Individual RGB zone control */ -static int alienware_update_led(struct alienfx_priv *priv, u8 location) -{ - int method_id; - acpi_status status; - char *guid; - struct acpi_buffer input; - struct legacy_led_args legacy_args; - struct wmax_led_args wmax_basic_args; - if (interface =3D=3D WMAX) { - wmax_basic_args.led_mask =3D 1 << location; - wmax_basic_args.colors =3D priv->colors[location]; - wmax_basic_args.state =3D priv->lighting_control_state; - guid =3D WMAX_CONTROL_GUID; - method_id =3D WMAX_METHOD_ZONE_CONTROL; - - input.length =3D sizeof(wmax_basic_args); - input.pointer =3D &wmax_basic_args; - } else { - legacy_args.colors =3D priv->colors[location]; - legacy_args.brightness =3D priv->global_brightness; - legacy_args.state =3D 0; - if (priv->lighting_control_state =3D=3D LEGACY_BOOTING || - priv->lighting_control_state =3D=3D LEGACY_SUSPEND) { - guid =3D LEGACY_POWER_CONTROL_GUID; - legacy_args.state =3D priv->lighting_control_state; - } else - guid =3D LEGACY_CONTROL_GUID; - method_id =3D location + 1; - - input.length =3D sizeof(legacy_args); - input.pointer =3D &legacy_args; - } - pr_debug("alienware-wmi: guid %s method %d\n", guid, method_id); - - status =3D wmi_evaluate_method(guid, 0, method_id, &input, NULL); - if (ACPI_FAILURE(status)) - pr_err("alienware-wmi: zone set failure: %u\n", status); - return ACPI_FAILURE(status); -} - static ssize_t zone_show(struct device *dev, struct device_attribute *attr, char *buf, u8 location) { @@ -518,13 +510,14 @@ static ssize_t zone_store(struct device *dev, struct = device_attribute *attr, { struct alienfx_priv *priv =3D dev_get_drvdata(dev); struct color_platform *colors =3D &priv->colors[location]; + struct alienfx_platdata *pdata =3D dev_get_platdata(dev); int ret; =20 ret =3D parse_rgb(buf, colors); if (ret) return ret; =20 - ret =3D alienware_update_led(priv, location); + ret =3D pdata->ops.upd_led(priv, pdata->wdev, location); =20 return ret ? ret : count; } @@ -660,36 +653,17 @@ static struct attribute_group zone_attribute_group = =3D { /* * LED Brightness (Global) */ -static int wmax_brightness(int brightness) -{ - acpi_status status; - struct acpi_buffer input; - struct wmax_brightness_args args =3D { - .led_mask =3D 0xFF, - .percentage =3D brightness, - }; - input.length =3D sizeof(args); - input.pointer =3D &args; - status =3D wmi_evaluate_method(WMAX_CONTROL_GUID, 0, - WMAX_METHOD_BRIGHTNESS, &input, NULL); - if (ACPI_FAILURE(status)) - pr_err("alienware-wmi: brightness set failure: %u\n", status); - return ACPI_FAILURE(status); -} - static void global_led_set(struct led_classdev *led_cdev, enum led_brightness brightness) { struct alienfx_priv *priv =3D container_of(led_cdev, struct alienfx_priv, global_led); + struct alienfx_platdata *pdata =3D dev_get_platdata(&priv->pdev->dev); int ret; =20 priv->global_brightness =3D brightness; =20 - if (interface =3D=3D WMAX) - ret =3D wmax_brightness(brightness); - else - ret =3D alienware_update_led(priv, 0); + ret =3D pdata->ops.upd_brightness(priv, pdata->wdev, brightness); if (ret) pr_err("LED brightness update failed\n"); } @@ -1249,10 +1223,49 @@ static int alienware_alienfx_setup(struct alienfx_p= latdata *pdata) /* * Legacy WMI driver */ +static int legacy_wmi_update_led(struct alienfx_priv *priv, + struct wmi_device *wdev, u8 location) +{ + struct legacy_led_args legacy_args =3D { + .colors =3D priv->colors[location], + .brightness =3D priv->global_brightness, + .state =3D 0, + }; + struct acpi_buffer input; + acpi_status status; + + if (legacy_args.state !=3D LEGACY_RUNNING) { + legacy_args.state =3D priv->lighting_control_state; + + input.length =3D sizeof(legacy_args); + input.pointer =3D &legacy_args; + + status =3D wmi_evaluate_method(LEGACY_POWER_CONTROL_GUID, 0, + location + 1, &input, NULL); + if (ACPI_FAILURE(status)) + return -EIO; + + return 0; + } + + return alienware_wmi_command(wdev, location + 1, &legacy_args, + sizeof(legacy_args), NULL); +} + +static int legacy_wmi_update_brightness(struct alienfx_priv *priv, + struct wmi_device *wdev, u8 brightness) +{ + return legacy_wmi_update_led(priv, wdev, 0); +} + static int legacy_wmi_probe(struct wmi_device *wdev, const void *context) { struct alienfx_platdata pdata =3D { .wdev =3D wdev, + .ops =3D { + .upd_led =3D legacy_wmi_update_led, + .upd_brightness =3D legacy_wmi_update_brightness, + }, }; =20 return alienware_alienfx_setup(&pdata); @@ -1287,10 +1300,39 @@ static void __exit alienware_legacy_wmi_exit(void) /* * WMAX WMI driver */ +static int wmax_wmi_update_led(struct alienfx_priv *priv, + struct wmi_device *wdev, u8 location) +{ + struct wmax_led_args in_args =3D { + .led_mask =3D 1 << location, + .colors =3D priv->colors[location], + .state =3D priv->lighting_control_state, + }; + + return alienware_wmi_command(wdev, WMAX_METHOD_ZONE_CONTROL, &in_args, + sizeof(in_args), NULL); +} + +static int wmax_wmi_update_brightness(struct alienfx_priv *priv, + struct wmi_device *wdev, u8 brightness) +{ + struct wmax_brightness_args in_args =3D { + .led_mask =3D 0xFF, + .percentage =3D brightness, + }; + + return alienware_wmi_command(wdev, WMAX_METHOD_BRIGHTNESS, &in_args, + sizeof(in_args), NULL); +} + static int wmax_wmi_probe(struct wmi_device *wdev, const void *context) { struct alienfx_platdata pdata =3D { .wdev =3D wdev, + .ops =3D { + .upd_led =3D wmax_wmi_update_led, + .upd_brightness =3D wmax_wmi_update_brightness, + }, }; int ret; =20 --=20 2.48.1