ixgbe: Fix IOSF SB access issues
Subsystems (2)
PATCH 1/1 ixgbe: Fix IOSF SB access issues
IOSF is the Intel On-chip System Fabric used in SOCs. IOSF SB is the IOSF SideBand message interface. This patch serializes IOSF SB access using both phy bits in the SWFW_SEMAPHORE register. It also adds a helper function to wait for IOSF SB accesses to complete. Use the new function to perform this wait before each access, as specified in the datasheet, in addition to using it to wait for IOSF SB read/write completion.
---
0 files changed
drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c +65 -37
@@ -103,6 +103,39 @@ static s32 ixgbe_init_eeprom_params_X550(struct ixgbe_hw *hw)return 0 ; } +/** +* ixgbe_iosf_wait - Wait for IOSF command completion +* @hw: pointer to hardware structure +* @ctrl: pointer to location to receive final IOSF control value +* +* Return: failing status on timeout +* +* Note: ctrl can be NULL if the IOSF control register value is not needed +*/ +static s32 ixgbe_iosf_wait (struct ixgbe_hw *hw,u32 *ctrl) +{ +u32 i, command; + +/* Check every 10 usec to see if the address cycle completed. +* The SB IOSF BUSY bit will clear when the operation is +* complete. +*/ +for (i =0 ; i <IXGBE_MDIO_COMMAND_TIMEOUT ; i++) { + command =IXGBE_READ_REG (hw,IXGBE_SB_IOSF_INDIRECT_CTRL ); +if (!(command &IXGBE_SB_IOSF_CTRL_BUSY )) +break ; +usleep_range (10 ,20 ); + } +if (ctrl) + *ctrl = command; +if (i ==IXGBE_MDIO_COMMAND_TIMEOUT ) { +hw_dbg (hw,"IOSF wait timed out\n" ); +return IXGBE_ERR_PHY ; + } + +return 0 ; +} +/** ixgbe_read_iosf_sb_reg_x550 - Writes a value to specified register of the * IOSF device * @hw: pointer to hardware structure
@@ -113,7 +146,17 @@ static s32 ixgbe_init_eeprom_params_X550(struct ixgbe_hw *hw)static s32 ixgbe_read_iosf_sb_reg_x550 (struct ixgbe_hw *hw,u32 reg_addr,u32 device_type,u32 *data) { -u32 i, command, error; +u32 gssr =IXGBE_GSSR_PHY1_SM |IXGBE_GSSR_PHY0_SM ; +u32 command, error; +s32 ret; + + ret = hw->mac.ops.acquire_swfw_sync (hw, gssr); +if (ret) +return ret; + + ret =ixgbe_iosf_wait (hw,NULL ); +if (ret) + goto out; command = ((reg_addr <<IXGBE_SB_IOSF_CTRL_ADDR_SHIFT ) | (device_type <<IXGBE_SB_IOSF_CTRL_TARGET_SELECT_SHIFT ));
@@ -121,17 +164,7 @@ static s32 ixgbe_read_iosf_sb_reg_x550(struct ixgbe_hw *hw, u32 reg_addr,/* Write IOSF control register */ IXGBE_WRITE_REG (hw,IXGBE_SB_IOSF_INDIRECT_CTRL , command); -/* Check every 10 usec to see if the address cycle completed. -* The SB IOSF BUSY bit will clear when the operation is -* complete -*/ -for (i =0 ; i <IXGBE_MDIO_COMMAND_TIMEOUT ; i++) { -usleep_range (10 ,20 ); - - command =IXGBE_READ_REG (hw,IXGBE_SB_IOSF_INDIRECT_CTRL ); -if ((command &IXGBE_SB_IOSF_CTRL_BUSY ) ==0 ) -break ; - } + ret =ixgbe_iosf_wait (hw, &command);if ((command &IXGBE_SB_IOSF_CTRL_RESP_STAT_MASK ) !=0 ) { error = (command & IXGBE_SB_IOSF_CTRL_CMPL_ERR_MASK) >>
@@ -140,14 +173,12 @@ static s32 ixgbe_read_iosf_sb_reg_x550(struct ixgbe_hw *hw, u32 reg_addr,return IXGBE_ERR_PHY ; } -if (i ==IXGBE_MDIO_COMMAND_TIMEOUT ) { -hw_dbg (hw,"Read timed out\n" ); -return IXGBE_ERR_PHY ; - } - - *data =IXGBE_READ_REG (hw,IXGBE_SB_IOSF_INDIRECT_DATA ); +if (!ret) + *data =IXGBE_READ_REG (hw,IXGBE_SB_IOSF_INDIRECT_DATA ); -return 0 ; +out: + hw->mac.ops.release_swfw_sync (hw, gssr); +return ret; }/** ixgbe_read_ee_hostif_data_X550 - Read EEPROM word using a host interface
@@ -789,7 +820,17 @@ static s32 ixgbe_get_link_capabilities_X550em(struct ixgbe_hw *hw,static s32 ixgbe_write_iosf_sb_reg_x550 (struct ixgbe_hw *hw,u32 reg_addr,u32 device_type,u32 data) { -u32 i, command, error; +u32 gssr =IXGBE_GSSR_PHY1_SM |IXGBE_GSSR_PHY0_SM ; +u32 command, error; +s32 ret; + + ret = hw->mac.ops.acquire_swfw_sync (hw, gssr); +if (ret) +return ret; + + ret =ixgbe_iosf_wait (hw,NULL ); +if (ret) + goto out; command = ((reg_addr <<IXGBE_SB_IOSF_CTRL_ADDR_SHIFT ) | (device_type <<IXGBE_SB_IOSF_CTRL_TARGET_SELECT_SHIFT ));
@@ -800,17 +841,7 @@ static s32 ixgbe_write_iosf_sb_reg_x550(struct ixgbe_hw *hw, u32 reg_addr,/* Write IOSF data register */ IXGBE_WRITE_REG (hw,IXGBE_SB_IOSF_INDIRECT_DATA , data); -/* Check every 10 usec to see if the address cycle completed. -* The SB IOSF BUSY bit will clear when the operation is -* complete -*/ -for (i =0 ; i <IXGBE_MDIO_COMMAND_TIMEOUT ; i++) { -usleep_range (10 ,20 ); - - command =IXGBE_READ_REG (hw,IXGBE_SB_IOSF_INDIRECT_CTRL ); -if ((command &IXGBE_SB_IOSF_CTRL_BUSY ) ==0 ) -break ; - } + ret =ixgbe_iosf_wait (hw, &command);if ((command &IXGBE_SB_IOSF_CTRL_RESP_STAT_MASK ) !=0 ) { error = (command & IXGBE_SB_IOSF_CTRL_CMPL_ERR_MASK) >>
@@ -819,12 +850,9 @@ static s32 ixgbe_write_iosf_sb_reg_x550(struct ixgbe_hw *hw, u32 reg_addr,return IXGBE_ERR_PHY ; } -if (i ==IXGBE_MDIO_COMMAND_TIMEOUT ) { -hw_dbg (hw,"Write timed out\n" ); -return IXGBE_ERR_PHY ; - } - -return 0 ; +out: + hw->mac.ops.release_swfw_sync (hw, gssr); +return ret; }/** ixgbe_setup_ixfi_x550em - Configure the KR PHY for iXFI mode.
PATCH 1/1 ixgbe: Fix IOSF SB access issues
Quoted 9 lines · Mark D Rustad
IOSF is the Intel On-chip System Fabric used in SOCs. IOSF SB is the IOSF SideBand message interface. This patch serializes IOSF SB access using both phy bits in the
SWFW_SEMAPHOREregister. It also adds a helper function to wait for IOSF SB accesses to complete. Use the new function to perform this wait before each access, as specified in the datasheet, in addition to using it to wait for IOSF SB read/write completion.Signed-off-by Mark Rustad <[email protected]>
Thanks Mark, I have applied your patch to my queue.
Signature · 9 lines
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue.git dev-queue -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: This is a digitally signed message part URL: <http://lists.osuosl.org/pipermail/intel-wired-lan/attachments/20150410/060db0fc/attachment-0001.asc>
Schmitt
PATCH 1/1 ixgbe: Fix IOSF SB access issues
Quoted 19 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Jeff Kirsher
Sent: Friday, April 10, 2015 3:55 PM
To: Rustad, Mark D
Cc: intel-wired-lan at lists.osuosl.org
Subject: Re: [Intel-wired-lan] [PATCH] ixgbe: Fix IOSF SB access issuesQuoted 8 lines · Mark D Rustad
IOSF is the Intel On-chip System Fabric used in SOCs. IOSF SB is the IOSF SideBand message interface. This patch serializes IOSF SB access using both phy bits in the
SWFW_SEMAPHOREregister. It also adds a helper function to wait for IOSF SB accesses to complete. Use the new function to perform this wait before each access, as specified in the datasheet, in addition to using it to wait for IOSF SB read/write completion.
Quoted 6 lines
Quoted 1 line
Signed-off-by Mark Rustad <[email protected]>Thanks Mark, I have applied your patch to my queue. --
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue.git
dev-queue