| i40e_adminq.c (291248) | i40e_adminq.c (292095) |
|---|---|
| 1/****************************************************************************** 2 | 1/****************************************************************************** 2 |
| 3 Copyright (c) 2013-2014, Intel Corporation | 3 Copyright (c) 2013-2015, Intel Corporation |
| 4 All rights reserved. 5 6 Redistribution and use in source and binary forms, with or without 7 modification, are permitted provided that the following conditions are met: 8 9 1. Redistributions of source code must retain the above copyright notice, 10 this list of conditions and the following disclaimer. 11 --- 13 unchanged lines hidden (view full) --- 25 CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 26 SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 27 INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 28 CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 29 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 30 POSSIBILITY OF SUCH DAMAGE. 31 32******************************************************************************/ | 4 All rights reserved. 5 6 Redistribution and use in source and binary forms, with or without 7 modification, are permitted provided that the following conditions are met: 8 9 1. Redistributions of source code must retain the above copyright notice, 10 this list of conditions and the following disclaimer. 11 --- 13 unchanged lines hidden (view full) --- 25 CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 26 SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 27 INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 28 CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 29 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 30 POSSIBILITY OF SUCH DAMAGE. 31 32******************************************************************************/ |
| 33/*$FreeBSD: stable/10/sys/dev/ixl/i40e_adminq.c 291248 2015-11-24 11:09:39Z smh $*/ | 33/*$FreeBSD: stable/10/sys/dev/ixl/i40e_adminq.c 292095 2015-12-11 12:20:58Z smh $*/ |
| 34 35#include "i40e_status.h" 36#include "i40e_type.h" 37#include "i40e_register.h" 38#include "i40e_adminq.h" 39#include "i40e_prototype.h" 40 41/** --- 567 unchanged lines hidden (view full) --- 609 retry++; 610 i40e_msec_delay(100); 611 i40e_resume_aq(hw); 612 } while (retry < 10); 613 if (ret_code != I40E_SUCCESS) 614 goto init_adminq_free_arq; 615 616 /* get the NVM version info */ | 34 35#include "i40e_status.h" 36#include "i40e_type.h" 37#include "i40e_register.h" 38#include "i40e_adminq.h" 39#include "i40e_prototype.h" 40 41/** --- 567 unchanged lines hidden (view full) --- 609 retry++; 610 i40e_msec_delay(100); 611 i40e_resume_aq(hw); 612 } while (retry < 10); 613 if (ret_code != I40E_SUCCESS) 614 goto init_adminq_free_arq; 615 616 /* get the NVM version info */ |
| 617 i40e_read_nvm_word(hw, I40E_SR_NVM_IMAGE_VERSION, &hw->nvm.version); | 617 i40e_read_nvm_word(hw, I40E_SR_NVM_DEV_STARTER_VERSION, 618 &hw->nvm.version); |
| 618 i40e_read_nvm_word(hw, I40E_SR_NVM_EETRACK_LO, &eetrack_lo); 619 i40e_read_nvm_word(hw, I40E_SR_NVM_EETRACK_HI, &eetrack_hi); 620 hw->nvm.eetrack = (eetrack_hi << 16) | eetrack_lo; 621 622 if (hw->aq.api_maj_ver > I40E_FW_API_VERSION_MAJOR) { 623 ret_code = I40E_ERR_FIRMWARE_API_VERSION; 624 goto init_adminq_free_arq; 625 } --- 437 unchanged lines hidden --- | 619 i40e_read_nvm_word(hw, I40E_SR_NVM_EETRACK_LO, &eetrack_lo); 620 i40e_read_nvm_word(hw, I40E_SR_NVM_EETRACK_HI, &eetrack_hi); 621 hw->nvm.eetrack = (eetrack_hi << 16) | eetrack_lo; 622 623 if (hw->aq.api_maj_ver > I40E_FW_API_VERSION_MAJOR) { 624 ret_code = I40E_ERR_FIRMWARE_API_VERSION; 625 goto init_adminq_free_arq; 626 } --- 437 unchanged lines hidden --- |