From baf248c146677bea26df5d6ce76448eae5503e25 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 23 Apr 2024 13:33:13 -0700 Subject: patch fuzz refresh --- queue-6.6/pci-dpc-use-field_get.patch | 21 ++++++--------------- ...oid-notify-pm-core-about-runtime-pm-resume.patch | 12 ++++++------ ...ix-wake-configurations-after-device-unplug.patch | 2 +- ...oid-notify-pm-core-about-runtime-pm-resume.patch | 12 ++++++------ ...ix-wake-configurations-after-device-unplug.patch | 2 +- 5 files changed, 20 insertions(+), 29 deletions(-) diff --git a/queue-6.6/pci-dpc-use-field_get.patch b/queue-6.6/pci-dpc-use-field_get.patch index 1a1a210894..b10ce63fa3 100644 --- a/queue-6.6/pci-dpc-use-field_get.patch +++ b/queue-6.6/pci-dpc-use-field_get.patch @@ -18,13 +18,11 @@ Signed-off-by: Ilpo Järvinen Signed-off-by: Bjorn Helgaas Signed-off-by: Sasha Levin --- - drivers/pci/pcie/dpc.c | 5 +++-- - drivers/pci/quirks.c | 2 +- - include/uapi/linux/pci_regs.h | 1 + + drivers/pci/pcie/dpc.c | 5 +++-- + drivers/pci/quirks.c | 2 +- + include/uapi/linux/pci_regs.h | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) -diff --git a/drivers/pci/pcie/dpc.c b/drivers/pci/pcie/dpc.c -index b4818007788f9..a5cec2a4e057d 100644 --- a/drivers/pci/pcie/dpc.c +++ b/drivers/pci/pcie/dpc.c @@ -9,6 +9,7 @@ @@ -35,7 +33,7 @@ index b4818007788f9..a5cec2a4e057d 100644 #include #include #include -@@ -202,7 +203,7 @@ static void dpc_process_rp_pio_error(struct pci_dev *pdev) +@@ -202,7 +203,7 @@ static void dpc_process_rp_pio_error(str /* Get First Error Pointer */ pci_read_config_word(pdev, cap + PCI_EXP_DPC_STATUS, &dpc_status); @@ -53,11 +51,9 @@ index b4818007788f9..a5cec2a4e057d 100644 if (pdev->dpc_rp_log_size < 4 || pdev->dpc_rp_log_size > 9) { pci_err(pdev, "RP PIO log size %u is invalid\n", pdev->dpc_rp_log_size); -diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c -index 675f77ac1968d..e1c652b1c53a4 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c -@@ -6198,7 +6198,7 @@ static void dpc_log_size(struct pci_dev *dev) +@@ -6198,7 +6198,7 @@ static void dpc_log_size(struct pci_dev if (!(val & PCI_EXP_DPC_CAP_RP_EXT)) return; @@ -66,11 +62,9 @@ index 675f77ac1968d..e1c652b1c53a4 100644 pci_info(dev, "Overriding RP PIO Log Size to 4\n"); dev->dpc_rp_log_size = 4; } -diff --git a/include/uapi/linux/pci_regs.h b/include/uapi/linux/pci_regs.h -index 06df65f11c396..6c31c805ac4bd 100644 --- a/include/uapi/linux/pci_regs.h +++ b/include/uapi/linux/pci_regs.h -@@ -1046,6 +1046,7 @@ +@@ -1045,6 +1045,7 @@ #define PCI_EXP_DPC_STATUS_INTERRUPT 0x0008 /* Interrupt Status */ #define PCI_EXP_DPC_RP_BUSY 0x0010 /* Root Port Busy */ #define PCI_EXP_DPC_STATUS_TRIGGER_RSN_EXT 0x0060 /* Trig Reason Extension */ @@ -78,6 +72,3 @@ index 06df65f11c396..6c31c805ac4bd 100644 #define PCI_EXP_DPC_SOURCE_ID 0x0A /* DPC Source Identifier */ --- -2.43.0 - diff --git a/queue-6.6/thunderbolt-avoid-notify-pm-core-about-runtime-pm-resume.patch b/queue-6.6/thunderbolt-avoid-notify-pm-core-about-runtime-pm-resume.patch index 4c610f5524..51a864ae59 100644 --- a/queue-6.6/thunderbolt-avoid-notify-pm-core-about-runtime-pm-resume.patch +++ b/queue-6.6/thunderbolt-avoid-notify-pm-core-about-runtime-pm-resume.patch @@ -29,7 +29,7 @@ Signed-off-by: Greg Kroah-Hartman --- a/drivers/thunderbolt/switch.c +++ b/drivers/thunderbolt/switch.c -@@ -3106,7 +3106,26 @@ static int tb_switch_set_wake(struct tb_ +@@ -3208,7 +3208,26 @@ static int tb_switch_set_wake(struct tb_ return tb_lc_set_wake(sw, flags); } @@ -57,7 +57,7 @@ Signed-off-by: Greg Kroah-Hartman { struct tb_port *port; int err; -@@ -3155,6 +3174,9 @@ int tb_switch_resume(struct tb_switch *s +@@ -3257,6 +3276,9 @@ int tb_switch_resume(struct tb_switch *s if (err) return err; @@ -67,7 +67,7 @@ Signed-off-by: Greg Kroah-Hartman /* Disable wakes */ tb_switch_set_wake(sw, 0); -@@ -3184,7 +3206,8 @@ int tb_switch_resume(struct tb_switch *s +@@ -3286,7 +3308,8 @@ int tb_switch_resume(struct tb_switch *s */ if (tb_port_unlock(port)) tb_port_warn(port, "failed to unlock port\n"); @@ -79,7 +79,7 @@ Signed-off-by: Greg Kroah-Hartman tb_sw_set_unplugged(port->remote->sw); --- a/drivers/thunderbolt/tb.c +++ b/drivers/thunderbolt/tb.c -@@ -2250,7 +2250,7 @@ static int tb_resume_noirq(struct tb *tb +@@ -2262,7 +2262,7 @@ static int tb_resume_noirq(struct tb *tb /* remove any pci devices the firmware might have setup */ tb_switch_reset(tb->root_switch); @@ -88,7 +88,7 @@ Signed-off-by: Greg Kroah-Hartman tb_free_invalid_tunnels(tb); tb_free_unplugged_children(tb->root_switch); tb_restore_children(tb->root_switch); -@@ -2376,7 +2376,7 @@ static int tb_runtime_resume(struct tb * +@@ -2388,7 +2388,7 @@ static int tb_runtime_resume(struct tb * struct tb_tunnel *tunnel, *n; mutex_lock(&tb->lock); @@ -108,7 +108,7 @@ Signed-off-by: Greg Kroah-Hartman int tb_switch_reset(struct tb_switch *sw); int tb_switch_wait_for_bit(struct tb_switch *sw, u32 offset, u32 bit, u32 value, int timeout_msec); -@@ -1222,6 +1222,7 @@ static inline bool tb_switch_is_usb4(con +@@ -1224,6 +1224,7 @@ static inline bool tb_switch_is_usb4(con return usb4_switch_version(sw) > 0; } diff --git a/queue-6.6/thunderbolt-fix-wake-configurations-after-device-unplug.patch b/queue-6.6/thunderbolt-fix-wake-configurations-after-device-unplug.patch index 3069a1a5e2..c3b0e01c7c 100644 --- a/queue-6.6/thunderbolt-fix-wake-configurations-after-device-unplug.patch +++ b/queue-6.6/thunderbolt-fix-wake-configurations-after-device-unplug.patch @@ -24,7 +24,7 @@ Signed-off-by: Greg Kroah-Hartman --- a/drivers/thunderbolt/switch.c +++ b/drivers/thunderbolt/switch.c -@@ -2847,22 +2847,29 @@ void tb_switch_unconfigure_link(struct t +@@ -2949,22 +2949,29 @@ void tb_switch_unconfigure_link(struct t { struct tb_port *up, *down; diff --git a/queue-6.8/thunderbolt-avoid-notify-pm-core-about-runtime-pm-resume.patch b/queue-6.8/thunderbolt-avoid-notify-pm-core-about-runtime-pm-resume.patch index d1db936772..8fb8bc5138 100644 --- a/queue-6.8/thunderbolt-avoid-notify-pm-core-about-runtime-pm-resume.patch +++ b/queue-6.8/thunderbolt-avoid-notify-pm-core-about-runtime-pm-resume.patch @@ -29,7 +29,7 @@ Signed-off-by: Greg Kroah-Hartman --- a/drivers/thunderbolt/switch.c +++ b/drivers/thunderbolt/switch.c -@@ -3339,7 +3339,26 @@ static int tb_switch_set_wake(struct tb_ +@@ -3441,7 +3441,26 @@ static int tb_switch_set_wake(struct tb_ return tb_lc_set_wake(sw, flags); } @@ -57,7 +57,7 @@ Signed-off-by: Greg Kroah-Hartman { struct tb_port *port; int err; -@@ -3388,6 +3407,9 @@ int tb_switch_resume(struct tb_switch *s +@@ -3490,6 +3509,9 @@ int tb_switch_resume(struct tb_switch *s if (err) return err; @@ -67,7 +67,7 @@ Signed-off-by: Greg Kroah-Hartman /* Disable wakes */ tb_switch_set_wake(sw, 0); -@@ -3417,7 +3439,8 @@ int tb_switch_resume(struct tb_switch *s +@@ -3519,7 +3541,8 @@ int tb_switch_resume(struct tb_switch *s */ if (tb_port_unlock(port)) tb_port_warn(port, "failed to unlock port\n"); @@ -79,7 +79,7 @@ Signed-off-by: Greg Kroah-Hartman tb_sw_set_unplugged(port->remote->sw); --- a/drivers/thunderbolt/tb.c +++ b/drivers/thunderbolt/tb.c -@@ -2748,7 +2748,7 @@ static int tb_resume_noirq(struct tb *tb +@@ -2760,7 +2760,7 @@ static int tb_resume_noirq(struct tb *tb /* remove any pci devices the firmware might have setup */ tb_switch_reset(tb->root_switch); @@ -88,7 +88,7 @@ Signed-off-by: Greg Kroah-Hartman tb_free_invalid_tunnels(tb); tb_free_unplugged_children(tb->root_switch); tb_restore_children(tb->root_switch); -@@ -2874,7 +2874,7 @@ static int tb_runtime_resume(struct tb * +@@ -2886,7 +2886,7 @@ static int tb_runtime_resume(struct tb * struct tb_tunnel *tunnel, *n; mutex_lock(&tb->lock); @@ -108,7 +108,7 @@ Signed-off-by: Greg Kroah-Hartman int tb_switch_reset(struct tb_switch *sw); int tb_switch_wait_for_bit(struct tb_switch *sw, u32 offset, u32 bit, u32 value, int timeout_msec); -@@ -1276,6 +1276,7 @@ static inline bool tb_switch_is_usb4(con +@@ -1278,6 +1278,7 @@ static inline bool tb_switch_is_usb4(con return usb4_switch_version(sw) > 0; } diff --git a/queue-6.8/thunderbolt-fix-wake-configurations-after-device-unplug.patch b/queue-6.8/thunderbolt-fix-wake-configurations-after-device-unplug.patch index 76050535e3..4e0514074f 100644 --- a/queue-6.8/thunderbolt-fix-wake-configurations-after-device-unplug.patch +++ b/queue-6.8/thunderbolt-fix-wake-configurations-after-device-unplug.patch @@ -24,7 +24,7 @@ Signed-off-by: Greg Kroah-Hartman --- a/drivers/thunderbolt/switch.c +++ b/drivers/thunderbolt/switch.c -@@ -3078,22 +3078,29 @@ void tb_switch_unconfigure_link(struct t +@@ -3180,22 +3180,29 @@ void tb_switch_unconfigure_link(struct t { struct tb_port *up, *down; -- cgit 1.2.3-korg