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

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

rt2x00: Optimize TX descriptor handling 



HT and no-HT rt2x00 devices use a partly different TX descriptor.
Optimize the tx desciptor memory layout by putting the PLCP and HT
substructs into a union and introduce a new driver flag to decide which
TX desciptor format is used by the device.

This saves us the expensive PLCP calculation fOr HT devices and the HT
descriptor setup on no-HT devices.

Acked-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
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 7fe7ee77

drivers/net/wireless/rt2x00/rt2400pci.c

+6 −4
Original line number Original line Diff line number Diff line
@@ -1131,19 +1131,21 @@ static void rt2400pci_write_tx_desc(struct queue_entry *entry, 
	rt2x00_desc_write(txd, 2, word);

	rt2x00_desc_write(txd, 2, word);





	rt2x00_desc_read(txd, 3, &word);

	rt2x00_desc_read(txd, 3, &word);

	rt2x00_set_field32(&word, TXD_W3_PLCP_SIGNAL, txdesc->signal);

	rt2x00_set_field32(&word, TXD_W3_PLCP_SIGNAL, txdesc->u.plcp.signal);

	rt2x00_set_field32(&word, TXD_W3_PLCP_SIGNAL_REGNUM, 5);

	rt2x00_set_field32(&word, TXD_W3_PLCP_SIGNAL_REGNUM, 5);

	rt2x00_set_field32(&word, TXD_W3_PLCP_SIGNAL_BUSY, 1);

	rt2x00_set_field32(&word, TXD_W3_PLCP_SIGNAL_BUSY, 1);

	rt2x00_set_field32(&word, TXD_W3_PLCP_SERVICE, txdesc->service);

	rt2x00_set_field32(&word, TXD_W3_PLCP_SERVICE, txdesc->u.plcp.service);

	rt2x00_set_field32(&word, TXD_W3_PLCP_SERVICE_REGNUM, 6);

	rt2x00_set_field32(&word, TXD_W3_PLCP_SERVICE_REGNUM, 6);

	rt2x00_set_field32(&word, TXD_W3_PLCP_SERVICE_BUSY, 1);

	rt2x00_set_field32(&word, TXD_W3_PLCP_SERVICE_BUSY, 1);

	rt2x00_desc_write(txd, 3, word);

	rt2x00_desc_write(txd, 3, word);





	rt2x00_desc_read(txd, 4, &word);

	rt2x00_desc_read(txd, 4, &word);

	rt2x00_set_field32(&word, TXD_W4_PLCP_LENGTH_LOW, txdesc->length_low);

	rt2x00_set_field32(&word, TXD_W4_PLCP_LENGTH_LOW,

			   txdesc->u.plcp.length_low);

	rt2x00_set_field32(&word, TXD_W3_PLCP_LENGTH_LOW_REGNUM, 8);

	rt2x00_set_field32(&word, TXD_W3_PLCP_LENGTH_LOW_REGNUM, 8);

	rt2x00_set_field32(&word, TXD_W3_PLCP_LENGTH_LOW_BUSY, 1);

	rt2x00_set_field32(&word, TXD_W3_PLCP_LENGTH_LOW_BUSY, 1);

	rt2x00_set_field32(&word, TXD_W4_PLCP_LENGTH_HIGH, txdesc->length_high);

	rt2x00_set_field32(&word, TXD_W4_PLCP_LENGTH_HIGH,

			   txdesc->u.plcp.length_high);

	rt2x00_set_field32(&word, TXD_W3_PLCP_LENGTH_HIGH_REGNUM, 7);

	rt2x00_set_field32(&word, TXD_W3_PLCP_LENGTH_HIGH_REGNUM, 7);

	rt2x00_set_field32(&word, TXD_W3_PLCP_LENGTH_HIGH_BUSY, 1);

	rt2x00_set_field32(&word, TXD_W3_PLCP_LENGTH_HIGH_BUSY, 1);

	rt2x00_desc_write(txd, 4, word);

	rt2x00_desc_write(txd, 4, word);

drivers/net/wireless/rt2x00/rt2500pci.c

+6 −4
Original line number Original line Diff line number Diff line
@@ -1287,10 +1287,12 @@ static void rt2500pci_write_tx_desc(struct queue_entry *entry, 
	rt2x00_desc_write(txd, 2, word);

	rt2x00_desc_write(txd, 2, word);





	rt2x00_desc_read(txd, 3, &word);

	rt2x00_desc_read(txd, 3, &word);

	rt2x00_set_field32(&word, TXD_W3_PLCP_SIGNAL, txdesc->signal);

	rt2x00_set_field32(&word, TXD_W3_PLCP_SIGNAL, txdesc->u.plcp.signal);

	rt2x00_set_field32(&word, TXD_W3_PLCP_SERVICE, txdesc->service);

	rt2x00_set_field32(&word, TXD_W3_PLCP_SERVICE, txdesc->u.plcp.service);

	rt2x00_set_field32(&word, TXD_W3_PLCP_LENGTH_LOW, txdesc->length_low);

	rt2x00_set_field32(&word, TXD_W3_PLCP_LENGTH_LOW,

	rt2x00_set_field32(&word, TXD_W3_PLCP_LENGTH_HIGH, txdesc->length_high);

			   txdesc->u.plcp.length_low);

	rt2x00_set_field32(&word, TXD_W3_PLCP_LENGTH_HIGH,

			   txdesc->u.plcp.length_high);

	rt2x00_desc_write(txd, 3, word);

	rt2x00_desc_write(txd, 3, word);





	rt2x00_desc_read(txd, 10, &word);

	rt2x00_desc_read(txd, 10, &word);

drivers/net/wireless/rt2x00/rt2500usb.c

+6 −4
Original line number Original line Diff line number Diff line
@@ -1114,10 +1114,12 @@ static void rt2500usb_write_tx_desc(struct queue_entry *entry, 
	rt2x00_desc_write(txd, 1, word);

	rt2x00_desc_write(txd, 1, word);





	rt2x00_desc_read(txd, 2, &word);

	rt2x00_desc_read(txd, 2, &word);

	rt2x00_set_field32(&word, TXD_W2_PLCP_SIGNAL, txdesc->signal);

	rt2x00_set_field32(&word, TXD_W2_PLCP_SIGNAL, txdesc->u.plcp.signal);

	rt2x00_set_field32(&word, TXD_W2_PLCP_SERVICE, txdesc->service);

	rt2x00_set_field32(&word, TXD_W2_PLCP_SERVICE, txdesc->u.plcp.service);

	rt2x00_set_field32(&word, TXD_W2_PLCP_LENGTH_LOW, txdesc->length_low);

	rt2x00_set_field32(&word, TXD_W2_PLCP_LENGTH_LOW,

	rt2x00_set_field32(&word, TXD_W2_PLCP_LENGTH_HIGH, txdesc->length_high);

			   txdesc->u.plcp.length_low);

	rt2x00_set_field32(&word, TXD_W2_PLCP_LENGTH_HIGH,

			   txdesc->u.plcp.length_high);

	rt2x00_desc_write(txd, 2, word);

	rt2x00_desc_write(txd, 2, word);





	if (test_bit(ENTRY_TXD_ENCRYPT, &txdesc->flags)) {

	if (test_bit(ENTRY_TXD_ENCRYPT, &txdesc->flags)) {

drivers/net/wireless/rt2x00/rt2800lib.c

+6 −5
Original line number Original line Diff line number Diff line
@@ -472,14 +472,15 @@ void rt2800_write_tx_data(struct queue_entry *entry, 
			   test_bit(ENTRY_TXD_REQ_TIMESTAMP, &txdesc->flags));

			   test_bit(ENTRY_TXD_REQ_TIMESTAMP, &txdesc->flags));

	rt2x00_set_field32(&word, TXWI_W0_AMPDU,

	rt2x00_set_field32(&word, TXWI_W0_AMPDU,

			   test_bit(ENTRY_TXD_HT_AMPDU, &txdesc->flags));

			   test_bit(ENTRY_TXD_HT_AMPDU, &txdesc->flags));

	rt2x00_set_field32(&word, TXWI_W0_MPDU_DENSITY, txdesc->mpdu_density);

	rt2x00_set_field32(&word, TXWI_W0_MPDU_DENSITY,

	rt2x00_set_field32(&word, TXWI_W0_TX_OP, txdesc->txop);

			   txdesc->u.ht.mpdu_density);

	rt2x00_set_field32(&word, TXWI_W0_MCS, txdesc->mcs);

	rt2x00_set_field32(&word, TXWI_W0_TX_OP, txdesc->u.ht.txop);

	rt2x00_set_field32(&word, TXWI_W0_MCS, txdesc->u.ht.mcs);

	rt2x00_set_field32(&word, TXWI_W0_BW,

	rt2x00_set_field32(&word, TXWI_W0_BW,

			   test_bit(ENTRY_TXD_HT_BW_40, &txdesc->flags));

			   test_bit(ENTRY_TXD_HT_BW_40, &txdesc->flags));

	rt2x00_set_field32(&word, TXWI_W0_SHORT_GI,

	rt2x00_set_field32(&word, TXWI_W0_SHORT_GI,

			   test_bit(ENTRY_TXD_HT_SHORT_GI, &txdesc->flags));

			   test_bit(ENTRY_TXD_HT_SHORT_GI, &txdesc->flags));

	rt2x00_set_field32(&word, TXWI_W0_STBC, txdesc->stbc);

	rt2x00_set_field32(&word, TXWI_W0_STBC, txdesc->u.ht.stbc);

	rt2x00_set_field32(&word, TXWI_W0_PHYMODE, txdesc->rate_mode);

	rt2x00_set_field32(&word, TXWI_W0_PHYMODE, txdesc->rate_mode);

	rt2x00_desc_write(txwi, 0, word);

	rt2x00_desc_write(txwi, 0, word);
@@ -488,7 +489,7 @@ void rt2800_write_tx_data(struct queue_entry *entry, 
			   test_bit(ENTRY_TXD_ACK, &txdesc->flags));

			   test_bit(ENTRY_TXD_ACK, &txdesc->flags));

	rt2x00_set_field32(&word, TXWI_W1_NSEQ,

	rt2x00_set_field32(&word, TXWI_W1_NSEQ,

			   test_bit(ENTRY_TXD_GENERATE_SEQ, &txdesc->flags));

			   test_bit(ENTRY_TXD_GENERATE_SEQ, &txdesc->flags));

	rt2x00_set_field32(&word, TXWI_W1_BW_WIN_SIZE, txdesc->ba_size);

	rt2x00_set_field32(&word, TXWI_W1_BW_WIN_SIZE, txdesc->u.ht.ba_size);

	rt2x00_set_field32(&word, TXWI_W1_WIRELESS_CLI_ID,

	rt2x00_set_field32(&word, TXWI_W1_WIRELESS_CLI_ID,

			   test_bit(ENTRY_TXD_ENCRYPT, &txdesc->flags) ?

			   test_bit(ENTRY_TXD_ENCRYPT, &txdesc->flags) ?

			   txdesc->key_idx : 0xff);

			   txdesc->key_idx : 0xff);

drivers/net/wireless/rt2x00/rt2800pci.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -979,6 +979,7 @@ static int rt2800pci_probe_hw(struct rt2x00_dev *rt2x00dev) 
	if (!modparam_nohwcrypt)

	if (!modparam_nohwcrypt)

		__set_bit(CONFIG_SUPPORT_HW_CRYPTO, &rt2x00dev->flags);

		__set_bit(CONFIG_SUPPORT_HW_CRYPTO, &rt2x00dev->flags);

	__set_bit(DRIVER_SUPPORT_LINK_TUNING, &rt2x00dev->flags);

	__set_bit(DRIVER_SUPPORT_LINK_TUNING, &rt2x00dev->flags);

	__set_bit(DRIVER_REQUIRE_HT_TX_DESC, &rt2x00dev->flags);





	/*

	/*

	 * Set the rssi offset.

	 * Set the rssi offset.