summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2020-06-17 10:43:13 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2020-06-17 10:43:13 -0500
commit0430b33a23c16299f74acf10624c5393f10fbb29 (patch)
tree3043667b054cc20c544c4d305cfb5fc56b9d15ab
parent94234b951873e6fa9b726b7d8717f9d5ede85a8c (diff)
downloadkernel-0430b33a23c16299f74acf10624c5393f10fbb29.tar.gz
kernel-0430b33a23c16299f74acf10624c5393f10fbb29.tar.xz
kernel-0430b33a23c16299f74acf10624c5393f10fbb29.zip
Linux v5.7.3
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
-rw-r--r--0001-platform-x86-sony-laptop-SNC-calls-should-handle-BUF.patch116
-rw-r--r--kernel.spec6
-rw-r--r--sources2
3 files changed, 5 insertions, 119 deletions
diff --git a/0001-platform-x86-sony-laptop-SNC-calls-should-handle-BUF.patch b/0001-platform-x86-sony-laptop-SNC-calls-should-handle-BUF.patch
deleted file mode 100644
index 743e38804..000000000
--- a/0001-platform-x86-sony-laptop-SNC-calls-should-handle-BUF.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Mattia Dongili <malattia@linux.it>
-Date: Fri, 8 May 2020 09:14:04 +0900
-Subject: [PATCH] platform/x86: sony-laptop: SNC calls should handle BUFFER
- types
-
-After commit 6d232b29cfce ("ACPICA: Dispatcher: always generate buffer
-objects for ASL create_field() operator") ACPICA creates buffers even
-when new fields are small enough to fit into an integer.
-Many SNC calls counted on the old behaviour.
-Since sony-laptop already handles the INTEGER/BUFFER case in
-sony_nc_buffer_call, switch sony_nc_int_call to use its more generic
-function instead.
-
-Fixes: 6d232b29cfce ("ACPICA: Dispatcher: always generate buffer objects for ASL create_field() operator")
-Reported-by: Dominik Mierzejewski <dominik@greysector.net>
-Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=207491
-Reported-by: William Bader <williambader@hotmail.com>
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1830150
-Signed-off-by: Mattia Dongili <malattia@linux.it>
-Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-Upstream Status: linux-platform-drivers-x86/for-next
-(cherry picked from commit 47828d22539f76c8c9dcf2a55f18ea3a8039d8ef)
----
- drivers/platform/x86/sony-laptop.c | 53 +++++++++++++-----------------
- 1 file changed, 23 insertions(+), 30 deletions(-)
-
-diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
-index 51309f7ceede..6932cd11e660 100644
---- a/drivers/platform/x86/sony-laptop.c
-+++ b/drivers/platform/x86/sony-laptop.c
-@@ -757,33 +757,6 @@ static union acpi_object *__call_snc_method(acpi_handle handle, char *method,
- return result;
- }
-
--static int sony_nc_int_call(acpi_handle handle, char *name, int *value,
-- int *result)
--{
-- union acpi_object *object = NULL;
-- if (value) {
-- u64 v = *value;
-- object = __call_snc_method(handle, name, &v);
-- } else
-- object = __call_snc_method(handle, name, NULL);
--
-- if (!object)
-- return -EINVAL;
--
-- if (object->type != ACPI_TYPE_INTEGER) {
-- pr_warn("Invalid acpi_object: expected 0x%x got 0x%x\n",
-- ACPI_TYPE_INTEGER, object->type);
-- kfree(object);
-- return -EINVAL;
-- }
--
-- if (result)
-- *result = object->integer.value;
--
-- kfree(object);
-- return 0;
--}
--
- #define MIN(a, b) (a > b ? b : a)
- static int sony_nc_buffer_call(acpi_handle handle, char *name, u64 *value,
- void *buffer, size_t buflen)
-@@ -795,17 +768,20 @@ static int sony_nc_buffer_call(acpi_handle handle, char *name, u64 *value,
- if (!object)
- return -EINVAL;
-
-- if (object->type == ACPI_TYPE_BUFFER) {
-+ if (!buffer) {
-+ /* do nothing */
-+ } else if (object->type == ACPI_TYPE_BUFFER) {
- len = MIN(buflen, object->buffer.length);
-+ memset(buffer, 0, buflen);
- memcpy(buffer, object->buffer.pointer, len);
-
- } else if (object->type == ACPI_TYPE_INTEGER) {
- len = MIN(buflen, sizeof(object->integer.value));
-+ memset(buffer, 0, buflen);
- memcpy(buffer, &object->integer.value, len);
-
- } else {
-- pr_warn("Invalid acpi_object: expected 0x%x got 0x%x\n",
-- ACPI_TYPE_BUFFER, object->type);
-+ pr_warn("Unexpected acpi_object: 0x%x\n", object->type);
- ret = -EINVAL;
- }
-
-@@ -813,6 +789,23 @@ static int sony_nc_buffer_call(acpi_handle handle, char *name, u64 *value,
- return ret;
- }
-
-+static int sony_nc_int_call(acpi_handle handle, char *name, int *value, int
-+ *result)
-+{
-+ int ret;
-+
-+ if (value) {
-+ u64 v = *value;
-+
-+ ret = sony_nc_buffer_call(handle, name, &v, result,
-+ sizeof(*result));
-+ } else {
-+ ret = sony_nc_buffer_call(handle, name, NULL, result,
-+ sizeof(*result));
-+ }
-+ return ret;
-+}
-+
- struct sony_nc_handles {
- u16 cap[0x10];
- struct device_attribute devattr;
---
-2.26.2
-
diff --git a/kernel.spec b/kernel.spec
index 6aada521d..3f16f8087 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -92,7 +92,7 @@ Summary: The Linux kernel
%if 0%{?released_kernel}
# Do we have a -stable update to apply?
-%define stable_update 2
+%define stable_update 3
# Set rpm version accordingly
%if 0%{?stable_update}
%define stablerev %{stable_update}
@@ -858,7 +858,6 @@ Patch102: 0001-virt-vbox-Add-vbg_set_host_capabilities-helper-funct.patch
Patch103: 0001-virt-vbox-Add-support-for-the-new-VBG_IOCTL_ACQUIRE_.patch
Patch104: 0001-virt-vbox-Add-a-few-new-vmmdev-request-types-to-the-.patch
Patch105: 0001-virt-vbox-Log-unknown-ioctl-requests-as-error.patch
-Patch106: 0001-platform-x86-sony-laptop-SNC-calls-should-handle-BUF.patch
# Thinkpad dual fan control
Patch107: 0001-platform-x86-thinkpad_acpi-Add-support-for-dual-fan-.patch
@@ -2959,6 +2958,9 @@ fi
#
#
%changelog
+* Wed Jun 17 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.7.3-200
+- Linux v5.7.3
+
* Tue Jun 16 2020 Justin M. Forbes <jforbes@fedoraproject.org>
- Add thinkpad dual fan control patch from upstream
diff --git a/sources b/sources
index 877c6956a..db73d6bca 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (linux-5.7.tar.xz) = 45bde01593f6147c8c169b9e46b4b56eee998142552ae0ff82f1dd21b1fd54f3b32f6283f6bd77ea717d374672167849e468c157f235d2f12f7d7816e4623bf6
-SHA512 (patch-5.7.2.xz) = c3f699e8ce044552ae0e5b3a705105b7670932b5a556d7de73e0d7abb7ab66da177710292166bbc4c53c27dc1d776a92a7cf55a4b2217b50030afeb49f079ce1
+SHA512 (patch-5.7.3.xz) = bb2b27e6c05c96c55ceb757cbb56094e94ea38fb7fc272d419a5cdcdad23be45c469bc27de1bf68b37a8fd3e5f27b08a830c3d0d95dea04b8124028e1b9ad4fc