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

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

rt2x00: Use rt2x00 queue numbering 



Use the rt2x00 queue enumeration as much as possible,
removing the usage of the mac80211 queue numbering
wherever it is possible.

This makes it easier for mac80211 to change it queue
identification scheme without having to deal with
big changes in the rt2x00 code.

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

drivers/net/wireless/rt2x00/rt2400pci.c

+11 −21
Original line number Diff line number Diff line
@@ -1055,11 +1055,11 @@ static void rt2400pci_write_tx_desc(struct rt2x00_dev *rt2x00dev, 
 * TX data initialization

 */

static void rt2400pci_kick_tx_queue(struct rt2x00_dev *rt2x00dev,

				    const unsigned int queue)

				    const enum data_queue_qid queue)

{

	u32 reg;



	if (queue == RT2X00_BCN_QUEUE_BEACON) {

	if (queue == QID_BEACON) {

		rt2x00pci_register_read(rt2x00dev, CSR14, &reg);

		if (!rt2x00_get_field32(reg, CSR14_BEACON_GEN)) {

			rt2x00_set_field32(&reg, CSR14_TSF_COUNT, 1);
@@ -1071,12 +1071,9 @@ static void rt2400pci_kick_tx_queue(struct rt2x00_dev *rt2x00dev, 
	}



	rt2x00pci_register_read(rt2x00dev, TXCSR0, &reg);

	rt2x00_set_field32(&reg, TXCSR0_KICK_PRIO,

			   (queue == IEEE80211_TX_QUEUE_DATA0));

	rt2x00_set_field32(&reg, TXCSR0_KICK_TX,

			   (queue == IEEE80211_TX_QUEUE_DATA1));

	rt2x00_set_field32(&reg, TXCSR0_KICK_ATIM,

			   (queue == RT2X00_BCN_QUEUE_ATIM));

	rt2x00_set_field32(&reg, TXCSR0_KICK_PRIO, (queue == QID_AC_BE));

	rt2x00_set_field32(&reg, TXCSR0_KICK_TX, (queue == QID_AC_BK));

	rt2x00_set_field32(&reg, TXCSR0_KICK_ATIM, (queue == QID_ATIM));

	rt2x00pci_register_write(rt2x00dev, TXCSR0, reg);

}
@@ -1120,7 +1117,7 @@ static void rt2400pci_fill_rxdone(struct queue_entry *entry, 
 * Interrupt functions.

 */

static void rt2400pci_txdone(struct rt2x00_dev *rt2x00dev,

			     const enum ieee80211_tx_queue queue_idx)

			     const enum data_queue_qid queue_idx)

{

	struct data_queue *queue = rt2x00queue_get_queue(rt2x00dev, queue_idx);

	struct queue_entry_priv_pci_tx *priv_tx;
@@ -1187,19 +1184,19 @@ static irqreturn_t rt2400pci_interrupt(int irq, void *dev_instance) 
	 * 3 - Atim ring transmit done interrupt.

	 */

	if (rt2x00_get_field32(reg, CSR7_TXDONE_ATIMRING))

		rt2400pci_txdone(rt2x00dev, RT2X00_BCN_QUEUE_ATIM);

		rt2400pci_txdone(rt2x00dev, QID_ATIM);



	/*

	 * 4 - Priority ring transmit done interrupt.

	 */

	if (rt2x00_get_field32(reg, CSR7_TXDONE_PRIORING))

		rt2400pci_txdone(rt2x00dev, IEEE80211_TX_QUEUE_DATA0);

		rt2400pci_txdone(rt2x00dev, QID_AC_BE);



	/*

	 * 5 - Tx ring transmit done interrupt.

	 */

	if (rt2x00_get_field32(reg, CSR7_TXDONE_TXRING))

		rt2400pci_txdone(rt2x00dev, IEEE80211_TX_QUEUE_DATA1);

		rt2400pci_txdone(rt2x00dev, QID_AC_BK);



	return IRQ_HANDLED;

}
@@ -1520,21 +1517,14 @@ static int rt2400pci_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb, 
	rt2x00_set_field32(&reg, CSR14_BEACON_GEN, 0);

	rt2x00pci_register_write(rt2x00dev, CSR14, reg);



	/*

	 * mac80211 doesn't provide the control->queue variable

	 * for beacons. Set our own queue identification so

	 * it can be used during descriptor initialization.

	 */

	control->queue = RT2X00_BCN_QUEUE_BEACON;

	rt2x00lib_write_tx_desc(rt2x00dev, skb, control);



	/*

	 * Enable beacon generation.

	 * Write entire beacon with descriptor to register,

	 * and kick the beacon generator.

	 */

	rt2x00lib_write_tx_desc(rt2x00dev, skb, control);

	memcpy(priv_tx->data, skb->data, skb->len);

	rt2x00dev->ops->lib->kick_tx_queue(rt2x00dev, control->queue);

	rt2x00dev->ops->lib->kick_tx_queue(rt2x00dev, QID_BEACON);



	return 0;

}

drivers/net/wireless/rt2x00/rt2500pci.c

+12 −23
Original line number Diff line number Diff line
@@ -317,8 +317,7 @@ static void rt2500pci_config_intf(struct rt2x00_dev *rt2x00dev, 
				  struct rt2x00intf_conf *conf,

				  const unsigned int flags)

{

	struct data_queue *queue =

	    rt2x00queue_get_queue(rt2x00dev, RT2X00_BCN_QUEUE_BEACON);

	struct data_queue *queue = rt2x00queue_get_queue(rt2x00dev, QID_BEACON);

	unsigned int bcn_preload;

	u32 reg;
@@ -1210,11 +1209,11 @@ static void rt2500pci_write_tx_desc(struct rt2x00_dev *rt2x00dev, 
 * TX data initialization

 */

static void rt2500pci_kick_tx_queue(struct rt2x00_dev *rt2x00dev,

				    const unsigned int queue)

				    const enum data_queue_qid queue)

{

	u32 reg;



	if (queue == RT2X00_BCN_QUEUE_BEACON) {

	if (queue == QID_BEACON) {

		rt2x00pci_register_read(rt2x00dev, CSR14, &reg);

		if (!rt2x00_get_field32(reg, CSR14_BEACON_GEN)) {

			rt2x00_set_field32(&reg, CSR14_TSF_COUNT, 1);
@@ -1226,12 +1225,9 @@ static void rt2500pci_kick_tx_queue(struct rt2x00_dev *rt2x00dev, 
	}



	rt2x00pci_register_read(rt2x00dev, TXCSR0, &reg);

	rt2x00_set_field32(&reg, TXCSR0_KICK_PRIO,

			   (queue == IEEE80211_TX_QUEUE_DATA0));

	rt2x00_set_field32(&reg, TXCSR0_KICK_TX,

			   (queue == IEEE80211_TX_QUEUE_DATA1));

	rt2x00_set_field32(&reg, TXCSR0_KICK_ATIM,

			   (queue == RT2X00_BCN_QUEUE_ATIM));

	rt2x00_set_field32(&reg, TXCSR0_KICK_PRIO, (queue == QID_AC_BE));

	rt2x00_set_field32(&reg, TXCSR0_KICK_TX, (queue == QID_AC_BK));

	rt2x00_set_field32(&reg, TXCSR0_KICK_ATIM, (queue == QID_ATIM));

	rt2x00pci_register_write(rt2x00dev, TXCSR0, reg);

}
@@ -1276,7 +1272,7 @@ static void rt2500pci_fill_rxdone(struct queue_entry *entry, 
 * Interrupt functions.

 */

static void rt2500pci_txdone(struct rt2x00_dev *rt2x00dev,

			     const enum ieee80211_tx_queue queue_idx)

			     const enum data_queue_qid queue_idx)

{

	struct data_queue *queue = rt2x00queue_get_queue(rt2x00dev, queue_idx);

	struct queue_entry_priv_pci_tx *priv_tx;
@@ -1343,19 +1339,19 @@ static irqreturn_t rt2500pci_interrupt(int irq, void *dev_instance) 
	 * 3 - Atim ring transmit done interrupt.

	 */

	if (rt2x00_get_field32(reg, CSR7_TXDONE_ATIMRING))

		rt2500pci_txdone(rt2x00dev, RT2X00_BCN_QUEUE_ATIM);

		rt2500pci_txdone(rt2x00dev, QID_ATIM);



	/*

	 * 4 - Priority ring transmit done interrupt.

	 */

	if (rt2x00_get_field32(reg, CSR7_TXDONE_PRIORING))

		rt2500pci_txdone(rt2x00dev, IEEE80211_TX_QUEUE_DATA0);

		rt2500pci_txdone(rt2x00dev, QID_AC_BE);



	/*

	 * 5 - Tx ring transmit done interrupt.

	 */

	if (rt2x00_get_field32(reg, CSR7_TXDONE_TXRING))

		rt2500pci_txdone(rt2x00dev, IEEE80211_TX_QUEUE_DATA1);

		rt2500pci_txdone(rt2x00dev, QID_AC_BK);



	return IRQ_HANDLED;

}
@@ -1833,21 +1829,14 @@ static int rt2500pci_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb, 
	rt2x00_set_field32(&reg, CSR14_BEACON_GEN, 0);

	rt2x00pci_register_write(rt2x00dev, CSR14, reg);



	/*

	 * mac80211 doesn't provide the control->queue variable

	 * for beacons. Set our own queue identification so

	 * it can be used during descriptor initialization.

	 */

	control->queue = RT2X00_BCN_QUEUE_BEACON;

	rt2x00lib_write_tx_desc(rt2x00dev, skb, control);



	/*

	 * Enable beacon generation.

	 * Write entire beacon with descriptor to register,

	 * and kick the beacon generator.

	 */

	rt2x00lib_write_tx_desc(rt2x00dev, skb, control);

	memcpy(priv_tx->data, skb->data, skb->len);

	rt2x00dev->ops->lib->kick_tx_queue(rt2x00dev, control->queue);

	rt2x00dev->ops->lib->kick_tx_queue(rt2x00dev, QID_BEACON);



	return 0;

}

drivers/net/wireless/rt2x00/rt2500usb.c

+3 −9
Original line number Diff line number Diff line
@@ -1094,11 +1094,11 @@ static int rt2500usb_get_tx_data_len(struct rt2x00_dev *rt2x00dev, 
 * TX data initialization

 */

static void rt2500usb_kick_tx_queue(struct rt2x00_dev *rt2x00dev,

				    const unsigned int queue)

				    const enum data_queue_qid queue)

{

	u16 reg;



	if (queue != RT2X00_BCN_QUEUE_BEACON)

	if (queue != QID_BEACON)

		return;



	rt2500usb_register_read(rt2x00dev, TXRX_CSR19, &reg);
@@ -1720,12 +1720,6 @@ static int rt2500usb_beacon_update(struct ieee80211_hw *hw, 
	rt2x00_set_field16(&reg, TXRX_CSR19_BEACON_GEN, 0);

	rt2500usb_register_write(rt2x00dev, TXRX_CSR19, reg);



	/*

	 * mac80211 doesn't provide the control->queue variable

	 * for beacons. Set our own queue identification so

	 * it can be used during descriptor initialization.

	 */

	control->queue = RT2X00_BCN_QUEUE_BEACON;

	rt2x00lib_write_tx_desc(rt2x00dev, skb, control);



	/*
@@ -1757,7 +1751,7 @@ static int rt2500usb_beacon_update(struct ieee80211_hw *hw, 
	/*

	 * Enable beacon generation.

	 */

	rt2500usb_kick_tx_queue(rt2x00dev, control->queue);

	rt2500usb_kick_tx_queue(rt2x00dev, QID_BEACON);



	return 0;

}

drivers/net/wireless/rt2x00/rt2x00.h

+4 −5
Original line number Diff line number Diff line
@@ -548,7 +548,7 @@ struct rt2x00lib_ops { 
	int (*get_tx_data_len) (struct rt2x00_dev *rt2x00dev,

				struct sk_buff *skb);

	void (*kick_tx_queue) (struct rt2x00_dev *rt2x00dev,

			       const unsigned int queue);

			       const enum data_queue_qid queue);



	/*

	 * RX control handlers
@@ -927,13 +927,12 @@ static inline u16 get_duration_res(const unsigned int size, const u8 rate) 
}



/**

 * rt2x00queue_get_queue - Convert mac80211 queue index to rt2x00 queue

 * rt2x00queue_get_queue - Convert queue index to queue pointer

 * @rt2x00dev: Pointer to &struct rt2x00_dev.

 * @queue: mac80211/rt2x00 queue index

 *	(see &enum ieee80211_tx_queue and &enum rt2x00_bcn_queue).

 * @queue: rt2x00 queue index (see &enum data_queue_qid).

 */

struct data_queue *rt2x00queue_get_queue(struct rt2x00_dev *rt2x00dev,

					 const unsigned int queue);

					 const enum data_queue_qid queue);



/**

 * rt2x00queue_get_entry - Get queue entry where the given index points to.

drivers/net/wireless/rt2x00/rt2x00dev.c

+1 −2
Original line number Diff line number Diff line
@@ -687,8 +687,7 @@ void rt2x00lib_write_tx_desc(struct rt2x00_dev *rt2x00dev, 
	 * Beacons and probe responses require the tsf timestamp

	 * to be inserted into the frame.

	 */

	if (control->queue == RT2X00_BCN_QUEUE_BEACON ||

	    is_probe_resp(frame_control))

	if (txdesc.queue == QID_BEACON || is_probe_resp(frame_control))

		__set_bit(ENTRY_TXD_REQ_TIMESTAMP, &txdesc.flags);



	/*