Skip to content
Snippets Groups Projects
Commit dbeae94c authored by Helmut Stult's avatar Helmut Stult
Browse files

[pkg-upd] 5.7.8-7

- add wmi patches
parent 3495c64f
No related branches found
No related tags found
No related merge requests found
diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
index 45d9010aafcf..5ac17e360fa2 100644
--- a/drivers/platform/x86/wmi.c
+++ b/drivers/platform/x86/wmi.c
@@ -1102,28 +1102,6 @@ static void wmi_free_devices(struct acpi_device *device)
}
}
-static bool guid_already_parsed(struct acpi_device *device,
- const u8 *guid)
-{
- struct wmi_block *wblock;
-
- list_for_each_entry(wblock, &wmi_block_list, list) {
- if (memcmp(wblock->gblock.guid, guid, 16) == 0) {
- /*
- * Because we historically didn't track the relationship
- * between GUIDs and ACPI nodes, we don't know whether
- * we need to suppress GUIDs that are unique on a
- * given node but duplicated across nodes.
- */
- dev_warn(&device->dev, "duplicate WMI GUID %pUL (first instance was on %s)\n",
- guid, dev_name(&wblock->acpi_device->dev));
- return true;
- }
- }
-
- return false;
-}
-
/*
* Parse the _WDG method for the GUID data blocks
*/
@@ -1157,15 +1135,6 @@ static int parse_wdg(struct device *wmi_bus_dev, struct acpi_device *device)
if (debug_dump_wdg)
wmi_dump_wdg(&gblock[i]);
- /*
- * Some WMI devices, like those for nVidia hooks, have a
- * duplicate GUID. It's not clear what we should do in this
- * case yet, so for now, we'll just ignore the duplicate
- * for device creation.
- */
- if (guid_already_parsed(device, gblock[i].guid))
- continue;
-
wblock = kzalloc(sizeof(struct wmi_block), GFP_KERNEL);
if (!wblock) {
retval = -ENOMEM;
diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
index 791449a2370f..45d9010aafcf 100644
--- a/drivers/platform/x86/wmi.c
+++ b/drivers/platform/x86/wmi.c
@@ -1081,7 +1081,8 @@ static int wmi_create_device(struct device *wmi_bus_dev,
wblock->dev.dev.bus = &wmi_bus_type;
wblock->dev.dev.parent = wmi_bus_dev;
- dev_set_name(&wblock->dev.dev, "%pUL", gblock->guid);
+ dev_set_name(&wblock->dev.dev, "%s-%pUL",
+ dev_name(&wblock->acpi_device->dev), gblock->guid);
device_initialize(&wblock->dev.dev);
...@@ -12,7 +12,7 @@ _basekernel=5.7 ...@@ -12,7 +12,7 @@ _basekernel=5.7
_basever=57 _basever=57
_aufs=20200622 _aufs=20200622
pkgver=5.7.8 pkgver=5.7.8
pkgrel=6 pkgrel=7
arch=('x86_64') arch=('x86_64')
url="http://www.kernel.org/" url="http://www.kernel.org/"
license=('GPL2') license=('GPL2')
...@@ -50,6 +50,9 @@ source=("https://www.kernel.org/pub/linux/kernel/v5.x/linux-${_basekernel}.tar.x ...@@ -50,6 +50,9 @@ source=("https://www.kernel.org/pub/linux/kernel/v5.x/linux-${_basekernel}.tar.x
# Lenovo P50 multiple fans # Lenovo P50 multiple fans
'0005-thinkpad_acpi_dual_fan_control.patch::https://github.com/dvhart/linux-pdx86/commit/26c16f9d956f269bbc32e034e3ec11c4831137de.patch' '0005-thinkpad_acpi_dual_fan_control.patch::https://github.com/dvhart/linux-pdx86/commit/26c16f9d956f269bbc32e034e3ec11c4831137de.patch'
"$pkgname-ath9k-fix-general-protection-fault-in-ath9k_hif_usb_rx_cb.patch::https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/plain/releases/5.7.3/ath9k-fix-general-protection-fault-in-ath9k_hif_usb_rx_cb.patch" "$pkgname-ath9k-fix-general-protection-fault-in-ath9k_hif_usb_rx_cb.patch::https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/plain/releases/5.7.3/ath9k-fix-general-protection-fault-in-ath9k_hif_usb_rx_cb.patch"
# Lenovo LEGION 5
'0001-lenovo-wmi1.patch'
'0001-lenovo-wmi2.patch'
# Bootsplash # Bootsplash
'0001-bootsplash.patch' '0001-bootsplash.patch'
'0002-bootsplash.patch' '0002-bootsplash.patch'
...@@ -87,6 +90,8 @@ sha256sums=('de8163bb62f822d84f7a3983574ec460060bf013a78ff79cd7c979ff1ec1d7e0' ...@@ -87,6 +90,8 @@ sha256sums=('de8163bb62f822d84f7a3983574ec460060bf013a78ff79cd7c979ff1ec1d7e0'
'77746aea71ffb06c685e7769b49c78e29af9b2e28209cd245e95d9cbb0dba3c9' '77746aea71ffb06c685e7769b49c78e29af9b2e28209cd245e95d9cbb0dba3c9'
'f93707e75ec6be5f289605f913e59d4f3514524a1aab3368f49bf6789723d443' 'f93707e75ec6be5f289605f913e59d4f3514524a1aab3368f49bf6789723d443'
'715ee8cae71db82f31c486cc0a946a7e9f9eb8d7c69d8bb5c64c35400affef3c' '715ee8cae71db82f31c486cc0a946a7e9f9eb8d7c69d8bb5c64c35400affef3c'
'7d2af76b8dae73946379b967a493b927d76a68bb524b275b7c445bab90995687'
'1d58ef2991c625f6f0eb33b4cb8303932f53f1c4694e42bae24c9cd36d2ad013'
'a504f6cf84094e08eaa3cc5b28440261797bf4f06f04993ee46a20628ff2b53c' 'a504f6cf84094e08eaa3cc5b28440261797bf4f06f04993ee46a20628ff2b53c'
'e096b127a5208f56d368d2cb938933454d7200d70c86b763aa22c38e0ddb8717' 'e096b127a5208f56d368d2cb938933454d7200d70c86b763aa22c38e0ddb8717'
'8c1c880f2caa9c7ae43281a35410203887ea8eae750fe8d360d0c8bf80fcc6e0' '8c1c880f2caa9c7ae43281a35410203887ea8eae750fe8d360d0c8bf80fcc6e0'
...@@ -146,6 +151,13 @@ prepare() { ...@@ -146,6 +151,13 @@ prepare() {
# https://twitter.com/vskye11/status/1216240051639791616 # https://twitter.com/vskye11/status/1216240051639791616
patch -Np1 -i '../0001-i2c-nuvoton-nc677x-hwmon-driver.patch' patch -Np1 -i '../0001-i2c-nuvoton-nc677x-hwmon-driver.patch'
# Lenovo LEGION 5
msg "Lenovo LEGION 5"
msg2 "0001-lenovo-wmi1"
patch -Np1 -i '../0001-lenovo-wmi1.patch'
msg2 "0001-lenovo-wmi2"
patch -Np1 -i '../0001-lenovo-wmi2.patch'
# handling of multiple fans on Lenovo P50 # handling of multiple fans on Lenovo P50
# https://github.com/vmatare/thinkfan/issues/58 # https://github.com/vmatare/thinkfan/issues/58
msg "handling of multiple fans on Lenovo P50" msg "handling of multiple fans on Lenovo P50"
...@@ -160,30 +172,30 @@ prepare() { ...@@ -160,30 +172,30 @@ prepare() {
msg "Add bootsplash" msg "Add bootsplash"
msg2 "0001-bootsplash." msg2 "0001-bootsplash."
patch -Np1 -i "${srcdir}/0001-bootsplash.patch" patch -Np1 -i "${srcdir}/0001-bootsplash.patch"
msg2 "0002-bootsplash." msg2 "0002-bootsplash"
patch -Np1 -i "${srcdir}/0002-bootsplash.patch" patch -Np1 -i "${srcdir}/0002-bootsplash.patch"
msg2 "0003-bootsplash." msg2 "0003-bootsplash"
patch -Np1 -i "${srcdir}/0003-bootsplash.patch" patch -Np1 -i "${srcdir}/0003-bootsplash.patch"
msg2 "0004-bootsplash." msg2 "0004-bootsplash"
patch -Np1 -i "${srcdir}/0004-bootsplash.patch" patch -Np1 -i "${srcdir}/0004-bootsplash.patch"
msg2 "0005-bootsplash." msg2 "0005-bootsplash"
patch -Np1 -i "${srcdir}/0005-bootsplash.patch" patch -Np1 -i "${srcdir}/0005-bootsplash.patch"
msg2 "0006-bootsplash." msg2 "0006-bootsplash"
patch -Np1 -i "${srcdir}/0006-bootsplash.patch" patch -Np1 -i "${srcdir}/0006-bootsplash.patch"
msg2 "0007-bootsplash." msg2 "0007-bootsplash"
patch -Np1 -i "${srcdir}/0007-bootsplash.patch" patch -Np1 -i "${srcdir}/0007-bootsplash.patch"
msg2 "0008-bootsplash." msg2 "0008-bootsplash"
patch -Np1 -i "${srcdir}/0008-bootsplash.patch" patch -Np1 -i "${srcdir}/0008-bootsplash.patch"
msg2 "0009-bootsplash." msg2 "0009-bootsplash"
patch -Np1 -i "${srcdir}/0009-bootsplash.patch" patch -Np1 -i "${srcdir}/0009-bootsplash.patch"
msg2 "0010-bootsplash." msg2 "0010-bootsplash."
patch -Np1 -i "${srcdir}/0010-bootsplash.patch" patch -Np1 -i "${srcdir}/0010-bootsplash.patch"
msg2 "0011-bootsplash." msg2 "0011-bootsplash"
patch -Np1 -i "${srcdir}/0011-bootsplash.patch" patch -Np1 -i "${srcdir}/0011-bootsplash.patch"
msg2 "0012-bootsplash." msg2 "0012-bootsplash"
patch -Np1 -i "${srcdir}/0012-bootsplash.patch" patch -Np1 -i "${srcdir}/0012-bootsplash.patch"
# use git-apply to add binary files # use git-apply to add binary files
msg2 "0013-bootsplash." msg2 "0013-bootsplash"
git apply -p1 < "${srcdir}/0013-bootsplash.patch" git apply -p1 < "${srcdir}/0013-bootsplash.patch"
# add aufs5 support # add aufs5 support
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment