Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2263113 authored by Bruce Allan's avatar Bruce Allan Committed by Jeff Kirsher
Browse files

e1000e: cosmetic move of #defines and function prototypes to the new nvm.h 



Move #defines and function prototypes which are applicable to all/most
devices supported by the driver and are specific to the NVM component of
each device to the new nvm.h header file.  These #defines and function
prototypes can be used by other files in the driver and moving them to the
NVM-specific file makes it clearer to which component they are applicable.

Signed-off-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 93b9f8bf

drivers/net/ethernet/intel/e1000e/e1000.h

+0 −12
Original line number Diff line number Diff line
@@ -510,12 +510,8 @@ extern const struct e1000_info e1000_pch2_info; 
extern const struct e1000_info e1000_pch_lpt_info;

extern const struct e1000_info e1000_es2_info;



extern s32 e1000_read_pba_string_generic(struct e1000_hw *hw, u8 *pba_num,

					 u32 pba_num_size);



extern bool e1000e_enable_mng_pass_thru(struct e1000_hw *hw);



extern s32 e1000e_valid_led_default(struct e1000_hw *hw, u16 *data);

extern void e1000e_ptp_init(struct e1000_adapter *adapter);

extern void e1000e_ptp_remove(struct e1000_adapter *adapter);
@@ -544,15 +540,7 @@ static inline s32 e1e_wphy_locked(struct e1000_hw *hw, u32 offset, u16 data) 
	return hw->phy.ops.write_reg_locked(hw, offset, data);

}



extern s32 e1000e_acquire_nvm(struct e1000_hw *hw);

extern s32 e1000e_write_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words, u16 *data);

extern s32 e1000e_update_nvm_checksum_generic(struct e1000_hw *hw);

extern s32 e1000e_poll_eerd_eewr_done(struct e1000_hw *hw, int ee_reg);

extern s32 e1000e_read_nvm_eerd(struct e1000_hw *hw, u16 offset, u16 words, u16 *data);

extern s32 e1000e_validate_nvm_checksum_generic(struct e1000_hw *hw);

extern void e1000e_release_nvm(struct e1000_hw *hw);

extern void e1000e_reload_nvm_generic(struct e1000_hw *hw);

extern s32 e1000_read_mac_addr_generic(struct e1000_hw *hw);



static inline s32 e1000e_read_mac_addr(struct e1000_hw *hw)

{

drivers/net/ethernet/intel/e1000e/hw.h

+1 −3
Original line number Diff line number Diff line
@@ -266,9 +266,6 @@ enum e1e_registers { 
#define E1000_MNG_DHCP_COOKIE_STATUS_PARSING	0x1

#define E1000_MNG_DHCP_COOKIE_STATUS_VLAN	0x2



/* nvm.c */

#define E1000_STM_OPCODE  0xDB00



#define E1000_DEV_ID_82571EB_COPPER		0x105E

#define E1000_DEV_ID_82571EB_FIBER		0x105F

#define E1000_DEV_ID_82571EB_SERDES		0x1060
@@ -677,6 +674,7 @@ struct e1000_host_mng_command_info { 


#include "mac.h"

#include "phy.h"

#include "nvm.h"



/* Function pointers for the MAC. */

struct e1000_mac_operations {

drivers/net/ethernet/intel/e1000e/nvm.h

0 → 100644
+47 −0
Original line number Diff line number Diff line 
/*******************************************************************************



  Intel PRO/1000 Linux driver

  Copyright(c) 1999 - 2013 Intel Corporation.



  This program is free software; you can redistribute it and/or modify it

  under the terms and conditions of the GNU General Public License,

  version 2, as published by the Free Software Foundation.



  This program is distributed in the hope it will be useful, but WITHOUT

  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

  more details.



  You should have received a copy of the GNU General Public License along with

  this program; if not, write to the Free Software Foundation, Inc.,

  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.



  The full GNU General Public License is included in this distribution in

  the file called "COPYING".



  Contact Information:

  Linux NICS <linux.nics@intel.com>

  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>

  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497



*******************************************************************************/



#ifndef _E1000E_NVM_H_

#define _E1000E_NVM_H_



s32 e1000e_acquire_nvm(struct e1000_hw *hw);



s32 e1000e_poll_eerd_eewr_done(struct e1000_hw *hw, int ee_reg);

s32 e1000_read_mac_addr_generic(struct e1000_hw *hw);

s32 e1000_read_pba_string_generic(struct e1000_hw *hw, u8 *pba_num,

				  u32 pba_num_size);

s32 e1000e_read_nvm_eerd(struct e1000_hw *hw, u16 offset, u16 words, u16 *data);

s32 e1000e_valid_led_default(struct e1000_hw *hw, u16 *data);

s32 e1000e_validate_nvm_checksum_generic(struct e1000_hw *hw);

s32 e1000e_write_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words, u16 *data);

s32 e1000e_update_nvm_checksum_generic(struct e1000_hw *hw);

void e1000e_release_nvm(struct e1000_hw *hw);



#define E1000_STM_OPCODE	0xDB00



#endif