From owner-svn-src-all@freebsd.org Wed Oct 16 21:46:49 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E4A57150BA6; Wed, 16 Oct 2019 21:46:49 +0000 (UTC) (envelope-from erj@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46tm8n5Pkgz4JLQ; Wed, 16 Oct 2019 21:46:49 +0000 (UTC) (envelope-from erj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9E674D6B3; Wed, 16 Oct 2019 21:46:49 +0000 (UTC) (envelope-from erj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x9GLknRM027212; Wed, 16 Oct 2019 21:46:49 GMT (envelope-from erj@FreeBSD.org) Received: (from erj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9GLknlB027211; Wed, 16 Oct 2019 21:46:49 GMT (envelope-from erj@FreeBSD.org) Message-Id: <201910162146.x9GLknlB027211@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: erj set sender to erj@FreeBSD.org using -f From: Eric Joyner Date: Wed, 16 Oct 2019 21:46:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r353665 - releng/12.1/sys/dev/ixgbe X-SVN-Group: releng X-SVN-Commit-Author: erj X-SVN-Commit-Paths: releng/12.1/sys/dev/ixgbe X-SVN-Commit-Revision: 353665 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Oct 2019 21:46:50 -0000 Author: erj Date: Wed Oct 16 21:46:49 2019 New Revision: 353665 URL: https://svnweb.freebsd.org/changeset/base/353665 Log: MFC r353660: ixgbe: Disable EEE for backplane X550EM_X This prevents a kernel panic when configuring EEE on X552 devices. PR: 240320 Approved by: re@ (gjb@) Sponsored by: Intel Corporation Modified: releng/12.1/sys/dev/ixgbe/if_ix.c Directory Properties: releng/12.1/ (props changed) Modified: releng/12.1/sys/dev/ixgbe/if_ix.c ============================================================================== --- releng/12.1/sys/dev/ixgbe/if_ix.c Wed Oct 16 21:07:18 2019 (r353664) +++ releng/12.1/sys/dev/ixgbe/if_ix.c Wed Oct 16 21:46:49 2019 (r353665) @@ -4416,7 +4416,7 @@ ixgbe_sysctl_eee_state(SYSCTL_HANDLER_ARGS) if ((new_eee < 0) || (new_eee > 1)) return (EINVAL); - retval = adapter->hw.mac.ops.setup_eee(&adapter->hw, new_eee); + retval = ixgbe_setup_eee(&adapter->hw, new_eee); if (retval) { device_printf(dev, "Error in EEE setup: 0x%08X\n", retval); return (EINVAL); @@ -4469,8 +4469,6 @@ ixgbe_init_device_features(struct adapter *adapter) case ixgbe_mac_X550EM_x: adapter->feat_cap |= IXGBE_FEATURE_SRIOV; adapter->feat_cap |= IXGBE_FEATURE_FDIR; - if (adapter->hw.device_id == IXGBE_DEV_ID_X550EM_X_KR) - adapter->feat_cap |= IXGBE_FEATURE_EEE; break; case ixgbe_mac_X550EM_a: adapter->feat_cap |= IXGBE_FEATURE_SRIOV;