5.13.9

5 files changed, 294 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 75c03754a90c..2b33893e101a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-g14
 	pkgdesc = Linux
-	pkgver = 5.13.8.arch1
+	pkgver = 5.13.9.arch1
 	pkgrel = 1
 	url = https://lab.retarded.farm/zappel/asus-rog-zephyrus-g14/
 	arch = x86_64
@@ -16,7 +16,7 @@ pkgbase = linux-g14
 	makedepends = git
 	makedepends = gcc>=11.0
 	options = !strip
-	source = archlinux-linux::git+https://github.com/archlinux/linux?signed#tag=v5.13.8-arch1
+	source = archlinux-linux::git+https://github.com/archlinux/linux?signed#tag=v5.13.9-arch1
 	source = config
 	source = choose-gcc-optimization.sh
 	source = sys-kernel_arch-sources-g14_files-0004-5.8+--more-uarches-for-kernel.patch::https://raw.githubusercontent.com/graysky2/kernel_compiler_patch/a8d200f422f4b2abeaa6cfcfa37136b308e6e33e/more-uarches-for-kernel-5.8%2B.patch
@@ -36,6 +36,9 @@ pkgbase = linux-g14
 	source = sys-kernel_arch-sources-g14_files-8014-mt76-mt7921-Add-mt7922-support.patch
 	source = sys-kernel_arch-sources-g14_files-9001-v5.13.2-s0ix-patch-2021-08-05.patch
 	source = sys-kernel_arch-sources-g14_files-9002-amd-pmc-smu-register-dump-for-diagnostics.patch
+	source = sys-kernel_arch-sources-g14_files-9003-ACPI-PM-s2idle-Invert-Microsoft-UUID-entry-and-exit.patch
+	source = sys-kernel_arch-sources-g14_files-9004-HID-asus-Reduce-object-size-by-consolidating-calls.patch
+	source = sys-kernel_arch-sources-g14_files-9005-acpi-battery-Always-read-fresh-battery-state-on-update.patch
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
 	validpgpkeys = A2FF3A36AAA56654109064AB19802F8B0D70FC30
@@ -60,6 +63,9 @@ pkgbase = linux-g14
 	sha256sums = a01cf700d79b983807e2285be1b30df6e02db6adfd9c9027fe2dfa8ca5a74bc9
 	sha256sums = c097278b0421bcfd80f24b37bd58d7c9b3e809eaf3c391c73def1451fa366c8b
 	sha256sums = 6e629d4a032165f39202a702ad518a050c9305f911595a43bc34ce0c1d45d36b
+	sha256sums = 5b7b8f450282a15d0832b171e82fc5639de1cb7aa495efe6e6c7989ebeb8ca36
+	sha256sums = 544464bf0807b324120767d55867f03014a9fda4e1804768ca341be902d7ade4
+	sha256sums = f7a4bf6293912bfc4a20743e58a5a266be8c4dbe3c1862d196d3a3b45f2f7c90
 
 pkgname = linux-g14
 	pkgdesc = The Linux kernel and modules
diff --git a/PKGBUILD b/PKGBUILD
index dcb86db1e9ee..300f41de8706 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgbase=linux-g14
-pkgver=5.13.8.arch1
+pkgver=5.13.9.arch1
 pkgrel=1
 pkgdesc='Linux'
 _srctag=v${pkgver%.*}-${pkgver##*.}
@@ -53,6 +53,11 @@ source=(
   "sys-kernel_arch-sources-g14_files-9001-v5.13.2-s0ix-patch-2021-08-05.patch"
   # a small amd_pmc SMU debugging patch per Mario Limonciello @AMD
   "sys-kernel_arch-sources-g14_files-9002-amd-pmc-smu-register-dump-for-diagnostics.patch"
+  
+  "sys-kernel_arch-sources-g14_files-9003-ACPI-PM-s2idle-Invert-Microsoft-UUID-entry-and-exit.patch"
+  
+  "sys-kernel_arch-sources-g14_files-9004-HID-asus-Reduce-object-size-by-consolidating-calls.patch"
+  "sys-kernel_arch-sources-g14_files-9005-acpi-battery-Always-read-fresh-battery-state-on-update.patch"
 )
 
 validpgpkeys=(
@@ -81,7 +86,10 @@ sha256sums=('SKIP'
             '2163cb2e394a013042a40cd3b00dae788603284b20d71e262995366c5534e480'
             'a01cf700d79b983807e2285be1b30df6e02db6adfd9c9027fe2dfa8ca5a74bc9'
             'c097278b0421bcfd80f24b37bd58d7c9b3e809eaf3c391c73def1451fa366c8b'
-            '6e629d4a032165f39202a702ad518a050c9305f911595a43bc34ce0c1d45d36b')
+            '6e629d4a032165f39202a702ad518a050c9305f911595a43bc34ce0c1d45d36b'
+            '5b7b8f450282a15d0832b171e82fc5639de1cb7aa495efe6e6c7989ebeb8ca36'
+            '544464bf0807b324120767d55867f03014a9fda4e1804768ca341be902d7ade4'
+            'f7a4bf6293912bfc4a20743e58a5a266be8c4dbe3c1862d196d3a3b45f2f7c90')
 
 # notable microarch levels:
 #
diff --git a/sys-kernel_arch-sources-g14_files-9003-ACPI-PM-s2idle-Invert-Microsoft-UUID-entry-and-exit.patch b/sys-kernel_arch-sources-g14_files-9003-ACPI-PM-s2idle-Invert-Microsoft-UUID-entry-and-exit.patch
new file mode 100644
index 000000000000..10d96825accd
--- /dev/null
+++ b/sys-kernel_arch-sources-g14_files-9003-ACPI-PM-s2idle-Invert-Microsoft-UUID-entry-and-exit.patch
@@ -0,0 +1,48 @@
+From ee3b91570a02d421d73f235edfe21ea62c628100 Mon Sep 17 00:00:00 2001
+From: Mario Limonciello <mario.limonciello@amd.com>
+Date: Mon, 9 Aug 2021 20:40:04 -0500
+Subject: [PATCH] ACPI: PM: s2idle: Invert Microsoft UUID entry and exit
+
+It was reported by a user with a Dell m15 R5 (5800H) that
+the keyboard backlight was turning on when entering suspend
+and turning off when exiting (the opposite of how it should be).
+
+The user bisected it back to commit 5dbf50997578 ("ACPI: PM:
+s2idle: Add support for new Microsoft UUID").  Previous to that
+commit the LEDs didn't turn off at all.  Confirming in the spec,
+these were reversed when introduced.
+
+Fix them to match the spec.
+
+BugLink: https://gitlab.freedesktop.org/drm/amd/-/issues/1230#note_1021836
+Fixes: 5dbf50997578 ("ACPI: PM: s2idle: Add support for new Microsoft UUID")
+Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
+---
+ drivers/acpi/x86/s2idle.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/acpi/x86/s2idle.c b/drivers/acpi/x86/s2idle.c
+index fbdbef0ab552..3a308461246a 100644
+--- a/drivers/acpi/x86/s2idle.c
++++ b/drivers/acpi/x86/s2idle.c
+@@ -452,7 +452,7 @@ int acpi_s2idle_prepare_late(void)
+ 	if (lps0_dsm_func_mask_microsoft > 0) {
+ 		acpi_sleep_run_lps0_dsm(ACPI_LPS0_SCREEN_OFF,
+ 				lps0_dsm_func_mask_microsoft, lps0_dsm_guid_microsoft);
+-		acpi_sleep_run_lps0_dsm(ACPI_LPS0_MS_EXIT,
++		acpi_sleep_run_lps0_dsm(ACPI_LPS0_MS_ENTRY,
+ 				lps0_dsm_func_mask_microsoft, lps0_dsm_guid_microsoft);
+ 		acpi_sleep_run_lps0_dsm(ACPI_LPS0_ENTRY,
+ 				lps0_dsm_func_mask_microsoft, lps0_dsm_guid_microsoft);
+@@ -479,7 +479,7 @@ void acpi_s2idle_restore_early(void)
+ 	if (lps0_dsm_func_mask_microsoft > 0) {
+ 		acpi_sleep_run_lps0_dsm(ACPI_LPS0_EXIT,
+ 				lps0_dsm_func_mask_microsoft, lps0_dsm_guid_microsoft);
+-		acpi_sleep_run_lps0_dsm(ACPI_LPS0_MS_ENTRY,
++		acpi_sleep_run_lps0_dsm(ACPI_LPS0_MS_EXIT,
+ 				lps0_dsm_func_mask_microsoft, lps0_dsm_guid_microsoft);
+ 		acpi_sleep_run_lps0_dsm(ACPI_LPS0_SCREEN_ON,
+ 				lps0_dsm_func_mask_microsoft, lps0_dsm_guid_microsoft);
+-- 
+2.32.0
+
diff --git a/sys-kernel_arch-sources-g14_files-9004-HID-asus-Reduce-object-size-by-consolidating-calls.patch b/sys-kernel_arch-sources-g14_files-9004-HID-asus-Reduce-object-size-by-consolidating-calls.patch
new file mode 100644
index 000000000000..761b6bcae9ef
--- /dev/null
+++ b/sys-kernel_arch-sources-g14_files-9004-HID-asus-Reduce-object-size-by-consolidating-calls.patch
@@ -0,0 +1,190 @@
+From patchwork Sat May 29 16:29:48 2021
+Message-ID: <56767df55117cc5834b0021ba2c056272e686804.camel@perches.com>
+Subject: [PATCH] HID: asus: Reduce object size by consolidating calls
+From: Joe Perches <joe@perches.com>
+To: Jiri Kosina <jikos@kernel.org>,
+        Benjamin Tissoires <benjamin.tissoires@redhat.com>
+Cc: linux-input <linux-input@vger.kernel.org>,
+        LKML <linux-kernel@vger.kernel.org>
+Date: Sat, 29 May 2021 09:29:48 -0700
+List-ID: <linux-input.vger.kernel.org>
+X-Mailing-List: linux-input@vger.kernel.org
+
+Add intermediating lookup functions to avoid repetitive calls.
+
+Reduces object size ~4kb (x86-64 defconfig w/ hid-asus)
+
+$ size drivers/hid/hid-asus.o*
+   text	   data	    bss	    dec	    hex	filename
+  10442	    468	      0	  10910	   2a9e	drivers/hid/hid-asus.o.bew
+  14523	    468	      0	  14991	   3a8f	drivers/hid/hid-asus.o.old
+
+Miscellanea:
+
+o Remove now unused asus_map_kay_clear macro
+
+Signed-off-by: Joe Perches <joe@perches.com>
+---
+
+untested, no hardware
+
+ drivers/hid/hid-asus.c | 128 ++++++++++++++++++++++++-------------------------
+ 1 file changed, 64 insertions(+), 64 deletions(-)
+
+diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c
+index fca8fc78a78a3..5b78e6c3bb5d9 100644
+--- a/drivers/hid/hid-asus.c
++++ b/drivers/hid/hid-asus.c
+@@ -811,8 +811,58 @@ static int asus_input_configured(struct hid_device *hdev, struct hid_input *hi)
+ 	return 0;
+ }
+ 
+-#define asus_map_key_clear(c)	hid_map_usage_clear(hi, usage, bit, \
+-						    max, EV_KEY, (c))
++static int asus_map_use_to_btn(int use)
++{
++	switch (use) {
++	case 0x10: return KEY_BRIGHTNESSDOWN;
++	case 0x20: return KEY_BRIGHTNESSUP;
++	case 0x35: return KEY_DISPLAY_OFF;
++	case 0x6c: return KEY_SLEEP;
++	case 0x7c: return KEY_MICMUTE;
++	case 0x82: return KEY_CAMERA;
++	case 0x88: return KEY_RFKILL;
++	case 0xb5: return KEY_CALC;
++	case 0xc4: return KEY_KBDILLUMUP;
++	case 0xc5: return KEY_KBDILLUMDOWN;
++	case 0x6b: return KEY_F21;	/* ASUS touchpad toggle */
++	case 0x38: return KEY_PROG1;	/* ROG key */
++	case 0xba: return KEY_PROG2;	/* Fn+C ASUS Splendid */
++	case 0x5c: return KEY_PROG3;	/* Fn+Space Power4Gear Hybrid */
++	case 0x99: return KEY_PROG4;	/* Fn+F5 "fan" symbol on FX503VD */
++	/* for N-Key keyboard */
++	case 0xae: return KEY_PROG4;	/* Fn+F5 "fan" symbol */
++	case 0x92: return KEY_CALC;	/* Fn+Ret "Calc" symbol */
++	case 0xb2: return KEY_PROG2;	/* Fn+Left Aura mode previous */
++	case 0xb3: return KEY_PROG3;	/* Fn+Right Aura mode next */
++	}
++
++	return 0;
++}
++
++static int ms_map_use_to_btn(int use)
++{
++	switch (use) {
++	case 0xff01: return BTN_1;
++	case 0xff02: return BTN_2;
++	case 0xff03: return BTN_3;
++	case 0xff04: return BTN_4;
++	case 0xff05: return BTN_5;
++	case 0xff06: return BTN_6;
++	case 0xff07: return BTN_7;
++	case 0xff08: return BTN_8;
++	case 0xff09: return BTN_9;
++	case 0xff0a: return BTN_A;
++	case 0xff0b: return BTN_B;
++	case 0x00f1: return KEY_WLAN;
++	case 0x00f2: return KEY_BRIGHTNESSDOWN;
++	case 0x00f3: return KEY_BRIGHTNESSUP;
++	case 0x00f4: return KEY_DISPLAY_OFF;
++	case 0x00f7: return KEY_CAMERA;
++	case 0x00f8: return KEY_PROG1;
++	}
++
++	return 0;
++}
+ static int asus_input_mapping(struct hid_device *hdev,
+ 		struct hid_input *hi, struct hid_field *field,
+ 		struct hid_usage *usage, unsigned long **bit,
+@@ -842,50 +892,16 @@ static int asus_input_mapping(struct hid_device *hdev,
+ 
+ 	/* ASUS-specific keyboard hotkeys and led backlight */
+ 	if ((usage->hid & HID_USAGE_PAGE) == HID_UP_ASUSVENDOR) {
+-		switch (usage->hid & HID_USAGE) {
+-		case 0x10: asus_map_key_clear(KEY_BRIGHTNESSDOWN);	break;
+-		case 0x20: asus_map_key_clear(KEY_BRIGHTNESSUP);		break;
+-		case 0x35: asus_map_key_clear(KEY_DISPLAY_OFF);		break;
+-		case 0x6c: asus_map_key_clear(KEY_SLEEP);		break;
+-		case 0x7c: asus_map_key_clear(KEY_MICMUTE);		break;
+-		case 0x82: asus_map_key_clear(KEY_CAMERA);		break;
+-		case 0x88: asus_map_key_clear(KEY_RFKILL);			break;
+-		case 0xb5: asus_map_key_clear(KEY_CALC);			break;
+-		case 0xc4: asus_map_key_clear(KEY_KBDILLUMUP);		break;
+-		case 0xc5: asus_map_key_clear(KEY_KBDILLUMDOWN);		break;
+-
+-		/* ASUS touchpad toggle */
+-		case 0x6b: asus_map_key_clear(KEY_F21);			break;
+-
+-		/* ROG key */
+-		case 0x38: asus_map_key_clear(KEY_PROG1);		break;
+-
+-		/* Fn+C ASUS Splendid */
+-		case 0xba: asus_map_key_clear(KEY_PROG2);		break;
++		int btn = asus_map_use_to_btn(usage->hid & HID_USAGE);
+ 
+-		/* Fn+Space Power4Gear Hybrid */
+-		case 0x5c: asus_map_key_clear(KEY_PROG3);		break;
+-
+-		/* Fn+F5 "fan" symbol on FX503VD */
+-		case 0x99: asus_map_key_clear(KEY_PROG4);		break;
+-
+-		/* Fn+F5 "fan" symbol on N-Key keyboard */
+-		case 0xae: asus_map_key_clear(KEY_PROG4);		break;
+-
+-		/* Fn+Ret "Calc" symbol on N-Key keyboard */
+-		case 0x92: asus_map_key_clear(KEY_CALC);		break;
+-
+-		/* Fn+Left Aura mode previous on N-Key keyboard */
+-		case 0xb2: asus_map_key_clear(KEY_PROG2);		break;
+-
+-		/* Fn+Right Aura mode next on N-Key keyboard */
+-		case 0xb3: asus_map_key_clear(KEY_PROG3);		break;
+-
+-		default:
+-			/* ASUS lazily declares 256 usages, ignore the rest,
+-			 * as some make the keyboard appear as a pointer device. */
++		/*
++		 * ASUS lazily declares 256 usages, ignore the rest,
++		 * as some make the keyboard appear as a pointer device.
++		 */
++		if (!btn)
+ 			return -1;
+-		}
++
++		hid_map_usage_clear(hi, usage, bit, max, EV_KEY, btn);
+ 
+ 		/*
+ 		 * Check and enable backlight only on devices with UsagePage ==
+@@ -901,28 +917,12 @@ static int asus_input_mapping(struct hid_device *hdev,
+ 	}
+ 
+ 	if ((usage->hid & HID_USAGE_PAGE) == HID_UP_MSVENDOR) {
+-		switch (usage->hid & HID_USAGE) {
+-		case 0xff01: asus_map_key_clear(BTN_1);	break;
+-		case 0xff02: asus_map_key_clear(BTN_2);	break;
+-		case 0xff03: asus_map_key_clear(BTN_3);	break;
+-		case 0xff04: asus_map_key_clear(BTN_4);	break;
+-		case 0xff05: asus_map_key_clear(BTN_5);	break;
+-		case 0xff06: asus_map_key_clear(BTN_6);	break;
+-		case 0xff07: asus_map_key_clear(BTN_7);	break;
+-		case 0xff08: asus_map_key_clear(BTN_8);	break;
+-		case 0xff09: asus_map_key_clear(BTN_9);	break;
+-		case 0xff0a: asus_map_key_clear(BTN_A);	break;
+-		case 0xff0b: asus_map_key_clear(BTN_B);	break;
+-		case 0x00f1: asus_map_key_clear(KEY_WLAN);	break;
+-		case 0x00f2: asus_map_key_clear(KEY_BRIGHTNESSDOWN);	break;
+-		case 0x00f3: asus_map_key_clear(KEY_BRIGHTNESSUP);	break;
+-		case 0x00f4: asus_map_key_clear(KEY_DISPLAY_OFF);	break;
+-		case 0x00f7: asus_map_key_clear(KEY_CAMERA);	break;
+-		case 0x00f8: asus_map_key_clear(KEY_PROG1);	break;
+-		default:
++		int btn = ms_map_use_to_btn(usage->hid & HID_USAGE);
++
++		if (!btn)
+ 			return 0;
+-		}
+ 
++		hid_map_usage_clear(hi, usage, bit, max, EV_KEY, btn);
+ 		set_bit(EV_REP, hi->input->evbit);
+ 		return 1;
+ 	}
diff --git a/sys-kernel_arch-sources-g14_files-9005-acpi-battery-Always-read-fresh-battery-state-on-update.patch b/sys-kernel_arch-sources-g14_files-9005-acpi-battery-Always-read-fresh-battery-state-on-update.patch
new file mode 100644
index 000000000000..04c52a5eab02
--- /dev/null
+++ b/sys-kernel_arch-sources-g14_files-9005-acpi-battery-Always-read-fresh-battery-state-on-update.patch
@@ -0,0 +1,38 @@
+From patchwork Thu Jun  4 19:56:58 2020
+From: Mathew King <mathewk@chromium.org>
+To: linux-kernel@vger.kernel.org
+Cc: Mathew King <mathewk@chromium.org>,
+        "Rafael J. Wysocki" <rjw@rjwysocki.net>,
+        Len Brown <lenb@kernel.org>, linux-acpi@vger.kernel.org
+Subject: [PATCH] acpi: battery: Always read fresh battery state on update
+Date: Thu,  4 Jun 2020 13:56:58 -0600
+Message-Id: <20200604195658.66201-1-mathewk@chromium.org>
+List-ID: <linux-acpi.vger.kernel.org>
+X-Mailing-List: linux-acpi@vger.kernel.org
+
+When the ACPI battery receives a notification event it should always
+read the battery state fresh from the ACPI device and not use the cached
+state. Currently the cached state stays valid and the new state may not
+be read when a notification occurs. This can lead to a udev event
+showing that the battery has changed but the sysfs state will still have
+the cached state values. This change invalidates the update time forcing
+the state to be updated before notifying the power_supply subsystem of
+the change.
+
+Signed-off-by: Mathew King <mathewk@chromium.org>
+---
+ drivers/acpi/battery.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
+index 366c389175d8..ab7fa4879fbe 100644
+--- a/drivers/acpi/battery.c
++++ b/drivers/acpi/battery.c
+@@ -981,6 +981,7 @@ static int acpi_battery_update(struct acpi_battery *battery, bool resume)
+ 		acpi_battery_init_alarm(battery);
+ 	}
+ 
++	battery->update_time = 0;
+ 	result = acpi_battery_get_state(battery);
+ 	if (result)
+ 		return result;