Skip to content

L
linux
Commit a6d27d2a authored by John W. Linville's avatar John W. Linville
Browse files
Options

Revert "rtl8180: use NAPI for bottom-half processing" 

This reverts commit 030725d2.

This commit relies on commit 5ed3bc72
("mac80211: use netif_receive_skb in ieee80211_tx_status callpath")
Unfortunately not all drivers are calling ieee80211_tx_status from a
compatible context, so that commit needs to be reverted in 2.6.36.
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 494486f8
Show whitespace changes
Inline Side-by-side
Showing with 59 additions and 69 deletions
drivers/net/wireless/rtl818x/rtl8180_dev.c
View file @ a6d27d2a
...@@ -99,66 +99,19 @@ void rtl8180_write_phy(struct ieee80211_hw *dev, u8 addr, u32 data) ...@@ -99,66 +99,19 @@ void rtl8180_write_phy(struct ieee80211_hw *dev, u8 addr, u32 data)
} }
} }
static void rtl8180_handle_tx(struct ieee80211_hw *dev) static void rtl8180_handle_rx(struct ieee80211_hw *dev)
{ {
struct rtl8180_priv *priv = dev->priv; struct rtl8180_priv *priv = dev->priv;
struct rtl8180_tx_ring *ring; unsigned int count = 32;
int prio;
spin_lock(&priv->lock);
for (prio = 3; prio >= 0; prio--) {
ring = &priv->tx_ring[prio];
while (skb_queue_len(&ring->queue)) {
struct rtl8180_tx_desc *entry = &ring->desc[ring->idx];
struct sk_buff *skb;
struct ieee80211_tx_info *info;
u32 flags = le32_to_cpu(entry->flags);
if (flags & RTL818X_TX_DESC_FLAG_OWN)
break;
ring->idx = (ring->idx + 1) % ring->entries;
skb = __skb_dequeue(&ring->queue);
pci_unmap_single(priv->pdev, le32_to_cpu(entry->tx_buf),
skb->len, PCI_DMA_TODEVICE);
info = IEEE80211_SKB_CB(skb);
ieee80211_tx_info_clear_status(info);
if (!(info->flags & IEEE80211_TX_CTL_NO_ACK) &&
(flags & RTL818X_TX_DESC_FLAG_TX_OK))
info->flags |= IEEE80211_TX_STAT_ACK;
info->status.rates[0].count = (flags & 0xFF) + 1;
info->status.rates[1].idx = -1;
ieee80211_tx_status(dev, skb);
if (ring->entries - skb_queue_len(&ring->queue) == 2)
ieee80211_wake_queue(dev, prio);
}
}
spin_unlock(&priv->lock);
}
static int rtl8180_poll(struct ieee80211_hw *dev, int budget)
{
struct rtl8180_priv *priv = dev->priv;
unsigned int count = 0;
u8 signal, agc, sq; u8 signal, agc, sq;
/* handle pending Tx queue cleanup */ while (count--) {
rtl8180_handle_tx(dev);
while (count++ < budget) {
struct rtl8180_rx_desc *entry = &priv->rx_ring[priv->rx_idx]; struct rtl8180_rx_desc *entry = &priv->rx_ring[priv->rx_idx];
struct sk_buff *skb = priv->rx_buf[priv->rx_idx]; struct sk_buff *skb = priv->rx_buf[priv->rx_idx];
u32 flags = le32_to_cpu(entry->flags); u32 flags = le32_to_cpu(entry->flags);
if (flags & RTL818X_RX_DESC_FLAG_OWN) if (flags & RTL818X_RX_DESC_FLAG_OWN)
break; return;
if (unlikely(flags & (RTL818X_RX_DESC_FLAG_DMA_FAIL | if (unlikely(flags & (RTL818X_RX_DESC_FLAG_DMA_FAIL |
RTL818X_RX_DESC_FLAG_FOF | RTL818X_RX_DESC_FLAG_FOF |
...@@ -198,7 +151,7 @@ static int rtl8180_poll(struct ieee80211_hw *dev, int budget) ...@@ -198,7 +151,7 @@ static int rtl8180_poll(struct ieee80211_hw *dev, int budget)
rx_status.flag |= RX_FLAG_FAILED_FCS_CRC; rx_status.flag |= RX_FLAG_FAILED_FCS_CRC;
memcpy(IEEE80211_SKB_RXCB(skb), &rx_status, sizeof(rx_status)); memcpy(IEEE80211_SKB_RXCB(skb), &rx_status, sizeof(rx_status));
ieee80211_rx(dev, skb); ieee80211_rx_irqsafe(dev, skb);
skb = new_skb; skb = new_skb;
priv->rx_buf[priv->rx_idx] = skb; priv->rx_buf[priv->rx_idx] = skb;
...@@ -215,16 +168,41 @@ static int rtl8180_poll(struct ieee80211_hw *dev, int budget) ...@@ -215,16 +168,41 @@ static int rtl8180_poll(struct ieee80211_hw *dev, int budget)
entry->flags |= cpu_to_le32(RTL818X_RX_DESC_FLAG_EOR); entry->flags |= cpu_to_le32(RTL818X_RX_DESC_FLAG_EOR);
priv->rx_idx = (priv->rx_idx + 1) % 32; priv->rx_idx = (priv->rx_idx + 1) % 32;
} }
}
if (count < budget) { static void rtl8180_handle_tx(struct ieee80211_hw *dev, unsigned int prio)
/* disable polling */ {
ieee80211_napi_complete(dev); struct rtl8180_priv *priv = dev->priv;
struct rtl8180_tx_ring *ring = &priv->tx_ring[prio];
/* enable interrupts */ while (skb_queue_len(&ring->queue)) {
rtl818x_iowrite16(priv, &priv->map->INT_MASK, 0xFFFF); struct rtl8180_tx_desc *entry = &ring->desc[ring->idx];
} struct sk_buff *skb;
struct ieee80211_tx_info *info;
u32 flags = le32_to_cpu(entry->flags);
if (flags & RTL818X_TX_DESC_FLAG_OWN)
return;
return count; ring->idx = (ring->idx + 1) % ring->entries;
skb = __skb_dequeue(&ring->queue);
pci_unmap_single(priv->pdev, le32_to_cpu(entry->tx_buf),
skb->len, PCI_DMA_TODEVICE);
info = IEEE80211_SKB_CB(skb);
ieee80211_tx_info_clear_status(info);
if (!(info->flags & IEEE80211_TX_CTL_NO_ACK) &&
(flags & RTL818X_TX_DESC_FLAG_TX_OK))
info->flags |= IEEE80211_TX_STAT_ACK;
info->status.rates[0].count = (flags & 0xFF) + 1;
info->status.rates[1].idx = -1;
ieee80211_tx_status_irqsafe(dev, skb);
if (ring->entries - skb_queue_len(&ring->queue) == 2)
ieee80211_wake_queue(dev, prio);
}
} }
static irqreturn_t rtl8180_interrupt(int irq, void *dev_id) static irqreturn_t rtl8180_interrupt(int irq, void *dev_id)
...@@ -233,17 +211,31 @@ static irqreturn_t rtl8180_interrupt(int irq, void *dev_id) ...@@ -233,17 +211,31 @@ static irqreturn_t rtl8180_interrupt(int irq, void *dev_id)
struct rtl8180_priv *priv = dev->priv; struct rtl8180_priv *priv = dev->priv;
u16 reg; u16 reg;
spin_lock(&priv->lock);
reg = rtl818x_ioread16(priv, &priv->map->INT_STATUS); reg = rtl818x_ioread16(priv, &priv->map->INT_STATUS);
if (unlikely(reg == 0xFFFF)) if (unlikely(reg == 0xFFFF)) {
spin_unlock(&priv->lock);
return IRQ_HANDLED; return IRQ_HANDLED;
}
rtl818x_iowrite16(priv, &priv->map->INT_STATUS, reg); rtl818x_iowrite16(priv, &priv->map->INT_STATUS, reg);
/* disable interrupts */ if (reg & (RTL818X_INT_TXB_OK | RTL818X_INT_TXB_ERR))
rtl818x_iowrite16(priv, &priv->map->INT_MASK, 0); rtl8180_handle_tx(dev, 3);
if (reg & (RTL818X_INT_TXH_OK | RTL818X_INT_TXH_ERR))
rtl8180_handle_tx(dev, 2);
if (reg & (RTL818X_INT_TXN_OK | RTL818X_INT_TXN_ERR))
rtl8180_handle_tx(dev, 1);
if (reg & (RTL818X_INT_TXL_OK | RTL818X_INT_TXL_ERR))
rtl8180_handle_tx(dev, 0);
/* enable polling */ if (reg & (RTL818X_INT_RX_OK | RTL818X_INT_RX_ERR))
ieee80211_napi_schedule(dev); rtl8180_handle_rx(dev);
spin_unlock(&priv->lock);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
...@@ -255,6 +247,7 @@ static int rtl8180_tx(struct ieee80211_hw *dev, struct sk_buff *skb) ...@@ -255,6 +247,7 @@ static int rtl8180_tx(struct ieee80211_hw *dev, struct sk_buff *skb)
struct rtl8180_priv *priv = dev->priv; struct rtl8180_priv *priv = dev->priv;
struct rtl8180_tx_ring *ring; struct rtl8180_tx_ring *ring;
struct rtl8180_tx_desc *entry; struct rtl8180_tx_desc *entry;
unsigned long flags;
unsigned int idx, prio; unsigned int idx, prio;
dma_addr_t mapping; dma_addr_t mapping;
u32 tx_flags; u32 tx_flags;
...@@ -301,7 +294,7 @@ static int rtl8180_tx(struct ieee80211_hw *dev, struct sk_buff *skb) ...@@ -301,7 +294,7 @@ static int rtl8180_tx(struct ieee80211_hw *dev, struct sk_buff *skb)
plcp_len |= 1 << 15; plcp_len |= 1 << 15;
} }
spin_lock(&priv->lock); spin_lock_irqsave(&priv->lock, flags);
if (info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ) { if (info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ) {
if (info->flags & IEEE80211_TX_CTL_FIRST_FRAGMENT) if (info->flags & IEEE80211_TX_CTL_FIRST_FRAGMENT)
...@@ -325,7 +318,7 @@ static int rtl8180_tx(struct ieee80211_hw *dev, struct sk_buff *skb) ...@@ -325,7 +318,7 @@ static int rtl8180_tx(struct ieee80211_hw *dev, struct sk_buff *skb)
if (ring->entries - skb_queue_len(&ring->queue) < 2) if (ring->entries - skb_queue_len(&ring->queue) < 2)
ieee80211_stop_queue(dev, prio); ieee80211_stop_queue(dev, prio);
spin_unlock(&priv->lock); spin_unlock_irqrestore(&priv->lock, flags);
rtl818x_iowrite8(priv, &priv->map->TX_DMA_POLLING, (1 << (prio + 4))); rtl818x_iowrite8(priv, &priv->map->TX_DMA_POLLING, (1 << (prio + 4)));
...@@ -871,7 +864,6 @@ static const struct ieee80211_ops rtl8180_ops = { ...@@ -871,7 +864,6 @@ static const struct ieee80211_ops rtl8180_ops = {
.prepare_multicast = rtl8180_prepare_multicast, .prepare_multicast = rtl8180_prepare_multicast,
.configure_filter = rtl8180_configure_filter, .configure_filter = rtl8180_configure_filter,
.get_tsf = rtl8180_get_tsf, .get_tsf = rtl8180_get_tsf,
.napi_poll = rtl8180_poll,
}; };
static void rtl8180_eeprom_register_read(struct eeprom_93cx6 *eeprom) static void rtl8180_eeprom_register_read(struct eeprom_93cx6 *eeprom)
...@@ -1003,8 +995,6 @@ static int __devinit rtl8180_probe(struct pci_dev *pdev, ...@@ -1003,8 +995,6 @@ static int __devinit rtl8180_probe(struct pci_dev *pdev,
dev->queues = 1; dev->queues = 1;
dev->max_signal = 65; dev->max_signal = 65;
dev->napi_weight = 64;
reg = rtl818x_ioread32(priv, &priv->map->TX_CONF); reg = rtl818x_ioread32(priv, &priv->map->TX_CONF);
reg &= RTL818X_TX_CONF_HWVER_MASK; reg &= RTL818X_TX_CONF_HWVER_MASK;
switch (reg) { switch (reg) {
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7