From nobody Wed Jun 29 17:08:11 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 ADBE386FD7D; Wed, 29 Jun 2022 17:08:11 +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 4LY7Fl4Ly4z3sq8; Wed, 29 Jun 2022 17:08:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656522491; 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=cZ52ArWhRPUcFIyNq6Oa6osZ/HfCX3Ln1YtwMv+7XpY=; b=UkPzeLigE+0cn57JnShhpmtFfQogf8c8CYBn7bynJ8q3wSD9jSED+YDLOvq9mNFMTiea63 Qge0cYZaBNJgFR8ZC8zXlYYbvBt49oKCIVRZwAvGj3MYuP0ZZiOZfu7WNRJprzzDaAfAJC cU7Mw4+M0Y9qus9QGFBNsYcgnDtacmNiYyrst9Y0R2SoklMDi/1g0j6q2Pth+gKbsUxRe8 Tfo5e2yb+6leL8dExmY1rEApxkttuGoiIZHnll5hOL1oriz6UStt2hvtQ1Bcr+vnUCtXCO YuXL0LXboTfgKxO2jnD8T02DZh7yBafrxsw7YNIw2c1jzBereulW2QavH37uQA== 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 7694E15A38; Wed, 29 Jun 2022 17:08:11 +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 25TH8BQj031602; Wed, 29 Jun 2022 17:08:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25TH8Bao031601; Wed, 29 Jun 2022 17:08:11 GMT (envelope-from git) Date: Wed, 29 Jun 2022 17:08:11 GMT Message-Id: <202206291708.25TH8Bao031601@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: d0303ad18ae9 - stable/12 - 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/12 X-Git-Reftype: branch X-Git-Commit: d0303ad18ae9cb9715f168b69a3e86a2424bcfec Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656522491; 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=cZ52ArWhRPUcFIyNq6Oa6osZ/HfCX3Ln1YtwMv+7XpY=; b=p4unV1mDYENzVrTQqLRhpYbICaXdwvGOL+rag0uPFCfewZyDPAv3wJvSqCgegWUixxl5PB z/HBq9HZhL8uQ91PgajMcZWGumq456ZN/GsdnCqXATQN59/XPw5YRtzQ4yL3GWkIAZtMH0 dJoxv8sH2IXmBFKgjMG56Y6Qzg2jzwsFkEkofIxxghPPuohdmUDAhkOtutNndLGU9VOhvK gAP6xyaAoLMTBG0mPrbnH6Mft9R9Ne2UqFIJ3+TsI3pcdNLBzLKrhQxFp2Q004MYm/RkH3 C7PUHkwpXJdN8a4GHm1UOxejlrhQ8ktYRNMWMn08+8iYF/6QjnbWJf3XsgnZow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656522491; a=rsa-sha256; cv=none; b=seLnKOmV3eyl/+jTVe8SDst24Xrvbi9yBCVAZEEkqsclzeUoZdeKROavxOs6HW9EaQT3zs RQzVzEVQUZRw8q09bBHFSgRc6jBmb0UI9kNzigehueZNS6npZpfmMqaWmpbYxWD3khmTJj 8zyNG72HJpdvjqXsuRalXRBhUA2ekgZoavBfyMbftyIOPiVdFqey2kpOMvRUYPZczoU+RB 5ED7Pk++U/SEV+oXT3pj4JkI+XBO7L/2Vecw4k8Ip4zODnnUb8wFJ9SELbTSaPCWdqWSFs xIzl1yOEELttUXe12R/5Phf3pH3UlSTtWDsu6RZABGb5JABfZvw2s2Inm7kK2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by nc (ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=d0303ad18ae9cb9715f168b69a3e86a2424bcfec commit d0303ad18ae9cb9715f168b69a3e86a2424bcfec Author: Neel Chauhan AuthorDate: 2022-06-22 02:13:19 +0000 Commit: Neel Chauhan CommitDate: 2022-06-29 17:08:13 +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 9bb368ae8a90..4308033ad3c6 100644 --- a/sys/dev/ixgbe/if_ix.c +++ b/sys/dev/ixgbe/if_ix.c @@ -2435,7 +2435,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); }