Commit ae1b1c5d authored by Gabor Juhos's avatar Gabor Juhos Committed by John W. Linville

rt2x00: rt2800lib: introduce rt2800_get_txwi_rxwi_size helper

The rt2800pci driver uses the same [RT]XWI size
for all chipsets, however some chips requires
different values.

The size of the [RT]XWI structures is a constant
value for a given chipset and it does not depend
on the underlying interface. Add a helper function
which returns the correct values for the actual
chipset and use the new helper both in the rt2800usb
and in the rt2800pci drivers. This ensures that both
drivers are using the correct values.
Signed-off-by: default avatarGabor Juhos <juhosg@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d074e8d5
...@@ -521,6 +521,29 @@ void rt2800_disable_wpdma(struct rt2x00_dev *rt2x00dev) ...@@ -521,6 +521,29 @@ void rt2800_disable_wpdma(struct rt2x00_dev *rt2x00dev)
} }
EXPORT_SYMBOL_GPL(rt2800_disable_wpdma); EXPORT_SYMBOL_GPL(rt2800_disable_wpdma);
void rt2800_get_txwi_rxwi_size(struct rt2x00_dev *rt2x00dev,
unsigned short *txwi_size,
unsigned short *rxwi_size)
{
switch (rt2x00dev->chip.rt) {
case RT3593:
*txwi_size = TXWI_DESC_SIZE_4WORDS;
*rxwi_size = RXWI_DESC_SIZE_5WORDS;
break;
case RT5592:
*txwi_size = TXWI_DESC_SIZE_5WORDS;
*rxwi_size = RXWI_DESC_SIZE_6WORDS;
break;
default:
*txwi_size = TXWI_DESC_SIZE_4WORDS;
*rxwi_size = RXWI_DESC_SIZE_4WORDS;
break;
}
}
EXPORT_SYMBOL_GPL(rt2800_get_txwi_rxwi_size);
static bool rt2800_check_firmware_crc(const u8 *data, const size_t len) static bool rt2800_check_firmware_crc(const u8 *data, const size_t len)
{ {
u16 fw_crc; u16 fw_crc;
......
...@@ -226,4 +226,8 @@ int rt2800_get_survey(struct ieee80211_hw *hw, int idx, ...@@ -226,4 +226,8 @@ int rt2800_get_survey(struct ieee80211_hw *hw, int idx,
struct survey_info *survey); struct survey_info *survey);
void rt2800_disable_wpdma(struct rt2x00_dev *rt2x00dev); void rt2800_disable_wpdma(struct rt2x00_dev *rt2x00dev);
void rt2800_get_txwi_rxwi_size(struct rt2x00_dev *rt2x00dev,
unsigned short *txwi_size,
unsigned short *rxwi_size);
#endif /* RT2800LIB_H */ #endif /* RT2800LIB_H */
...@@ -1189,12 +1189,17 @@ static const struct rt2x00lib_ops rt2800pci_rt2x00_ops = { ...@@ -1189,12 +1189,17 @@ static const struct rt2x00lib_ops rt2800pci_rt2x00_ops = {
static void rt2800pci_queue_init(struct data_queue *queue) static void rt2800pci_queue_init(struct data_queue *queue)
{ {
struct rt2x00_dev *rt2x00dev = queue->rt2x00dev;
unsigned short txwi_size, rxwi_size;
rt2800_get_txwi_rxwi_size(rt2x00dev, &txwi_size, &rxwi_size);
switch (queue->qid) { switch (queue->qid) {
case QID_RX: case QID_RX:
queue->limit = 128; queue->limit = 128;
queue->data_size = AGGREGATION_SIZE; queue->data_size = AGGREGATION_SIZE;
queue->desc_size = RXD_DESC_SIZE; queue->desc_size = RXD_DESC_SIZE;
queue->winfo_size = RXWI_DESC_SIZE_4WORDS; queue->winfo_size = rxwi_size;
queue->priv_size = sizeof(struct queue_entry_priv_mmio); queue->priv_size = sizeof(struct queue_entry_priv_mmio);
break; break;
...@@ -1205,7 +1210,7 @@ static void rt2800pci_queue_init(struct data_queue *queue) ...@@ -1205,7 +1210,7 @@ static void rt2800pci_queue_init(struct data_queue *queue)
queue->limit = 64; queue->limit = 64;
queue->data_size = AGGREGATION_SIZE; queue->data_size = AGGREGATION_SIZE;
queue->desc_size = TXD_DESC_SIZE; queue->desc_size = TXD_DESC_SIZE;
queue->winfo_size = TXWI_DESC_SIZE_4WORDS; queue->winfo_size = txwi_size;
queue->priv_size = sizeof(struct queue_entry_priv_mmio); queue->priv_size = sizeof(struct queue_entry_priv_mmio);
break; break;
...@@ -1213,7 +1218,7 @@ static void rt2800pci_queue_init(struct data_queue *queue) ...@@ -1213,7 +1218,7 @@ static void rt2800pci_queue_init(struct data_queue *queue)
queue->limit = 8; queue->limit = 8;
queue->data_size = 0; /* No DMA required for beacons */ queue->data_size = 0; /* No DMA required for beacons */
queue->desc_size = TXD_DESC_SIZE; queue->desc_size = TXD_DESC_SIZE;
queue->winfo_size = TXWI_DESC_SIZE_4WORDS; queue->winfo_size = txwi_size;
queue->priv_size = sizeof(struct queue_entry_priv_mmio); queue->priv_size = sizeof(struct queue_entry_priv_mmio);
break; break;
......
...@@ -854,16 +854,7 @@ static void rt2800usb_queue_init(struct data_queue *queue) ...@@ -854,16 +854,7 @@ static void rt2800usb_queue_init(struct data_queue *queue)
struct rt2x00_dev *rt2x00dev = queue->rt2x00dev; struct rt2x00_dev *rt2x00dev = queue->rt2x00dev;
unsigned short txwi_size, rxwi_size; unsigned short txwi_size, rxwi_size;
if (rt2x00_rt(rt2x00dev, RT3593)) { rt2800_get_txwi_rxwi_size(rt2x00dev, &txwi_size, &rxwi_size);
txwi_size = TXWI_DESC_SIZE_4WORDS;
rxwi_size = RXWI_DESC_SIZE_5WORDS;
} else if (rt2x00_rt(rt2x00dev, RT5592)) {
txwi_size = TXWI_DESC_SIZE_5WORDS;
rxwi_size = RXWI_DESC_SIZE_6WORDS;
} else {
txwi_size = TXWI_DESC_SIZE_4WORDS;
rxwi_size = RXWI_DESC_SIZE_4WORDS;
}
switch (queue->qid) { switch (queue->qid) {
case QID_RX: case QID_RX:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment