Commit 5ccdcecb authored by Bruce Allan's avatar Bruce Allan Committed by David S. Miller
Browse files

e1000e: allow for swflag to be held over consecutive PHY accesses 



PCH-based parts (82577/82578) and some ICH8-based parts (82566) need to
hold the swflag (sw/fw/hw hardware semaphore) over consecutive PHY accesses
in order to perform sw-driven PHY configuration during initialization to
workaround known hardware issues (see follow-on patch).  This patch
provides new PHY read/write functions (and function pointers) that will
allow accessing the PHY registers assuming the swflag has already been
acquired.  The actual PHY register access code has moved into helper
functions that are called with a flag indicating whether or not the swflag
has already been acquired and acquires/releases it if not.

The functions called from within the updated PHY access functions had to be
updated to assume the swflag was already acquired, and other functions that
called those functions were also updated to acquire/release the swflag.

Signed-off-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ca15df58

drivers/net/e1000e/e1000.h

+12 −0
Original line number Original line Diff line number Diff line
@@ -519,9 +519,13 @@ extern s32 e1000e_phy_force_speed_duplex_igp(struct e1000_hw *hw); 
extern s32 e1000e_get_cable_length_igp_2(struct e1000_hw *hw);

extern s32 e1000e_get_cable_length_igp_2(struct e1000_hw *hw);

extern s32 e1000e_get_phy_info_igp(struct e1000_hw *hw);

extern s32 e1000e_get_phy_info_igp(struct e1000_hw *hw);

extern s32 e1000e_read_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 *data);

extern s32 e1000e_read_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 *data);

extern s32 e1000e_read_phy_reg_igp_locked(struct e1000_hw *hw, u32 offset,

                                          u16 *data);

extern s32 e1000e_phy_hw_reset_generic(struct e1000_hw *hw);

extern s32 e1000e_phy_hw_reset_generic(struct e1000_hw *hw);

extern s32 e1000e_set_d3_lplu_state(struct e1000_hw *hw, bool active);

extern s32 e1000e_set_d3_lplu_state(struct e1000_hw *hw, bool active);

extern s32 e1000e_write_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 data);

extern s32 e1000e_write_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 data);

extern s32 e1000e_write_phy_reg_igp_locked(struct e1000_hw *hw, u32 offset,

                                           u16 data);

extern s32 e1000e_phy_sw_reset(struct e1000_hw *hw);

extern s32 e1000e_phy_sw_reset(struct e1000_hw *hw);

extern s32 e1000e_phy_force_speed_duplex_m88(struct e1000_hw *hw);

extern s32 e1000e_phy_force_speed_duplex_m88(struct e1000_hw *hw);

extern s32 e1000e_get_cfg_done(struct e1000_hw *hw);

extern s32 e1000e_get_cfg_done(struct e1000_hw *hw);
@@ -538,7 +542,11 @@ extern s32 e1000e_read_phy_reg_bm2(struct e1000_hw *hw, u32 offset, u16 *data); 
extern s32 e1000e_write_phy_reg_bm2(struct e1000_hw *hw, u32 offset, u16 data);

extern s32 e1000e_write_phy_reg_bm2(struct e1000_hw *hw, u32 offset, u16 data);

extern void e1000e_phy_force_speed_duplex_setup(struct e1000_hw *hw, u16 *phy_ctrl);

extern void e1000e_phy_force_speed_duplex_setup(struct e1000_hw *hw, u16 *phy_ctrl);

extern s32 e1000e_write_kmrn_reg(struct e1000_hw *hw, u32 offset, u16 data);

extern s32 e1000e_write_kmrn_reg(struct e1000_hw *hw, u32 offset, u16 data);

extern s32 e1000e_write_kmrn_reg_locked(struct e1000_hw *hw, u32 offset,

                                        u16 data);

extern s32 e1000e_read_kmrn_reg(struct e1000_hw *hw, u32 offset, u16 *data);

extern s32 e1000e_read_kmrn_reg(struct e1000_hw *hw, u32 offset, u16 *data);

extern s32 e1000e_read_kmrn_reg_locked(struct e1000_hw *hw, u32 offset,

                                       u16 *data);

extern s32 e1000e_phy_has_link_generic(struct e1000_hw *hw, u32 iterations,

extern s32 e1000e_phy_has_link_generic(struct e1000_hw *hw, u32 iterations,

			       u32 usec_interval, bool *success);

			       u32 usec_interval, bool *success);

extern s32 e1000e_phy_reset_dsp(struct e1000_hw *hw);

extern s32 e1000e_phy_reset_dsp(struct e1000_hw *hw);
@@ -546,7 +554,11 @@ extern s32 e1000e_read_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 *data); 
extern s32 e1000e_write_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 data);

extern s32 e1000e_write_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 data);

extern s32 e1000e_check_downshift(struct e1000_hw *hw);

extern s32 e1000e_check_downshift(struct e1000_hw *hw);

extern s32 e1000_read_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 *data);

extern s32 e1000_read_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 *data);

extern s32 e1000_read_phy_reg_hv_locked(struct e1000_hw *hw, u32 offset,

                                        u16 *data);

extern s32 e1000_write_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 data);

extern s32 e1000_write_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 data);

extern s32 e1000_write_phy_reg_hv_locked(struct e1000_hw *hw, u32 offset,

                                         u16 data);

extern s32 e1000_set_mdio_slow_mode_hv(struct e1000_hw *hw, bool slow);

extern s32 e1000_set_mdio_slow_mode_hv(struct e1000_hw *hw, bool slow);

extern s32 e1000_link_stall_workaround_hv(struct e1000_hw *hw);

extern s32 e1000_link_stall_workaround_hv(struct e1000_hw *hw);

extern s32 e1000_copper_link_setup_82577(struct e1000_hw *hw);

extern s32 e1000_copper_link_setup_82577(struct e1000_hw *hw);

drivers/net/e1000e/hw.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -764,11 +764,13 @@ struct e1000_phy_operations { 
	s32  (*get_cable_length)(struct e1000_hw *);

	s32  (*get_cable_length)(struct e1000_hw *);

	s32  (*get_phy_info)(struct e1000_hw *);

	s32  (*get_phy_info)(struct e1000_hw *);

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

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

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

	void (*release_phy)(struct e1000_hw *);

	void (*release_phy)(struct e1000_hw *);

	s32  (*reset_phy)(struct e1000_hw *);

	s32  (*reset_phy)(struct e1000_hw *);

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

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

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

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

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

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

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

	s32  (*cfg_on_link_up)(struct e1000_hw *);

	s32  (*cfg_on_link_up)(struct e1000_hw *);

};

};

drivers/net/e1000e/ich8lan.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -250,9 +250,11 @@ static s32 e1000_init_phy_params_pchlan(struct e1000_hw *hw) 




	phy->ops.check_polarity       = e1000_check_polarity_ife_ich8lan;

	phy->ops.check_polarity       = e1000_check_polarity_ife_ich8lan;

	phy->ops.read_phy_reg         = e1000_read_phy_reg_hv;

	phy->ops.read_phy_reg         = e1000_read_phy_reg_hv;

	phy->ops.read_phy_reg_locked  = e1000_read_phy_reg_hv_locked;

	phy->ops.set_d0_lplu_state    = e1000_set_lplu_state_pchlan;

	phy->ops.set_d0_lplu_state    = e1000_set_lplu_state_pchlan;

	phy->ops.set_d3_lplu_state    = e1000_set_lplu_state_pchlan;

	phy->ops.set_d3_lplu_state    = e1000_set_lplu_state_pchlan;

	phy->ops.write_phy_reg        = e1000_write_phy_reg_hv;

	phy->ops.write_phy_reg        = e1000_write_phy_reg_hv;

	phy->ops.write_phy_reg_locked = e1000_write_phy_reg_hv_locked;

	phy->autoneg_mask             = AUTONEG_ADVERTISE_SPEED_DEFAULT;

	phy->autoneg_mask             = AUTONEG_ADVERTISE_SPEED_DEFAULT;





	phy->id = e1000_phy_unknown;

	phy->id = e1000_phy_unknown;
@@ -313,6 +315,8 @@ static s32 e1000_init_phy_params_ich8lan(struct e1000_hw *hw) 
	case IGP03E1000_E_PHY_ID:

	case IGP03E1000_E_PHY_ID:

		phy->type = e1000_phy_igp_3;

		phy->type = e1000_phy_igp_3;

		phy->autoneg_mask = AUTONEG_ADVERTISE_SPEED_DEFAULT;

		phy->autoneg_mask = AUTONEG_ADVERTISE_SPEED_DEFAULT;

		phy->ops.read_phy_reg_locked = e1000e_read_phy_reg_igp_locked;

		phy->ops.write_phy_reg_locked = e1000e_write_phy_reg_igp_locked;

		break;

		break;

	case IFE_E_PHY_ID:

	case IFE_E_PHY_ID:

	case IFE_PLUS_E_PHY_ID:

	case IFE_PLUS_E_PHY_ID:

drivers/net/e1000e/phy.c

+328 −141

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE