From nobody Thu Dec 18 08:13:35 2025 Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) (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 E47FC487A5 for ; Wed, 18 Dec 2024 02:38:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.125.188.122 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734489483; cv=none; b=cY6O40K6e2DMhVEaaIxbQSCT1Fh4WLc6LdocMHarFRM9pIz0TrRaO8Br5esfAh7g0kUEyuXCetCpnUmzeD5j9lEy5uDub2RWj9rgA7LsqaCyYPw8EhJeAl7B/7GbaiCjT+t+eLh3fkvnLt7DOOjM8GDxRBWqVNq5ae3g2THqULM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734489483; c=relaxed/simple; bh=iMPPzW/fOg1yXbJy86HU8s3UQaJRbFNDDtnOn7pMfMo=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=fTM2PQMWyyjee8p4Ie9DeTfuSS8cbmLpq0y7JGnrY3PCTPQw4xl2G8XgdkRbrs1L1hyU9EQmAe1XkXEvsbpOQCuXKs+PR0eSANed8RHfb9dNCOdBm7ld0cFvpyD/ZIRqRxQtDEEVnqe2qA3vmHzeDYoaAVY2rlX/8If7iCCInNg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com; spf=pass smtp.mailfrom=canonical.com; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b=Y/0zOoGM; arc=none smtp.client-ip=185.125.188.122 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canonical.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b="Y/0zOoGM" Received: from mail-pg1-f198.google.com (mail-pg1-f198.google.com [209.85.215.198]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 11AEC3F5BA for ; Wed, 18 Dec 2024 02:37:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1734489473; bh=TFaVEYsO+0RIB0bo3fMP3mzQbKddwngJ+5DgQ8I1mWg=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Y/0zOoGMjPF+yplKRF7YZXuFtUdzYwaa+KxYEXvoyiELE/+PCHneJ9jOFEKNIpYuZ VNYj19C91/MbFI9dWo9GENeZnEXjlppwRvVShZamrh+Om2kM6iXoZA95LNyVkkF7P/ 91Le7KkNlU0KZmrPrjUJD75EjDTy/SmhD/woHjjtRHfEpEZKmIP1TmYnvnjoMHPHRi DLqfVlO1OmYb5Bu2rwH+Ezs6KWgTI4vTZVae+LLEjd5Hcb4nUdTp0YoP9dZw3g8RUB Lm2gW4i9GZcFePQmR2D/qEGvBZ5q8nOL/ZjAewVf2XcXvI2PsZsQ0xRLswd7U9DcGe Vnl/a5O9mqEwQ== Received: by mail-pg1-f198.google.com with SMTP id 41be03b00d2f7-801c27e67a6so6492123a12.2 for ; Tue, 17 Dec 2024 18:37:52 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734489467; x=1735094267; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=TFaVEYsO+0RIB0bo3fMP3mzQbKddwngJ+5DgQ8I1mWg=; b=mPr2w4DEqRwTXUr2RY9W3Z/DotE1086Fx3lXoSm+e2you9ufr8JsvnvhEme3cXa28l 0YkcmUY/J+uXqpYVvOBnYVXmPhxPkZEUXxcWm8pVhFmAyXQK7k6kTK6Hf7B82mOVbLJK I28m0EYipUS+g5YY6CgJNL4NOu/CJnpdi7IGohlRNP7esl/eJnKPdYD2nMm0SbcXPW5R DKdnkLad5dJp0Gv0prNUSOMoZ7dOAkmNvKjvjmKstl5uUM1hHG1LOUEn+DxfPZM5DNpb x7v2DxfUO0YDufo2rYPT6+fHeCEDZ3fuihnI2SEbGMfIlTC1960FBQp0PnPvgyKgTgX5 jCmg== X-Forwarded-Encrypted: i=1; AJvYcCVWo+7qPmP1wi0u0tGMIo/k49Hxe04RO7R2sALnFKxOrMjhcCJXu5LonO5XTrycVUtENWiti01WsY8bdtA=@vger.kernel.org X-Gm-Message-State: AOJu0YztS+JR6y/rc3gsr6jhbAvThAFfLz1BVW4IavyU+vwIRO3CwrGs AR9RCfbvnsgSGNHMoa0W38r/rPa32kQzpCcAH1AsRT+T1mtRoCBprG0TFx/3PSueROnYg3rQFxq YJ6WaPU3AjffTD1eEM+htNj9sq9/4g+ovb1LZrRQl74en/LkmmRvbSRHlOR0xjFYL7+dfqkgRzO AUlw== X-Gm-Gg: ASbGnctaTBTDhu7mJL9jTNiv5w0ztuNgAn0D95EoZ1aAS2aONG2Ky/UjBEUndEnYCBQ nPhZzKC5g0rgFZLgSismyntDgZZeNlLVUK3I/qp+Q03kZSnM81ouUi2jAVQzyjceCY0Wu7WXqbX n/n+qhLNbVAmqanykAqwQF2r3tusWelqyLuPytYUZAOEz5r2hIt1CSSS+Mm7h/VcBQa4IRzheWP y0kckAjuV0fR5pxYoEEtIAmG1ZOyZt6vBRQ8hkUmakRlKTGclq0AKNsfqyfZKSRNVXLcEK+q/9U 6W89Sq4zrLgU09Er9Aub4N5vM9UlvzO28ecJTHy82L7tO8WPHrNDgMMl3Dg= X-Received: by 2002:a17:903:234d:b0:216:4064:53ad with SMTP id d9443c01a7336-218d7258781mr20456495ad.48.1734489466663; Tue, 17 Dec 2024 18:37:46 -0800 (PST) X-Google-Smtp-Source: AGHT+IFGnjXVQbSCPpcLEMs1vNBYJeTiWQaRdGDFeNo4OX7+T80FP/PD94tyzBKNkLNro+8IXcQ2nA== X-Received: by 2002:a17:903:234d:b0:216:4064:53ad with SMTP id d9443c01a7336-218d7258781mr20456265ad.48.1734489466357; Tue, 17 Dec 2024 18:37:46 -0800 (PST) Received: from rickywu0421-ThinkPad-X1-Carbon-Gen-11.. (118-163-61-247.hinet-ip.hinet.net. [118.163.61.247]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219ce1b347fsm212475ad.78.2024.12.17.18.37.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Dec 2024 18:37:46 -0800 (PST) From: En-Wei Wu To: anthony.l.nguyen@intel.com, przemyslaw.kitszel@intel.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: vitaly.lifshits@intel.com, Chia-Lin Kao Subject: [PATCH iwl-net v2] igc: return early when failing to read EECD register Date: Wed, 18 Dec 2024 10:37:42 +0800 Message-ID: <20241218023742.882811-1-en-wei.wu@canonical.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When booting with a dock connected, the igc driver may get stuck for ~40 seconds if PCIe link is lost during initialization. This happens because the driver access device after EECD register reads return all F's, indicating failed reads. Consequently, hw->hw_addr is set to NULL, which impacts subsequent rd32() reads. This leads to the driver hanging in igc_get_hw_semaphore_i225(), as the invalid hw->hw_addr prevents retrieving the expected value. To address this, a validation check and a corresponding return value catch is added for the EECD register read result. If all F's are returned, indicating PCIe link loss, the driver will return -ENXIO immediately. This avoids the 40-second hang and significantly improves boot time when using a dock with an igc NIC. Log before the patch: [ 0.911913] igc 0000:70:00.0: enabling device (0000 -> 0002) [ 0.912386] igc 0000:70:00.0: PTM enabled, 4ns granularity [ 1.571098] igc 0000:70:00.0 (unnamed net_device) (uninitialized): PCIe = link lost, device now detached [ 43.449095] igc_get_hw_semaphore_i225: igc 0000:70:00.0 (unnamed net_dev= ice) (uninitialized): Driver can't access device - SMBI bit is set. [ 43.449186] igc 0000:70:00.0: probe with driver igc failed with error -13 [ 46.345701] igc 0000:70:00.0: enabling device (0000 -> 0002) [ 46.345777] igc 0000:70:00.0: PTM enabled, 4ns granularity Log after the patch: [ 1.031000] igc 0000:70:00.0: enabling device (0000 -> 0002) [ 1.032097] igc 0000:70:00.0: PTM enabled, 4ns granularity [ 1.642291] igc 0000:70:00.0 (unnamed net_device) (uninitialized): PCIe = link lost, device now detached [ 5.480490] igc 0000:70:00.0: enabling device (0000 -> 0002) [ 5.480516] igc 0000:70:00.0: PTM enabled, 4ns granularity Fixes: ab4056126813 ("igc: Add NVM support") Cc: Chia-Lin Kao (AceLan) Signed-off-by: En-Wei Wu Reviewed-by: Vitaly Lifshits Tested-by: Mor Bar-Gabay --- Changes in v2: - Added "after" logs showing improved boot time - Fixed error code (use -ENXIO instead of -ENODEV) - Added error propagation in igc_get_invariants_base() - Added Fixes tag - Added [PATCH iwl-net] prefix - Changed original author from AceLan to En-Wei drivers/net/ethernet/intel/igc/igc_base.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/ethernet/intel/igc/igc_base.c b/drivers/net/ethern= et/intel/igc/igc_base.c index 9fae8bdec2a7..1613b562d17c 100644 --- a/drivers/net/ethernet/intel/igc/igc_base.c +++ b/drivers/net/ethernet/intel/igc/igc_base.c @@ -68,6 +68,10 @@ static s32 igc_init_nvm_params_base(struct igc_hw *hw) u32 eecd =3D rd32(IGC_EECD); u16 size; =20 + /* failed to read reg and got all F's */ + if (!(~eecd)) + return -ENXIO; + size =3D FIELD_GET(IGC_EECD_SIZE_EX_MASK, eecd); =20 /* Added to a constant, "size" becomes the left-shift value @@ -221,6 +225,8 @@ static s32 igc_get_invariants_base(struct igc_hw *hw) =20 /* NVM initialization */ ret_val =3D igc_init_nvm_params_base(hw); + if (ret_val) + goto out; switch (hw->mac.type) { case igc_i225: ret_val =3D igc_init_nvm_params_i225(hw); --=20 2.43.0