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

Commit efd2f271 authored by Helmut Schaa's avatar Helmut Schaa Committed by John W. Linville
Browse files

rt2x00: Sync Tx and RX ring sizes with legacy drivers 



All rt2x00 devices used the same Tx and Rx ring size (24 entries) till
now. Newer devices (like rt2800) can however make use of a larger TX and
RX ring due to 11n capabilities (AMPDUs of size 64 for example).

Hence, bring rt2x00 in sync with the legacy drivers and use the same TX
and RX ring sizes. Also remove the global defines RX_ENTRIES, TX_ENTRIES,
BEACON_ENTRIES and ATIM_ENTRIES and use per driver values.

That is 24 entries for rt2400pci, 32 entries for rt2500pci, rt2500usb,
rt61pci and rt73usb and 128 (RX) and 64 (TX) for rt2800pci and rt2800usb.

Signed-off-by: default avatarHelmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 961621ab

drivers/net/wireless/rt2x00/rt2400pci.c

+4 −4
Original line number Diff line number Diff line
@@ -1640,28 +1640,28 @@ static const struct rt2x00lib_ops rt2400pci_rt2x00_ops = { 
};



static const struct data_queue_desc rt2400pci_queue_rx = {

	.entry_num		= RX_ENTRIES,

	.entry_num		= 24,

	.data_size		= DATA_FRAME_SIZE,

	.desc_size		= RXD_DESC_SIZE,

	.priv_size		= sizeof(struct queue_entry_priv_pci),

};



static const struct data_queue_desc rt2400pci_queue_tx = {

	.entry_num		= TX_ENTRIES,

	.entry_num		= 24,

	.data_size		= DATA_FRAME_SIZE,

	.desc_size		= TXD_DESC_SIZE,

	.priv_size		= sizeof(struct queue_entry_priv_pci),

};



static const struct data_queue_desc rt2400pci_queue_bcn = {

	.entry_num		= BEACON_ENTRIES,

	.entry_num		= 1,

	.data_size		= MGMT_FRAME_SIZE,

	.desc_size		= TXD_DESC_SIZE,

	.priv_size		= sizeof(struct queue_entry_priv_pci),

};



static const struct data_queue_desc rt2400pci_queue_atim = {

	.entry_num		= ATIM_ENTRIES,

	.entry_num		= 8,

	.data_size		= DATA_FRAME_SIZE,

	.desc_size		= TXD_DESC_SIZE,

	.priv_size		= sizeof(struct queue_entry_priv_pci),

drivers/net/wireless/rt2x00/rt2500pci.c

+4 −4
Original line number Diff line number Diff line
@@ -1937,28 +1937,28 @@ static const struct rt2x00lib_ops rt2500pci_rt2x00_ops = { 
};



static const struct data_queue_desc rt2500pci_queue_rx = {

	.entry_num		= RX_ENTRIES,

	.entry_num		= 32,

	.data_size		= DATA_FRAME_SIZE,

	.desc_size		= RXD_DESC_SIZE,

	.priv_size		= sizeof(struct queue_entry_priv_pci),

};



static const struct data_queue_desc rt2500pci_queue_tx = {

	.entry_num		= TX_ENTRIES,

	.entry_num		= 32,

	.data_size		= DATA_FRAME_SIZE,

	.desc_size		= TXD_DESC_SIZE,

	.priv_size		= sizeof(struct queue_entry_priv_pci),

};



static const struct data_queue_desc rt2500pci_queue_bcn = {

	.entry_num		= BEACON_ENTRIES,

	.entry_num		= 1,

	.data_size		= MGMT_FRAME_SIZE,

	.desc_size		= TXD_DESC_SIZE,

	.priv_size		= sizeof(struct queue_entry_priv_pci),

};



static const struct data_queue_desc rt2500pci_queue_atim = {

	.entry_num		= ATIM_ENTRIES,

	.entry_num		= 8,

	.data_size		= DATA_FRAME_SIZE,

	.desc_size		= TXD_DESC_SIZE,

	.priv_size		= sizeof(struct queue_entry_priv_pci),

drivers/net/wireless/rt2x00/rt2500usb.c

+4 −4
Original line number Diff line number Diff line
@@ -1829,28 +1829,28 @@ static const struct rt2x00lib_ops rt2500usb_rt2x00_ops = { 
};



static const struct data_queue_desc rt2500usb_queue_rx = {

	.entry_num		= RX_ENTRIES,

	.entry_num		= 32,

	.data_size		= DATA_FRAME_SIZE,

	.desc_size		= RXD_DESC_SIZE,

	.priv_size		= sizeof(struct queue_entry_priv_usb),

};



static const struct data_queue_desc rt2500usb_queue_tx = {

	.entry_num		= TX_ENTRIES,

	.entry_num		= 32,

	.data_size		= DATA_FRAME_SIZE,

	.desc_size		= TXD_DESC_SIZE,

	.priv_size		= sizeof(struct queue_entry_priv_usb),

};



static const struct data_queue_desc rt2500usb_queue_bcn = {

	.entry_num		= BEACON_ENTRIES,

	.entry_num		= 1,

	.data_size		= MGMT_FRAME_SIZE,

	.desc_size		= TXD_DESC_SIZE,

	.priv_size		= sizeof(struct queue_entry_priv_usb_bcn),

};



static const struct data_queue_desc rt2500usb_queue_atim = {

	.entry_num		= ATIM_ENTRIES,

	.entry_num		= 8,

	.data_size		= DATA_FRAME_SIZE,

	.desc_size		= TXD_DESC_SIZE,

	.priv_size		= sizeof(struct queue_entry_priv_usb),

drivers/net/wireless/rt2x00/rt2800lib.c

+1 −1
Original line number Diff line number Diff line
@@ -727,7 +727,7 @@ void rt2800_txdone(struct rt2x00_dev *rt2x00dev) 
	 * that the TX_STA_FIFO stack has a size of 16. We stick to our

	 * tx ring size for now.

	 */

	for (i = 0; i < TX_ENTRIES; i++) {

	for (i = 0; i < rt2x00dev->ops->tx->entry_num; i++) {

		rt2800_register_read(rt2x00dev, TX_STA_FIFO, &reg);

		if (!rt2x00_get_field32(reg, TX_STA_FIFO_VALID))

			break;

drivers/net/wireless/rt2x00/rt2800pci.c

+4 −4
Original line number Diff line number Diff line
@@ -777,7 +777,7 @@ static void rt2800pci_txstatus_interrupt(struct rt2x00_dev *rt2x00dev) 
	 * Since we have only one producer and one consumer we don't

	 * need to lock the kfifo.

	 */

	for (i = 0; i < TX_ENTRIES; i++) {

	for (i = 0; i < rt2x00dev->ops->tx->entry_num; i++) {

		rt2800_register_read(rt2x00dev, TX_STA_FIFO, &status);



		if (!rt2x00_get_field32(status, TX_STA_FIFO_VALID))
@@ -991,21 +991,21 @@ static const struct rt2x00lib_ops rt2800pci_rt2x00_ops = { 
};



static const struct data_queue_desc rt2800pci_queue_rx = {

	.entry_num		= RX_ENTRIES,

	.entry_num		= 128,

	.data_size		= AGGREGATION_SIZE,

	.desc_size		= RXD_DESC_SIZE,

	.priv_size		= sizeof(struct queue_entry_priv_pci),

};



static const struct data_queue_desc rt2800pci_queue_tx = {

	.entry_num		= TX_ENTRIES,

	.entry_num		= 64,

	.data_size		= AGGREGATION_SIZE,

	.desc_size		= TXD_DESC_SIZE,

	.priv_size		= sizeof(struct queue_entry_priv_pci),

};



static const struct data_queue_desc rt2800pci_queue_bcn = {

	.entry_num		= 8 * BEACON_ENTRIES,

	.entry_num		= 8,

	.data_size		= 0, /* No DMA required for beacons */

	.desc_size		= TXWI_DESC_SIZE,

	.priv_size		= sizeof(struct queue_entry_priv_pci),