From nobody Wed Jun 22 03:23:33 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 DDAC88731A1; Wed, 22 Jun 2022 03:23:33 +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 4LSTHT5vkTz4qgD; Wed, 22 Jun 2022 03:23:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655868213; 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=Vd+aaCQvqJxiTzDWCB3jDvR06H0HPZF+B7IIJ+HXT9M=; b=nV8di+JxwRHQa1N84UbAG6n3QlqQxNkYVZFC6Z8iDauAmPFUR9Ce5FZKVDNse0BL3He3cS SLxKn1Yv4PT8KX7qdR+C0zJ3RYp77o/FqzabI8I+YUSFjcec894nJhTeRrnvtNlM9JSJjH WYFpkp8zt2pBpFrPuMhgv+T/CPPBwtuPmshNzcwQDVR1DkQHMaK10YCGwSRZcqpUdLpzxa VZxJdOMCR2Z3IR2lFuYLNatuNCRl60n2402Y0Ymt2DqfF4HqiA89GhKY4i7EXIQTbM74m8 r15EgojEWbyWqkB8aLE0IDymT7hg3W1UdJLmK12fCo887lv2CByyLUP1uKRXHw== 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 AC08E1E62B; Wed, 22 Jun 2022 03:23:33 +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 25M3NXmJ046204; Wed, 22 Jun 2022 03:23:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25M3NXWQ046203; Wed, 22 Jun 2022 03:23:33 GMT (envelope-from git) Date: Wed, 22 Jun 2022 03:23:33 GMT Message-Id: <202206220323.25M3NXWQ046203@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Neel Chauhan Subject: git: 4f1d91e413d7 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 4f1d91e413d7e05f13f12d43a48178c023150dde Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655868213; 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=Vd+aaCQvqJxiTzDWCB3jDvR06H0HPZF+B7IIJ+HXT9M=; b=t+ZXyl9OOR6FyzNoMVO1AvdiUgditvAphP7imVvcTEPj353XWzONPyPlm+UUY5USHJNQE4 yRn808IHnQddhKCvgcj82c5nAtpjK4R9yYbVYkkBjz7F4dW76mh0kjWCXDkWC4sP07cLaQ bw7t43S6cgI46VBA5NLN8+8NGPIHlUwOiR0v7K9Q71xvzy6zvzxvttLQU7KziznxE/uUcw Y/uyTa9Mo3qdvU7Bwihdk5CDLRkKPt54hDUQuBCC57WbtZ/PTfd4PcAMwwxAMImGfPtPuY W1+2XhUsfV3B5+rfudhxjjvO3kLolpB74dQi95yes7lqLu+vSuuNtSXmOx59lg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655868213; a=rsa-sha256; cv=none; b=FPAvDdCQiiV+G4GtAIv6alCqQFADMI+mABY1qDIOSD13rjPXTxpzoCGAxEH8cbAqwac/ML IJ2VcZDGgIxfbvn7LBoEdlI3GRckXn7x54ljDgE0vcr5f5VqYITt0oOmN9ms8XcZtM/Mq0 Z16Sw0bKbIR6Nnet+5iB4oaQ0mJ+XfAAiAbdQSdlvzTCRbt1Ku0khwZ6uadwg5lxdV6YSc oj4LS/Skt2D2rgaGT5s6iga0FvX9tND+QSqQi+zv8UsWtrJeiQaRRsuiL703VdzCUWgfWP kS83IygZ3/2Fdi9wawYkBFEYuHwmsxWr0PKnJMzcP1L/ryI0hSX8Yl4ToR/KTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by nc (ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=4f1d91e413d7e05f13f12d43a48178c023150dde commit 4f1d91e413d7e05f13f12d43a48178c023150dde Author: Neel Chauhan AuthorDate: 2022-06-22 02:13:19 +0000 Commit: Neel Chauhan CommitDate: 2022-06-22 03:22:25 +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 --- 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 364e08cc722a..ae5c65894f83 100644 --- a/sys/dev/ixgbe/if_ix.c +++ b/sys/dev/ixgbe/if_ix.c @@ -2537,7 +2537,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); }