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

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

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



Move #defines, function prototypes and data types which are applicable to
all/most devices supported by the driver but are specific to the
manageability component of each device to the new manage.h header file.
These #defines, function prototypes and data types can be used by other
files in the driver and moving them to the manageability-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 d2263113

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

+0 −6
Original line number Diff line number Diff line
@@ -510,8 +510,6 @@ 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 bool e1000e_enable_mng_pass_thru(struct e1000_hw *hw);



extern void e1000e_ptp_init(struct e1000_adapter *adapter);

extern void e1000e_ptp_remove(struct e1000_adapter *adapter);
@@ -575,10 +573,6 @@ static inline s32 e1000_get_phy_info(struct e1000_hw *hw) 
	return hw->phy.ops.get_info(hw);

}



extern bool e1000e_check_mng_mode_generic(struct e1000_hw *hw);

extern bool e1000e_enable_tx_pkt_filtering(struct e1000_hw *hw);

extern s32 e1000e_mng_write_dhcp_info(struct e1000_hw *hw, u8 *buffer, u16 length);



static inline u32 __er32(struct e1000_hw *hw, unsigned long reg)

{

	return readl(hw->hw_addr + reg);

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

+1 −22
Original line number Diff line number Diff line
@@ -244,28 +244,6 @@ enum e1e_registers { 
	E1000_RXUDP     = 0x0B638, /* Timesync Rx UDP Port - RW */

};



/* manage.c */

#define E1000_VFTA_ENTRY_SHIFT		5

#define E1000_VFTA_ENTRY_MASK		0x7F

#define E1000_VFTA_ENTRY_BIT_SHIFT_MASK	0x1F



#define E1000_HICR_EN			0x01  /* Enable bit - RO */

/* Driver sets this bit when done to put command in RAM */

#define E1000_HICR_C			0x02

#define E1000_HICR_FW_RESET_ENABLE	0x40

#define E1000_HICR_FW_RESET		0x80



#define E1000_FWSM_MODE_MASK		0xE

#define E1000_FWSM_MODE_SHIFT		1



#define E1000_MNG_IAMT_MODE		0x3

#define E1000_MNG_DHCP_COOKIE_LENGTH	0x10

#define E1000_MNG_DHCP_COOKIE_OFFSET	0x6F0

#define E1000_MNG_DHCP_COMMAND_TIMEOUT	10

#define E1000_MNG_DHCP_TX_PAYLOAD_CMD	64

#define E1000_MNG_DHCP_COOKIE_STATUS_PARSING	0x1

#define E1000_MNG_DHCP_COOKIE_STATUS_VLAN	0x2



#define E1000_DEV_ID_82571EB_COPPER		0x105E

#define E1000_DEV_ID_82571EB_FIBER		0x105F

#define E1000_DEV_ID_82571EB_SERDES		0x1060
@@ -675,6 +653,7 @@ struct e1000_host_mng_command_info { 
#include "mac.h"

#include "phy.h"

#include "nvm.h"

#include "manage.h"



/* Function pointers for the MAC. */

struct e1000_mac_operations {

drivers/net/ethernet/intel/e1000e/manage.c

+0 −13
Original line number Diff line number Diff line
@@ -28,19 +28,6 @@ 


#include "e1000.h"



enum e1000_mng_mode {

	e1000_mng_mode_none = 0,

	e1000_mng_mode_asf,

	e1000_mng_mode_pt,

	e1000_mng_mode_ipmi,

	e1000_mng_mode_host_if_only

};



#define E1000_FACTPS_MNGCG		0x20000000



/* Intel(R) Active Management Technology signature */

#define E1000_IAMT_SIGNATURE		0x544D4149



/**

 *  e1000_calculate_checksum - Calculate checksum for buffer

 *  @buffer: pointer to EEPROM

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

0 → 100644
+72 −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_MANAGE_H_

#define _E1000E_MANAGE_H_



bool e1000e_check_mng_mode_generic(struct e1000_hw *hw);

bool e1000e_enable_tx_pkt_filtering(struct e1000_hw *hw);

s32 e1000e_mng_write_dhcp_info(struct e1000_hw *hw, u8 *buffer, u16 length);

bool e1000e_enable_mng_pass_thru(struct e1000_hw *hw);



enum e1000_mng_mode {

	e1000_mng_mode_none = 0,

	e1000_mng_mode_asf,

	e1000_mng_mode_pt,

	e1000_mng_mode_ipmi,

	e1000_mng_mode_host_if_only

};



#define E1000_FACTPS_MNGCG			0x20000000



#define E1000_FWSM_MODE_MASK			0xE

#define E1000_FWSM_MODE_SHIFT			1



#define E1000_MNG_IAMT_MODE			0x3

#define E1000_MNG_DHCP_COOKIE_LENGTH		0x10

#define E1000_MNG_DHCP_COOKIE_OFFSET		0x6F0

#define E1000_MNG_DHCP_COMMAND_TIMEOUT		10

#define E1000_MNG_DHCP_TX_PAYLOAD_CMD		64

#define E1000_MNG_DHCP_COOKIE_STATUS_PARSING	0x1

#define E1000_MNG_DHCP_COOKIE_STATUS_VLAN	0x2



#define E1000_VFTA_ENTRY_SHIFT			5

#define E1000_VFTA_ENTRY_MASK			0x7F

#define E1000_VFTA_ENTRY_BIT_SHIFT_MASK		0x1F



#define E1000_HICR_EN			0x01	/* Enable bit - RO */

/* Driver sets this bit when done to put command in RAM */

#define E1000_HICR_C			0x02

#define E1000_HICR_SV			0x04	/* Status Validity */

#define E1000_HICR_FW_RESET_ENABLE	0x40

#define E1000_HICR_FW_RESET		0x80



/* Intel(R) Active Management Technology signature */

#define E1000_IAMT_SIGNATURE		0x544D4149



#endif