From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) (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 5FC5C248F78 for ; Fri, 5 Dec 2025 08:25:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.125.188.123 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764923129; cv=none; b=Po9ScZXFEjAHmIh5iuR5pfBbBCyomFUAU03nP98nH8Zgt9du6J7jvhQ10jqx5Jkfjx1gcp2p9NrxuUN83gT6vaEhfriWOx1RvAPgOw89QvKsUNHifG57ypVSgtP/bZxTw/uKrmXmADNMa+4q4rq1z2Q4z0mDjp+wyJj0mcJrUFQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764923129; c=relaxed/simple; bh=K60gl9Mnhetq6W/Ntrnbmtt6jeMTyUUbXPtCpqDQ8LI=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iW8llq/9afTVYw6lFJuMG1D2k0U6CvIC4W6NITpxumMBBUdimNwIgEwVCo+URzYg6nBqdxHyIhNS9JeEClqaFaxjPBLb1ysp9A+EgqvhgBgg42M3R0binvXSNmyc2D36jZWa6Uhdv3LHw++kmHAAuuH+aRsjkYppz39GPtzt4SQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=canonical.com; spf=pass smtp.mailfrom=canonical.com; dkim=pass (4096-bit key) header.d=canonical.com header.i=@canonical.com header.b=im1ojwYK; arc=none smtp.client-ip=185.125.188.123 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject 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 (4096-bit key) header.d=canonical.com header.i=@canonical.com header.b="im1ojwYK" Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) (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-1.canonical.com (Postfix) with ESMTPS id 4E2A0403F8 for ; Fri, 5 Dec 2025 08:25:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20251003; t=1764923117; bh=vPAIHokCAd7ibs1BxYRl6MfcOlaVrL938oA/Hg2FruU=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=im1ojwYKZivA7F2xYlX+oakoEYhfvkEMq+AFp4b8E5G58BF/8a5LVQB+/ccxMNAGp +FfYQDKMGFVm6Nns4Ooaivp9k3D3xfIBtEaCrSgaQR+yQEUa+gA/qya+pF+5J7nSju erh7vM+7+nVcw85yljjWG+ByAnjPUM3ID5h1mcUB4zat+FGj2uUJyVIccv2+smRyW3 VBvK71leagIs4srp+vHaNdornkJJkml0EaxSH1IO9y9kj+fzSN2c4ZkZBBpwR1E+fG jTJsuwCsUo6GgvVYPgHUErZswvUcIn9H6lK8c1Dcxfek7DSi10GgalWATJOfyGk8Dv StT171SO9jiWPW/+vlsoHJygJ7SlwbM692tet3ayw0PojYdQjE8mCErHUmooxaLB/5 hTpf36PH1gnytJtuAHsejTJQyMRwhnaBJ8YsajwVcT1pgj+f0rWwo4toVbDFoadq3x ESTIZytUByeE/xVvakgajV7/S+QQGPsWnl5n/QXnmhhekkLjcIMm3O2rTSYuXpkDzL lwh3dxSvJw8VLXflhNCubUvwcUHa5Jmln2PR5mXqKe5tCA2FEPvVcFMQjRjnZqZNYM q7AW8LJccKwi8bNNXWyL8+sAa+FX9fvC4fmkiKKStJh53wuCziGGrfMX59Lbu8of+F pRhhrib9z6rm9MwgGhEuToU4= Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-29557f43d56so25103315ad.3 for ; Fri, 05 Dec 2025 00:25:17 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764923116; x=1765527916; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=vPAIHokCAd7ibs1BxYRl6MfcOlaVrL938oA/Hg2FruU=; b=H7tmqakTYJVTfZFapRzFV8dCXqyzII5zHbdWo2P+6jeX+aAs9x1bm+H1Ri8tWsTy1U y7dCK+rO6YqiFIMRsZ2ZUpp43PDbwJneVFyLVM+FW138JwveYs5P5NlOhR1CUXQDSpyZ ffvHYssE2ALeXIcTCmVaqa07Sx4O4oz8R0r3gQj0aI2mzA4zJZLnM7h1d8U0MnbqoT4o AG8s3oyDEbpiKF9lGjPPaVbsZ+aTTTbnIvoDNp4RYLEpoJAIUwn8MzLz5H0KUqbEIE/u WWP6kpw5qTrYYlJDZtvLPIp+oxKpLIxNXHu3VdIKwhInfzv0efNhP7H1lYsafpPQ9RHl oPkg== X-Forwarded-Encrypted: i=1; AJvYcCXxWxppV5mMIgc2LSfkX372QzBkWrxA8dlqQvmd0ArTRlQbld8kH2z37LvoAUGTXYPFyv7PmKPXCWikYjQ=@vger.kernel.org X-Gm-Message-State: AOJu0YxN/ecLYuuFe8qXc8jy237gSC5iLnP2DvaD0C2CnHXTkFwovFDD eVzO3RILpvJK8fmRsPKwEkWaG61e1khWuttRICELkwRCgEgqfmHBbXnL49BxSir5KTlV0yuUO2K XXEvfJr1+GvbBDuc9rllE4xZIkT4SVJvzRjgeTMk19D1ZuCDuj5X5AlAb2O3FamQ+O0qqmTUY8Y D1C8v29Q== X-Gm-Gg: ASbGncuXTbn6OaugssdMDkxhaLqZBWi1A8grVpUWIvCvmj3DW828+5BF7IzdVZjvb+O +tE8fex+mki0UcpLpYa6RruNIvW68jiFxW8qAEqXvT66s2lNECiktUWLRC+jjg7m46CFUYOa9/8 YaqNeEEaVNs1233togPDVvJYB4yAMQiZg7lhF+cCZB8ceXVE5JxeK6ON7VK27guB7dsEZ4xLYRD 7QfImKMzXzD0E1Lm9fsgIo2MsRweTESMRJ0dzbK3REgpbrbGmLiUbYF01zfAwSZ8F3ReEB7Ly+H phO8/DN74ikbaKb4zp1XfMsNMHgYAcd97mVRXnDqC5GoX7lAMtiVQeVb4jI2GuODAYAjJbhCvUh Vr+Q4MHpRBOyGGJ3wpE3y7sKY X-Received: by 2002:a17:903:41d1:b0:298:5fde:5a90 with SMTP id d9443c01a7336-29da1eea72amr76285955ad.58.1764923115904; Fri, 05 Dec 2025 00:25:15 -0800 (PST) X-Google-Smtp-Source: AGHT+IG/emSI1vAJLDPvRoUuEvwKwrwhdDo47cnuu11gTK6CsB4P3+sbvvwIcQoU91SQafUrHCG18A== X-Received: by 2002:a17:903:41d1:b0:298:5fde:5a90 with SMTP id d9443c01a7336-29da1eea72amr76285705ad.58.1764923115542; Fri, 05 Dec 2025 00:25:15 -0800 (PST) Received: from localhost.localdomain ([103.155.100.4]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29dae4cfaecsm40896875ad.27.2025.12.05.00.25.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Dec 2025 00:25:15 -0800 (PST) From: Aaron Ma 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 Subject: [PATCH v2 2/2] ice: Initialize RDMA after rebuild Date: Fri, 5 Dec 2025 16:24:59 +0800 Message-ID: <20251205082459.1586143-2-aaron.ma@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251205082459.1586143-1-aaron.ma@canonical.com> References: <20251205082459.1586143-1-aaron.ma@canonical.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit After wakeup from suspend, IRDMA is initialized with error: kernel: ice 0000:60:00.0: IRDMA hardware initialization FAILED init_state=4 status=-110 kernel: ice 0000:60:00.1: IRDMA hardware initialization FAILED init_state=4 status=-110 kernel: irdma.gen_2 ice.roce.1: probe with driver irdma.gen_2 failed with error -110 kernel: irdma.gen_2 ice.roce.2: probe with driver irdma.gen_2 failed with error -110 IRDMA times out because the initialization before the schedule reset. The ice_init_rdma() function already calls ice_plug_aux_dev() internally, ensuring proper initialization order. Fixes: bc69ad74867db ("ice: avoid IRQ collision to fix init failure on ACPI S3 resume") Reviewed-by: Aleksandr Loktionov Signed-off-by: Aaron Ma --- V1 -> V2: no changes. drivers/net/ethernet/intel/ice/ice_main.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c index 2533876f1a2fd..c6dd04d24ac09 100644 --- a/drivers/net/ethernet/intel/ice/ice_main.c +++ b/drivers/net/ethernet/intel/ice/ice_main.c @@ -5677,11 +5677,6 @@ static int ice_resume(struct device *dev) if (ret) dev_err(dev, "Cannot restore interrupt scheme: %d\n", ret); - ret = ice_init_rdma(pf); - if (ret) - dev_err(dev, "Reinitialize RDMA during resume failed: %d\n", - ret); - clear_bit(ICE_DOWN, pf->state); /* Now perform PF reset and rebuild */ reset_type = ICE_RESET_PFR; @@ -7805,7 +7800,12 @@ static void ice_rebuild(struct ice_pf *pf, enum ice_reset_req reset_type) ice_health_clear(pf); - ice_plug_aux_dev(pf); + /* Initialize RDMA after control queues are ready */ + err = ice_init_rdma(pf); + if (err) + dev_err(dev, "Reinitialize RDMA after rebuild failed: %d\n", + err); + if (ice_is_feature_supported(pf, ICE_F_SRIOV_LAG)) ice_lag_rebuild(pf); -- 2.43.0