kernel 6.7.3

1 files changed, 8 insertions, 406 deletions

diff --git a/SOURCES/asus-linux.patch b/SOURCES/asus-linux.patch
index 6caf775..acdc4a3 100644
--- a/SOURCES/asus-linux.patch
+++ b/SOURCES/asus-linux.patch
@@ -36,14 +36,14 @@ diff --git a/sound/pci/hda/cs35l41_hda_property.c b/sound/pci/hda/cs35l41_hda_pr
 index c9eb70290..2b8f8fd52 100644
 --- a/sound/pci/hda/cs35l41_hda_property.c
 +++ b/sound/pci/hda/cs35l41_hda_property.c
-@@ -57,6 +57,7 @@ static const struct cs35l41_config cs35l41_config_table[] = {
- 	{ "104316D3", SPI, 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 0, 0, 0 },
- 	{ "104316F3", SPI, 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 0, 0, 0 },
- 	{ "104317F3", I2C, 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4500, 24 },
-+	{ "10431B93", SPI, 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 1000, 4500, 24 },
- 	{ "10431863", SPI, 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 1000, 4500, 24 },
- 	{ "104318D3", I2C, 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 0, 0, 0 },
- 	{ "10431C9F", SPI, 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 1000, 4500, 24 },
+@@ -79,6 +79,7 @@
+ 	{ "104316D3", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 0, 0, 0 },
+ 	{ "104316F3", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 0, 0, 0 },
+ 	{ "104317F3", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4500, 24 },
++	{ "10431B93", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 1000, 4500, 24 },
+ 	{ "10431863", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 1000, 4500, 24 },
+ 	{ "104318D3", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 0, 0, 0 },
+ 	{ "10431C9F", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 1000, 4500, 24 },
 @@ -360,6 +361,7 @@ static const struct cs35l41_prop_model cs35l41_prop_model_table[] = {
  	{ "CSC3551", "104316D3", generic_dsd_config },
  	{ "CSC3551", "104316F3", generic_dsd_config },
@@ -55,401 +55,3 @@ index c9eb70290..2b8f8fd52 100644
 
 --
 2.41.0
-
-From b35a4c957b3f0e5b4c7c73dec4fe3a5b9dbc4873 Mon Sep 17 00:00:00 2001
-From: "Luke D. Jones" <luke@ljones.dev>
-Date: Sun, 30 Apr 2023 10:56:34 +1200
-Subject: [PATCH v6 1/1] platform/x86: asus-wmi: add support for ASUS screenpad
-
-Add support for the WMI methods used to turn off and adjust the
-brightness of the secondary "screenpad" device found on some high-end
-ASUS laptops like the GX650P series and others.
-
-There are some small quirks with this device when considering only the
-raw WMI methods:
-1. The Off method can only switch the device off
-2. Changing the brightness turns the device back on
-3. To turn the device back on the brightness must be > 1
-4. When the device is off the brightness can't be changed (so it is
-   stored by the driver if device is off).
-5. Booting with a value of 0 brightness (retained by bios) means the bios
-   will set a value of >0 <15
-6. When the device is off it is "unplugged"
-
-asus_wmi sets the minimum brightness as 20 in general use, and 60 for
-booting with values <= min.
-
-The ACPI methods are used in a new backlight device named asus_screenpad.
-
-Signed-off-by: Luke D. Jones <luke@ljones.dev>
----
- drivers/platform/x86/asus-wmi.c            | 133 +++++++++++++++++++++
- drivers/platform/x86/asus-wmi.h            |   1 +
- include/linux/platform_data/x86/asus-wmi.h |   4 +
- 3 files changed, 138 insertions(+)
-
-diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
-index f54178d6f780..0b13be703856 100644
---- a/drivers/platform/x86/asus-wmi.c
-+++ b/drivers/platform/x86/asus-wmi.c
-@@ -25,6 +25,7 @@
- #include <linux/input/sparse-keymap.h>
- #include <linux/kernel.h>
- #include <linux/leds.h>
-+#include <linux/minmax.h>
- #include <linux/module.h>
- #include <linux/pci.h>
- #include <linux/pci_hotplug.h>
-@@ -127,6 +128,10 @@ module_param(fnlock_default, bool, 0444);
- #define NVIDIA_TEMP_MIN		75
- #define NVIDIA_TEMP_MAX		87
-
-+#define ASUS_SCREENPAD_BRIGHT_MIN 20
-+#define ASUS_SCREENPAD_BRIGHT_MAX 255
-+#define ASUS_SCREENPAD_BRIGHT_DEFAULT 60
-+
- static const char * const ashs_ids[] = { "ATK4001", "ATK4002", NULL };
-
- static int throttle_thermal_policy_write(struct asus_wmi *);
-@@ -212,6 +217,7 @@ struct asus_wmi {
-
- 	struct input_dev *inputdev;
- 	struct backlight_device *backlight_device;
-+	struct backlight_device *screenpad_backlight_device;
- 	struct platform_device *platform_device;
-
- 	struct led_classdev wlan_led;
-@@ -3776,6 +3782,124 @@ static int is_display_toggle(int code)
- 	return 0;
- }
-
-+/* Screenpad backlight *******************************************************/
-+
-+static int read_screenpad_backlight_power(struct asus_wmi *asus)
-+{
-+	int ret;
-+
-+	ret = asus_wmi_get_devstate_simple(asus, ASUS_WMI_DEVID_SCREENPAD_POWER);
-+	if (ret < 0)
-+		return ret;
-+	/* 1 == powered */
-+	return ret ? FB_BLANK_UNBLANK : FB_BLANK_POWERDOWN;
-+}
-+
-+static int read_screenpad_brightness(struct backlight_device *bd)
-+{
-+	struct asus_wmi *asus = bl_get_data(bd);
-+	u32 retval;
-+	int err;
-+
-+	err = read_screenpad_backlight_power(asus);
-+	if (err < 0)
-+		return err;
-+	/* The device brightness can only be read if powered, so return stored */
-+	if (err == FB_BLANK_POWERDOWN)
-+		return asus->driver->screenpad_brightness - ASUS_SCREENPAD_BRIGHT_MIN;
-+
-+	err = asus_wmi_get_devstate(asus, ASUS_WMI_DEVID_SCREENPAD_LIGHT, &retval);
-+	if (err < 0)
-+		return err;
-+
-+	return (retval & ASUS_WMI_DSTS_BRIGHTNESS_MASK) - ASUS_SCREENPAD_BRIGHT_MIN;
-+}
-+
-+static int update_screenpad_bl_status(struct backlight_device *bd)
-+{
-+	struct asus_wmi *asus = bl_get_data(bd);
-+	int power, err = 0;
-+	u32 ctrl_param;
-+
-+	power = read_screenpad_backlight_power(asus);
-+	if (power < 0)
-+		return power;
-+
-+	if (bd->props.power != power) {
-+		if (power != FB_BLANK_UNBLANK) {
-+			/* Only brightness > 0 can power it back on */
-+			ctrl_param = asus->driver->screenpad_brightness - ASUS_SCREENPAD_BRIGHT_MIN;
-+			err = asus_wmi_set_devstate(ASUS_WMI_DEVID_SCREENPAD_LIGHT,
-+						    ctrl_param, NULL);
-+		} else {
-+			err = asus_wmi_set_devstate(ASUS_WMI_DEVID_SCREENPAD_POWER, 0, NULL);
-+		}
-+	} else if (power == FB_BLANK_UNBLANK) {
-+		/* Only set brightness if powered on or we get invalid/unsync state */
-+		ctrl_param = bd->props.brightness + ASUS_SCREENPAD_BRIGHT_MIN;
-+		err = asus_wmi_set_devstate(ASUS_WMI_DEVID_SCREENPAD_LIGHT, ctrl_param, NULL);
-+	}
-+
-+	/* Ensure brightness is stored to turn back on with */
-+	if (err == 0)
-+		asus->driver->screenpad_brightness = bd->props.brightness + ASUS_SCREENPAD_BRIGHT_MIN;
-+
-+	return err;
-+}
-+
-+static const struct backlight_ops asus_screenpad_bl_ops = {
-+	.get_brightness = read_screenpad_brightness,
-+	.update_status = update_screenpad_bl_status,
-+	.options = BL_CORE_SUSPENDRESUME,
-+};
-+
-+static int asus_screenpad_init(struct asus_wmi *asus)
-+{
-+	struct backlight_device *bd;
-+	struct backlight_properties props;
-+	int err, power;
-+	int brightness = 0;
-+
-+	power = read_screenpad_backlight_power(asus);
-+	if (power < 0)
-+		return power;
-+
-+	if (power != FB_BLANK_POWERDOWN) {
-+		err = asus_wmi_get_devstate(asus, ASUS_WMI_DEVID_SCREENPAD_LIGHT, &brightness);
-+		if (err < 0)
-+			return err;
-+	}
-+	/* default to an acceptable min brightness on boot if too low */
-+	if (brightness < ASUS_SCREENPAD_BRIGHT_MIN)
-+		brightness = ASUS_SCREENPAD_BRIGHT_DEFAULT;
-+
-+	memset(&props, 0, sizeof(struct backlight_properties));
-+	props.type = BACKLIGHT_RAW; /* ensure this bd is last to be picked */
-+	props.max_brightness = ASUS_SCREENPAD_BRIGHT_MAX - ASUS_SCREENPAD_BRIGHT_MIN;
-+	bd = backlight_device_register("asus_screenpad",
-+				       &asus->platform_device->dev, asus,
-+				       &asus_screenpad_bl_ops, &props);
-+	if (IS_ERR(bd)) {
-+		pr_err("Could not register backlight device\n");
-+		return PTR_ERR(bd);
-+	}
-+
-+	asus->screenpad_backlight_device = bd;
-+	asus->driver->screenpad_brightness = brightness;
-+	bd->props.brightness = brightness;
-+	bd->props.power = power;
-+	backlight_update_status(bd);
-+
-+	return 0;
-+}
-+
-+static void asus_screenpad_exit(struct asus_wmi *asus)
-+{
-+	backlight_device_unregister(asus->screenpad_backlight_device);
-+
-+	asus->screenpad_backlight_device = NULL;
-+}
-+
- /* Fn-lock ********************************************************************/
-
- static bool asus_wmi_has_fnlock_key(struct asus_wmi *asus)
-@@ -4431,6 +4555,12 @@ static int asus_wmi_add(struct platform_device *pdev)
- 	} else if (asus->driver->quirks->wmi_backlight_set_devstate)
- 		err = asus_wmi_set_devstate(ASUS_WMI_DEVID_BACKLIGHT, 2, NULL);
-
-+	if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_SCREENPAD_LIGHT)) {
-+		err = asus_screenpad_init(asus);
-+		if (err && err != -ENODEV)
-+			goto fail_screenpad;
-+	}
-+
- 	if (asus_wmi_has_fnlock_key(asus)) {
- 		asus->fnlock_locked = fnlock_default;
- 		asus_wmi_fnlock_update(asus);
-@@ -4454,6 +4584,8 @@ static int asus_wmi_add(struct platform_device *pdev)
- 	asus_wmi_backlight_exit(asus);
- fail_backlight:
- 	asus_wmi_rfkill_exit(asus);
-+fail_screenpad:
-+	asus_screenpad_exit(asus);
- fail_rfkill:
- 	asus_wmi_led_exit(asus);
- fail_leds:
-@@ -4481,6 +4481,7 @@
- 		i8042_remove_filter(asus->driver->quirks->i8042_filter);
- 	wmi_remove_notify_handler(asus->driver->event_guid);
- 	asus_wmi_backlight_exit(asus);
-+	asus_screenpad_exit(asus);
- 	asus_wmi_input_exit(asus);
- 	asus_wmi_led_exit(asus);
- 	asus_wmi_rfkill_exit(asus);
-diff --git a/drivers/platform/x86/asus-wmi.h b/drivers/platform/x86/asus-wmi.h
-index a478ebfd34df..5fbdd0eafa02 100644
---- a/drivers/platform/x86/asus-wmi.h
-+++ b/drivers/platform/x86/asus-wmi.h
-@@ -57,6 +57,7 @@ struct quirk_entry {
- struct asus_wmi_driver {
- 	int			brightness;
- 	int			panel_power;
-+	int			screenpad_brightness;
- 	int			wlan_ctrl_by_user;
-
- 	const char		*name;
-diff --git a/include/linux/platform_data/x86/asus-wmi.h b/include/linux/platform_data/x86/asus-wmi.h
-index 16e99a1c37fc..63e630276499 100644
---- a/include/linux/platform_data/x86/asus-wmi.h
-+++ b/include/linux/platform_data/x86/asus-wmi.h
-@@ -58,6 +58,10 @@
- #define ASUS_WMI_DEVID_KBD_BACKLIGHT	0x00050021
- #define ASUS_WMI_DEVID_LIGHT_SENSOR	0x00050022 /* ?? */
- #define ASUS_WMI_DEVID_LIGHTBAR		0x00050025
-+/* This can only be used to disable the screen, not re-enable */
-+#define ASUS_WMI_DEVID_SCREENPAD_POWER	0x00050031
-+/* Writing a brightness re-enables the screen if disabled */
-+#define ASUS_WMI_DEVID_SCREENPAD_LIGHT	0x00050032
- #define ASUS_WMI_DEVID_FAN_BOOST_MODE	0x00110018
- #define ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY 0x00120075
-
---
-2.41.0
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Luke D. Jones" <luke@ljones.dev>
-Date: Mon, 27 Nov 2023 12:05:21 +1300
-Subject: [PATCH] platform/x86: asus-wmi: disable USB0 hub on ROG Ally before
- suspend
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-ASUS have worked around an issue in XInput where it doesn't support USB
-selective suspend, which causes suspend issues in Windows. They worked
-around this by adjusting the MCU firmware to disable the USB0 hub when
-the screen is switched off during the Microsoft DSM suspend path in ACPI.
-
-The issue we have with this however is one of timing - the call the tells
-the MCU to this isn't able to complete before suspend is done so we call
-this in a prepare() and add a small msleep() to ensure it is done. This
-must be done before the screen is switched off to prevent a variety of
-possible races.
-
-Further to this the MCU powersave option must also be disabled as it can
-cause a number of issues such as:
-- unreliable resume connection of N-Key
-- complete loss of N-Key if the power is plugged in while suspended
-Disabling the powersave option prevents this.
-
-Without this the MCU is unable to initialise itself correctly on resume.
-
-Signed-off-by: "Luke D. Jones" <luke@ljones.dev>
-Tested-by: Philip Mueller <philm@manjaro.org>
-Reviewed-by: Hans de Goede <hdegoede@redhat.com>
-Link: https://lore.kernel.org/r/20231126230521.125708-2-luke@ljones.dev
-Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
-Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
----
- drivers/platform/x86/asus-wmi.c            | 50 ++++++++++++++++++++++
- include/linux/platform_data/x86/asus-wmi.h |  3 ++
- 2 files changed, 53 insertions(+)
-
-diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
-index ca668cf04020..9f7e23c5c6b4 100644
---- a/drivers/platform/x86/asus-wmi.c
-+++ b/drivers/platform/x86/asus-wmi.c
-@@ -16,6 +16,7 @@
- #include <linux/acpi.h>
- #include <linux/backlight.h>
- #include <linux/debugfs.h>
-+#include <linux/delay.h>
- #include <linux/dmi.h>
- #include <linux/fb.h>
- #include <linux/hwmon.h>
-@@ -132,6 +133,11 @@ module_param(fnlock_default, bool, 0444);
- #define ASUS_SCREENPAD_BRIGHT_MAX 255
- #define ASUS_SCREENPAD_BRIGHT_DEFAULT 60
- 
-+/* Controls the power state of the USB0 hub on ROG Ally which input is on */
-+#define ASUS_USB0_PWR_EC0_CSEE "\\_SB.PCI0.SBRG.EC0.CSEE"
-+/* 300ms so far seems to produce a reliable result on AC and battery */
-+#define ASUS_USB0_PWR_EC0_CSEE_WAIT 300
-+
- static const char * const ashs_ids[] = { "ATK4001", "ATK4002", NULL };
- 
- static int throttle_thermal_policy_write(struct asus_wmi *);
-@@ -300,6 +306,9 @@ struct asus_wmi {
- 
- 	bool fnlock_locked;
- 
-+	/* The ROG Ally device requires the MCU USB device be disconnected before suspend */
-+	bool ally_mcu_usb_switch;
-+
- 	struct asus_wmi_debug debug;
- 
- 	struct asus_wmi_driver *driver;
-@@ -4488,6 +4497,8 @@ static int asus_wmi_add(struct platform_device *pdev)
- 	asus->nv_temp_tgt_available = asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_NV_THERM_TARGET);
- 	asus->panel_overdrive_available = asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_PANEL_OD);
- 	asus->mini_led_mode_available = asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_MINI_LED_MODE);
-+	asus->ally_mcu_usb_switch = acpi_has_method(NULL, ASUS_USB0_PWR_EC0_CSEE)
-+						&& dmi_match(DMI_BOARD_NAME, "RC71L");
- 
- 	err = fan_boost_mode_check_present(asus);
- 	if (err)
-@@ -4662,6 +4673,43 @@ static int asus_hotk_resume(struct device *device)
- 		asus_wmi_fnlock_update(asus);
- 
- 	asus_wmi_tablet_mode_get_state(asus);
-+
-+	return 0;
-+}
-+
-+static int asus_hotk_resume_early(struct device *device)
-+{
-+	struct asus_wmi *asus = dev_get_drvdata(device);
-+
-+	if (asus->ally_mcu_usb_switch) {
-+		if (ACPI_FAILURE(acpi_execute_simple_method(NULL, ASUS_USB0_PWR_EC0_CSEE, 0xB8)))
-+			dev_err(device, "ROG Ally MCU failed to connect USB dev\n");
-+		else
-+			msleep(ASUS_USB0_PWR_EC0_CSEE_WAIT);
-+	}
-+	return 0;
-+}
-+
-+static int asus_hotk_prepare(struct device *device)
-+{
-+	struct asus_wmi *asus = dev_get_drvdata(device);
-+	int result, err;
-+
-+	if (asus->ally_mcu_usb_switch) {
-+		/* When powersave is enabled it causes many issues with resume of USB hub */
-+		result = asus_wmi_get_devstate_simple(asus, ASUS_WMI_DEVID_MCU_POWERSAVE);
-+		if (result == 1) {
-+			dev_warn(device, "MCU powersave enabled, disabling to prevent resume issues");
-+			err = asus_wmi_set_devstate(ASUS_WMI_DEVID_MCU_POWERSAVE, 0, &result);
-+			if (err || result != 1)
-+				dev_err(device, "Failed to set MCU powersave mode: %d\n", err);
-+		}
-+		/* sleep required to ensure USB0 is disabled before sleep continues */
-+		if (ACPI_FAILURE(acpi_execute_simple_method(NULL, ASUS_USB0_PWR_EC0_CSEE, 0xB7)))
-+			dev_err(device, "ROG Ally MCU failed to disconnect USB dev\n");
-+		else
-+			msleep(ASUS_USB0_PWR_EC0_CSEE_WAIT);
-+	}
- 	return 0;
- }
- 
-@@ -4709,6 +4757,8 @@ static const struct dev_pm_ops asus_pm_ops = {
- 	.thaw = asus_hotk_thaw,
- 	.restore = asus_hotk_restore,
- 	.resume = asus_hotk_resume,
-+	.resume_early = asus_hotk_resume_early,
-+	.prepare = asus_hotk_prepare,
- };
- 
- /* Registration ***************************************************************/
-diff --git a/include/linux/platform_data/x86/asus-wmi.h b/include/linux/platform_data/x86/asus-wmi.h
-index 63e630276499..ab1c7deff118 100644
---- a/include/linux/platform_data/x86/asus-wmi.h
-+++ b/include/linux/platform_data/x86/asus-wmi.h
-@@ -114,6 +114,9 @@
- /* Charging mode - 1=Barrel, 2=USB */
- #define ASUS_WMI_DEVID_CHARGE_MODE	0x0012006C
- 
-+/* MCU powersave mode */
-+#define ASUS_WMI_DEVID_MCU_POWERSAVE   0x001200E2
-+
- /* epu is connected? 1 == true */
- #define ASUS_WMI_DEVID_EGPU_CONNECTED	0x00090018
- /* egpu on/off */