From nobody Wed Jun 29 17:07:56 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 998A18701AF; Wed, 29 Jun 2022 17:07:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LY7FS3nPdz3sjg; Wed, 29 Jun 2022 17:07:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656522476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j7F4qRMrkCMmWADbRaw3lHKBlCipdAJPa1Y/MmJrMpQ=; b=N1O/OCs71ZWB/rAegARml08VKB91zIgNquHqN3XrVEDFpACQ7HzjLFpDf1fNqTcZ5TnMyZ lmTZpCslHMts4uU5GPl2RSp4UsViK9600IaVX3iYi8Td/SAJr3cNva64bln2UB3xdbKRV7 g6109fo3nCJ9guRAgD0VMYuLbv8MLAAi1gZ3kib3/llTdAV+yfmEIwVS3Pb1PVplXS5Frc z1vSxMfWMqzjL2Et3qUoIxs1FskWQql+6t7IWJCuJ8dv6ecNYINJCo3EPjjrKvZoYY3Sys V39wYi7qsGwq/3/Hm7jmOTMV7WBz24uiQ1Aj8b4SxC//b8xwsrsuTZlUySHIHQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 596A715C0C; Wed, 29 Jun 2022 17:07:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25TH7uXp031469; Wed, 29 Jun 2022 17:07:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25TH7uAs031468; Wed, 29 Jun 2022 17:07:56 GMT (envelope-from git) Date: Wed, 29 Jun 2022 17:07:56 GMT Message-Id: <202206291707.25TH7uAs031468@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Neel Chauhan Subject: git: 7a8188739a99 - stable/13 - if_ix: Reset on an ECC error List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nc X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7a8188739a99780048616798bb65c144363afdd9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656522476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j7F4qRMrkCMmWADbRaw3lHKBlCipdAJPa1Y/MmJrMpQ=; b=liMJZbULWEXcx0SrxNY9+3usgDpoUKcVCvRjqw5I6HGhtrexqaMN4ZghsIi4T3rwRAef+s xelEG9oFNSS1LFz2GIupMnxHSbotqRiNl6jdKyW4o85xR4sTw5Gj1pOZ+vTkgbWP6Txgyq iVMFm4gH+TkdweF/QvyTa1YTZVQjFNpIP7jfyQXt4YQwRGYK4RKxpvrSdOwIDyXVXaILk7 uPE8JHej8xxjP9LcWrXfMaoBNcQdzikksen7fYoBXQZXqY5ExpC6hNplDJM+jJjvoRRfyQ OC0xlBQt/i6LvQvrUZWUzUXbTajSYxq1M64H9MTx58BvCLm9B2WGmwXrXzpRAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656522476; a=rsa-sha256; cv=none; b=n4ruu6mlTndRZKey2Hhd0KjuyMrXpWzbT4ZoBX4AY57WS4O1sHHKQQEVLOHWLI9PCM8jrP iGv4691oh2t+J+HmdA1Vq+60fJIcxoc6cAY3H/LTrBP1UVF5+9OyEZfcLZ5GhIKqKf5MT4 Ols5f5K5KwehrKUo+1uyNpUbAUCzdBjxYjejH93+PiqFBrF1ol689UG7mEEPLbblm/rnlU 0+ekKSTl4Xi0wc6QpGLE9l3KXAYSmN9ne+j3p3l6+Zsy9ZHgwn+Sihzh5kJXvdv+8h7dYW m93xpvHja8bjYW/XLGl4Mgks2NvO7H+6iHrI3UxagTGp1D81u9rmHlhD3poLRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by nc (ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=7a8188739a99780048616798bb65c144363afdd9 commit 7a8188739a99780048616798bb65c144363afdd9 Author: Neel Chauhan AuthorDate: 2022-06-22 02:13:19 +0000 Commit: Neel Chauhan CommitDate: 2022-06-29 17:07:50 +0000 if_ix: Reset on an ECC error This mirrors the Linux behavior as seen in the kernel commit d773ce2. Reviewed by: kbowling MFH after: 3 days Differential Revision: https://reviews.freebsd.org/D35542 (cherry picked from commit 4f1d91e413d7e05f13f12d43a48178c023150dde) --- sys/dev/ixgbe/if_ix.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/dev/ixgbe/if_ix.c b/sys/dev/ixgbe/if_ix.c index d7df1dcf6899..e36bea228058 100644 --- a/sys/dev/ixgbe/if_ix.c +++ b/sys/dev/ixgbe/if_ix.c @@ -2538,7 +2538,9 @@ ixgbe_msix_link(void *arg) } else if (eicr & IXGBE_EICR_ECC) { device_printf(iflib_get_dev(sc->ctx), - "\nCRITICAL: ECC ERROR!! Please Reboot!!\n"); + "Received ECC Err, initiating reset\n"); + hw->mac.flags |= ~IXGBE_FLAGS_DOUBLE_RESET_REQUIRED; + ixgbe_reset_hw(hw); IXGBE_WRITE_REG(hw, IXGBE_EICR, IXGBE_EICR_ECC); }