Update acpi patch

7 files changed, 88 insertions, 136 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4c88d5f30be1..0728977e14bc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -22,18 +22,14 @@ pkgbase = linux-mainline-um5302ta
 	options = !strip
 	source = linux-mainline::git+https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#tag=v5.19-rc4
 	source = config
-	source = v3-1-3-ACPI-skip-IRQ1-override-on-Lenovo-ThinkBook-14G4-ARA.patch
-	source = v3-2-3-ACPI-skip-IRQ1-override-on-Redmi-Book-Pro-15-2022.patch
-	source = v3-3-3-ACPI-skip-IRQ1-override-on-Asus-Zenbook-S-13-OLED-UM5302.patch
+	source = v5-ACPI-skip-IRQ1-override-on-3-Ryzen-6000-laptops.patch
 	source = v4-Bluetooth-btusb-Add-a-new-VID-PID-0489-e0e2-for-MT7922.patch
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
 	validpgpkeys = A2FF3A36AAA56654109064AB19802F8B0D70FC30
 	sha256sums = SKIP
 	sha256sums = 382aa201a6a6939210dd8668ab052724547b4bd489b38e97502bbd0848061b35
-	sha256sums = 2f8cf3f6914d4c122c5247f0caadb2c3832b2bd9662005d05e4179337dd84adc
-	sha256sums = f68853f51f7e0d58e1a9c34fea8516d45a18e5b0a59477e87fea0eacf5be5c77
-	sha256sums = 336c842b0054d496f05394b52d3361a005d81621e39f54878a41928988466735
+	sha256sums = a78e1868cfcaa34d5e5c8e16f2072e54966798664e5148a804579819ef965814
 	sha256sums = 5212ffc69ba29c5b29365849e8bdb621c8cadac4025de5a503f55af923f123f0
 
 pkgname = linux-mainline-um5302ta
diff --git a/.gitignore b/.gitignore
index 4d304b160b41..953619cbf014 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,5 @@
 !/PKGBUILD
 !/.SRCINFO
 !/config
-!/v3-1-3-ACPI-skip-IRQ1-override-on-Lenovo-ThinkBook-14G4-ARA.patch
-!/v3-2-3-ACPI-skip-IRQ1-override-on-Redmi-Book-Pro-15-2022.patch
-!/v3-3-3-ACPI-skip-IRQ1-override-on-Asus-Zenbook-S-13-OLED-UM5302.patch
+!/v5-ACPI-skip-IRQ1-override-on-3-Ryzen-6000-laptops.patch
 !/v4-Bluetooth-btusb-Add-a-new-VID-PID-0489-e0e2-for-MT7922.patch
diff --git a/PKGBUILD b/PKGBUILD
index 7cebdb7dd487..2a67128621be 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -19,9 +19,7 @@ _srcname=linux-mainline
 source=(
   "$_srcname::git+https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#tag=$_srctag"
   config         # the main kernel config file
-  v3-1-3-ACPI-skip-IRQ1-override-on-Lenovo-ThinkBook-14G4-ARA.patch
-  v3-2-3-ACPI-skip-IRQ1-override-on-Redmi-Book-Pro-15-2022.patch
-  v3-3-3-ACPI-skip-IRQ1-override-on-Asus-Zenbook-S-13-OLED-UM5302.patch
+  v5-ACPI-skip-IRQ1-override-on-3-Ryzen-6000-laptops.patch
   v4-Bluetooth-btusb-Add-a-new-VID-PID-0489-e0e2-for-MT7922.patch
 )
 validpgpkeys=(
@@ -31,9 +29,7 @@ validpgpkeys=(
 )
 sha256sums=('SKIP'
             '382aa201a6a6939210dd8668ab052724547b4bd489b38e97502bbd0848061b35'
-            '2f8cf3f6914d4c122c5247f0caadb2c3832b2bd9662005d05e4179337dd84adc'
-            'f68853f51f7e0d58e1a9c34fea8516d45a18e5b0a59477e87fea0eacf5be5c77'
-            '336c842b0054d496f05394b52d3361a005d81621e39f54878a41928988466735'
+            'a78e1868cfcaa34d5e5c8e16f2072e54966798664e5148a804579819ef965814'
             '5212ffc69ba29c5b29365849e8bdb621c8cadac4025de5a503f55af923f123f0')
 
 export KBUILD_BUILD_HOST=archlinux
diff --git a/v3-1-3-ACPI-skip-IRQ1-override-on-Lenovo-ThinkBook-14G4-ARA.patch b/v3-1-3-ACPI-skip-IRQ1-override-on-Lenovo-ThinkBook-14G4-ARA.patch
deleted file mode 100644
index beeea3ea1d55..000000000000
--- a/v3-1-3-ACPI-skip-IRQ1-override-on-Lenovo-ThinkBook-14G4-ARA.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-The IRQ is described as (Edge, ActiveLow, Shared, ) in ACPI DSDT and
-it's correct. The override makes the keyboard interrupt polarity
-inverted, resulting in non-functional keyboard.
-Add an entry for skipping the override.
-
-Cc: <stable@vger.kernel.org>
-Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
----
-Change since v1:
- Match DMI_PRODUCT_NAME for ThinkBook because the board name
- is used for other completely different Lenovo laptops.
-
-Change since v2:
- fix alphabetical order in skip_override_table
-
- drivers/acpi/resource.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c
-index c2d494784425..f888c62b8b96 100644
---- a/drivers/acpi/resource.c
-+++ b/drivers/acpi/resource.c
-@@ -399,6 +399,17 @@ static const struct dmi_system_id medion_laptop[] = {
- 	{ }
- };
- 
-+static const struct dmi_system_id irq1_edge_low_shared[] = {
-+	{
-+		.ident = "Lenovo ThinkBook 14 G4+ ARA",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "21D0"),
-+		},
-+	},
-+	{ }
-+};
-+
- struct irq_override_cmp {
- 	const struct dmi_system_id *system;
- 	unsigned char irq;
-@@ -408,6 +419,7 @@ struct irq_override_cmp {
- };
- 
- static const struct irq_override_cmp skip_override_table[] = {
-+	{ irq1_edge_low_shared, 1, ACPI_EDGE_SENSITIVE, ACPI_ACTIVE_LOW, 1 },
- 	{ medion_laptop, 1, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW, 0 },
- };
- 
--- 
-2.36.1
diff --git a/v3-2-3-ACPI-skip-IRQ1-override-on-Redmi-Book-Pro-15-2022.patch b/v3-2-3-ACPI-skip-IRQ1-override-on-Redmi-Book-Pro-15-2022.patch
deleted file mode 100644
index fa7b64628688..000000000000
--- a/v3-2-3-ACPI-skip-IRQ1-override-on-Redmi-Book-Pro-15-2022.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Kent Hou Man <knthmn0@gmail.com>
-
-This laptop also defines its active-low keyboard IRQ in legacy format.
-Add IRQ override skipping for it.
-
-Cc: <stable@vger.kernel.org>
-Signed-off-by: Kent Hou Man <knthmn0@gmail.com>
-Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
----
-Change since v2: none
-
- drivers/acpi/resource.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c
-index 30c0d85b2bf2..eff615f51d07 100644
---- a/drivers/acpi/resource.c
-+++ b/drivers/acpi/resource.c
-@@ -400,6 +400,13 @@ static const struct dmi_system_id medion_laptop[] = {
- };
- 
- static const struct dmi_system_id irq1_edge_low_shared[] = {
-+	{
-+		.ident = "Asus Zenbook S 13 OLED UM5302",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-+			DMI_MATCH(DMI_BOARD_NAME, "UM5302TA"),
-+		},
-+	},
- 	{
- 		.ident = "Lenovo ThinkBook 14 G4+ ARA",
- 		.matches = {
--- 
-2.36.1
diff --git a/v3-3-3-ACPI-skip-IRQ1-override-on-Asus-Zenbook-S-13-OLED-UM5302.patch b/v3-3-3-ACPI-skip-IRQ1-override-on-Asus-Zenbook-S-13-OLED-UM5302.patch
deleted file mode 100644
index ecc9dd05d22e..000000000000
--- a/v3-3-3-ACPI-skip-IRQ1-override-on-Asus-Zenbook-S-13-OLED-UM5302.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Tighe Donnelly <tighe.donnelly@protonmail.com>
-
-The IRQ is described as (Edge, ActiveLow, Shared, ) in ACPI DSDT and
-it's correct. The override makes the keyboard interrupt polarity
-inverted, resulting in non-functional keyboard.
-Add an entry for skipping the override.
-
-Cc: <stable@vger.kernel.org>
-Signed-off-by: Tighe Donnelly <tighe.donnelly@protonmail.com>
-Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
----
-Change since v1: new patch
-Change since v2: none
-
- drivers/acpi/resource.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c
-index f888c62b8b96..30c0d85b2bf2 100644
---- a/drivers/acpi/resource.c
-+++ b/drivers/acpi/resource.c
-@@ -407,6 +407,13 @@ static const struct dmi_system_id irq1_edge_low_shared[] = {
- 			DMI_MATCH(DMI_PRODUCT_NAME, "21D0"),
- 		},
- 	},
-+	{
-+		.ident = "Redmi Book Pro 15 2022",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "TIMI"),
-+			DMI_MATCH(DMI_BOARD_NAME, "TM2113"),
-+		},
-+	},
- 	{ }
- };
- 
--- 
-2.36.1
diff --git a/v5-ACPI-skip-IRQ1-override-on-3-Ryzen-6000-laptops.patch b/v5-ACPI-skip-IRQ1-override-on-3-Ryzen-6000-laptops.patch
new file mode 100644
index 000000000000..da4a13c8aac4
--- /dev/null
+++ b/v5-ACPI-skip-IRQ1-override-on-3-Ryzen-6000-laptops.patch
@@ -0,0 +1,83 @@
+The IRQ1 of these laptops with Ryzen 6000 and Insyde UEFI are active
+low and defined in legacy format in ACPI DSDT. The kernel override
+makes the keyboard interrupt polarity inverted, resulting in
+non-functional keyboard.
+
+Skip legacy IRQ override for:
+Lenovo ThinkBook 14G4+ ARA
+Redmi Book Pro 15 2022 Ryzen
+Asus Zenbook S 13 OLED UM5302
+
+Cc: <stable@vger.kernel.org>
+Signed-off-by: Tighe Donnelly <tighe.donnelly@protonmail.com>
+Signed-off-by: Kent Hou Man <knthmn0@gmail.com>
+Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
+---
+Changes since v1:
+ Match DMI_PRODUCT_NAME for ThinkBook because the board name
+ is used for other completely different Lenovo laptops.
+ Add a patch for RedmiBook
+
+Changes since v2:
+ Fix alphabetical order in skip_override_table
+ Add a patch for Asus Zenbook
+
+Changes since v3:
+ Merge patches as requested
+ Fix another alphabetical ordering between two structs
+
+Changes since v4:
+ rename the ident in RedmiBook entry.
+  There's also an Intel version of this series, so
+  rename it to make it specific.
+ reword commit title
+
+ drivers/acpi/resource.c | 26 ++++++++++++++++++++++++++
+ 1 file changed, 26 insertions(+)
+
+diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c
+index c2d494784425..0491da180fc5 100644
+--- a/drivers/acpi/resource.c
++++ b/drivers/acpi/resource.c
+@@ -381,6 +381,31 @@ unsigned int acpi_dev_get_irq_type(int triggering, int polarity)
+ }
+ EXPORT_SYMBOL_GPL(acpi_dev_get_irq_type);
+ 
++static const struct dmi_system_id irq1_edge_low_shared[] = {
++	{
++		.ident = "Asus Zenbook S 13 OLED UM5302",
++		.matches = {
++			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
++			DMI_MATCH(DMI_BOARD_NAME, "UM5302TA"),
++		},
++	},
++	{
++		.ident = "Lenovo ThinkBook 14 G4+ ARA",
++		.matches = {
++			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
++			DMI_MATCH(DMI_PRODUCT_NAME, "21D0"),
++		},
++	},
++	{
++		.ident = "Redmi Book Pro 15 2022 Ryzen",
++		.matches = {
++			DMI_MATCH(DMI_SYS_VENDOR, "TIMI"),
++			DMI_MATCH(DMI_BOARD_NAME, "TM2113"),
++		},
++	},
++	{ }
++};
++
+ static const struct dmi_system_id medion_laptop[] = {
+ 	{
+ 		.ident = "MEDION P15651",
+@@ -408,6 +433,7 @@ struct irq_override_cmp {
+ };
+ 
+ static const struct irq_override_cmp skip_override_table[] = {
++	{ irq1_edge_low_shared, 1, ACPI_EDGE_SENSITIVE, ACPI_ACTIVE_LOW, 1 },
+ 	{ medion_laptop, 1, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW, 0 },
+ };
+ 
+-- 
+2.36.1