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

Commit 798b7adb authored by Ivo van Doorn's avatar Ivo van Doorn Committed by John W. Linville
Browse files

rt2x00: Cleanup TX/RX entry handling 



Merge the callback functions init_txentry() and
init_rxentry(). This makes life in rt2x00lib a
lot simpler and we can cleanup several functions.

rt2x00pci contained "fake" FIELD definitions for
descriptor words. This is not flexible since it
assumes the driver will always have the same field
to indicate if a driver is available or not.
This should be dependent on the driver, and we
should add a callback function for this.

Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 0ed94eaa

drivers/net/wireless/rt2x00/rt2400pci.c

+31 −20
Original line number Diff line number Diff line
@@ -626,13 +626,30 @@ static void rt2400pci_link_tuner(struct rt2x00_dev *rt2x00dev) 
/*

 * Initialization functions.

 */

static void rt2400pci_init_rxentry(struct rt2x00_dev *rt2x00dev,

				   struct queue_entry *entry)

static bool rt2400pci_get_entry_state(struct queue_entry *entry)

{

	struct queue_entry_priv_pci *entry_priv = entry->priv_data;

	u32 word;



	if (entry->queue->qid == QID_RX) {

		rt2x00_desc_read(entry_priv->desc, 0, &word);



		return rt2x00_get_field32(word, RXD_W0_OWNER_NIC);

	} else {

		rt2x00_desc_read(entry_priv->desc, 0, &word);



		return (rt2x00_get_field32(word, TXD_W0_OWNER_NIC) ||

		        rt2x00_get_field32(word, TXD_W0_VALID));

	}

}



static void rt2400pci_clear_entry(struct queue_entry *entry)

{

	struct queue_entry_priv_pci *entry_priv = entry->priv_data;

	struct skb_frame_desc *skbdesc = get_skb_frame_desc(entry->skb);

	u32 word;



	if (entry->queue->qid == QID_RX) {

		rt2x00_desc_read(entry_priv->desc, 2, &word);

		rt2x00_set_field32(&word, RXD_W2_BUFFER_LENGTH, entry->skb->len);

		rt2x00_desc_write(entry_priv->desc, 2, word);
@@ -644,19 +661,13 @@ static void rt2400pci_init_rxentry(struct rt2x00_dev *rt2x00dev, 
		rt2x00_desc_read(entry_priv->desc, 0, &word);

		rt2x00_set_field32(&word, RXD_W0_OWNER_NIC, 1);

		rt2x00_desc_write(entry_priv->desc, 0, word);

}



static void rt2400pci_init_txentry(struct rt2x00_dev *rt2x00dev,

				   struct queue_entry *entry)

{

	struct queue_entry_priv_pci *entry_priv = entry->priv_data;

	u32 word;



	} else {

		rt2x00_desc_read(entry_priv->desc, 0, &word);

		rt2x00_set_field32(&word, TXD_W0_VALID, 0);

		rt2x00_set_field32(&word, TXD_W0_OWNER_NIC, 0);

		rt2x00_desc_write(entry_priv->desc, 0, word);

	}

}



static int rt2400pci_init_queues(struct rt2x00_dev *rt2x00dev)

{
@@ -1570,8 +1581,8 @@ static const struct rt2x00lib_ops rt2400pci_rt2x00_ops = { 
	.probe_hw		= rt2400pci_probe_hw,

	.initialize		= rt2x00pci_initialize,

	.uninitialize		= rt2x00pci_uninitialize,

	.init_rxentry		= rt2400pci_init_rxentry,

	.init_txentry		= rt2400pci_init_txentry,

	.get_entry_state	= rt2400pci_get_entry_state,

	.clear_entry		= rt2400pci_clear_entry,

	.set_device_state	= rt2400pci_set_device_state,

	.rfkill_poll		= rt2400pci_rfkill_poll,

	.link_stats		= rt2400pci_link_stats,

drivers/net/wireless/rt2x00/rt2500pci.c

+28 −17
Original line number Diff line number Diff line
@@ -722,33 +722,44 @@ dynamic_cca_tune: 
/*

 * Initialization functions.

 */

static void rt2500pci_init_rxentry(struct rt2x00_dev *rt2x00dev,

				   struct queue_entry *entry)

static bool rt2500pci_get_entry_state(struct queue_entry *entry)

{

	struct queue_entry_priv_pci *entry_priv = entry->priv_data;

	struct skb_frame_desc *skbdesc = get_skb_frame_desc(entry->skb);

	u32 word;



	rt2x00_desc_read(entry_priv->desc, 1, &word);

	rt2x00_set_field32(&word, RXD_W1_BUFFER_ADDRESS, skbdesc->skb_dma);

	rt2x00_desc_write(entry_priv->desc, 1, word);

	if (entry->queue->qid == QID_RX) {

		rt2x00_desc_read(entry_priv->desc, 0, &word);



		return rt2x00_get_field32(word, RXD_W0_OWNER_NIC);

	} else {

		rt2x00_desc_read(entry_priv->desc, 0, &word);

	rt2x00_set_field32(&word, RXD_W0_OWNER_NIC, 1);

	rt2x00_desc_write(entry_priv->desc, 0, word);



		return (rt2x00_get_field32(word, TXD_W0_OWNER_NIC) ||

		        rt2x00_get_field32(word, TXD_W0_VALID));

	}

}



static void rt2500pci_init_txentry(struct rt2x00_dev *rt2x00dev,

				   struct queue_entry *entry)

static void rt2500pci_clear_entry(struct queue_entry *entry)

{

	struct queue_entry_priv_pci *entry_priv = entry->priv_data;

	struct skb_frame_desc *skbdesc = get_skb_frame_desc(entry->skb);

	u32 word;



	if (entry->queue->qid == QID_RX) {

		rt2x00_desc_read(entry_priv->desc, 1, &word);

		rt2x00_set_field32(&word, RXD_W1_BUFFER_ADDRESS, skbdesc->skb_dma);

		rt2x00_desc_write(entry_priv->desc, 1, word);



		rt2x00_desc_read(entry_priv->desc, 0, &word);

		rt2x00_set_field32(&word, RXD_W0_OWNER_NIC, 1);

		rt2x00_desc_write(entry_priv->desc, 0, word);

	} else {

		rt2x00_desc_read(entry_priv->desc, 0, &word);

		rt2x00_set_field32(&word, TXD_W0_VALID, 0);

		rt2x00_set_field32(&word, TXD_W0_OWNER_NIC, 0);

		rt2x00_desc_write(entry_priv->desc, 0, word);

	}

}



static int rt2500pci_init_queues(struct rt2x00_dev *rt2x00dev)

{
@@ -1871,8 +1882,8 @@ static const struct rt2x00lib_ops rt2500pci_rt2x00_ops = { 
	.probe_hw		= rt2500pci_probe_hw,

	.initialize		= rt2x00pci_initialize,

	.uninitialize		= rt2x00pci_uninitialize,

	.init_rxentry		= rt2500pci_init_rxentry,

	.init_txentry		= rt2500pci_init_txentry,

	.get_entry_state	= rt2500pci_get_entry_state,

	.clear_entry		= rt2500pci_clear_entry,

	.set_device_state	= rt2500pci_set_device_state,

	.rfkill_poll		= rt2500pci_rfkill_poll,

	.link_stats		= rt2500pci_link_stats,

drivers/net/wireless/rt2x00/rt2500usb.c

+1 −2
Original line number Diff line number Diff line
@@ -1777,8 +1777,7 @@ static const struct rt2x00lib_ops rt2500usb_rt2x00_ops = { 
	.probe_hw		= rt2500usb_probe_hw,

	.initialize		= rt2x00usb_initialize,

	.uninitialize		= rt2x00usb_uninitialize,

	.init_rxentry		= rt2x00usb_init_rxentry,

	.init_txentry		= rt2x00usb_init_txentry,

	.clear_entry		= rt2x00usb_clear_entry,

	.set_device_state	= rt2500usb_set_device_state,

	.link_stats		= rt2500usb_link_stats,

	.reset_tuner		= rt2500usb_reset_tuner,

drivers/net/wireless/rt2x00/rt2x00.h

+2 −4
Original line number Diff line number Diff line
@@ -523,10 +523,8 @@ struct rt2x00lib_ops { 
	/*

	 * queue initialization handlers

	 */

	void (*init_rxentry) (struct rt2x00_dev *rt2x00dev,

			      struct queue_entry *entry);

	void (*init_txentry) (struct rt2x00_dev *rt2x00dev,

			      struct queue_entry *entry);

	bool (*get_entry_state) (struct queue_entry *entry);

	void (*clear_entry) (struct queue_entry *entry);



	/*

	 * Radio control handlers.

drivers/net/wireless/rt2x00/rt2x00dev.c

+3 −4
Original line number Diff line number Diff line
@@ -101,8 +101,7 @@ int rt2x00lib_enable_radio(struct rt2x00_dev *rt2x00dev) 
	/*

	 * Initialize all data queues.

	 */

	rt2x00queue_init_rx(rt2x00dev);

	rt2x00queue_init_tx(rt2x00dev);

	rt2x00queue_init_queues(rt2x00dev);



	/*

	 * Enable radio.
@@ -576,7 +575,7 @@ void rt2x00lib_txdone(struct queue_entry *entry, 
	entry->skb = NULL;

	entry->flags = 0;



	rt2x00dev->ops->lib->init_txentry(rt2x00dev, entry);

	rt2x00dev->ops->lib->clear_entry(entry);



	clear_bit(ENTRY_OWNER_DEVICE_DATA, &entry->flags);

	rt2x00queue_index_inc(entry->queue, Q_INDEX_DONE);
@@ -708,7 +707,7 @@ void rt2x00lib_rxdone(struct rt2x00_dev *rt2x00dev, 
	entry->skb = skb;

	entry->flags = 0;



	rt2x00dev->ops->lib->init_rxentry(rt2x00dev, entry);

	rt2x00dev->ops->lib->clear_entry(entry);



	rt2x00queue_index_inc(entry->queue, Q_INDEX);

}