6064 ixgbe needs X550 support

          --- old/usr/src/uts/common/io/ixgbe/ixgbe_x540.h
          +++ new/usr/src/uts/common/io/ixgbe/ixgbe_x540.h
   1    1  /******************************************************************************
   2    2  
   3      -  Copyright (c) 2001-2012, Intel Corporation 
        3 +  Copyright (c) 2001-2015, Intel Corporation 
   4    4    All rights reserved.
   5    5    
   6    6    Redistribution and use in source and binary forms, with or without 
   7    7    modification, are permitted provided that the following conditions are met:
   8    8    
   9    9     1. Redistributions of source code must retain the above copyright notice, 
  10   10        this list of conditions and the following disclaimer.
  11   11    
  12   12     2. Redistributions in binary form must reproduce the above copyright 
  13   13        notice, this list of conditions and the following disclaimer in the 

  14   14        documentation and/or other materials provided with the distribution.
  15   15    
  16   16     3. Neither the name of the Intel Corporation nor the names of its 
  17   17        contributors may be used to endorse or promote products derived from 
  18   18        this software without specific prior written permission.
  19   19    
  20   20    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  21   21    AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
  22   22    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
  23   23    ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
  24   24    LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
  25   25    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
  26   26    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
  27   27    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
  28   28    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
  29   29    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  30   30    POSSIBILITY OF SUCH DAMAGE.
  31   31  
  32   32  ******************************************************************************/
  33   33  /*$FreeBSD$*/

  34   34  
  35   35  #ifndef _IXGBE_X540_H_
  36   36  #define _IXGBE_X540_H_
  37   37  
  38   38  #include "ixgbe_type.h"
  39   39  
  40   40  s32 ixgbe_get_link_capabilities_X540(struct ixgbe_hw *hw,
  41   41                                       ixgbe_link_speed *speed, bool *autoneg);
  42   42  enum ixgbe_media_type ixgbe_get_media_type_X540(struct ixgbe_hw *hw);
  43   43  s32 ixgbe_setup_mac_link_X540(struct ixgbe_hw *hw, ixgbe_link_speed speed,
  44      -                              bool autoneg, bool link_up_wait_to_complete);
       44 +                              bool link_up_wait_to_complete);
  45   45  s32 ixgbe_reset_hw_X540(struct ixgbe_hw *hw);
  46   46  s32 ixgbe_start_hw_X540(struct ixgbe_hw *hw);
  47   47  u32 ixgbe_get_supported_physical_layer_X540(struct ixgbe_hw *hw);
  48   48  
  49   49  s32 ixgbe_init_eeprom_params_X540(struct ixgbe_hw *hw);
  50   50  s32 ixgbe_read_eerd_X540(struct ixgbe_hw *hw, u16 offset, u16 *data);
  51   51  s32 ixgbe_read_eerd_buffer_X540(struct ixgbe_hw *hw, u16 offset, u16 words,
  52   52                                  u16 *data);
  53   53  s32 ixgbe_write_eewr_X540(struct ixgbe_hw *hw, u16 offset, u16 data);
  54   54  s32 ixgbe_write_eewr_buffer_X540(struct ixgbe_hw *hw, u16 offset, u16 words,
  55   55                                   u16 *data);
  56   56  s32 ixgbe_update_eeprom_checksum_X540(struct ixgbe_hw *hw);
  57   57  s32 ixgbe_validate_eeprom_checksum_X540(struct ixgbe_hw *hw, u16 *checksum_val);
  58      -u16 ixgbe_calc_eeprom_checksum_X540(struct ixgbe_hw *hw);
       58 +s32 ixgbe_calc_eeprom_checksum_X540(struct ixgbe_hw *hw);
       59 +s32 ixgbe_update_flash_X540(struct ixgbe_hw *hw);
  59   60  
  60      -s32 ixgbe_acquire_swfw_sync_X540(struct ixgbe_hw *hw, u16 mask);
  61      -void ixgbe_release_swfw_sync_X540(struct ixgbe_hw *hw, u16 mask);
       61 +s32 ixgbe_acquire_swfw_sync_X540(struct ixgbe_hw *hw, u32 mask);
       62 +void ixgbe_release_swfw_sync_X540(struct ixgbe_hw *hw, u32 mask);
  62   63  
  63   64  s32 ixgbe_blink_led_start_X540(struct ixgbe_hw *hw, u32 index);
  64   65  s32 ixgbe_blink_led_stop_X540(struct ixgbe_hw *hw, u32 index);
  65   66  #endif /* _IXGBE_X540_H_ */
       67 +
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX