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

Commit bcad6e80 authored by David Kilroy's avatar David Kilroy Committed by John W. Linville
Browse files

orinoco: encapsulate driver locking 



Local bus and USB drivers will need to do locking differently.

The original orinoco_usb patches had a boolean variable controlling
whether spin_lock_bh was used, or irq based locking. This version
provides wrappers for the lock functions and the drivers specify the
functions pointers needed.

This will introduce a performance penalty, but I'm not expecting it to
be noticable.

Signed-off-by: default avatarDavid Kilroy <kilroyd@googlemail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 593ef09c

drivers/net/wireless/orinoco/airport.c

+2 −2
Original line number Diff line number Diff line
@@ -77,9 +77,9 @@ airport_resume(struct macio_dev *mdev) 


	enable_irq(card->irq);



	spin_lock_irqsave(&priv->lock, flags);

	priv->hw.ops->lock_irqsave(&priv->lock, &flags);

	err = orinoco_up(priv);

	spin_unlock_irqrestore(&priv->lock, flags);

	priv->hw.ops->unlock_irqrestore(&priv->lock, &flags);



	return err;

}

drivers/net/wireless/orinoco/hermes.c

+27 −1
Original line number Diff line number Diff line
@@ -529,6 +529,28 @@ static int hermes_write_ltv(hermes_t *hw, int bap, u16 rid, 
	return err;

}



static void hermes_lock_irqsave(spinlock_t *lock,

				unsigned long *flags) __acquires(lock)

{

	spin_lock_irqsave(lock, *flags);

}



static void hermes_unlock_irqrestore(spinlock_t *lock,

				     unsigned long *flags) __releases(lock)

{

	spin_unlock_irqrestore(lock, *flags);

}



static void hermes_lock_irq(spinlock_t *lock) __acquires(lock)

{

	spin_lock_irq(lock);

}



static void hermes_unlock_irq(spinlock_t *lock) __releases(lock)

{

	spin_unlock_irq(lock);

}



/* Hermes operations for local buses */

static const struct hermes_ops hermes_ops_local = {

	.init = hermes_init,
@@ -538,5 +560,9 @@ static const struct hermes_ops hermes_ops_local = { 
	.read_ltv = hermes_read_ltv,

	.write_ltv = hermes_write_ltv,

	.bap_pread = hermes_bap_pread,

	.bap_pwrite = hermes_bap_pwrite

	.bap_pwrite = hermes_bap_pwrite,

	.lock_irqsave = hermes_lock_irqsave,

	.unlock_irqrestore = hermes_unlock_irqrestore,

	.lock_irq = hermes_lock_irq,

	.unlock_irq = hermes_unlock_irq,

};

drivers/net/wireless/orinoco/hermes.h

+4 −0
Original line number Diff line number Diff line
@@ -393,6 +393,10 @@ struct hermes_ops { 
			 u16 id, u16 offset);

	int (*bap_pwrite)(struct hermes *hw, int bap, const void *buf,

			  int len, u16 id, u16 offset);

	void (*lock_irqsave)(spinlock_t *lock, unsigned long *flags);

	void (*unlock_irqrestore)(spinlock_t *lock, unsigned long *flags);

	void (*lock_irq)(spinlock_t *lock);

	void (*unlock_irq)(spinlock_t *lock);

};



/* Basic control structure */

drivers/net/wireless/orinoco/main.c

+10 −10
Original line number Diff line number Diff line
@@ -281,13 +281,13 @@ int orinoco_stop(struct net_device *dev) 
	/* We mustn't use orinoco_lock() here, because we need to be

	   able to close the interface even if hw_unavailable is set

	   (e.g. as we're released after a PC Card removal) */

	spin_lock_irq(&priv->lock);

	orinoco_lock_irq(priv);



	priv->open = 0;



	err = __orinoco_down(priv);



	spin_unlock_irq(&priv->lock);

	orinoco_unlock_irq(priv);



	return err;

}
@@ -1741,7 +1741,7 @@ void orinoco_reset(struct work_struct *work) 
	}



	/* This has to be called from user context */

	spin_lock_irq(&priv->lock);

	orinoco_lock_irq(priv);



	priv->hw_unavailable--;
@@ -1756,7 +1756,7 @@ void orinoco_reset(struct work_struct *work) 
			dev->trans_start = jiffies;

	}



	spin_unlock_irq(&priv->lock);

	orinoco_unlock_irq(priv);



	return;

 disable:
@@ -2073,9 +2073,9 @@ int orinoco_init(struct orinoco_private *priv) 


	/* Make the hardware available, as long as it hasn't been

	 * removed elsewhere (e.g. by PCMCIA hot unplug) */

	spin_lock_irq(&priv->lock);

	orinoco_lock_irq(priv);

	priv->hw_unavailable--;

	spin_unlock_irq(&priv->lock);

	orinoco_unlock_irq(priv);



	dev_dbg(dev, "Ready\n");
@@ -2317,7 +2317,7 @@ int orinoco_up(struct orinoco_private *priv) 
	unsigned long flags;

	int err;



	spin_lock_irqsave(&priv->lock, flags);

	priv->hw.ops->lock_irqsave(&priv->lock, &flags);



	err = orinoco_reinit_firmware(priv);

	if (err) {
@@ -2337,7 +2337,7 @@ int orinoco_up(struct orinoco_private *priv) 
	}



exit:

	spin_unlock_irqrestore(&priv->lock, flags);

	priv->hw.ops->unlock_irqrestore(&priv->lock, &flags);



	return 0;

}
@@ -2349,7 +2349,7 @@ void orinoco_down(struct orinoco_private *priv) 
	unsigned long flags;

	int err;



	spin_lock_irqsave(&priv->lock, flags);

	priv->hw.ops->lock_irqsave(&priv->lock, &flags);

	err = __orinoco_down(priv);

	if (err)

		printk(KERN_WARNING "%s: Error %d downing interface\n",
@@ -2357,7 +2357,7 @@ void orinoco_down(struct orinoco_private *priv) 


	netif_device_detach(dev);

	priv->hw_unavailable++;

	spin_unlock_irqrestore(&priv->lock, flags);

	priv->hw.ops->unlock_irqrestore(&priv->lock, &flags);

}

EXPORT_SYMBOL(orinoco_down);

drivers/net/wireless/orinoco/orinoco.h

+13 −3
Original line number Diff line number Diff line
@@ -212,11 +212,11 @@ void orinoco_tx_timeout(struct net_device *dev); 
static inline int orinoco_lock(struct orinoco_private *priv,

			       unsigned long *flags)

{

	spin_lock_irqsave(&priv->lock, *flags);

	priv->hw.ops->lock_irqsave(&priv->lock, flags);

	if (priv->hw_unavailable) {

		DEBUG(1, "orinoco_lock() called with hw_unavailable (dev=%p)\n",

		       priv->ndev);

		spin_unlock_irqrestore(&priv->lock, *flags);

		priv->hw.ops->unlock_irqrestore(&priv->lock, flags);

		return -EBUSY;

	}

	return 0;
@@ -225,7 +225,17 @@ static inline int orinoco_lock(struct orinoco_private *priv, 
static inline void orinoco_unlock(struct orinoco_private *priv,

				  unsigned long *flags)

{

	spin_unlock_irqrestore(&priv->lock, *flags);

	priv->hw.ops->unlock_irqrestore(&priv->lock, flags);

}



static inline void orinoco_lock_irq(struct orinoco_private *priv)

{

	priv->hw.ops->lock_irq(&priv->lock);

}



static inline void orinoco_unlock_irq(struct orinoco_private *priv)

{

	priv->hw.ops->unlock_irq(&priv->lock);

}



/*** Navigate from net_device to orinoco_private ***/