From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3DF15146D53; Tue, 9 Jul 2024 11:26:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720524380; cv=none; b=SfZSsnIIrsb+CZGtRHeLoBbnaEchBjZYWAdDosu5Wr0U4gATFqGr7lv4zNP1FSS1nqZ0faHDsK1lunKh6t1mj0avboijObLr1e8JvfySuHS4ozDptYlGeTESrENpY1/pO3IqRoDgLATWKPR24V0pqOQrZ89fry7KpOUADJtrMGI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720524380; c=relaxed/simple; bh=pTJdx73KkUwXoroqcfk5ovFZYz5rtIn4ooCE5lmk+c0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=J9dKubLAGxcxEGQQ/SNZ3pCOQ2mkdTqQW5U1+PD9LZiSVGnv8+GmI9Q3MVrAx9YWo6KznQQ/AzTIbkR5DBMY4Zo1/DE7rEk60psfBZD0ZZ9FBTrItIS5X+NJfBvhzfPz86WkcJaJK2YZoANO7n5MlQzE/ZahHxFP4bn7wj0srfg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Kt5sj6LV; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Kt5sj6LV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 720C6C32786; Tue, 9 Jul 2024 11:26:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1720524379; bh=pTJdx73KkUwXoroqcfk5ovFZYz5rtIn4ooCE5lmk+c0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Kt5sj6LVh+H36zOZ0AXVAmkOqcNk0EVuOWU5hV9hutCp2/P6qWWfLnSFUeMa+q7U6 YEuBm5KSfb2J/8R5NSm8WlpGjq09j14GgituRtsT4BOJnZxhNMFBoU2cS76zYxl8uU jVvi+aspVqZGThlHO9Y7EvBTP7EBUm+eLWxBqJN4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Sasha Neftin , Naama Meir , Tony Nguyen , Jakub Kicinski Subject: [PATCH 6.9 132/197] Revert "igc: fix a log entry using uninitialized netdev" Date: Tue, 9 Jul 2024 13:09:46 +0200 Message-ID: <20240709110714.058686416@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240709110708.903245467@linuxfoundation.org> References: <20240709110708.903245467@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.9-stable review patch. If anyone has any objections, please let me know. ------------------ 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 @@ -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);