Commit 960d6d08 authored by Zhaoyang Liu's avatar Zhaoyang Liu Committed by Kalle Valo

mwifiex: delay skb allocation for RX until cmd53 over

This patch moves SKB allocation for RX packets from current
place i.e. after reading MP regs to place where we already
have read data from SDIO bus ie after cmd53.

mp_rx_aggr_setup has been modified accordingly to set
skb_arr to NULL.
Signed-off-by: default avatarZhaoyang Liu <liuzy@marvell.com>
Signed-off-by: default avatarShengzhen Li <szli@marvell.com>
Reviewed-by: default avatarAmitkumar Karwar <akarwar@marvell.com>
Reviewed-by: default avatarCathy Luo <cluo@marvell.com>
Reviewed-by: default avatarAvinash Patil <patila@marvell.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 92263a84
...@@ -1197,7 +1197,7 @@ static int mwifiex_decode_rx_packet(struct mwifiex_adapter *adapter, ...@@ -1197,7 +1197,7 @@ static int mwifiex_decode_rx_packet(struct mwifiex_adapter *adapter,
* provided there is space left, processed and finally uploaded. * provided there is space left, processed and finally uploaded.
*/ */
static int mwifiex_sdio_card_to_host_mp_aggr(struct mwifiex_adapter *adapter, static int mwifiex_sdio_card_to_host_mp_aggr(struct mwifiex_adapter *adapter,
struct sk_buff *skb, u8 port) u16 rx_len, u8 port)
{ {
struct sdio_mmc_card *card = adapter->card; struct sdio_mmc_card *card = adapter->card;
s32 f_do_rx_aggr = 0; s32 f_do_rx_aggr = 0;
...@@ -1205,10 +1205,9 @@ static int mwifiex_sdio_card_to_host_mp_aggr(struct mwifiex_adapter *adapter, ...@@ -1205,10 +1205,9 @@ static int mwifiex_sdio_card_to_host_mp_aggr(struct mwifiex_adapter *adapter,
s32 f_aggr_cur = 0; s32 f_aggr_cur = 0;
s32 f_post_aggr_cur = 0; s32 f_post_aggr_cur = 0;
struct sk_buff *skb_deaggr; struct sk_buff *skb_deaggr;
u32 pind; struct sk_buff *skb = NULL;
u32 pkt_len, pkt_type, mport; u32 pkt_len, pkt_type, mport, pind;
u8 *curr_ptr; u8 *curr_ptr;
u32 rx_len = skb->len;
if ((card->has_control_mask) && (port == CTRL_PORT)) { if ((card->has_control_mask) && (port == CTRL_PORT)) {
/* Read the command Resp without aggr */ /* Read the command Resp without aggr */
...@@ -1235,7 +1234,7 @@ static int mwifiex_sdio_card_to_host_mp_aggr(struct mwifiex_adapter *adapter, ...@@ -1235,7 +1234,7 @@ static int mwifiex_sdio_card_to_host_mp_aggr(struct mwifiex_adapter *adapter,
dev_dbg(adapter->dev, "info: %s: not last packet\n", __func__); dev_dbg(adapter->dev, "info: %s: not last packet\n", __func__);
if (MP_RX_AGGR_IN_PROGRESS(card)) { if (MP_RX_AGGR_IN_PROGRESS(card)) {
if (MP_RX_AGGR_BUF_HAS_ROOM(card, skb->len)) { if (MP_RX_AGGR_BUF_HAS_ROOM(card, rx_len)) {
f_aggr_cur = 1; f_aggr_cur = 1;
} else { } else {
/* No room in Aggr buf, do rx aggr now */ /* No room in Aggr buf, do rx aggr now */
...@@ -1253,7 +1252,7 @@ static int mwifiex_sdio_card_to_host_mp_aggr(struct mwifiex_adapter *adapter, ...@@ -1253,7 +1252,7 @@ static int mwifiex_sdio_card_to_host_mp_aggr(struct mwifiex_adapter *adapter,
if (MP_RX_AGGR_IN_PROGRESS(card)) { if (MP_RX_AGGR_IN_PROGRESS(card)) {
f_do_rx_aggr = 1; f_do_rx_aggr = 1;
if (MP_RX_AGGR_BUF_HAS_ROOM(card, skb->len)) if (MP_RX_AGGR_BUF_HAS_ROOM(card, rx_len))
f_aggr_cur = 1; f_aggr_cur = 1;
else else
/* No room in Aggr buf, do rx aggr now */ /* No room in Aggr buf, do rx aggr now */
...@@ -1266,7 +1265,7 @@ static int mwifiex_sdio_card_to_host_mp_aggr(struct mwifiex_adapter *adapter, ...@@ -1266,7 +1265,7 @@ static int mwifiex_sdio_card_to_host_mp_aggr(struct mwifiex_adapter *adapter,
if (f_aggr_cur) { if (f_aggr_cur) {
dev_dbg(adapter->dev, "info: current packet aggregation\n"); dev_dbg(adapter->dev, "info: current packet aggregation\n");
/* Curr pkt can be aggregated */ /* Curr pkt can be aggregated */
mp_rx_aggr_setup(card, skb, port); mp_rx_aggr_setup(card, rx_len, port);
if (MP_RX_AGGR_PKT_LIMIT_REACHED(card) || if (MP_RX_AGGR_PKT_LIMIT_REACHED(card) ||
mp_rx_aggr_port_limit_reached(card)) { mp_rx_aggr_port_limit_reached(card)) {
...@@ -1309,18 +1308,25 @@ static int mwifiex_sdio_card_to_host_mp_aggr(struct mwifiex_adapter *adapter, ...@@ -1309,18 +1308,25 @@ static int mwifiex_sdio_card_to_host_mp_aggr(struct mwifiex_adapter *adapter,
curr_ptr = card->mpa_rx.buf; curr_ptr = card->mpa_rx.buf;
for (pind = 0; pind < card->mpa_rx.pkt_cnt; pind++) { for (pind = 0; pind < card->mpa_rx.pkt_cnt; pind++) {
u32 *len_arr = card->mpa_rx.len_arr;
/* get curr PKT len & type */ /* get curr PKT len & type */
pkt_len = le16_to_cpu(*(__le16 *) &curr_ptr[0]); pkt_len = le16_to_cpu(*(__le16 *) &curr_ptr[0]);
pkt_type = le16_to_cpu(*(__le16 *) &curr_ptr[2]); pkt_type = le16_to_cpu(*(__le16 *) &curr_ptr[2]);
/* copy pkt to deaggr buf */ /* copy pkt to deaggr buf */
skb_deaggr = card->mpa_rx.skb_arr[pind]; skb_deaggr = mwifiex_alloc_dma_align_buf(len_arr[pind],
GFP_KERNEL |
GFP_DMA);
if (!skb_deaggr)
goto error;
skb_put(skb_deaggr, len_arr[pind]);
card->mpa_rx.skb_arr[pind] = skb_deaggr;
if ((pkt_type == MWIFIEX_TYPE_DATA || if ((pkt_type == MWIFIEX_TYPE_DATA ||
(pkt_type == MWIFIEX_TYPE_AGGR_DATA && (pkt_type == MWIFIEX_TYPE_AGGR_DATA &&
adapter->sdio_rx_aggr_enable)) && adapter->sdio_rx_aggr_enable)) &&
(pkt_len <= card->mpa_rx.len_arr[pind])) { (pkt_len <= len_arr[pind])) {
memcpy(skb_deaggr->data, curr_ptr, pkt_len); memcpy(skb_deaggr->data, curr_ptr, pkt_len);
...@@ -1335,10 +1341,10 @@ static int mwifiex_sdio_card_to_host_mp_aggr(struct mwifiex_adapter *adapter, ...@@ -1335,10 +1341,10 @@ static int mwifiex_sdio_card_to_host_mp_aggr(struct mwifiex_adapter *adapter,
"type=%d len=%d max_len=%d\n", "type=%d len=%d max_len=%d\n",
adapter->sdio_rx_aggr_enable, adapter->sdio_rx_aggr_enable,
pkt_type, pkt_len, pkt_type, pkt_len,
card->mpa_rx.len_arr[pind]); len_arr[pind]);
dev_kfree_skb_any(skb_deaggr); dev_kfree_skb_any(skb_deaggr);
} }
curr_ptr += card->mpa_rx.len_arr[pind]; curr_ptr += len_arr[pind];
} }
MP_RX_AGGR_BUF_RESET(card); MP_RX_AGGR_BUF_RESET(card);
} }
...@@ -1347,6 +1353,10 @@ static int mwifiex_sdio_card_to_host_mp_aggr(struct mwifiex_adapter *adapter, ...@@ -1347,6 +1353,10 @@ static int mwifiex_sdio_card_to_host_mp_aggr(struct mwifiex_adapter *adapter,
if (f_do_rx_cur) { if (f_do_rx_cur) {
dev_dbg(adapter->dev, "info: RX: port: %d, rx_len: %d\n", dev_dbg(adapter->dev, "info: RX: port: %d, rx_len: %d\n",
port, rx_len); port, rx_len);
skb = mwifiex_alloc_dma_align_buf(rx_len, GFP_KERNEL | GFP_DMA);
if (!skb)
goto error;
skb_put(skb, rx_len);
if (mwifiex_sdio_card_to_host(adapter, &pkt_type, if (mwifiex_sdio_card_to_host(adapter, &pkt_type,
skb->data, skb->len, skb->data, skb->len,
...@@ -1365,7 +1375,7 @@ static int mwifiex_sdio_card_to_host_mp_aggr(struct mwifiex_adapter *adapter, ...@@ -1365,7 +1375,7 @@ static int mwifiex_sdio_card_to_host_mp_aggr(struct mwifiex_adapter *adapter,
if (f_post_aggr_cur) { if (f_post_aggr_cur) {
dev_dbg(adapter->dev, "info: current packet aggregation\n"); dev_dbg(adapter->dev, "info: current packet aggregation\n");
/* Curr pkt can be aggregated */ /* Curr pkt can be aggregated */
mp_rx_aggr_setup(card, skb, port); mp_rx_aggr_setup(card, skb->len, port);
} }
return 0; return 0;
...@@ -1375,12 +1385,13 @@ static int mwifiex_sdio_card_to_host_mp_aggr(struct mwifiex_adapter *adapter, ...@@ -1375,12 +1385,13 @@ static int mwifiex_sdio_card_to_host_mp_aggr(struct mwifiex_adapter *adapter,
for (pind = 0; pind < card->mpa_rx.pkt_cnt; pind++) { for (pind = 0; pind < card->mpa_rx.pkt_cnt; pind++) {
/* copy pkt to deaggr buf */ /* copy pkt to deaggr buf */
skb_deaggr = card->mpa_rx.skb_arr[pind]; skb_deaggr = card->mpa_rx.skb_arr[pind];
dev_kfree_skb_any(skb_deaggr); if (skb_deaggr)
dev_kfree_skb_any(skb_deaggr);
} }
MP_RX_AGGR_BUF_RESET(card); MP_RX_AGGR_BUF_RESET(card);
} }
if (f_do_rx_cur) if (f_do_rx_cur && skb)
/* Single transfer pending. Free curr buff also */ /* Single transfer pending. Free curr buff also */
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);
...@@ -1442,6 +1453,7 @@ static int mwifiex_process_int_status(struct mwifiex_adapter *adapter) ...@@ -1442,6 +1453,7 @@ static int mwifiex_process_int_status(struct mwifiex_adapter *adapter)
MWIFIEX_RX_DATA_BUF_SIZE) MWIFIEX_RX_DATA_BUF_SIZE)
return -1; return -1;
rx_len = (u16) (rx_blocks * MWIFIEX_SDIO_BLOCK_SIZE); rx_len = (u16) (rx_blocks * MWIFIEX_SDIO_BLOCK_SIZE);
dev_dbg(adapter->dev, "info: rx_len = %d\n", rx_len);
skb = mwifiex_alloc_dma_align_buf(rx_len, GFP_KERNEL | GFP_DMA); skb = mwifiex_alloc_dma_align_buf(rx_len, GFP_KERNEL | GFP_DMA);
if (!skb) if (!skb)
...@@ -1538,24 +1550,11 @@ static int mwifiex_process_int_status(struct mwifiex_adapter *adapter) ...@@ -1538,24 +1550,11 @@ static int mwifiex_process_int_status(struct mwifiex_adapter *adapter)
rx_len); rx_len);
return -1; return -1;
} }
rx_len = (u16) (rx_blocks * MWIFIEX_SDIO_BLOCK_SIZE);
skb = mwifiex_alloc_dma_align_buf(rx_len, rx_len = (u16) (rx_blocks * MWIFIEX_SDIO_BLOCK_SIZE);
GFP_KERNEL | dev_dbg(adapter->dev, "info: rx_len = %d\n", rx_len);
GFP_DMA);
if (!skb) {
dev_err(adapter->dev, "%s: failed to alloc skb",
__func__);
return -1;
}
skb_put(skb, rx_len);
dev_dbg(adapter->dev, "info: rx_len = %d skb->len = %d\n",
rx_len, skb->len);
if (mwifiex_sdio_card_to_host_mp_aggr(adapter, skb, if (mwifiex_sdio_card_to_host_mp_aggr(adapter, rx_len,
port)) { port)) {
dev_err(adapter->dev, "card_to_host_mpa failed:" dev_err(adapter->dev, "card_to_host_mpa failed:"
" int status=%#x\n", sdio_ireg); " int status=%#x\n", sdio_ireg);
......
...@@ -573,9 +573,9 @@ mp_tx_aggr_port_limit_reached(struct sdio_mmc_card *card) ...@@ -573,9 +573,9 @@ mp_tx_aggr_port_limit_reached(struct sdio_mmc_card *card)
/* Prepare to copy current packet from card to SDIO Rx aggregation buffer */ /* Prepare to copy current packet from card to SDIO Rx aggregation buffer */
static inline void mp_rx_aggr_setup(struct sdio_mmc_card *card, static inline void mp_rx_aggr_setup(struct sdio_mmc_card *card,
struct sk_buff *skb, u8 port) u16 rx_len, u8 port)
{ {
card->mpa_rx.buf_len += skb->len; card->mpa_rx.buf_len += rx_len;
if (!card->mpa_rx.pkt_cnt) if (!card->mpa_rx.pkt_cnt)
card->mpa_rx.start_port = port; card->mpa_rx.start_port = port;
...@@ -588,8 +588,8 @@ static inline void mp_rx_aggr_setup(struct sdio_mmc_card *card, ...@@ -588,8 +588,8 @@ static inline void mp_rx_aggr_setup(struct sdio_mmc_card *card,
else else
card->mpa_rx.ports |= 1 << (card->mpa_rx.pkt_cnt + 1); card->mpa_rx.ports |= 1 << (card->mpa_rx.pkt_cnt + 1);
} }
card->mpa_rx.skb_arr[card->mpa_rx.pkt_cnt] = skb; card->mpa_rx.skb_arr[card->mpa_rx.pkt_cnt] = NULL;
card->mpa_rx.len_arr[card->mpa_rx.pkt_cnt] = skb->len; card->mpa_rx.len_arr[card->mpa_rx.pkt_cnt] = rx_len;
card->mpa_rx.pkt_cnt++; card->mpa_rx.pkt_cnt++;
} }
#endif /* _MWIFIEX_SDIO_H */ #endif /* _MWIFIEX_SDIO_H */
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