Skip to content
Snippets Groups Projects
Verified Commit 478a4261 authored by Clayton Craft's avatar Clayton Craft :speech_balloon: Committed by Newbyte
Browse files

linux-valve-jupiter: upgrade to 6.9-rc5 (MR 5058)

[ci:skip-build]: already built successfully in CI
parent 970bc34c
Branches
No related tags found
No related merge requests found
Pipeline #205226 passed
Showing
with 49 additions and 49 deletions
From 103895dd0c1106595c46e8cd61f5edea349e6f4c Mon Sep 17 00:00:00 2001
From 5a57e80db401b841cc6f57832cf95d2830fc3350 Mon Sep 17 00:00:00 2001
From: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Date: Fri, 4 Mar 2022 21:20:39 +0000
Subject: [PATCH 01/21] ACPICA: Limit error message flood caused by firmware
......
From 6122171153699e140375a99ad2b0cca7668617aa Mon Sep 17 00:00:00 2001
From 8b12a04e9b7ceaa5026ced58e6dcd957cc55faa1 Mon Sep 17 00:00:00 2001
From: "Pierre-Loup A. Griffais" <pgriffais@valvesoftware.com>
Date: Tue, 14 Jun 2022 14:31:18 -0700
Subject: [PATCH 02/21] drivers: video: backlight: Disable backlight
......
From 046bbbde9257dd08a4433ebce76132a71b397294 Mon Sep 17 00:00:00 2001
From dcb1c1bd9f85caa78b5cb62ea42ab344acb520d0 Mon Sep 17 00:00:00 2001
From: Shreeya Patel <shreeya.patel@collabora.com>
Date: Mon, 17 Jul 2023 14:02:21 +0530
Subject: [PATCH 03/21] iio: light: ltrf216a: Return floating point values
......
From 4cc7f39b393b2a9531951bb6ac544a72ae2a3edf Mon Sep 17 00:00:00 2001
From f8409dacc69c563e92bf4aa71c3b75516c7251b5 Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <andrew.smirnov@gmail.com>
Date: Sat, 19 Feb 2022 16:08:36 -0800
Subject: [PATCH 04/21] mfd: Add MFD core driver for Steam Deck
......@@ -17,10 +17,10 @@ Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
create mode 100644 drivers/mfd/steamdeck.c
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index e7a6e45b9fac..31e2c95eca02 100644
index 4b023ee229cf..0fa6921e5a9e 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -2333,5 +2333,16 @@ config MFD_RSMU_SPI
@@ -2334,5 +2334,16 @@ config MFD_RSMU_SPI
Additional drivers must be enabled in order to use the functionality
of the device.
......
From 498c8379bae238aca5707308652e0834e1f6de7a Mon Sep 17 00:00:00 2001
From e2b6dc5c513c9407def9bcbcdb9d4d7435225c77 Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <andrew.smirnov@gmail.com>
Date: Sat, 19 Feb 2022 16:09:45 -0800
Subject: [PATCH 05/21] hwmon: Add driver for Steam Deck's EC sensors
......@@ -15,10 +15,10 @@ Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
create mode 100644 drivers/hwmon/steamdeck-hwmon.c
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index a608264da87d..cf0fc2ce1017 100644
index 83945397b6eb..6219ebfef801 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -1974,6 +1974,17 @@ config SENSORS_SCH5636
@@ -2036,6 +2036,17 @@ config SENSORS_SCH5636
This driver can also be built as a module. If so, the module
will be called sch5636.
......@@ -37,17 +37,17 @@ index a608264da87d..cf0fc2ce1017 100644
tristate "ST Microelectronics STTS751"
depends on I2C
diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
index 47be39af5c03..b1cc9112a0a6 100644
index 5c31808f6378..34a4851866cb 100644
--- a/drivers/hwmon/Makefile
+++ b/drivers/hwmon/Makefile
@@ -200,6 +200,7 @@ obj-$(CONFIG_SENSORS_SMSC47B397)+= smsc47b397.o
@@ -206,6 +206,7 @@ obj-$(CONFIG_SENSORS_SMSC47B397)+= smsc47b397.o
obj-$(CONFIG_SENSORS_SMSC47M1) += smsc47m1.o
obj-$(CONFIG_SENSORS_SMSC47M192)+= smsc47m192.o
obj-$(CONFIG_SENSORS_SPARX5) += sparx5-temp.o
+obj-$(CONFIG_SENSORS_STEAMDECK) += steamdeck-hwmon.o
obj-$(CONFIG_SENSORS_STTS751) += stts751.o
obj-$(CONFIG_SENSORS_SURFACE_FAN)+= surface_fan.o
obj-$(CONFIG_SENSORS_SY7636A) += sy7636a-hwmon.o
obj-$(CONFIG_SENSORS_AMC6821) += amc6821.o
diff --git a/drivers/hwmon/steamdeck-hwmon.c b/drivers/hwmon/steamdeck-hwmon.c
new file mode 100644
index 000000000000..fab9e9460bd4
......
From 497ad3272c2d94687d1300517aff7da599d98232 Mon Sep 17 00:00:00 2001
From 5649180090a647fa91fff540f4b6a87b70a66449 Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <andrew.smirnov@gmail.com>
Date: Sun, 27 Feb 2022 12:58:05 -0800
Subject: [PATCH 06/21] leds: steamdeck: Add support for Steam Deck LED
......@@ -13,10 +13,10 @@ Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
create mode 100644 drivers/leds/leds-steamdeck.c
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index d721b254e1e4..673b751f625b 100644
index 05e6af88b88c..f1967a88ebeb 100644
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -917,6 +917,13 @@ config LEDS_ACER_A500
@@ -927,6 +927,13 @@ config LEDS_ACER_A500
This option enables support for the Power Button LED of
Acer Iconia Tab A500.
......@@ -31,7 +31,7 @@ index d721b254e1e4..673b751f625b 100644
comment "Flash and Torch LED drivers"
diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile
index ce07dc295ff0..8b1be8945a57 100644
index effdfc6f1e95..f2929021afeb 100644
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
@@ -79,6 +79,7 @@ obj-$(CONFIG_LEDS_POWERNV) += leds-powernv.o
......
From d29a5ac61f85c4dbdb553b0aae6c0700ccb46872 Mon Sep 17 00:00:00 2001
From ef64d0cede1c3cbc780118f2d2694bd4ebbb7485 Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <andrew.smirnov@gmail.com>
Date: Sun, 27 Feb 2022 14:46:08 -0800
Subject: [PATCH 07/21] extcon: Add driver for Steam Deck
......
From 666399155bd11608017e09f0bbda0181119d6206 Mon Sep 17 00:00:00 2001
From 25cdd9691d7d455b9fe2b2ac600ad2eba47851d0 Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <andrew.smirnov@gmail.com>
Date: Sat, 15 Jul 2023 12:58:54 -0700
Subject: [PATCH 08/21] hwmon: steamdeck-hwmon: Add support for max battery
......
From 7b9a162071ee2bf519336b70dccdf2954d881892 Mon Sep 17 00:00:00 2001
From 424d56857067fec8944f562b75028dd3c1a8d9bd Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <andrew.smirnov@gmail.com>
Date: Sun, 24 Sep 2023 15:02:33 -0700
Subject: [PATCH 09/21] mfd: steamdeck: Expose controller board power in sysfs
......
From 1fba949e975caea1a568124ad9f417daa989dc80 Mon Sep 17 00:00:00 2001
From a92d1fa3a5ad8514aa350bbc9625bb0456262eb0 Mon Sep 17 00:00:00 2001
From: Steven Noonan <steven@uplinklabs.net>
Date: Wed, 17 Nov 2021 00:25:26 -0800
Subject: [PATCH 10/21] x86: implement tsc=directsync for systems without
......@@ -15,23 +15,23 @@ Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
4 files changed, 44 insertions(+), 10 deletions(-)
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 31b3a25680d0..8243a9c96031 100644
index 902ecd92a29f..b963dc738ca0 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -6727,6 +6727,8 @@
@@ -6788,6 +6788,8 @@
This will be suppressed by an earlier tsc=nowatchdog and
can be overridden by a later tsc=nowatchdog. A console
message will flag any such suppression or overriding.
+ [x86] directsync: attempt to sync the tsc via direct
+ writes if MSR_IA32_TSC_ADJUST isn't available
tsc_early_khz= [X86] Skip early TSC calibration and use the given
tsc_early_khz= [X86,EARLY] Skip early TSC calibration and use the given
value instead. Useful when the early TSC frequency discovery
diff --git a/arch/x86/include/asm/tsc.h b/arch/x86/include/asm/tsc.h
index 594fce0ca744..529dc6d4a426 100644
index 405efb3e4996..eda44749b34c 100644
--- a/arch/x86/include/asm/tsc.h
+++ b/arch/x86/include/asm/tsc.h
@@ -41,6 +41,7 @@ extern unsigned long native_calibrate_tsc(void);
@@ -42,6 +42,7 @@ extern unsigned long native_calibrate_tsc(void);
extern unsigned long long native_sched_clock_from_tsc(u64 tsc);
extern int tsc_clocksource_reliable;
......@@ -40,7 +40,7 @@ index 594fce0ca744..529dc6d4a426 100644
extern bool tsc_async_resets;
#else
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
index 15f97c0abc9d..9cf8f85c5638 100644
index 5a69a49acc96..61faedcdbdc9 100644
--- a/arch/x86/kernel/tsc.c
+++ b/arch/x86/kernel/tsc.c
@@ -47,6 +47,7 @@ static unsigned int __initdata tsc_early_khz;
......
From c40db6ea8e9a1c9d7d136de44108fbacd659fd45 Mon Sep 17 00:00:00 2001
From 0d076448cbdd64f2a07ba03f4182b86790f853c5 Mon Sep 17 00:00:00 2001
From: Steven Noonan <steven@uplinklabs.net>
Date: Wed, 17 Nov 2021 11:55:18 -0800
Subject: [PATCH 11/21] x86: touch clocksource watchdog after syncing TSCs
......@@ -11,7 +11,7 @@ Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
1 file changed, 4 insertions(+)
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 3f57ce68a3f1..f13ddbbb5d79 100644
index 76bb65045c64..46fd40f15deb 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -60,6 +60,7 @@
......@@ -22,7 +22,7 @@ index 3f57ce68a3f1..f13ddbbb5d79 100644
#include <asm/acpi.h>
#include <asm/cacheinfo.h>
@@ -1248,6 +1249,7 @@ void arch_thaw_secondary_cpus_begin(void)
@@ -1118,6 +1119,7 @@ void arch_thaw_secondary_cpus_begin(void)
void arch_thaw_secondary_cpus_end(void)
{
......@@ -30,15 +30,15 @@ index 3f57ce68a3f1..f13ddbbb5d79 100644
cache_aps_init();
}
@@ -1282,6 +1284,8 @@ void __init native_smp_cpus_done(unsigned int max_cpus)
@@ -1139,6 +1141,8 @@ void __init native_smp_cpus_done(unsigned int max_cpus)
{
pr_debug("Boot done\n");
+ clocksource_touch_watchdog();
+
calculate_max_logical_packages();
build_sched_topology();
nmi_selftest();
impress_friends();
--
2.44.0
From 426f372abc181230275dba722a2d17377d4050d7 Mon Sep 17 00:00:00 2001
From cbe56fa207de09512384969097114c3b9bd1d863 Mon Sep 17 00:00:00 2001
From: Steven Noonan <steven@uplinklabs.net>
Date: Wed, 17 Nov 2021 00:26:20 -0800
Subject: [PATCH 12/21] x86: save/restore TSC counter value during sleep/wake
......
From 2673c6532e52380e8fd7b1ebff966bc7b07755fa Mon Sep 17 00:00:00 2001
From f500fbfa381961bfa36b63b48f5537fea4ed0f21 Mon Sep 17 00:00:00 2001
From: Steven Noonan <steven@uplinklabs.net>
Date: Wed, 17 Nov 2021 11:58:46 -0800
Subject: [PATCH 13/21] x86: only restore TSC if we have IA32_TSC_ADJUST or
......
From 609d68f2225d5e394a573ffe9c77c82b30ea8e9d Mon Sep 17 00:00:00 2001
From dc7ee68b96518fa01deead155b2ba2ce8cd87634 Mon Sep 17 00:00:00 2001
From: Steven Noonan <steven@uplinklabs.net>
Date: Wed, 17 Nov 2021 19:42:32 -0800
Subject: [PATCH 14/21] x86: don't check for random warps if using direct sync
......
From 58758906879db1450ac2dfdedf08fe68f018c5f5 Mon Sep 17 00:00:00 2001
From c0f3ff33c331bac0d902ab7b401e901596fe4f6a Mon Sep 17 00:00:00 2001
From: Muhammad Usama Anjum <usama.anjum@collabora.com>
Date: Tue, 6 Jun 2023 16:12:06 +0500
Subject: [PATCH 15/21] x86: revert extra time added to check for tsc wraps
......
From 4bda77716e5b8c3716917fa85ff9f4f745bba88f Mon Sep 17 00:00:00 2001
From 4d9c1dd3c3ca648fd44e99165f68dcc32ba25c79 Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <andrew.smirnov@gmail.com>
Date: Fri, 2 Sep 2022 19:13:12 +0300
Subject: [PATCH 16/21] usb: dwc3: Hardcode jupiter ACPI device as extcon name
......@@ -17,10 +17,10 @@ Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
1 file changed, 1 insertion(+)
diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c
index 39564e17f3b0..393a2efac0c7 100644
index 497deed38c0c..0e2d08b22e0d 100644
--- a/drivers/usb/dwc3/dwc3-pci.c
+++ b/drivers/usb/dwc3/dwc3-pci.c
@@ -179,6 +179,7 @@ static const struct property_entry dwc3_pci_mr_properties[] = {
@@ -178,6 +178,7 @@ static const struct property_entry dwc3_pci_mr_properties[] = {
PROPERTY_ENTRY_BOOL("usb-role-switch"),
PROPERTY_ENTRY_STRING("role-switch-default-mode", "host"),
PROPERTY_ENTRY_BOOL("linux,sysdev_is_parent"),
......
From 770e26e1816b0a1a3013c26d1dc1b1da7cff9dbc Mon Sep 17 00:00:00 2001
From a9aef03f01f86629bcd429e28e20124461af2f04 Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <andrew.smirnov@gmail.com>
Date: Tue, 18 Jan 2022 08:44:34 -0800
Subject: [PATCH 17/21] usb: dwc3: Bump USB gadget wakeup timeout
......@@ -13,10 +13,10 @@ Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 28f49400f3e8..93f7d0290037 100644
index 4df2661f6675..b45de01d33b6 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -2382,7 +2382,7 @@ static int __dwc3_gadget_wakeup(struct dwc3 *dwc, bool async)
@@ -2363,7 +2363,7 @@ static int __dwc3_gadget_wakeup(struct dwc3 *dwc, bool async)
return 0;
/* poll until Link State changes to ON */
......
From e61238022c903aaec88609454f602e3fda0cd623 Mon Sep 17 00:00:00 2001
From 23b10f478de6245926aa3b9bf7bbaab765baeceb Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <andrew.smirnov@gmail.com>
Date: Sat, 29 Oct 2022 15:25:21 -0700
Subject: [PATCH 18/21] usb: dwc3: Drop "usb-role-swtich" from
......@@ -20,10 +20,10 @@ Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
1 file changed, 2 deletions(-)
diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c
index 393a2efac0c7..21a764d30bff 100644
index 0e2d08b22e0d..ebe42ae00951 100644
--- a/drivers/usb/dwc3/dwc3-pci.c
+++ b/drivers/usb/dwc3/dwc3-pci.c
@@ -176,8 +176,6 @@ static const struct property_entry dwc3_pci_amd_properties[] = {
@@ -175,8 +175,6 @@ static const struct property_entry dwc3_pci_amd_properties[] = {
static const struct property_entry dwc3_pci_mr_properties[] = {
PROPERTY_ENTRY_STRING("dr_mode", "otg"),
......
From 1ab4a0fb0e9436f72b668778ee27a036042de6e9 Mon Sep 17 00:00:00 2001
From e4028b1471564c0178c695aee7ad6845f38dc5c9 Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <andrew.smirnov@gmail.com>
Date: Sun, 27 Feb 2022 16:34:23 -0800
Subject: [PATCH 19/21] usb: dwc3: Fix "linux,extcon-name"
......@@ -10,10 +10,10 @@ Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c
index 21a764d30bff..cf805293a933 100644
index ebe42ae00951..f04de746d681 100644
--- a/drivers/usb/dwc3/dwc3-pci.c
+++ b/drivers/usb/dwc3/dwc3-pci.c
@@ -177,7 +177,7 @@ static const struct property_entry dwc3_pci_amd_properties[] = {
@@ -176,7 +176,7 @@ static const struct property_entry dwc3_pci_amd_properties[] = {
static const struct property_entry dwc3_pci_mr_properties[] = {
PROPERTY_ENTRY_STRING("dr_mode", "otg"),
PROPERTY_ENTRY_BOOL("linux,sysdev_is_parent"),
......
From 23305d0eaad752788bae70db64f933febcbced82 Mon Sep 17 00:00:00 2001
From 281ec38a96739db6a9282fa0c13cabd6cef258e1 Mon Sep 17 00:00:00 2001
From: Gabriel Krisman Bertazi <krisman@collabora.com>
Date: Wed, 5 May 2021 22:12:17 -0400
Subject: [PATCH 20/21] pinctrl-amd: Add quirk to timeout irq pin
......@@ -27,7 +27,7 @@ Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/drivers/pinctrl/pinctrl-amd.c b/drivers/pinctrl/pinctrl-amd.c
index 49f89b70dcec..16d544bb0626 100644
index 7f66ec73199a..5763c37e5204 100644
--- a/drivers/pinctrl/pinctrl-amd.c
+++ b/drivers/pinctrl/pinctrl-amd.c
@@ -31,6 +31,7 @@
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment