From: Greg Kroah-Hartman Date: Mon, 8 Jul 2024 11:49:53 +0000 (+0200) Subject: 5.15-stable patches X-Git-Tag: v6.6.38~43 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=304f45dca53da7b463e4afe32cc07c62f827c4f5;p=thirdparty%2Fkernel%2Fstable-queue.git 5.15-stable patches added patches: revert-igc-fix-a-log-entry-using-uninitialized-netdev.patch --- diff --git a/queue-5.15/revert-igc-fix-a-log-entry-using-uninitialized-netdev.patch b/queue-5.15/revert-igc-fix-a-log-entry-using-uninitialized-netdev.patch new file mode 100644 index 00000000000..d852fe0357b --- /dev/null +++ b/queue-5.15/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 +Date: Tue, 11 Jun 2024 09:24:55 -0700 +Subject: Revert "igc: fix a log entry using uninitialized netdev" + +From: Sasha Neftin + +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 +Tested-by: Naama Meir +Signed-off-by: Tony Nguyen +Link: https://lore.kernel.org/r/20240611162456.961631-1-anthony.l.nguyen@intel.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + 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 +@@ -6673,6 +6673,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 */ +@@ -6694,9 +6696,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-5.15/series b/queue-5.15/series index a8c2cff67fb..576d4cfaee2 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -46,3 +46,4 @@ inet_diag-initialize-pad-field-in-struct-inet_diag_r.patch gpiolib-of-factor-out-code-overriding-gpio-line-pola.patch gpiolib-of-add-a-quirk-for-reset-line-polarity-for-h.patch gpiolib-of-add-polarity-quirk-for-tsc2005.patch +revert-igc-fix-a-log-entry-using-uninitialized-netdev.patch