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

Commit 441fc6fd authored by Carolyn Wyborny's avatar Carolyn Wyborny Committed by Jeff Kirsher
Browse files

igb: Add i2c interface to igb. 



Some of our adapters have sensors on them accessible via i2c and a private
interface.  This patch implements the kernel interface for i2c to those sensors.
Subsequent patches will provide functions to export that data.

Signed-off-by: default avatarCarolyn Wyborny <carolyn.wyborny@intel.com>
Tested-by: default avatarJeff Pieper <jeffrey.e.pieper@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent fa44f2f1

drivers/net/ethernet/intel/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -94,6 +94,8 @@ config IGB 
	tristate "Intel(R) 82575/82576 PCI-Express Gigabit Ethernet support"

	depends on PCI

	select PTP_1588_CLOCK

	select I2C

	select I2C_ALGOBIT

	---help---

	  This driver supports Intel(R) 82575/82576 gigabit ethernet family of

	  adapters.  For more information on how to identify your adapter, go

drivers/net/ethernet/intel/igb/e1000_82575.c

+3 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 


#include <linux/types.h>

#include <linux/if_ether.h>

#include <linux/i2c.h>



#include "e1000_mac.h"

#include "e1000_82575.h"
@@ -2314,6 +2315,8 @@ static struct e1000_phy_operations e1000_phy_ops_82575 = { 
	.acquire              = igb_acquire_phy_82575,

	.get_cfg_done         = igb_get_cfg_done_82575,

	.release              = igb_release_phy_82575,

	.write_i2c_byte       = igb_write_i2c_byte,

	.read_i2c_byte        = igb_read_i2c_byte,

};



static struct e1000_nvm_operations e1000_nvm_ops_82575 = {

drivers/net/ethernet/intel/igb/e1000_82575.h

+6 −0
Original line number Diff line number Diff line
@@ -32,6 +32,10 @@ extern void igb_shutdown_serdes_link_82575(struct e1000_hw *hw); 
extern void igb_power_up_serdes_link_82575(struct e1000_hw *hw);

extern void igb_power_down_phy_copper_82575(struct e1000_hw *hw);

extern void igb_rx_fifo_flush_82575(struct e1000_hw *hw);

extern s32 igb_read_i2c_byte(struct e1000_hw *hw, u8 byte_offset,

				u8 dev_addr, u8 *data);

extern s32 igb_write_i2c_byte(struct e1000_hw *hw, u8 byte_offset,

				 u8 dev_addr, u8 data);



#define ID_LED_DEFAULT_82575_SERDES ((ID_LED_DEF1_DEF2 << 12) | \

                                     (ID_LED_DEF1_DEF2 <<  8) | \
@@ -261,4 +265,6 @@ void igb_vmdq_set_replication_pf(struct e1000_hw *, bool); 
u16 igb_rxpbs_adjust_82580(u32 data);

s32 igb_set_eee_i350(struct e1000_hw *);



#define E1000_I2C_THERMAL_SENSOR_ADDR	0xF8



#endif

drivers/net/ethernet/intel/igb/e1000_defines.h

+1 −0
Original line number Diff line number Diff line
@@ -470,6 +470,7 @@ 
#define E1000_ERR_NO_SPACE          17

#define E1000_ERR_NVM_PBA_SECTION   18

#define E1000_ERR_INVM_VALUE_NOT_FOUND	19

#define E1000_ERR_I2C               20



/* Loop limit on how long we wait for auto-negotiation to complete */

#define COPPER_LINK_UP_LIMIT              10

drivers/net/ethernet/intel/igb/e1000_hw.h

+2 −0
Original line number Diff line number Diff line
@@ -342,6 +342,8 @@ struct e1000_phy_operations { 
	s32  (*set_d0_lplu_state)(struct e1000_hw *, bool);

	s32  (*set_d3_lplu_state)(struct e1000_hw *, bool);

	s32  (*write_reg)(struct e1000_hw *, u32, u16);

	s32 (*read_i2c_byte)(struct e1000_hw *, u8, u8, u8 *);

	s32 (*write_i2c_byte)(struct e1000_hw *, u8, u8, u8);

};



struct e1000_nvm_operations {