fm10k: use spinlock to implement mailbox lock
Lets not re-invent the locking wheel. Remove our bitlock and use a proper spinlock instead. Signed-off-by: Jacob Keller <jacob.e.keller@intel.com> Tested-by: Krishneil Singh <krishneil.k.singh@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
parent
0b40f45748
commit
b4fcd43661
drivers/net/ethernet/intel/fm10k
|
@ -276,7 +276,6 @@ enum fm10k_state_t {
|
||||||
__FM10K_SERVICE_SCHED,
|
__FM10K_SERVICE_SCHED,
|
||||||
__FM10K_SERVICE_REQUEST,
|
__FM10K_SERVICE_REQUEST,
|
||||||
__FM10K_SERVICE_DISABLE,
|
__FM10K_SERVICE_DISABLE,
|
||||||
__FM10K_MBX_LOCK,
|
|
||||||
__FM10K_LINK_DOWN,
|
__FM10K_LINK_DOWN,
|
||||||
__FM10K_UPDATING_STATS,
|
__FM10K_UPDATING_STATS,
|
||||||
/* This value must be last and determines the BITMAP size */
|
/* This value must be last and determines the BITMAP size */
|
||||||
|
@ -346,6 +345,8 @@ struct fm10k_intfc {
|
||||||
|
|
||||||
struct fm10k_hw_stats stats;
|
struct fm10k_hw_stats stats;
|
||||||
struct fm10k_hw hw;
|
struct fm10k_hw hw;
|
||||||
|
/* Mailbox lock */
|
||||||
|
spinlock_t mbx_lock;
|
||||||
u32 __iomem *uc_addr;
|
u32 __iomem *uc_addr;
|
||||||
u32 __iomem *sw_addr;
|
u32 __iomem *sw_addr;
|
||||||
u16 msg_enable;
|
u16 msg_enable;
|
||||||
|
@ -386,23 +387,17 @@ struct fm10k_intfc {
|
||||||
|
|
||||||
static inline void fm10k_mbx_lock(struct fm10k_intfc *interface)
|
static inline void fm10k_mbx_lock(struct fm10k_intfc *interface)
|
||||||
{
|
{
|
||||||
/* busy loop if we cannot obtain the lock as some calls
|
spin_lock(&interface->mbx_lock);
|
||||||
* such as ndo_set_rx_mode may be made in atomic context
|
|
||||||
*/
|
|
||||||
while (test_and_set_bit(__FM10K_MBX_LOCK, interface->state))
|
|
||||||
udelay(20);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void fm10k_mbx_unlock(struct fm10k_intfc *interface)
|
static inline void fm10k_mbx_unlock(struct fm10k_intfc *interface)
|
||||||
{
|
{
|
||||||
/* flush memory to make sure state is correct */
|
spin_unlock(&interface->mbx_lock);
|
||||||
smp_mb__before_atomic();
|
|
||||||
clear_bit(__FM10K_MBX_LOCK, interface->state);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline int fm10k_mbx_trylock(struct fm10k_intfc *interface)
|
static inline int fm10k_mbx_trylock(struct fm10k_intfc *interface)
|
||||||
{
|
{
|
||||||
return !test_and_set_bit(__FM10K_MBX_LOCK, interface->state);
|
return spin_trylock(&interface->mbx_lock);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* fm10k_test_staterr - test bits in Rx descriptor status and error fields */
|
/* fm10k_test_staterr - test bits in Rx descriptor status and error fields */
|
||||||
|
|
|
@ -1921,6 +1921,9 @@ static int fm10k_sw_init(struct fm10k_intfc *interface,
|
||||||
netdev_rss_key_fill(rss_key, sizeof(rss_key));
|
netdev_rss_key_fill(rss_key, sizeof(rss_key));
|
||||||
memcpy(interface->rssrk, rss_key, sizeof(rss_key));
|
memcpy(interface->rssrk, rss_key, sizeof(rss_key));
|
||||||
|
|
||||||
|
/* Initialize the mailbox lock */
|
||||||
|
spin_lock_init(&interface->mbx_lock);
|
||||||
|
|
||||||
/* Start off interface as being down */
|
/* Start off interface as being down */
|
||||||
set_bit(__FM10K_DOWN, interface->state);
|
set_bit(__FM10K_DOWN, interface->state);
|
||||||
set_bit(__FM10K_UPDATING_STATS, interface->state);
|
set_bit(__FM10K_UPDATING_STATS, interface->state);
|
||||||
|
|
Loading…
Reference in New Issue