gitops/mt76
1
0
Fork 0
mirror of https://github.com/outbackdingo/mt76.git synced 2026-10-24 13:26:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

mt76: add skb pointer to mt76_tx_info

Browse Source 
Pass skb pointer to tx_prepare_skb through mt76_tx_info data structure.
This is a preliminary patch to properly support dma error path for
new chipsets (e.g. 7615)

Signed-off-by: Lorenzo Bianconi <[email protected]>
This commit is contained in:
Lorenzo Bianconi
2019-04-25 12:04:34 +02:00
committed by Felix Fietkau
parent 3e371ca35c
commit 5007326555
9 changed files with 36 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dma.c
+6 -5
View File
@@ -290,7 +290,9 @@ mt76_dma_tx_queue_skb(struct mt76_dev *dev, enum mt76_txq_id qid,
struct ieee80211_sta *sta) struct ieee80211_sta *sta)
{ {
struct mt76_queue *q = dev->q_tx[qid].q; struct mt76_queue *q = dev->q_tx[qid].q;
struct mt76_tx_info tx_info = {}; struct mt76_tx_info tx_info = {
.skb = skb,
};
int len, n = 0, ret = -ENOMEM; int len, n = 0, ret = -ENOMEM;
struct mt76_queue_entry e; struct mt76_queue_entry e;
struct mt76_txwi_cache *t; struct mt76_txwi_cache *t;
@@ -333,8 +335,7 @@ mt76_dma_tx_queue_skb(struct mt76_dev *dev, enum mt76_txq_id qid,
dma_sync_single_for_cpu(dev->dev, t->dma_addr, dev->drv->txwi_size, dma_sync_single_for_cpu(dev->dev, t->dma_addr, dev->drv->txwi_size,
DMA_TO_DEVICE); DMA_TO_DEVICE);
ret = dev->drv->tx_prepare_skb(dev, txwi, skb, qid, wcid, sta, ret = dev->drv->tx_prepare_skb(dev, txwi, qid, wcid, sta, &tx_info);
&tx_info);
dma_sync_single_for_device(dev->dev, t->dma_addr, dev->drv->txwi_size, dma_sync_single_for_device(dev->dev, t->dma_addr, dev->drv->txwi_size,
DMA_TO_DEVICE); DMA_TO_DEVICE);
if (ret < 0) if (ret < 0)
@@ -346,7 +347,7 @@ mt76_dma_tx_queue_skb(struct mt76_dev *dev, enum mt76_txq_id qid,
} }
return mt76_dma_add_buf(dev, q, tx_info.buf, tx_info.nbuf, return mt76_dma_add_buf(dev, q, tx_info.buf, tx_info.nbuf,
tx_info.info, skb, t); tx_info.info, tx_info.skb, t);
unmap: unmap:
for (n--; n > 0; n--) for (n--; n > 0; n--)
@@ -354,7 +355,7 @@ unmap:
tx_info.buf[n].len, DMA_TO_DEVICE); tx_info.buf[n].len, DMA_TO_DEVICE);
free: free:
e.skb = skb; e.skb = tx_info.skb;
e.txwi = t; e.txwi = t;
dev->drv->tx_complete_skb(dev, qid, &e); dev->drv->tx_complete_skb(dev, qid, &e);
mt76_put_txwi(dev, t); mt76_put_txwi(dev, t);
mt76.h
+2 -2
View File
@@ -86,6 +86,7 @@ struct mt76_queue_buf {
struct mt76_tx_info { struct mt76_tx_info {
struct mt76_queue_buf buf[32]; struct mt76_queue_buf buf[32];
struct sk_buff *skb;
int nbuf; int nbuf;
u32 info; u32 info;
}; };
@@ -291,8 +292,7 @@ struct mt76_driver_ops {
void (*update_survey)(struct mt76_dev *dev); void (*update_survey)(struct mt76_dev *dev);
int (*tx_prepare_skb)(struct mt76_dev *dev, void *txwi_ptr, int (*tx_prepare_skb)(struct mt76_dev *dev, void *txwi_ptr,
struct sk_buff *skb, enum mt76_txq_id qid, enum mt76_txq_id qid, struct mt76_wcid *wcid,
struct mt76_wcid *wcid,
struct ieee80211_sta *sta, struct ieee80211_sta *sta,
struct mt76_tx_info *tx_info); struct mt76_tx_info *tx_info);
mt7603/mac.c
+6 -5
View File
@@ -912,13 +912,13 @@ mt7603_mac_write_txwi(struct mt7603_dev *dev, __le32 *txwi,
} }
int mt7603_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr, int mt7603_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
struct sk_buff *skb, enum mt76_txq_id qid, enum mt76_txq_id qid, struct mt76_wcid *wcid,
struct mt76_wcid *wcid, struct ieee80211_sta *sta, struct ieee80211_sta *sta,
struct mt76_tx_info *tx_info) struct mt76_tx_info *tx_info)
{ {
struct mt7603_dev *dev = container_of(mdev, struct mt7603_dev, mt76); struct mt7603_dev *dev = container_of(mdev, struct mt7603_dev, mt76);
struct mt7603_sta *msta = container_of(wcid, struct mt7603_sta, wcid); struct mt7603_sta *msta = container_of(wcid, struct mt7603_sta, wcid);
struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); struct ieee80211_tx_info *info = IEEE80211_SKB_CB(tx_info->skb);
struct ieee80211_key_conf *key = info->control.hw_key; struct ieee80211_key_conf *key = info->control.hw_key;
int pid; int pid;
@@ -934,7 +934,7 @@ int mt7603_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
mt7603_wtbl_set_ps(dev, msta, false); mt7603_wtbl_set_ps(dev, msta, false);
} }
pid = mt76_tx_status_skb_add(mdev, wcid, skb); pid = mt76_tx_status_skb_add(mdev, wcid, tx_info->skb);
if (info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE) { if (info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE) {
spin_lock_bh(&dev->mt76.lock); spin_lock_bh(&dev->mt76.lock);
@@ -944,7 +944,8 @@ int mt7603_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
spin_unlock_bh(&dev->mt76.lock); spin_unlock_bh(&dev->mt76.lock);
} }
mt7603_mac_write_txwi(dev, txwi_ptr, skb, qid, wcid, sta, pid, key); mt7603_mac_write_txwi(dev, txwi_ptr, tx_info->skb, qid, wcid,
sta, pid, key);
return 0; return 0;
} }
mt7603/mt7603.h
+2 -2
View File
@@ -222,8 +222,8 @@ void mt7603_wtbl_set_smps(struct mt7603_dev *dev, struct mt7603_sta *sta,
void mt7603_filter_tx(struct mt7603_dev *dev, int idx, bool abort); void mt7603_filter_tx(struct mt7603_dev *dev, int idx, bool abort);
int mt7603_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr, int mt7603_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
struct sk_buff *skb, enum mt76_txq_id qid, enum mt76_txq_id qid, struct mt76_wcid *wcid,
struct mt76_wcid *wcid, struct ieee80211_sta *sta, struct ieee80211_sta *sta,
struct mt76_tx_info *tx_info); struct mt76_tx_info *tx_info);
void mt7603_tx_complete_skb(struct mt76_dev *mdev, enum mt76_txq_id qid, void mt7603_tx_complete_skb(struct mt76_dev *mdev, enum mt76_txq_id qid,
mt76x02.h
+2 -2
View File
@@ -184,8 +184,8 @@ irqreturn_t mt76x02_irq_handler(int irq, void *dev_instance);
void mt76x02_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control, void mt76x02_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control,
struct sk_buff *skb); struct sk_buff *skb);
int mt76x02_tx_prepare_skb(struct mt76_dev *mdev, void *txwi, int mt76x02_tx_prepare_skb(struct mt76_dev *mdev, void *txwi,
struct sk_buff *skb, enum mt76_txq_id qid, enum mt76_txq_id qid, struct mt76_wcid *wcid,
struct mt76_wcid *wcid, struct ieee80211_sta *sta, struct ieee80211_sta *sta,
struct mt76_tx_info *tx_info); struct mt76_tx_info *tx_info);
void mt76x02_sw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif, void mt76x02_sw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
const u8 *mac); const u8 *mac);
mt76x02_txrx.c
+4 -3
View File
@@ -147,13 +147,14 @@ bool mt76x02_tx_status_data(struct mt76_dev *mdev, u8 *update)
EXPORT_SYMBOL_GPL(mt76x02_tx_status_data); EXPORT_SYMBOL_GPL(mt76x02_tx_status_data);
int mt76x02_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr, int mt76x02_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
struct sk_buff *skb, enum mt76_txq_id qid, enum mt76_txq_id qid, struct mt76_wcid *wcid,
struct mt76_wcid *wcid, struct ieee80211_sta *sta, struct ieee80211_sta *sta,
struct mt76_tx_info *tx_info) struct mt76_tx_info *tx_info)
{ {
struct mt76x02_dev *dev = container_of(mdev, struct mt76x02_dev, mt76); struct mt76x02_dev *dev = container_of(mdev, struct mt76x02_dev, mt76);
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)tx_info->skb->data;
struct mt76x02_txwi *txwi = txwi_ptr; struct mt76x02_txwi *txwi = txwi_ptr;
struct sk_buff *skb = tx_info->skb;
int hdrlen, pad, len, pid, qsel = MT_QSEL_EDCA; int hdrlen, pad, len, pid, qsel = MT_QSEL_EDCA;
if (qid == MT_TXQ_PSD && wcid && wcid->idx < 128) if (qid == MT_TXQ_PSD && wcid && wcid->idx < 128)
mt76x02_usb.h
+2 -2
View File
@@ -26,8 +26,8 @@ int mt76x02u_mcu_fw_send_data(struct mt76x02_dev *dev, const void *data,
int mt76x02u_skb_dma_info(struct sk_buff *skb, int port, u32 flags); int mt76x02u_skb_dma_info(struct sk_buff *skb, int port, u32 flags);
int mt76x02u_tx_prepare_skb(struct mt76_dev *mdev, void *data, int mt76x02u_tx_prepare_skb(struct mt76_dev *mdev, void *data,
struct sk_buff *skb, enum mt76_txq_id qid, enum mt76_txq_id qid, struct mt76_wcid *wcid,
struct mt76_wcid *wcid, struct ieee80211_sta *sta, struct ieee80211_sta *sta,
struct mt76_tx_info *tx_info); struct mt76_tx_info *tx_info);
void mt76x02u_tx_complete_skb(struct mt76_dev *mdev, enum mt76_txq_id qid, void mt76x02u_tx_complete_skb(struct mt76_dev *mdev, enum mt76_txq_id qid,
struct mt76_queue_entry *e); struct mt76_queue_entry *e);
mt76x02_usb_core.c
+4 -3
View File
@@ -72,11 +72,12 @@ int mt76x02u_skb_dma_info(struct sk_buff *skb, int port, u32 flags)
} }
int mt76x02u_tx_prepare_skb(struct mt76_dev *mdev, void *data, int mt76x02u_tx_prepare_skb(struct mt76_dev *mdev, void *data,
struct sk_buff *skb, enum mt76_txq_id qid, enum mt76_txq_id qid, struct mt76_wcid *wcid,
struct mt76_wcid *wcid, struct ieee80211_sta *sta, struct ieee80211_sta *sta,
struct mt76_tx_info *tx_info) struct mt76_tx_info *tx_info)
{ {
struct mt76x02_dev *dev = container_of(mdev, struct mt76x02_dev, mt76); struct mt76x02_dev *dev = container_of(mdev, struct mt76x02_dev, mt76);
struct sk_buff *skb = tx_info->skb;
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
int pid, hdrlen, len = skb->len, ep = q2ep(mdev->q_tx[qid].q->hw_idx); int pid, hdrlen, len = skb->len, ep = q2ep(mdev->q_tx[qid].q->hw_idx);
struct mt76x02_txwi *txwi; struct mt76x02_txwi *txwi;
@@ -102,7 +103,7 @@ int mt76x02u_tx_prepare_skb(struct mt76_dev *mdev, void *data,
if (!wcid || wcid->hw_key_idx == 0xff || wcid->sw_iv) if (!wcid || wcid->hw_key_idx == 0xff || wcid->sw_iv)
flags |= MT_TXD_INFO_WIV; flags |= MT_TXD_INFO_WIV;
return mt76x02u_skb_dma_info(skb, WLAN_PORT, flags); return mt76x02u_skb_dma_info(tx_info->skb, WLAN_PORT, flags);
} }
EXPORT_SYMBOL_GPL(mt76x02u_tx_prepare_skb); EXPORT_SYMBOL_GPL(mt76x02u_tx_prepare_skb);
usb.c
+8 -6
View File
@@ -734,7 +734,9 @@ mt76u_tx_queue_skb(struct mt76_dev *dev, enum mt76_txq_id qid,
struct ieee80211_sta *sta) struct ieee80211_sta *sta)
{ {
struct mt76_queue *q = dev->q_tx[qid].q; struct mt76_queue *q = dev->q_tx[qid].q;
struct urb *urb; struct mt76_tx_info tx_info = {
.skb = skb,
};
u16 idx = q->tail; u16 idx = q->tail;
int err; int err;
@@ -742,20 +744,20 @@ mt76u_tx_queue_skb(struct mt76_dev *dev, enum mt76_txq_id qid,
return -ENOSPC; return -ENOSPC;
skb->prev = skb->next = NULL; skb->prev = skb->next = NULL;
err = dev->drv->tx_prepare_skb(dev, NULL, skb, qid, wcid, sta, NULL); err = dev->drv->tx_prepare_skb(dev, NULL, qid, wcid, sta, &tx_info);
if (err < 0) if (err < 0)
return err; return err;
urb = q->entry[idx].urb; err = mt76u_tx_setup_buffers(dev, tx_info.skb, q->entry[idx].urb);
err = mt76u_tx_setup_buffers(dev, skb, urb);
if (err < 0) if (err < 0)
return err; return err;
mt76u_fill_bulk_urb(dev, USB_DIR_OUT, q2ep(q->hw_idx), mt76u_fill_bulk_urb(dev, USB_DIR_OUT, q2ep(q->hw_idx),
urb, mt76u_complete_tx, &q->entry[idx]); q->entry[idx].urb, mt76u_complete_tx,
&q->entry[idx]);
q->tail = (q->tail + 1) % q->ndesc; q->tail = (q->tail + 1) % q->ndesc;
q->entry[idx].skb = skb; q->entry[idx].skb = tx_info.skb;
q->queued++; q->queued++;
return idx; return idx;