6.9-stable patches

added patches:
	revert-igc-fix-a-log-entry-using-uninitialized-netdev.patch

diff --git a/queue-6.9/revert-igc-fix-a-log-entry-using-uninitialized-netdev.patch b/queue-6.9/revert-igc-fix-a-log-entry-using-uninitialized-netdev.patch
new file mode 100644 (file)
index 0000000..47dd53e
--- /dev/null
+++ b/queue-6.9/revert-igc-fix-a-log-entry-using-uninitialized-netdev.patch
@@ -0,0 +1,49 @@
+From 8eef5c3cea65f248c99cd9dcb3f84c6509b78162 Mon Sep 17 00:00:00 2001
+From: Sasha Neftin <sasha.neftin@intel.com>
+Date: Tue, 11 Jun 2024 09:24:55 -0700
+Subject: Revert "igc: fix a log entry using uninitialized netdev"
+
+From: Sasha Neftin <sasha.neftin@intel.com>
+
+commit 8eef5c3cea65f248c99cd9dcb3f84c6509b78162 upstream.
+
+This reverts commit 86167183a17e03ec77198897975e9fdfbd53cb0b.
+
+igc_ptp_init() needs to be called before igc_reset(), otherwise kernel
+crash could be observed. Following the corresponding discussion [1] and
+[2] revert this commit.
+
+Link: https://lore.kernel.org/all/8fb634f8-7330-4cf4-a8ce-485af9c0a61a@intel.com/ [1]
+Link: https://lore.kernel.org/all/87o78rmkhu.fsf@intel.com/ [2]
+Fixes: 86167183a17e ("igc: fix a log entry using uninitialized netdev")
+Signed-off-by: Sasha Neftin <sasha.neftin@intel.com>
+Tested-by: Naama Meir <naamax.meir@linux.intel.com>
+Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
+Link: https://lore.kernel.org/r/20240611162456.961631-1-anthony.l.nguyen@intel.com
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/ethernet/intel/igc/igc_main.c |    5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+--- a/drivers/net/ethernet/intel/igc/igc_main.c
++++ b/drivers/net/ethernet/intel/igc/igc_main.c
+@@ -6932,6 +6932,8 @@ static int igc_probe(struct pci_dev *pde
+       device_set_wakeup_enable(&adapter->pdev->dev,
+                                adapter->flags & IGC_FLAG_WOL_SUPPORTED);
+ 
++      igc_ptp_init(adapter);
++
+       igc_tsn_clear_schedule(adapter);
+ 
+       /* reset the hardware with the new settings */
+@@ -6953,9 +6955,6 @@ static int igc_probe(struct pci_dev *pde
+       /* Check if Media Autosense is enabled */
+       adapter->ei = *ei;
+ 
+-      /* do hw tstamp init after resetting */
+-      igc_ptp_init(adapter);
+-
+       /* print pcie link status and MAC address */
+       pcie_print_link_status(pdev);
+       netdev_info(netdev, "MAC: %pM\n", netdev->dev_addr);

diff --git a/queue-6.9/series b/queue-6.9/series
index e8e582ad5ac5cc7465519571f1bfca24a1bee6bd..c9bdd9d47ea72d1f1ea1b9dd77dcafa43ef342f9 100644 (file)
--- a/queue-6.9/series
+++ b/queue-6.9/series
@@ -129,3 +129,4 @@ mlxsw-core_linecards-fix-double-memory-deallocation-.patch
 bnxt_en-fix-the-resource-check-condition-for-rss-con.patch
 gpiolib-of-add-polarity-quirk-for-tsc2005.patch
 platform-x86-toshiba_acpi-fix-quickstart-quirk-handling.patch
+revert-igc-fix-a-log-entry-using-uninitialized-netdev.patch