From nobody Thu Aug 17 00:30:59 2023 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 4RR5X40hnzz4mQsX; Thu, 17 Aug 2023 00:31:00 +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 4RR5X34r8bz4Tf8; Thu, 17 Aug 2023 00:30:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692232259; 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=Oh+1pS38PdRpd/YXNx6y5ObiHeDcXmky12EUL3+wTGg=; b=YrqM3tOIgpc9nROkAOxU4oVxhx9oV/FdEbMXbKcEMCsuLB94E2lpTop+45pUANgIuQPv5+ e+J4cvxJMbMy5W5+DBWMKZPiUbmoFbvrtO49v1AgT3IDO6/WvxCYO0rasG+u9a5VLQE6vp Fcj+Fe2g+Cs26LeJvxPJw6cQnpGYsC6Iwkk5ncu8VF7ZMBHOUZXd2W3czZ9qf67zxHNZjn Ehd/k0zY4UoJZjtwreiIuqE+gX/73BMjEVuSmF7MGVW6mCSvScnXucI7HsfKWAYU2Y0L1s k1GnW/F5itNePIw2zcFyYHMYd0HQnMS6OBRMHUNK93wrmTMSR+9rvESQLMP9Gg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692232259; 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=Oh+1pS38PdRpd/YXNx6y5ObiHeDcXmky12EUL3+wTGg=; b=ZtRq7YiWurLVVXOHVMAi+Jh1zSe1TTHUfzYYrEQphFQZg1cP7pldxuJYrSqZd3zjmq+VSO WtbmIt8HdJydJOr5LoxCGDakflgzESF43hCcPGcx0LS1OC/jUJ/dov2usKbgFA14tFSytW PQkrcTR6qgAJEjZDVDxkc42Xxh5TWDsG9kqUg8qhBQ2eYDS8oyeOb2k5arh1eNj/urnZ5J JZDaT286el5FWPrPoXsWZa6j6KNiBBn25NBEeHpZZIqFkooHS01ZqnHcqxL1HEwCwnaDlG v80ryjvFDCdI5nXhmRNKtyQz7WOEMAzYm/sF9FaLRsEzWrZOTl4eU2ITrfay4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692232259; a=rsa-sha256; cv=none; b=jKEDU0P5K0XGGDK8w2Rn9/22vc0c9jp1+RTrVX5o/wwb3e/lmv2mRvEbdIkT+OkPxNMGs4 I3U6IuulF01vhU1kwQYR2WCLLRw6ZAkWHXBWRzUefql1RW8ZvZsjaCQBQz2kbBBCUGriex YVvqABQ+F8pv/k7xKSOobH3gAbeOzRiNI66z4KxHh3XD10XjEnDpQll4ZFuwg7frHwDQH0 OPsYC4NDh5icfFxw+Ll7SD7aY9z/ez3aK/zluBgDXI9p4B8z23JkoivBNW++pWo4zjZx36 +UU8WOVXodXCd2JWXgzM7nqxQaNin5NXGUankqnepwmEI1uTO0E3fS7JrfPTzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RR5X33KRXz1C9R; Thu, 17 Aug 2023 00:30:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37H0UxlJ037375; Thu, 17 Aug 2023 00:30:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37H0Ux5U037371; Thu, 17 Aug 2023 00:30:59 GMT (envelope-from git) Date: Thu, 17 Aug 2023 00:30:59 GMT Message-Id: <202308170030.37H0Ux5U037371@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: a6b804a4f6f4 - stable/13 - ixgbe: Check for fw_recovery 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: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a6b804a4f6f499a63f428f73fba67ea8ccacb07a Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=a6b804a4f6f499a63f428f73fba67ea8ccacb07a commit a6b804a4f6f499a63f428f73fba67ea8ccacb07a Author: Kevin Bowling AuthorDate: 2023-08-10 00:31:49 +0000 Commit: Kevin Bowling CommitDate: 2023-08-17 00:30:47 +0000 ixgbe: Check for fw_recovery The x550 uses an upgradable flash code. Check for recovery condition like other flashable intel cards do in case of fw errors. Differential Revision: https://reviews.freebsd.org/D31869 (cherry picked from commit 8b4a3fbdd57215cffde530e2fa3098c272a985fe) --- sys/dev/ixgbe/if_ix.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/dev/ixgbe/if_ix.c b/sys/dev/ixgbe/if_ix.c index 150fdff03d05..4245f4f08eb7 100644 --- a/sys/dev/ixgbe/if_ix.c +++ b/sys/dev/ixgbe/if_ix.c @@ -921,6 +921,15 @@ ixgbe_if_attach_pre(if_ctx_t ctx) goto err_pci; } + if (hw->mac.ops.fw_recovery_mode && hw->mac.ops.fw_recovery_mode(hw)) { + device_printf(dev, "Firmware recovery mode detected. Limiting " + "functionality.\nRefer to the Intel(R) Ethernet Adapters " + "and Devices User Guide for details on firmware recovery " + "mode."); + error = ENOSYS; + goto err_pci; + } + if (hw->mbx.ops.init_params) hw->mbx.ops.init_params(hw);