gmane.linux.kernel.wireless.general

[PATCH 0/3] Work on STBC Rx monitoring

Oleksij Rempel — 2013-05-19T07:38:53

This patch set will pass RxSTBC flags from ath9k to ieee80211
and to radiotap.
This field is now a part of radiotap specification:
http://www.radiotap.org/defined-fields/MCS

Oleksij Rempel (3):
  mac80211: add STBC flag for radiotap
  ath9k: remove useless flag conversation.
  ath9k: check for Rx-STBC flag and pass it to ieee80211

 drivers/net/wireless/ath/ath9k/ar9003_mac.c |  5 +++--
 drivers/net/wireless/ath/ath9k/mac.c        | 16 ++++++++++++----
 drivers/net/wireless/ath/ath9k/mac.h        |  4 +++-
 drivers/net/wireless/ath/ath9k/recv.c       |  5 +----
 include/net/ieee80211_radiotap.h            |  7 +++++++
 include/net/mac80211.h                      |  4 ++++
 net/mac80211/main.c                         |  3 ++-
 net/mac80211/rx.c                           |  4 ++++
 net/mac80211/status.c                       |  3 ++-
 9 files changed, 38 insertions(+), 13 deletions(-)

[PATCH 3.10] ath9k: prevent aggregation session deadlocks

Felix Fietkau — 2013-05-18T19:28:15

Waiting for all subframes of an existing aggregation session to drain
before allowing mac80211 to start a new one is fragile and deadlocks
caused by this behavior have been observed.

Since mac80211 has proper synchronization for aggregation session
start/stop handling, a better approach to session handling is to simply
allow mac80211 to start a new session at any time. This requires
changing the code to discard any packets outside of the BlockAck window
in the A-MPDU software retry code.

This patch implements the above and also simplifies the code.

Signed-off-by: Felix Fietkau <nbd-p3rKhJxN3npAfugRpC6u6w< at >public.gmane.org>
---
 drivers/net/wireless/ath/ath9k/ath9k.h |  14 +---
 drivers/net/wireless/ath/ath9k/main.c  |   3 +-
 drivers/net/wireless/ath/ath9k/rc.c    |   5 +-
 drivers/net/wireless/ath/ath9k/xmit.c  | 138 ++++++++++-----------------------
 4 files changed, 46 insertions(+), 114 deletions(-)

diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index 366002f..42b03dc 100644
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
< at >< at > -251,10 +251,9 < at >< at > struct ath_atx_tid {
 int tidno;
 int baw_head;   /* first un-acked tx buffer */
 int baw_tail;   /* next unused tx buffer slot */
-int sched;
-int paused;
-u8 state;
-bool stop_cb;
+bool sched;
+bool paused;
+bool active;
 };
 
 struct ath_node {
< at >< at > -275,10 +274,6 < at >< at > struct ath_node {
 #endif
 };
 
-#define AGGR_CLEANUP         BIT(1)
-#define AGGR_ADDBA_COMPLETE  BIT(2)
-#define AGGR_ADDBA_PROGRESS  BIT(3)
-
 struct ath_tx_control {
 struct ath_txq *txq;
 struct ath_node *an;
< at >< at > -352,8 +347,7 < at >< at > void ath_tx_tasklet(struct ath_softc *sc);
 void ath_tx_edma_tasklet(struct ath_softc *sc);
 int ath_tx_aggr_start(struct ath_softc *sc, struct ieee80211_sta *sta,
       u16 tid, u16 *ssn);
-bool ath_tx_aggr_stop(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid,
-      bool flush);
+void ath_tx_aggr_stop(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid);
 void ath_tx_aggr_resume(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid);
 
 void ath_tx_aggr_wakeup(struct ath_softc *sc, struct ath_node *an);
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index 2382d12..5092eca 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
< at >< at > -1709,7 +1709,8 < at >< at > static int ath9k_ampdu_action(struct ieee80211_hw *hw,
 flush = true;
 case IEEE80211_AMPDU_TX_STOP_CONT:
 ath9k_ps_wakeup(sc);
-if (ath_tx_aggr_stop(sc, sta, tid, flush))
+ath_tx_aggr_stop(sc, sta, tid);
+if (!flush)
 ieee80211_stop_tx_ba_cb_irqsafe(vif, sta->addr, tid);
 ath9k_ps_restore(sc);
 break;
diff --git a/drivers/net/wireless/ath/ath9k/rc.c b/drivers/net/wireless/ath/ath9k/rc.c
index aa4d368..7eb1f4b 100644
--- a/drivers/net/wireless/ath/ath9k/rc.c
+++ b/drivers/net/wireless/ath/ath9k/rc.c
< at >< at > -1227,10 +1227,7 < at >< at > static bool ath_tx_aggr_check(struct ath_softc *sc, struct ieee80211_sta *sta,
 return false;
 
 txtid = ATH_AN_2_TID(an, tidno);
-
-if (!(txtid->state & (AGGR_ADDBA_COMPLETE | AGGR_ADDBA_PROGRESS)))
-return true;
-return false;
+return !txtid->active;
 }
 
 
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index 14bb335..1c9b1ba 100644
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
< at >< at > -125,24 +125,6 < at >< at > static void ath_tx_queue_tid(struct ath_txq *txq, struct ath_atx_tid *tid)
 list_add_tail(&ac->list, &txq->axq_acq);
 }
 
-static void ath_tx_resume_tid(struct ath_softc *sc, struct ath_atx_tid *tid)
-{
-struct ath_txq *txq = tid->ac->txq;
-
-WARN_ON(!tid->paused);
-
-ath_txq_lock(sc, txq);
-tid->paused = false;
-
-if (skb_queue_empty(&tid->buf_q))
-goto unlock;
-
-ath_tx_queue_tid(txq, tid);
-ath_txq_schedule(sc, txq);
-unlock:
-ath_txq_unlock_complete(sc, txq);
-}
-
 static struct ath_frame_info *get_frame_info(struct sk_buff *skb)
 {
 struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
< at >< at > -164,20 +146,7 < at >< at > static void ath_set_rates(struct ieee80211_vif *vif, struct ieee80211_sta *sta,
        ARRAY_SIZE(bf->rates));
 }
 
-static void ath_tx_clear_tid(struct ath_softc *sc, struct ath_atx_tid *tid)
-{
-tid->state &= ~AGGR_ADDBA_COMPLETE;
-tid->state &= ~AGGR_CLEANUP;
-if (!tid->stop_cb)
-return;
-
-ieee80211_start_tx_ba_cb_irqsafe(tid->an->vif, tid->an->sta->addr,
- tid->tidno);
-tid->stop_cb = false;
-}
-
-static void ath_tx_flush_tid(struct ath_softc *sc, struct ath_atx_tid *tid,
-     bool flush_packets)
+static void ath_tx_flush_tid(struct ath_softc *sc, struct ath_atx_tid *tid)
 {
 struct ath_txq *txq = tid->ac->txq;
 struct sk_buff *skb;
< at >< at > -194,15 +163,16 < at >< at > static void ath_tx_flush_tid(struct ath_softc *sc, struct ath_atx_tid *tid,
 while ((skb = __skb_dequeue(&tid->buf_q))) {
 fi = get_frame_info(skb);
 bf = fi->bf;
-if (!bf && !flush_packets)
-bf = ath_tx_setup_buffer(sc, txq, tid, skb);
 
 if (!bf) {
-ieee80211_free_txskb(sc->hw, skb);
-continue;
+bf = ath_tx_setup_buffer(sc, txq, tid, skb);
+if (!bf) {
+ieee80211_free_txskb(sc->hw, skb);
+continue;
+}
 }
 
-if (fi->retries || flush_packets) {
+if (fi->retries) {
 list_add_tail(&bf->list, &bf_head);
 ath_tx_update_baw(sc, tid, bf->bf_state.seqno);
 ath_tx_complete_buf(sc, bf, txq, &bf_head, &ts, 0);
< at >< at > -213,10 +183,7 < at >< at > static void ath_tx_flush_tid(struct ath_softc *sc, struct ath_atx_tid *tid,
 }
 }
 
-if (tid->baw_head == tid->baw_tail)
-ath_tx_clear_tid(sc, tid);
-
-if (sendbar && !flush_packets) {
+if (sendbar) {
 ath_txq_unlock(sc, txq);
 ath_send_bar(tid, tid->seq_start);
 ath_txq_lock(sc, txq);
< at >< at > -499,19 +466,19 < at >< at > static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
 tx_info = IEEE80211_SKB_CB(skb);
 fi = get_frame_info(skb);
 
-if (ATH_BA_ISSET(ba, ATH_BA_INDEX(seq_st, seqno))) {
+if (!BAW_WITHIN(tid->seq_start, tid->baw_size, seqno)) {
+/*
+ * Outside of the current BlockAck window,
+ * maybe part of a previous session
+ */
+txfail = 1;
+} else if (ATH_BA_ISSET(ba, ATH_BA_INDEX(seq_st, seqno))) {
 /* transmit completion, subframe is
  * acked by block ack */
 acked_cnt++;
 } else if (!isaggr && txok) {
 /* transmit completion */
 acked_cnt++;
-} else if (tid->state & AGGR_CLEANUP) {
-/*
- * cleanup in progress, just fail
- * the un-acked sub-frames
- */
-txfail = 1;
 } else if (flush) {
 txpending = 1;
 } else if (fi->retries < ATH_MAX_SW_RETRIES) {
< at >< at > -535,7 +502,7 < at >< at > static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
 if (bf_next != NULL || !bf_last->bf_stale)
 list_move_tail(&bf->list, &bf_head);
 
-if (!txpending || (tid->state & AGGR_CLEANUP)) {
+if (!txpending) {
 /*
  * complete the acked-ones/xretried ones; update
  * block-ack window
< at >< at > -609,9 +576,6 < at >< at > static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
 ath_txq_lock(sc, txq);
 }
 
-if (tid->state & AGGR_CLEANUP)
-ath_tx_flush_tid(sc, tid, false);
-
 rcu_read_unlock();
 
 if (needreset)
< at >< at > -1244,9 +1208,6 < at >< at > int ath_tx_aggr_start(struct ath_softc *sc, struct ieee80211_sta *sta,
 an = (struct ath_node *)sta->drv_priv;
 txtid = ATH_AN_2_TID(an, tid);
 
-if (txtid->state & (AGGR_CLEANUP | AGGR_ADDBA_COMPLETE))
-return -EAGAIN;
-
 /* update ampdu factor/density, they may have changed. This may happen
  * in HT IBSS when a beacon with HT-info is received after the station
  * has already been added.
< at >< at > -1258,7 +1219,7 < at >< at > int ath_tx_aggr_start(struct ath_softc *sc, struct ieee80211_sta *sta,
 an->mpdudensity = density;
 }
 
-txtid->state |= AGGR_ADDBA_PROGRESS;
+txtid->active = true;
 txtid->paused = true;
 *ssn = txtid->seq_start = txtid->seq_next;
 txtid->bar_index = -1;
< at >< at > -1269,45 +1230,17 < at >< at > int ath_tx_aggr_start(struct ath_softc *sc, struct ieee80211_sta *sta,
 return 0;
 }
 
-bool ath_tx_aggr_stop(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid,
-      bool flush)
+void ath_tx_aggr_stop(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid)
 {
 struct ath_node *an = (struct ath_node *)sta->drv_priv;
 struct ath_atx_tid *txtid = ATH_AN_2_TID(an, tid);
 struct ath_txq *txq = txtid->ac->txq;
-bool ret = !flush;
-
-if (flush)
-txtid->stop_cb = false;
-
-if (txtid->state & AGGR_CLEANUP)
-return false;
-
-if (!(txtid->state & AGGR_ADDBA_COMPLETE)) {
-txtid->state &= ~AGGR_ADDBA_PROGRESS;
-return ret;
-}
 
 ath_txq_lock(sc, txq);
+txtid->active = false;
 txtid->paused = true;
-
-/*
- * If frames are still being transmitted for this TID, they will be
- * cleaned up during tx completion. To prevent race conditions, this
- * TID can only be reused after all in-progress subframes have been
- * completed.
- */
-if (txtid->baw_head != txtid->baw_tail) {
-txtid->state |= AGGR_CLEANUP;
-ret = false;
-txtid->stop_cb = !flush;
-} else {
-txtid->state &= ~AGGR_ADDBA_COMPLETE;
-}
-
-ath_tx_flush_tid(sc, txtid, flush);
+ath_tx_flush_tid(sc, txtid);
 ath_txq_unlock_complete(sc, txq);
-return ret;
 }
 
 void ath_tx_aggr_sleep(struct ieee80211_sta *sta, struct ath_softc *sc,
< at >< at > -1371,18 +1304,28 < at >< at > void ath_tx_aggr_wakeup(struct ath_softc *sc, struct ath_node *an)
 }
 }
 
-void ath_tx_aggr_resume(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid)
+void ath_tx_aggr_resume(struct ath_softc *sc, struct ieee80211_sta *sta,
+u16 tidno)
 {
-struct ath_atx_tid *txtid;
+struct ath_atx_tid *tid;
 struct ath_node *an;
+struct ath_txq *txq;
 
 an = (struct ath_node *)sta->drv_priv;
+tid = ATH_AN_2_TID(an, tidno);
+txq = tid->ac->txq;
 
-txtid = ATH_AN_2_TID(an, tid);
-txtid->baw_size = IEEE80211_MIN_AMPDU_BUF << sta->ht_cap.ampdu_factor;
-txtid->state |= AGGR_ADDBA_COMPLETE;
-txtid->state &= ~AGGR_ADDBA_PROGRESS;
-ath_tx_resume_tid(sc, txtid);
+ath_txq_lock(sc, txq);
+
+tid->baw_size = IEEE80211_MIN_AMPDU_BUF << sta->ht_cap.ampdu_factor;
+tid->paused = false;
+
+if (!skb_queue_empty(&tid->buf_q)) {
+ath_tx_queue_tid(txq, tid);
+ath_txq_schedule(sc, txq);
+}
+
+ath_txq_unlock_complete(sc, txq);
 }
 
 /********************/
< at >< at > -2431,13 +2374,10 < at >< at > void ath_tx_node_init(struct ath_softc *sc, struct ath_node *an)
 tid->baw_head  = tid->baw_tail = 0;
 tid->sched     = false;
 tid->paused    = false;
-tid->state &= ~AGGR_CLEANUP;
+tid->active   = false;
 __skb_queue_head_init(&tid->buf_q);
 acno = TID_TO_WME_AC(tidno);
 tid->ac = &an->ac[acno];
-tid->state &= ~AGGR_ADDBA_COMPLETE;
-tid->state &= ~AGGR_ADDBA_PROGRESS;
-tid->stop_cb = false;
 }
 
 for (acno = 0, ac = &an->ac[acno];
< at >< at > -2474,7 +2414,7 < at >< at > void ath_tx_node_cleanup(struct ath_softc *sc, struct ath_node *an)
 }
 
 ath_tid_drain(sc, txq, tid);
-ath_tx_clear_tid(sc, tid);
+tid->active = false;
 
 ath_txq_unlock(sc, txq);
 }

rt3070-based usb device won't accept mac address changes

Alessandro Lannocca — 2013-05-18T15:10:55

Hi, after switching to kernel 3.8.8 (ubuntu quantal to raring), I'm
unable to change my alfa AWUS036NH mac address; a simple:

ifconfig <device> down
ifconfig <device> hw ether <random hw>

results in:

SIOCSIFHWADDR: Invalid argument

I tried the drivers shipped with the distribution,
compat-drivers-3.9-rc4-2-su and compat-drivers-2013-03-28-4-u aswell;
all to no avail.

Any help appreciated, I'm able to recompile/test if needed.

Thank you for your time.

Alessandro Lannocca

Attached 'lsusb -v' , kernel 3.8.8 x86_64

<snip>

Bus 003 Device 005: ID 148f:3070 Ralink Technology, Corp.
RT2870/RT3070 Wireless Adapter
Device Descriptor:
  bLength                18
  bDescriptorType         1
  bcdUSB               2.00
  bDeviceClass            0 (Defined at Interface level)
  bDeviceSubClass         0
  bDeviceProtocol         0
  bMaxPacketSize0        64
  idVendor           0x148f Ralink Technology, Corp.
  idProduct          0x3070 RT2870/RT3070 Wireless Adapter
  bcdDevice            1.01
  iManufacturer           1
  iProduct                2
  iSerial                 3
  bNumConfigurations      1
  Configuration Descriptor:
    bLength                 9
    bDescriptorType         2
    wTotalLength           67
    bNumInterfaces          1
    bConfigurationValue     1
    iConfiguration          0
    bmAttributes         0x80
      (Bus Powered)
    MaxPower              450mA
    Interface Descriptor:
      bLength                 9
      bDescriptorType         4
      bInterfaceNumber        0
      bAlternateSetting       0
      bNumEndpoints           7
      bInterfaceClass       255 Vendor Specific Class
      bInterfaceSubClass    255 Vendor Specific Subclass
      bInterfaceProtocol    255 Vendor Specific Protocol
      iInterface              5
      Endpoint Descriptor:
        bLength                 7
        bDescriptorType         5
        bEndpointAddress     0x81  EP 1 IN
        bmAttributes            2
          Transfer Type            Bulk
          Synch Type               None
          Usage Type               Data
        wMaxPacketSize     0x0200  1x 512 bytes
        bInterval               0
      Endpoint Descriptor:
        bLength                 7
        bDescriptorType         5
        bEndpointAddress     0x01  EP 1 OUT
        bmAttributes            2
          Transfer Type            Bulk
          Synch Type               None
          Usage Type               Data
        wMaxPacketSize     0x0200  1x 512 bytes
        bInterval               0
      Endpoint Descriptor:
        bLength                 7
        bDescriptorType         5
        bEndpointAddress     0x02  EP 2 OUT
        bmAttributes            2
          Transfer Type            Bulk
          Synch Type               None
          Usage Type               Data
        wMaxPacketSize     0x0200  1x 512 bytes
        bInterval               0
      Endpoint Descriptor:
        bLength                 7
        bDescriptorType         5
        bEndpointAddress     0x03  EP 3 OUT
        bmAttributes            2
          Transfer Type            Bulk
          Synch Type               None
          Usage Type               Data
        wMaxPacketSize     0x0200  1x 512 bytes
        bInterval               0
      Endpoint Descriptor:
        bLength                 7
        bDescriptorType         5
        bEndpointAddress     0x04  EP 4 OUT
        bmAttributes            2
          Transfer Type            Bulk
          Synch Type               None
          Usage Type               Data
        wMaxPacketSize     0x0200  1x 512 bytes
        bInterval               0
      Endpoint Descriptor:
        bLength                 7
        bDescriptorType         5
        bEndpointAddress     0x05  EP 5 OUT
        bmAttributes            2
          Transfer Type            Bulk
          Synch Type               None
          Usage Type               Data
        wMaxPacketSize     0x0200  1x 512 bytes
        bInterval               0
      Endpoint Descriptor:
        bLength                 7
        bDescriptorType         5
        bEndpointAddress     0x06  EP 6 OUT
        bmAttributes            2
          Transfer Type            Bulk
          Synch Type               None
          Usage Type               Data
        wMaxPacketSize     0x0200  1x 512 bytes
        bInterval               0

</snip>
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA< at >public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 00/32] BBP initialization split

2013-05-18T12:03:23

This series spits big and messy rt2800_init_bbp() procedure into small
per chip (or few similar chips) subroutines.

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA< at >public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v2 17/17] mwifiex: add support for Marvell SD8897 chipset

Bing Zhao — 2013-05-18T00:54:58

From: Yogesh Ashok Powar <yogeshp-eYqpPyKDWXRBDgjK7y7TUQ< at >public.gmane.org>

Some of the key differences between SD8897 and older chipsets
are as follows:

a) sdio mpa_rx and mpa_tx ports have been increased from 16 to 32
b) Same is the case with read/write bitmap that one receives from
   mpa_reg read
c) aggregation packet count doubled from 8 to 16
d) Most of key reg addresses are changed
e) There is a separate command or control port
f) Now command rx/tx_done have new interrupts

1. 'supports_sdio_new_mode' flag is added to handle (a) and (b).
2. (c) and (d) are taken care of by filling chip specific
   information in global structurei (mwifiex_sdio_sd8897).
3. For older chipsets, port 0 was cmd port and port 1->15 were
   data port. Therefore we had CTRL_PORT_MASK to differentiate
   port type. Now these changes are under 'has_control_mask' flag.

Signed-off-by: Yogesh Ashok Powar <yogeshp-eYqpPyKDWXRBDgjK7y7TUQ< at >public.gmane.org>
Signed-off-by: Amitkumar Karwar <akarwar-eYqpPyKDWXRBDgjK7y7TUQ< at >public.gmane.org>
Signed-off-by: Nishant Sarmukadam <nishants-eYqpPyKDWXRBDgjK7y7TUQ< at >public.gmane.org>
Signed-off-by: Bing Zhao <bzhao-eYqpPyKDWXRBDgjK7y7TUQ< at >public.gmane.org>
Signed-off-by: Frank Huang <frankh-eYqpPyKDWXRBDgjK7y7TUQ< at >public.gmane.org>
---
v2: fix cmd53 single port address overwriting

 drivers/net/wireless/mwifiex/Kconfig |   4 +-
 drivers/net/wireless/mwifiex/sdio.c  | 267 ++++++++++++++++++++++++++++-------
 drivers/net/wireless/mwifiex/sdio.h  | 105 +++++++++++++-
 3 files changed, 315 insertions(+), 61 deletions(-)

diff --git a/drivers/net/wireless/mwifiex/Kconfig b/drivers/net/wireless/mwifiex/Kconfig
index 4f614aa..f7ff472 100644
--- a/drivers/net/wireless/mwifiex/Kconfig
+++ b/drivers/net/wireless/mwifiex/Kconfig
< at >< at > -3,13 +3,13 < at >< at > config MWIFIEX
 depends on CFG80211
 ---help---
   This adds support for wireless adapters based on Marvell
-  802.11n chipsets.
+  802.11n/ac chipsets.
 
   If you choose to build it as a module, it will be called
   mwifiex.
 
 config MWIFIEX_SDIO
-tristate "Marvell WiFi-Ex Driver for SD8786/SD8787/SD8797"
+tristate "Marvell WiFi-Ex Driver for SD8786/SD8787/SD8797/SD8897"
 depends on MWIFIEX && MMC
 select FW_LOADER
 ---help---
diff --git a/drivers/net/wireless/mwifiex/sdio.c b/drivers/net/wireless/mwifiex/sdio.c
index 4b196dc..5ee5ed0 100644
--- a/drivers/net/wireless/mwifiex/sdio.c
+++ b/drivers/net/wireless/mwifiex/sdio.c
< at >< at > -84,6 +84,8 < at >< at > mwifiex_sdio_probe(struct sdio_func *func, const struct sdio_device_id *id)
 card->reg = data->reg;
 card->max_ports = data->max_ports;
 card->mp_agg_pkt_limit = data->mp_agg_pkt_limit;
+card->supports_sdio_new_mode = data->supports_sdio_new_mode;
+card->has_control_mask = data->has_control_mask;
 }
 
 sdio_claim_host(func);
< at >< at > -260,6 +262,8 < at >< at > static int mwifiex_sdio_resume(struct device *dev)
 #define SDIO_DEVICE_ID_MARVELL_8787   (0x9119)
 /* Device ID for SD8797 */
 #define SDIO_DEVICE_ID_MARVELL_8797   (0x9129)
+/* Device ID for SD8897 */
+#define SDIO_DEVICE_ID_MARVELL_8897   (0x912d)
 
 /* WLAN IDs */
 static const struct sdio_device_id mwifiex_ids[] = {
< at >< at > -269,6 +273,8 < at >< at > static const struct sdio_device_id mwifiex_ids[] = {
 .driver_data = (unsigned long) &mwifiex_sdio_sd8787},
 {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8797),
 .driver_data = (unsigned long) &mwifiex_sdio_sd8797},
+{SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8897),
+.driver_data = (unsigned long) &mwifiex_sdio_sd8897},
 {},
 };
 
< at >< at > -412,7 +418,40 < at >< at > static int mwifiex_pm_wakeup_card_complete(struct mwifiex_adapter *adapter)
 }
 
 /*
- * This function initializes the IO ports.
+ * This function is used to initialize IO ports for the
+ * chipsets supporting SDIO new mode eg SD8897.
+ */
+static int mwifiex_init_sdio_new_mode(struct mwifiex_adapter *adapter)
+{
+u8 reg;
+
+adapter->ioport = MEM_PORT;
+
+/* enable sdio new mode */
+if (mwifiex_read_reg(adapter, CARD_CONFIG_2_1_REG, &reg))
+return -1;
+if (mwifiex_write_reg(adapter, CARD_CONFIG_2_1_REG,
+      reg | CMD53_NEW_MODE))
+return -1;
+
+/* Configure cmd port and enable reading rx length from the register */
+if (mwifiex_read_reg(adapter, CMD_CONFIG_0, &reg))
+return -1;
+if (mwifiex_write_reg(adapter, CMD_CONFIG_0, reg | CMD_PORT_RD_LEN_EN))
+return -1;
+
+/* Enable Dnld/Upld ready auto reset for cmd port after cmd53 is
+ * completed
+ */
+if (mwifiex_read_reg(adapter, CMD_CONFIG_1, &reg))
+return -1;
+if (mwifiex_write_reg(adapter, CMD_CONFIG_1, reg | CMD_PORT_AUTO_EN))
+return -1;
+
+return 0;
+}
+
+/* This function initializes the IO ports.
  *
  * The following operations are performed -
  *      - Read the IO ports (0, 1 and 2)
< at >< at > -426,6 +465,12 < at >< at > static int mwifiex_init_sdio_ioport(struct mwifiex_adapter *adapter)
 
 adapter->ioport = 0;
 
+if (card->supports_sdio_new_mode) {
+if (mwifiex_init_sdio_new_mode(adapter))
+return -1;
+goto cont;
+}
+
 /* Read the IO port */
 if (!mwifiex_read_reg(adapter, IO_PORT_0_REG, &reg))
 adapter->ioport |= (reg & 0xff);
< at >< at > -441,7 +486,7 < at >< at > static int mwifiex_init_sdio_ioport(struct mwifiex_adapter *adapter)
 adapter->ioport |= ((reg & 0xff) << 16);
 else
 return -1;
-
+cont:
 pr_debug("info: SDIO FUNC1 IO port: %#x\n", adapter->ioport);
 
 /* Set Host interrupt reset to read to clear */
< at >< at > -504,10 +549,16 < at >< at > static int mwifiex_get_rd_port(struct mwifiex_adapter *adapter, u8 *port)
 
 dev_dbg(adapter->dev, "data: mp_rd_bitmap=0x%08x\n", rd_bitmap);
 
-if (!(rd_bitmap & (CTRL_PORT_MASK | reg->data_port_mask)))
-return -1;
+if (card->supports_sdio_new_mode) {
+if (!(rd_bitmap & reg->data_port_mask))
+return -1;
+} else {
+if (!(rd_bitmap & (CTRL_PORT_MASK | reg->data_port_mask)))
+return -1;
+}
 
-if (card->mp_rd_bitmap & CTRL_PORT_MASK) {
+if ((card->has_control_mask) &&
+    (card->mp_rd_bitmap & CTRL_PORT_MASK)) {
 card->mp_rd_bitmap &= (u32) (~CTRL_PORT_MASK);
 *port = CTRL_PORT;
 dev_dbg(adapter->dev, "data: port=%d mp_rd_bitmap=0x%08x\n",
< at >< at > -542,24 +593,34 < at >< at > static int mwifiex_get_rd_port(struct mwifiex_adapter *adapter, u8 *port)
 static int mwifiex_get_wr_port_data(struct mwifiex_adapter *adapter, u32 *port)
 {
 struct sdio_mmc_card *card = adapter->card;
+const struct mwifiex_sdio_card_reg *reg = card->reg;
 u32 wr_bitmap = card->mp_wr_bitmap;
 
 dev_dbg(adapter->dev, "data: mp_wr_bitmap=0x%08x\n", wr_bitmap);
 
-if (!(wr_bitmap & card->mp_data_port_mask))
+if (card->supports_sdio_new_mode &&
+    !(wr_bitmap & reg->data_port_mask)) {
+adapter->data_sent = true;
+return -EBUSY;
+} else if (!card->supports_sdio_new_mode &&
+   !(wr_bitmap & card->mp_data_port_mask)) {
 return -1;
+}
 
 if (card->mp_wr_bitmap & (1 << card->curr_wr_port)) {
 card->mp_wr_bitmap &= (u32) (~(1 << card->curr_wr_port));
 *port = card->curr_wr_port;
-if (++card->curr_wr_port == card->mp_end_port)
-card->curr_wr_port = card->reg->start_wr_port;
+if (((card->supports_sdio_new_mode) &&
+     (++card->curr_wr_port == card->max_ports)) ||
+    ((!card->supports_sdio_new_mode) &&
+     (++card->curr_wr_port == card->mp_end_port)))
+card->curr_wr_port = reg->start_wr_port;
 } else {
 adapter->data_sent = true;
 return -EBUSY;
 }
 
-if (*port == CTRL_PORT) {
+if ((card->has_control_mask) && (*port == CTRL_PORT)) {
 dev_err(adapter->dev,
 "invalid data port=%d cur port=%d mp_wr_bitmap=0x%08x -> 0x%08x\n",
 *port, card->curr_wr_port, wr_bitmap,
< at >< at > -904,6 +965,9 < at >< at > static void mwifiex_interrupt_status(struct mwifiex_adapter *adapter)
 if (sdio_ireg) {
 /*
  * DN_LD_HOST_INT_STATUS and/or UP_LD_HOST_INT_STATUS
+ * For SDIO new mode CMD port interrupts
+ *DN_LD_CMD_PORT_HOST_INT_STATUS and/or
+ *UP_LD_CMD_PORT_HOST_INT_STATUS
  * Clear the interrupt status register
  */
 dev_dbg(adapter->dev, "int: sdio_ireg = %#x\n", sdio_ireg);
< at >< at > -1031,7 +1095,7 < at >< at > static int mwifiex_sdio_card_to_host_mp_aggr(struct mwifiex_adapter *adapter,
 u8 *curr_ptr;
 u32 rx_len = skb->len;
 
-if (port == CTRL_PORT) {
+if ((card->has_control_mask) && (port == CTRL_PORT)) {
 /* Read the command Resp without aggr */
 dev_dbg(adapter->dev, "info: %s: no aggregation for cmd "
 "response\n", __func__);
< at >< at > -1048,7 +1112,10 < at >< at > static int mwifiex_sdio_card_to_host_mp_aggr(struct mwifiex_adapter *adapter,
 goto rx_curr_single;
 }
 
-if (card->mp_rd_bitmap & (~((u32) CTRL_PORT_MASK))) {
+if ((!card->has_control_mask && (card->mp_rd_bitmap &
+ card->reg->data_port_mask)) ||
+    (card->has_control_mask && (card->mp_rd_bitmap &
+(~((u32) CTRL_PORT_MASK))))) {
 /* Some more data RX pending */
 dev_dbg(adapter->dev, "info: %s: not last packet\n", __func__);
 
< at >< at > -1100,8 +1167,25 < at >< at > static int mwifiex_sdio_card_to_host_mp_aggr(struct mwifiex_adapter *adapter,
 dev_dbg(adapter->dev, "info: do_rx_aggr: num of packets: %d\n",
 card->mpa_rx.pkt_cnt);
 
-mport = (adapter->ioport | SDIO_MPA_ADDR_BASE |
- (card->mpa_rx.ports << 4)) + card->mpa_rx.start_port;
+if (card->supports_sdio_new_mode) {
+int i;
+u32 port_count;
+
+for (i = 0, port_count = 0; i < card->max_ports; i++)
+if (card->mpa_rx.ports & BIT(i))
+port_count++;
+
+/* Reading data from "start_port + 0" to "start_port +
+ * port_count -1", so decrease the count by 1
+ */
+port_count--;
+mport = (adapter->ioport | SDIO_MPA_ADDR_BASE |
+ (port_count << 8)) + card->mpa_rx.start_port;
+} else {
+mport = (adapter->ioport | SDIO_MPA_ADDR_BASE |
+ (card->mpa_rx.ports << 4)) +
+ card->mpa_rx.start_port;
+}
 
 if (mwifiex_read_data_sync(adapter, card->mpa_rx.buf,
    card->mpa_rx.buf_len, mport, 1))
< at >< at > -1200,6 +1284,8 < at >< at > static int mwifiex_process_int_status(struct mwifiex_adapter *adapter)
 u32 rx_blocks;
 u16 rx_len;
 unsigned long flags;
+u32 bitmap;
+u8 cr;
 
 spin_lock_irqsave(&adapter->int_lock, flags);
 sdio_ireg = adapter->int_status;
< at >< at > -1209,12 +1295,60 < at >< at > static int mwifiex_process_int_status(struct mwifiex_adapter *adapter)
 if (!sdio_ireg)
 return ret;
 
+/* Following interrupt is only for SDIO new mode */
+if (sdio_ireg & DN_LD_CMD_PORT_HOST_INT_STATUS && adapter->cmd_sent)
+adapter->cmd_sent = false;
+
+/* Following interrupt is only for SDIO new mode */
+if (sdio_ireg & UP_LD_CMD_PORT_HOST_INT_STATUS) {
+u32 pkt_type;
+
+/* read the len of control packet */
+rx_len = card->mp_regs[CMD_RD_LEN_1] << 8;
+rx_len |= (u16) card->mp_regs[CMD_RD_LEN_0];
+rx_blocks = DIV_ROUND_UP(rx_len, MWIFIEX_SDIO_BLOCK_SIZE);
+if (rx_len <= INTF_HEADER_LEN ||
+    (rx_blocks * MWIFIEX_SDIO_BLOCK_SIZE) >
+     MWIFIEX_RX_DATA_BUF_SIZE)
+return -1;
+rx_len = (u16) (rx_blocks * MWIFIEX_SDIO_BLOCK_SIZE);
+
+skb = dev_alloc_skb(rx_len);
+if (!skb)
+return -1;
+
+skb_put(skb, rx_len);
+
+if (mwifiex_sdio_card_to_host(adapter, &pkt_type, skb->data,
+      skb->len, adapter->ioport |
+CMD_PORT_SLCT)) {
+dev_err(adapter->dev,
+"%s: failed to card_to_host", __func__);
+dev_kfree_skb_any(skb);
+goto term_cmd;
+}
+
+if ((pkt_type != MWIFIEX_TYPE_CMD) &&
+    (pkt_type != MWIFIEX_TYPE_EVENT))
+dev_err(adapter->dev,
+"%s:Received wrong packet on cmd port",
+__func__);
+
+mwifiex_decode_rx_packet(adapter, skb, pkt_type);
+}
+
 if (sdio_ireg & DN_LD_HOST_INT_STATUS) {
-card->mp_wr_bitmap =
-((u32) card->mp_regs[reg->wr_bitmap_u]) << 8;
-card->mp_wr_bitmap |=
-(u32) card->mp_regs[reg->wr_bitmap_l];
-dev_dbg(adapter->dev, "int: DNLD: wr_bitmap=0x%08x\n",
+bitmap = (u32) card->mp_regs[reg->wr_bitmap_l];
+bitmap |= ((u32) card->mp_regs[reg->wr_bitmap_u]) << 8;
+if (card->supports_sdio_new_mode) {
+bitmap |=
+((u32) card->mp_regs[reg->wr_bitmap_1l]) << 16;
+bitmap |=
+((u32) card->mp_regs[reg->wr_bitmap_1u]) << 24;
+}
+card->mp_wr_bitmap = bitmap;
+
+dev_dbg(adapter->dev, "int: DNLD: wr_bitmap=0x%x\n",
 card->mp_wr_bitmap);
 if (adapter->data_sent &&
     (card->mp_wr_bitmap & card->mp_data_port_mask)) {
< at >< at > -1227,7 +1361,7 < at >< at > static int mwifiex_process_int_status(struct mwifiex_adapter *adapter)
 /* As firmware will not generate download ready interrupt if the port
    updated is command port only, cmd_sent should be done for any SDIO
    interrupt. */
-if (adapter->cmd_sent) {
+if (card->has_control_mask && adapter->cmd_sent) {
 /* Check if firmware has attach buffer at command port and
    update just that in wr_bit_map. */
 card->mp_wr_bitmap |=
< at >< at > -1239,10 +1373,16 < at >< at > static int mwifiex_process_int_status(struct mwifiex_adapter *adapter)
 dev_dbg(adapter->dev, "info: cmd_sent=%d data_sent=%d\n",
 adapter->cmd_sent, adapter->data_sent);
 if (sdio_ireg & UP_LD_HOST_INT_STATUS) {
-card->mp_rd_bitmap =
-((u32) card->mp_regs[reg->rd_bitmap_u]) << 8;
-card->mp_rd_bitmap |= (u32) card->mp_regs[reg->rd_bitmap_l];
-dev_dbg(adapter->dev, "int: UPLD: rd_bitmap=0x%08x\n",
+bitmap = (u32) card->mp_regs[reg->rd_bitmap_l];
+bitmap |= ((u32) card->mp_regs[reg->rd_bitmap_u]) << 8;
+if (card->supports_sdio_new_mode) {
+bitmap |=
+((u32) card->mp_regs[reg->rd_bitmap_1l]) << 16;
+bitmap |=
+((u32) card->mp_regs[reg->rd_bitmap_1u]) << 24;
+}
+card->mp_rd_bitmap = bitmap;
+dev_dbg(adapter->dev, "int: UPLD: rd_bitmap=0x%x\n",
 card->mp_rd_bitmap);
 
 while (true) {
< at >< at > -1285,37 +1425,33 < at >< at > static int mwifiex_process_int_status(struct mwifiex_adapter *adapter)
 
 if (mwifiex_sdio_card_to_host_mp_aggr(adapter, skb,
       port)) {
-u8 cr = 0;
-
 dev_err(adapter->dev, "card_to_host_mpa failed:"
 " int status=%#x\n", sdio_ireg);
-if (mwifiex_read_reg(adapter,
-     CONFIGURATION_REG, &cr))
-dev_err(adapter->dev,
-"read CFG reg failed\n");
-
-dev_dbg(adapter->dev,
-"info: CFG reg val = %d\n", cr);
-if (mwifiex_write_reg(adapter,
-      CONFIGURATION_REG,
-      (cr | 0x04)))
-dev_err(adapter->dev,
-"write CFG reg failed\n");
-
-dev_dbg(adapter->dev, "info: write success\n");
-if (mwifiex_read_reg(adapter,
-     CONFIGURATION_REG, &cr))
-dev_err(adapter->dev,
-"read CFG reg failed\n");
-
-dev_dbg(adapter->dev,
-"info: CFG reg val =%x\n", cr);
-return -1;
+goto term_cmd;
 }
 }
 }
 
 return 0;
+
+term_cmd:
+/* terminate cmd */
+if (mwifiex_read_reg(adapter, CONFIGURATION_REG, &cr))
+dev_err(adapter->dev, "read CFG reg failed\n");
+else
+dev_dbg(adapter->dev, "info: CFG reg val = %d\n", cr);
+
+if (mwifiex_write_reg(adapter, CONFIGURATION_REG, (cr | 0x04)))
+dev_err(adapter->dev, "write CFG reg failed\n");
+else
+dev_dbg(adapter->dev, "info: write success\n");
+
+if (mwifiex_read_reg(adapter, CONFIGURATION_REG, &cr))
+dev_err(adapter->dev, "read CFG reg failed\n");
+else
+dev_dbg(adapter->dev, "info: CFG reg val =%x\n", cr);
+
+return -1;
 }
 
 /*
< at >< at > -1344,7 +1480,9 < at >< at > static int mwifiex_host_to_card_mp_aggr(struct mwifiex_adapter *adapter,
 s32 f_postcopy_cur_buf = 0;
 u32 mport;
 
-if ((!card->mpa_tx.enabled) || (port == CTRL_PORT)) {
+if (!card->mpa_tx.enabled ||
+    (card->has_control_mask && (port == CTRL_PORT)) ||
+    (card->supports_sdio_new_mode && (port == CMD_PORT_SLCT))) {
 dev_dbg(adapter->dev, "info: %s: tx aggregation disabled\n",
 __func__);
 
< at >< at > -1419,8 +1557,26 < at >< at > static int mwifiex_host_to_card_mp_aggr(struct mwifiex_adapter *adapter,
 dev_dbg(adapter->dev, "data: %s: send aggr buffer: %d %d\n",
 __func__,
 card->mpa_tx.start_port, card->mpa_tx.ports);
-mport = (adapter->ioport | SDIO_MPA_ADDR_BASE |
- (card->mpa_tx.ports << 4)) + card->mpa_tx.start_port;
+if (card->supports_sdio_new_mode) {
+u32 port_count;
+int i;
+
+for (i = 0, port_count = 0; i < card->max_ports; i++)
+if (card->mpa_tx.ports & BIT(i))
+port_count++;
+
+/* Writing data from "start_port + 0" to "start_port +
+ * port_count -1", so decrease the count by 1
+ */
+port_count--;
+mport = (adapter->ioport | SDIO_MPA_ADDR_BASE |
+ (port_count << 8)) + card->mpa_tx.start_port;
+} else {
+mport = (adapter->ioport | SDIO_MPA_ADDR_BASE |
+ (card->mpa_tx.ports << 4)) +
+ card->mpa_tx.start_port;
+}
+
 ret = mwifiex_write_data_to_card(adapter, card->mpa_tx.buf,
  card->mpa_tx.buf_len, mport);
 
< at >< at > -1493,6 +1649,9 < at >< at > static int mwifiex_sdio_host_to_card(struct mwifiex_adapter *adapter,
     pkt_len > MWIFIEX_UPLD_SIZE)
 dev_err(adapter->dev, "%s: payload=%p, nb=%d\n",
 __func__, payload, pkt_len);
+
+if (card->supports_sdio_new_mode)
+port = CMD_PORT_SLCT;
 }
 
 /* Transfer data to card */
< at >< at > -1748,8 +1907,11 < at >< at > mwifiex_update_mp_end_port(struct mwifiex_adapter *adapter, u16 port)
 
 card->mp_data_port_mask = reg->data_port_mask;
 
-for (i = 1; i <= card->max_ports - card->mp_end_port; i++)
-card->mp_data_port_mask &= ~(1 << (card->max_ports - i));
+if (reg->start_wr_port) {
+for (i = 1; i <= card->max_ports - card->mp_end_port; i++)
+card->mp_data_port_mask &=
+~(1 << (card->max_ports - i));
+}
 
 card->curr_wr_port = reg->start_wr_port;
 
< at >< at > -1857,3 +2019,4 < at >< at > MODULE_LICENSE("GPL v2");
 MODULE_FIRMWARE(SD8786_DEFAULT_FW_NAME);
 MODULE_FIRMWARE(SD8787_DEFAULT_FW_NAME);
 MODULE_FIRMWARE(SD8797_DEFAULT_FW_NAME);
+MODULE_FIRMWARE(SD8897_DEFAULT_FW_NAME);
diff --git a/drivers/net/wireless/mwifiex/sdio.h b/drivers/net/wireless/mwifiex/sdio.h
index 597db37..6d51dfd 100644
--- a/drivers/net/wireless/mwifiex/sdio.h
+++ b/drivers/net/wireless/mwifiex/sdio.h
< at >< at > -32,6 +32,7 < at >< at >
 #define SD8786_DEFAULT_FW_NAME "mrvl/sd8786_uapsta.bin"
 #define SD8787_DEFAULT_FW_NAME "mrvl/sd8787_uapsta.bin"
 #define SD8797_DEFAULT_FW_NAME "mrvl/sd8797_uapsta.bin"
+#define SD8897_DEFAULT_FW_NAME "mrvl/sd8897_uapsta.bin"
 
 #define BLOCK_MODE1
 #define BYTE_MODE0
< at >< at > -46,6 +47,23 < at >< at >
 #define CTRL_PORT0
 #define CTRL_PORT_MASK0x0001
 
+#define CMD_PORT_UPLD_INT_MASK(0x1U<<6)
+#define CMD_PORT_DNLD_INT_MASK(0x1U<<7)
+#define HOST_TERM_CMD53(0x1U << 2)
+#define REG_PORT0
+#define MEM_PORT0x10000
+#define CMD_RD_LEN_00xB4
+#define CMD_RD_LEN_10xB5
+#define CARD_CONFIG_2_1_REG             0xCD
+#define CMD53_NEW_MODE(0x1U << 0)
+#define CMD_CONFIG_00xB8
+#define CMD_PORT_RD_LEN_EN(0x1U << 2)
+#define CMD_CONFIG_10xB9
+#define CMD_PORT_AUTO_EN(0x1U << 0)
+#define CMD_PORT_SLCT0x8000
+#define UP_LD_CMD_PORT_HOST_INT_STATUS(0x40U)
+#define DN_LD_CMD_PORT_HOST_INT_STATUS(0x80U)
+
 #define SDIO_MP_TX_AGGR_DEF_BUF_SIZE        (8192)/* 8K */
 
 /* Multi port RX aggregation buffer size */
< at >< at > -73,6 +91,7 < at >< at >
 #define UP_LD_HOST_INT_MASK(0x1U)
 /* Host Control Registers : Download host interrupt mask */
 #define DN_LD_HOST_INT_MASK(0x2U)
+
 /* Disable Host interrupt mask */
 #defineHOST_INT_DISABLE0xff
 
< at >< at > -196,8 +215,12 < at >< at > struct mwifiex_sdio_card_reg {
 u8 max_mp_regs;
 u8 rd_bitmap_l;
 u8 rd_bitmap_u;
+u8 rd_bitmap_1l;
+u8 rd_bitmap_1u;
 u8 wr_bitmap_l;
 u8 wr_bitmap_u;
+u8 wr_bitmap_1l;
+u8 wr_bitmap_1u;
 u8 rd_len_p0_l;
 u8 rd_len_p0_u;
 u8 card_misc_cfg_reg;
< at >< at > -211,6 +234,8 < at >< at > struct sdio_mmc_card {
 const struct mwifiex_sdio_card_reg *reg;
 u8 max_ports;
 u8 mp_agg_pkt_limit;
+bool supports_sdio_new_mode;
+bool has_control_mask;
 
 u32 mp_rd_bitmap;
 u32 mp_wr_bitmap;
< at >< at > -232,6 +257,8 < at >< at > struct mwifiex_sdio_device {
 const struct mwifiex_sdio_card_reg *reg;
 u8 max_ports;
 u8 mp_agg_pkt_limit;
+bool supports_sdio_new_mode;
+bool has_control_mask;
 };
 
 static const struct mwifiex_sdio_card_reg mwifiex_reg_sd87xx = {
< at >< at > -255,11 +282,39 < at >< at > static const struct mwifiex_sdio_card_reg mwifiex_reg_sd87xx = {
 .card_misc_cfg_reg = 0x6c,
 };
 
+static const struct mwifiex_sdio_card_reg mwifiex_reg_sd8897 = {
+.start_rd_port = 0,
+.start_wr_port = 0,
+.base_0_reg = 0x60,
+.base_1_reg = 0x61,
+.poll_reg = 0x50,
+.host_int_enable = UP_LD_HOST_INT_MASK | DN_LD_HOST_INT_MASK |
+CMD_PORT_UPLD_INT_MASK | CMD_PORT_DNLD_INT_MASK,
+.status_reg_0 = 0xc0,
+.status_reg_1 = 0xc1,
+.sdio_int_mask = 0xff,
+.data_port_mask = 0xffffffff,
+.max_mp_regs = 184,
+.rd_bitmap_l = 0x04,
+.rd_bitmap_u = 0x05,
+.rd_bitmap_1l = 0x06,
+.rd_bitmap_1u = 0x07,
+.wr_bitmap_l = 0x08,
+.wr_bitmap_u = 0x09,
+.wr_bitmap_1l = 0x0a,
+.wr_bitmap_1u = 0x0b,
+.rd_len_p0_l = 0x0c,
+.rd_len_p0_u = 0x0d,
+.card_misc_cfg_reg = 0xcc,
+};
+
 static const struct mwifiex_sdio_device mwifiex_sdio_sd8786 = {
 .firmware = SD8786_DEFAULT_FW_NAME,
 .reg = &mwifiex_reg_sd87xx,
 .max_ports = 16,
 .mp_agg_pkt_limit = 8,
+.supports_sdio_new_mode = false,
+.has_control_mask = true,
 };
 
 static const struct mwifiex_sdio_device mwifiex_sdio_sd8787 = {
< at >< at > -267,6 +322,8 < at >< at > static const struct mwifiex_sdio_device mwifiex_sdio_sd8787 = {
 .reg = &mwifiex_reg_sd87xx,
 .max_ports = 16,
 .mp_agg_pkt_limit = 8,
+.supports_sdio_new_mode = false,
+.has_control_mask = true,
 };
 
 static const struct mwifiex_sdio_device mwifiex_sdio_sd8797 = {
< at >< at > -274,6 +331,17 < at >< at > static const struct mwifiex_sdio_device mwifiex_sdio_sd8797 = {
 .reg = &mwifiex_reg_sd87xx,
 .max_ports = 16,
 .mp_agg_pkt_limit = 8,
+.supports_sdio_new_mode = false,
+.has_control_mask = true,
+};
+
+static const struct mwifiex_sdio_device mwifiex_sdio_sd8897 = {
+.firmware = SD8897_DEFAULT_FW_NAME,
+.reg = &mwifiex_reg_sd8897,
+.max_ports = 32,
+.mp_agg_pkt_limit = 16,
+.supports_sdio_new_mode = true,
+.has_control_mask = false,
 };
 
 /*
< at >< at > -302,13 +370,23 < at >< at > mp_rx_aggr_port_limit_reached(struct sdio_mmc_card *card)
 u8 tmp;
 
 if (card->curr_rd_port < card->mpa_rx.start_port) {
-tmp = card->mp_agg_pkt_limit;
+if (card->supports_sdio_new_mode)
+tmp = card->mp_end_port >> 1;
+else
+tmp = card->mp_agg_pkt_limit;
 
 if (((card->max_ports - card->mpa_rx.start_port) +
     card->curr_rd_port) >= tmp)
 return true;
 }
 
+if (!card->supports_sdio_new_mode)
+return false;
+
+if ((card->curr_rd_port - card->mpa_rx.start_port) >=
+    (card->mp_end_port >> 1))
+return true;
+
 return false;
 }
 
< at >< at > -318,13 +396,23 < at >< at > mp_tx_aggr_port_limit_reached(struct sdio_mmc_card *card)
 u16 tmp;
 
 if (card->curr_wr_port < card->mpa_tx.start_port) {
-tmp = card->mp_agg_pkt_limit;
+if (card->supports_sdio_new_mode)
+tmp = card->mp_end_port >> 1;
+else
+tmp = card->mp_agg_pkt_limit;
 
 if (((card->max_ports - card->mpa_tx.start_port) +
     card->curr_wr_port) >= tmp)
 return true;
 }
 
+if (!card->supports_sdio_new_mode)
+return false;
+
+if ((card->curr_wr_port - card->mpa_tx.start_port) >=
+    (card->mp_end_port >> 1))
+return true;
+
 return false;
 }
 
< at >< at > -337,11 +425,14 < at >< at > static inline void mp_rx_aggr_setup(struct sdio_mmc_card *card,
 if (!card->mpa_rx.pkt_cnt)
 card->mpa_rx.start_port = port;
 
-if (card->mpa_rx.start_port <= port)
-card->mpa_rx.ports |= 1 << (card->mpa_rx.pkt_cnt);
-else
-card->mpa_rx.ports |= 1 << (card->mpa_rx.pkt_cnt + 1);

[PATCH v2 16/17] mwifiex: code rearrangement in multiport aggregation path

Bing Zhao — 2013-05-18T00:54:51

From: Amitkumar Karwar <akarwar-eYqpPyKDWXRBDgjK7y7TUQ< at >public.gmane.org>

There are some macros defined for multiport aggregation
calculations. As we may need to add some more code to
accomodate new chipsets, we will change them to inline
functions. Also, use dynamic allocation for Rx buffer array.

Signed-off-by: Amitkumar Karwar <akarwar-eYqpPyKDWXRBDgjK7y7TUQ< at >public.gmane.org>
Signed-off-by: Bing Zhao <bzhao-eYqpPyKDWXRBDgjK7y7TUQ< at >public.gmane.org>
---
 drivers/net/wireless/mwifiex/sdio.c | 17 +++++---
 drivers/net/wireless/mwifiex/sdio.h | 83 +++++++++++++++++++++++--------------
 2 files changed, 64 insertions(+), 36 deletions(-)

diff --git a/drivers/net/wireless/mwifiex/sdio.c b/drivers/net/wireless/mwifiex/sdio.c
index 1892e88..4b196dc 100644
--- a/drivers/net/wireless/mwifiex/sdio.c
+++ b/drivers/net/wireless/mwifiex/sdio.c
< at >< at > -1084,10 +1084,10 < at >< at > static int mwifiex_sdio_card_to_host_mp_aggr(struct mwifiex_adapter *adapter,
 if (f_aggr_cur) {
 dev_dbg(adapter->dev, "info: current packet aggregation\n");
 /* Curr pkt can be aggregated */
-MP_RX_AGGR_SETUP(card, skb, port);
+mp_rx_aggr_setup(card, skb, port);
 
 if (MP_RX_AGGR_PKT_LIMIT_REACHED(card) ||
-    MP_RX_AGGR_PORT_LIMIT_REACHED(card)) {
+    mp_rx_aggr_port_limit_reached(card)) {
 dev_dbg(adapter->dev, "info: %s: aggregated packet "
 "limit reached\n", __func__);
 /* No more pkts allowed in Aggr buf, rx it */
< at >< at > -1358,7 +1358,7 < at >< at > static int mwifiex_host_to_card_mp_aggr(struct mwifiex_adapter *adapter,
 __func__);
 
 if (MP_TX_AGGR_IN_PROGRESS(card)) {
-if (!MP_TX_AGGR_PORT_LIMIT_REACHED(card) &&
+if (!mp_tx_aggr_port_limit_reached(card) &&
     MP_TX_AGGR_BUF_HAS_ROOM(card, pkt_len)) {
 f_precopy_cur_buf = 1;
 
< at >< at > -1371,7 +1371,7 < at >< at > static int mwifiex_host_to_card_mp_aggr(struct mwifiex_adapter *adapter,
 /* No room in Aggr buf, send it */
 f_send_aggr_buf = 1;
 
-if (MP_TX_AGGR_PORT_LIMIT_REACHED(card) ||
+if (mp_tx_aggr_port_limit_reached(card) ||
     !(card->mp_wr_bitmap &
       (1 << card->curr_wr_port)))
 f_send_cur_buf = 1;
< at >< at > -1410,7 +1410,7 < at >< at > static int mwifiex_host_to_card_mp_aggr(struct mwifiex_adapter *adapter,
 MP_TX_AGGR_BUF_PUT(card, payload, pkt_len, port);
 
 if (MP_TX_AGGR_PKT_LIMIT_REACHED(card) ||
-    MP_TX_AGGR_PORT_LIMIT_REACHED(card))
+    mp_tx_aggr_port_limit_reached(card))
 /* No more pkts allowed in Aggr buf, send it */
 f_send_aggr_buf = 1;
 }
< at >< at > -1687,6 +1687,11 < at >< at > static int mwifiex_init_sdio(struct mwifiex_adapter *adapter)
 if (!card->mp_regs)
 return -ENOMEM;
 
+/* Allocate skb pointer buffers */
+card->mpa_rx.skb_arr = kzalloc((sizeof(void *)) *
+       card->mp_agg_pkt_limit, GFP_KERNEL);
+card->mpa_rx.len_arr = kzalloc(sizeof(*card->mpa_rx.len_arr) *
+       card->mp_agg_pkt_limit, GFP_KERNEL);
 ret = mwifiex_alloc_sdio_mpa_buffers(adapter,
      SDIO_MP_TX_AGGR_DEF_BUF_SIZE,
      SDIO_MP_RX_AGGR_DEF_BUF_SIZE);
< at >< at > -1723,6 +1728,8 < at >< at > static void mwifiex_cleanup_sdio(struct mwifiex_adapter *adapter)
 struct sdio_mmc_card *card = adapter->card;
 
 kfree(card->mp_regs);
+kfree(card->mpa_rx.skb_arr);
+kfree(card->mpa_rx.len_arr);
 kfree(card->mpa_tx.buf);
 kfree(card->mpa_rx.buf);
 }
diff --git a/drivers/net/wireless/mwifiex/sdio.h b/drivers/net/wireless/mwifiex/sdio.h
index 339608b..597db37 100644
--- a/drivers/net/wireless/mwifiex/sdio.h
+++ b/drivers/net/wireless/mwifiex/sdio.h
< at >< at > -46,8 +46,6 < at >< at >
 #define CTRL_PORT0
 #define CTRL_PORT_MASK0x0001
 
-#define SDIO_MP_AGGR_DEF_PKT_LIMIT8
-
 #define SDIO_MP_TX_AGGR_DEF_BUF_SIZE        (8192)/* 8K */
 
 /* Multi port RX aggregation buffer size */
< at >< at > -126,12 +124,6 < at >< at >
 #define MP_TX_AGGR_PKT_LIMIT_REACHED(a)\
 (a->mpa_tx.pkt_cnt == a->mpa_tx.pkt_aggr_limit)
 
-/* SDIO Tx aggregation port limit ? */
-#define MP_TX_AGGR_PORT_LIMIT_REACHED(a) ((a->curr_wr_port <\
-a->mpa_tx.start_port) && (((a->max_ports -\
-a->mpa_tx.start_port) + a->curr_wr_port) >=\
-a->mp_agg_pkt_limit))
-
 /* Reset SDIO Tx aggregation buffer parameters */
 #define MP_TX_AGGR_BUF_RESET(a) do {\
 a->mpa_tx.pkt_cnt = 0;\
< at >< at > -144,12 +136,6 < at >< at >
 #define MP_RX_AGGR_PKT_LIMIT_REACHED(a)\
 (a->mpa_rx.pkt_cnt == a->mpa_rx.pkt_aggr_limit)
 
-/* SDIO Tx aggregation port limit ? */
-#define MP_RX_AGGR_PORT_LIMIT_REACHED(a) ((a->curr_rd_port <\
-a->mpa_rx.start_port) && (((a->max_ports -\
-a->mpa_rx.start_port) + a->curr_rd_port) >=\
-a->mp_agg_pkt_limit))
-
 /* SDIO Rx aggregation in progress ? */
 #define MP_RX_AGGR_IN_PROGRESS(a) (a->mpa_rx.pkt_cnt > 0)
 
< at >< at > -157,20 +143,6 < at >< at >
 #define MP_RX_AGGR_BUF_HAS_ROOM(a, rx_len)\
 ((a->mpa_rx.buf_len+rx_len) <= a->mpa_rx.buf_size)
 
-/* Prepare to copy current packet from card to SDIO Rx aggregation buffer */
-#define MP_RX_AGGR_SETUP(a, skb, port) do {\
-a->mpa_rx.buf_len += skb->len;\
-if (!a->mpa_rx.pkt_cnt)\
-a->mpa_rx.start_port = port;\
-if (a->mpa_rx.start_port <= port)\
-a->mpa_rx.ports |= (1<<(a->mpa_rx.pkt_cnt));\
-else\
-a->mpa_rx.ports |= (1<<(a->mpa_rx.pkt_cnt+1));\
-a->mpa_rx.skb_arr[a->mpa_rx.pkt_cnt] = skb;\
-a->mpa_rx.len_arr[a->mpa_rx.pkt_cnt] = skb->len;\
-a->mpa_rx.pkt_cnt++;\
-} while (0)
-
 /* Reset SDIO Rx aggregation buffer parameters */
 #define MP_RX_AGGR_BUF_RESET(a) do {\
 a->mpa_rx.pkt_cnt = 0;\
< at >< at > -179,7 +151,6 < at >< at >
 a->mpa_rx.start_port = 0;\
 } while (0)
 
-
 /* data structure for SDIO MPA TX */
 struct mwifiex_sdio_mpa_tx {
 /* multiport tx aggregation buffer pointer */
< at >< at > -200,8 +171,8 < at >< at > struct mwifiex_sdio_mpa_rx {
 u32 ports;
 u16 start_port;
 
-struct sk_buff *skb_arr[SDIO_MP_AGGR_DEF_PKT_LIMIT];
-u32 len_arr[SDIO_MP_AGGR_DEF_PKT_LIMIT];
+struct sk_buff **skb_arr;
+u32 *len_arr;
 
 u8 enabled;
 u32 buf_size;
< at >< at > -325,4 +296,54 < at >< at > static inline int mwifiex_sdio_event_complete(struct mwifiex_adapter *adapter,
 return 0;
 }
 
+static inline bool
+mp_rx_aggr_port_limit_reached(struct sdio_mmc_card *card)
+{
+u8 tmp;
+
+if (card->curr_rd_port < card->mpa_rx.start_port) {
+tmp = card->mp_agg_pkt_limit;
+
+if (((card->max_ports - card->mpa_rx.start_port) +
+    card->curr_rd_port) >= tmp)
+return true;
+}
+
+return false;
+}
+
+static inline bool
+mp_tx_aggr_port_limit_reached(struct sdio_mmc_card *card)
+{
+u16 tmp;
+
+if (card->curr_wr_port < card->mpa_tx.start_port) {
+tmp = card->mp_agg_pkt_limit;
+
+if (((card->max_ports - card->mpa_tx.start_port) +
+    card->curr_wr_port) >= tmp)
+return true;
+}
+
+return false;
+}
+
+/* Prepare to copy current packet from card to SDIO Rx aggregation buffer */
+static inline void mp_rx_aggr_setup(struct sdio_mmc_card *card,
+    struct sk_buff *skb, u8 port)
+{
+card->mpa_rx.buf_len += skb->len;
+
+if (!card->mpa_rx.pkt_cnt)
+card->mpa_rx.start_port = port;
+
+if (card->mpa_rx.start_port <= port)
+card->mpa_rx.ports |= 1 << (card->mpa_rx.pkt_cnt);
+else
+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.len_arr[card->mpa_rx.pkt_cnt] = skb->len;
+card->mpa_rx.pkt_cnt++;
+}
 #endif /* _MWIFIEX_SDIO_H */

[PATCH v2 15/17] mwifiex: remove unnecessary macros in sdio.h

Bing Zhao — 2013-05-18T00:54:42

From: Amitkumar Karwar <akarwar-eYqpPyKDWXRBDgjK7y7TUQ< at >public.gmane.org>

They are not used in the code.

Signed-off-by: Amitkumar Karwar <akarwar-eYqpPyKDWXRBDgjK7y7TUQ< at >public.gmane.org>
Signed-off-by: Bing Zhao <bzhao-eYqpPyKDWXRBDgjK7y7TUQ< at >public.gmane.org>
---
 drivers/net/wireless/mwifiex/sdio.h | 51 -------------------------------------
 1 file changed, 51 deletions(-)

diff --git a/drivers/net/wireless/mwifiex/sdio.h b/drivers/net/wireless/mwifiex/sdio.h
index e4016d2..339608b 100644
--- a/drivers/net/wireless/mwifiex/sdio.h
+++ b/drivers/net/wireless/mwifiex/sdio.h
< at >< at > -66,14 +66,8 < at >< at >
 
 /* Host Control Registers : Configuration */
 #define CONFIGURATION_REG0x00
-/* Host Control Registers : Host without Command 53 finish host*/
-#define HOST_TO_CARD_EVENT       (0x1U << 3)
-/* Host Control Registers : Host without Command 53 finish host */
-#define HOST_WO_CMD53_FINISH_HOST(0x1U << 2)
 /* Host Control Registers : Host power up */
 #define HOST_POWER_UP(0x1U << 1)
-/* Host Control Registers : Host power down */
-#define HOST_POWER_DOWN(0x1U << 0)
 
 /* Host Control Registers : Host interrupt mask */
 #define HOST_INT_MASK_REG0x02
< at >< at > -93,60 +87,15 < at >< at >
 
 /* Host Control Registers : Host interrupt RSR */
 #define HOST_INT_RSR_REG0x01
-/* Host Control Registers : Upload host interrupt RSR */
-#define UP_LD_HOST_INT_RSR(0x1U)
 
 /* Host Control Registers : Host interrupt status */
 #define HOST_INT_STATUS_REG0x28
-/* Host Control Registers : Upload CRC error */
-#define UP_LD_CRC_ERR(0x1U << 2)
-/* Host Control Registers : Upload restart */
-#define UP_LD_RESTART                   (0x1U << 1)
-/* Host Control Registers : Download restart */
-#define DN_LD_RESTART                   (0x1U << 0)
 
 /* Card Control Registers : Card I/O ready */
 #define CARD_IO_READY                   (0x1U << 3)
-/* Card Control Registers : CIS card ready */
-#define CIS_CARD_RDY                    (0x1U << 2)
-/* Card Control Registers : Upload card ready */
-#define UP_LD_CARD_RDY                  (0x1U << 1)
 /* Card Control Registers : Download card ready */
 #define DN_LD_CARD_RDY                  (0x1U << 0)
 
-/* Card Control Registers : Host interrupt mask register */
-#define HOST_INTERRUPT_MASK_REG         0x34
-/* Card Control Registers : Host power interrupt mask */
-#define HOST_POWER_INT_MASK             (0x1U << 3)
-/* Card Control Registers : Abort card interrupt mask */
-#define ABORT_CARD_INT_MASK             (0x1U << 2)
-/* Card Control Registers : Upload card interrupt mask */
-#define UP_LD_CARD_INT_MASK             (0x1U << 1)
-/* Card Control Registers : Download card interrupt mask */
-#define DN_LD_CARD_INT_MASK             (0x1U << 0)
-
-/* Card Control Registers : Card interrupt status register */
-#define CARD_INTERRUPT_STATUS_REG       0x38
-/* Card Control Registers : Power up interrupt */
-#define POWER_UP_INT                    (0x1U << 4)
-/* Card Control Registers : Power down interrupt */
-#define POWER_DOWN_INT                  (0x1U << 3)
-
-/* Card Control Registers : Card interrupt RSR register */
-#define CARD_INTERRUPT_RSR_REG          0x3c
-/* Card Control Registers : Power up RSR */
-#define POWER_UP_RSR                    (0x1U << 4)
-/* Card Control Registers : Power down RSR */
-#define POWER_DOWN_RSR                  (0x1U << 3)
-
-/* Host F1 card ready */
-#define HOST_F1_CARD_RDY0x0020
-
-/* Rx length register */
-#define CARD_RX_LEN_REG0x62
-/* Rx unit register */
-#define CARD_RX_UNIT_REG0x63

[PATCH v2 14/17] mwifiex: define a macro for MPA base address

Bing Zhao — 2013-05-18T00:54:34

From: Amitkumar Karwar <akarwar-eYqpPyKDWXRBDgjK7y7TUQ< at >public.gmane.org>

As Multiple-Port Aggregation base address value is fixed, we can
have a macro for it.

Signed-off-by: Amitkumar Karwar <akarwar-eYqpPyKDWXRBDgjK7y7TUQ< at >public.gmane.org>
Signed-off-by: Bing Zhao <bzhao-eYqpPyKDWXRBDgjK7y7TUQ< at >public.gmane.org>
---
 drivers/net/wireless/mwifiex/sdio.c | 4 ++--
 drivers/net/wireless/mwifiex/sdio.h | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/mwifiex/sdio.c b/drivers/net/wireless/mwifiex/sdio.c
index 99a508b..1892e88 100644
--- a/drivers/net/wireless/mwifiex/sdio.c
+++ b/drivers/net/wireless/mwifiex/sdio.c
< at >< at > -1100,7 +1100,7 < at >< at > static int mwifiex_sdio_card_to_host_mp_aggr(struct mwifiex_adapter *adapter,
 dev_dbg(adapter->dev, "info: do_rx_aggr: num of packets: %d\n",
 card->mpa_rx.pkt_cnt);
 
-mport = (adapter->ioport | 0x1000 |
+mport = (adapter->ioport | SDIO_MPA_ADDR_BASE |
  (card->mpa_rx.ports << 4)) + card->mpa_rx.start_port;
 
 if (mwifiex_read_data_sync(adapter, card->mpa_rx.buf,
< at >< at > -1419,7 +1419,7 < at >< at > static int mwifiex_host_to_card_mp_aggr(struct mwifiex_adapter *adapter,
 dev_dbg(adapter->dev, "data: %s: send aggr buffer: %d %d\n",
 __func__,
 card->mpa_tx.start_port, card->mpa_tx.ports);
-mport = (adapter->ioport | 0x1000 |
+mport = (adapter->ioport | SDIO_MPA_ADDR_BASE |
  (card->mpa_tx.ports << 4)) + card->mpa_tx.start_port;
 ret = mwifiex_write_data_to_card(adapter, card->mpa_tx.buf,
  card->mpa_tx.buf_len, mport);
diff --git a/drivers/net/wireless/mwifiex/sdio.h b/drivers/net/wireless/mwifiex/sdio.h
index 0d931f7..e4016d2 100644
--- a/drivers/net/wireless/mwifiex/sdio.h
+++ b/drivers/net/wireless/mwifiex/sdio.h
< at >< at > -42,6 +42,7 < at >< at >
 
 #define MWIFIEX_SDIO_BYTE_MODE_MASK0x80000000
 
+#define SDIO_MPA_ADDR_BASE0x1000
 #define CTRL_PORT0
 #define CTRL_PORT_MASK0x0001

[PATCH v2 13/17] mwifiex: do port calculations separately

Bing Zhao — 2013-05-18T00:54:23

From: Amitkumar Karwar <akarwar-eYqpPyKDWXRBDgjK7y7TUQ< at >public.gmane.org>

This patch rearranges the code for better readability

Signed-off-by: Amitkumar Karwar <akarwar-eYqpPyKDWXRBDgjK7y7TUQ< at >public.gmane.org>
Signed-off-by: Yogesh Ashok Powar <yogeshp-eYqpPyKDWXRBDgjK7y7TUQ< at >public.gmane.org>
Signed-off-by: Bing Zhao <bzhao-eYqpPyKDWXRBDgjK7y7TUQ< at >public.gmane.org>
---
v2: fix cmd53 single port address overwriting

 drivers/net/wireless/mwifiex/sdio.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/drivers/net/wireless/mwifiex/sdio.c b/drivers/net/wireless/mwifiex/sdio.c
index a18a5b4..99a508b 100644
--- a/drivers/net/wireless/mwifiex/sdio.c
+++ b/drivers/net/wireless/mwifiex/sdio.c
< at >< at > -539,7 +539,7 < at >< at > static int mwifiex_get_rd_port(struct mwifiex_adapter *adapter, u8 *port)
  * increased (provided it does not reach the maximum limit, in which
  * case it is reset to 1)
  */
-static int mwifiex_get_wr_port_data(struct mwifiex_adapter *adapter, u8 *port)
+static int mwifiex_get_wr_port_data(struct mwifiex_adapter *adapter, u32 *port)
 {
 struct sdio_mmc_card *card = adapter->card;
 u32 wr_bitmap = card->mp_wr_bitmap;
< at >< at > -1027,7 +1027,7 < at >< at > static int mwifiex_sdio_card_to_host_mp_aggr(struct mwifiex_adapter *adapter,
 s32 f_aggr_cur = 0;
 struct sk_buff *skb_deaggr;
 u32 pind;
-u32 pkt_len, pkt_type = 0;
+u32 pkt_len, pkt_type, mport;
 u8 *curr_ptr;
 u32 rx_len = skb->len;
 
< at >< at > -1100,11 +1100,11 < at >< at > static int mwifiex_sdio_card_to_host_mp_aggr(struct mwifiex_adapter *adapter,
 dev_dbg(adapter->dev, "info: do_rx_aggr: num of packets: %d\n",
 card->mpa_rx.pkt_cnt);
 
+mport = (adapter->ioport | 0x1000 |
+ (card->mpa_rx.ports << 4)) + card->mpa_rx.start_port;
+
 if (mwifiex_read_data_sync(adapter, card->mpa_rx.buf,
-   card->mpa_rx.buf_len,
-   (adapter->ioport | 0x1000 |
-    (card->mpa_rx.ports << 4)) +
-   card->mpa_rx.start_port, 1))
+   card->mpa_rx.buf_len, mport, 1))
 goto error;
 
 curr_ptr = card->mpa_rx.buf;
< at >< at > -1333,7 +1333,7 < at >< at > static int mwifiex_process_int_status(struct mwifiex_adapter *adapter)
  * and return.
  */
 static int mwifiex_host_to_card_mp_aggr(struct mwifiex_adapter *adapter,
-u8 *payload, u32 pkt_len, u8 port,
+u8 *payload, u32 pkt_len, u32 port,
 u32 next_pkt_len)
 {
 struct sdio_mmc_card *card = adapter->card;
< at >< at > -1342,6 +1342,7 < at >< at > static int mwifiex_host_to_card_mp_aggr(struct mwifiex_adapter *adapter,
 s32 f_send_cur_buf = 0;
 s32 f_precopy_cur_buf = 0;
 s32 f_postcopy_cur_buf = 0;
+u32 mport;
 
 if ((!card->mpa_tx.enabled) || (port == CTRL_PORT)) {
 dev_dbg(adapter->dev, "info: %s: tx aggregation disabled\n",
< at >< at > -1418,11 +1419,10 < at >< at > static int mwifiex_host_to_card_mp_aggr(struct mwifiex_adapter *adapter,
 dev_dbg(adapter->dev, "data: %s: send aggr buffer: %d %d\n",
 __func__,
 card->mpa_tx.start_port, card->mpa_tx.ports);
+mport = (adapter->ioport | 0x1000 |
+ (card->mpa_tx.ports << 4)) + card->mpa_tx.start_port;
 ret = mwifiex_write_data_to_card(adapter, card->mpa_tx.buf,
- card->mpa_tx.buf_len,
- (adapter->ioport | 0x1000 |
- (card->mpa_tx.ports << 4)) +
-  card->mpa_tx.start_port);
+ card->mpa_tx.buf_len, mport);
 
 MP_TX_AGGR_BUF_RESET(card);
 }
< at >< at > -1462,7 +1462,7 < at >< at > static int mwifiex_sdio_host_to_card(struct mwifiex_adapter *adapter,
 int ret;
 u32 buf_block_len;
 u32 blk_size;
-u8 port = CTRL_PORT;
+u32 port = CTRL_PORT;
 u8 *payload = (u8 *)skb->data;
 u32 pkt_len = skb->len;

[PATCH v2 11/17] mwifiex: replace unnecessary u32 variables with u8 in sdio.c

Bing Zhao — 2013-05-18T00:53:42

From: Amitkumar Karwar <akarwar-eYqpPyKDWXRBDgjK7y7TUQ< at >public.gmane.org>

Some u32 variables in sdio.c are used to store/pass u8 values.
Replace them with u8 variables.

Signed-off-by: Amitkumar Karwar <akarwar-eYqpPyKDWXRBDgjK7y7TUQ< at >public.gmane.org>
Signed-off-by: Bing Zhao <bzhao-eYqpPyKDWXRBDgjK7y7TUQ< at >public.gmane.org>
---
 drivers/net/wireless/mwifiex/sdio.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/drivers/net/wireless/mwifiex/sdio.c b/drivers/net/wireless/mwifiex/sdio.c
index 022e9fd..e4357a6 100644
--- a/drivers/net/wireless/mwifiex/sdio.c
+++ b/drivers/net/wireless/mwifiex/sdio.c
< at >< at > -294,13 +294,13 < at >< at > static struct sdio_driver mwifiex_sdio = {
  * This function writes data into SDIO card register.
  */
 static int
-mwifiex_write_reg(struct mwifiex_adapter *adapter, u32 reg, u32 data)
+mwifiex_write_reg(struct mwifiex_adapter *adapter, u32 reg, u8 data)
 {
 struct sdio_mmc_card *card = adapter->card;
 int ret = -1;
 
 sdio_claim_host(card->func);
-sdio_writeb(card->func, (u8) data, reg, &ret);
+sdio_writeb(card->func, data, reg, &ret);
 sdio_release_host(card->func);
 
 return ret;
< at >< at > -310,7 +310,7 < at >< at > mwifiex_write_reg(struct mwifiex_adapter *adapter, u32 reg, u32 data)
  * This function reads data from SDIO card register.
  */
 static int
-mwifiex_read_reg(struct mwifiex_adapter *adapter, u32 reg, u32 *data)
+mwifiex_read_reg(struct mwifiex_adapter *adapter, u32 reg, u8 *data)
 {
 struct sdio_mmc_card *card = adapter->card;
 int ret = -1;
< at >< at > -421,7 +421,7 < at >< at > static int mwifiex_pm_wakeup_card_complete(struct mwifiex_adapter *adapter)
  */
 static int mwifiex_init_sdio_ioport(struct mwifiex_adapter *adapter)
 {
-u32 reg;
+u8 reg;
 struct sdio_mmc_card *card = adapter->card;
 
 adapter->ioport = 0;
< at >< at > -580,7 +580,7 < at >< at > mwifiex_sdio_poll_card_status(struct mwifiex_adapter *adapter, u8 bits)
 {
 struct sdio_mmc_card *card = adapter->card;
 u32 tries;
-u32 cs;
+u8 cs;
 
 for (tries = 0; tries < MAX_POLL_TRIES; tries++) {
 if (mwifiex_read_reg(adapter, card->reg->poll_reg, &cs))
< at >< at > -604,7 +604,7 < at >< at > mwifiex_sdio_read_fw_status(struct mwifiex_adapter *adapter, u16 *dat)
 {
 struct sdio_mmc_card *card = adapter->card;
 const struct mwifiex_sdio_card_reg *reg = card->reg;
-u32 fws0, fws1;
+u8 fws0, fws1;
 
 if (mwifiex_read_reg(adapter, reg->status_reg_0, &fws0))
 return -1;
< at >< at > -625,14 +625,14 < at >< at > mwifiex_sdio_read_fw_status(struct mwifiex_adapter *adapter, u16 *dat)
  */
 static int mwifiex_sdio_disable_host_int(struct mwifiex_adapter *adapter)
 {
-u32 host_int_mask;
+u8 host_int_mask, host_int_disable = HOST_INT_DISABLE;
 
 /* Read back the host_int_mask register */
 if (mwifiex_read_reg(adapter, HOST_INT_MASK_REG, &host_int_mask))
 return -1;
 
 /* Update with the mask and write back to the register */
-host_int_mask &= ~HOST_INT_DISABLE;
+host_int_mask &= ~host_int_disable;
 
 if (mwifiex_write_reg(adapter, HOST_INT_MASK_REG, host_int_mask)) {
 dev_err(adapter->dev, "disable host interrupt failed\n");
< at >< at > -712,7 +712,7 < at >< at > static int mwifiex_prog_fw_w_helper(struct mwifiex_adapter *adapter,
 u8 *firmware = fw->fw_buf;
 u32 firmware_len = fw->fw_len;
 u32 offset = 0;
-u32 base0, base1;
+u8 base0, base1;
 u8 *fwbuf;
 u16 len = 0;
 u32 txlen, tx_blocks = 0, tries;
< at >< at > -854,7 +854,7 < at >< at > static int mwifiex_check_fw_status(struct mwifiex_adapter *adapter,
 int ret = 0;
 u16 firmware_stat;
 u32 tries;
-u32 winner_status;
+u8 winner_status;
 
 /* Wait for firmware initialization event */
 for (tries = 0; tries < poll_num; tries++) {
< at >< at > -889,7 +889,7 < at >< at > static int mwifiex_check_fw_status(struct mwifiex_adapter *adapter,
 static void mwifiex_interrupt_status(struct mwifiex_adapter *adapter)
 {
 struct sdio_mmc_card *card = adapter->card;
-u32 sdio_ireg;
+u8 sdio_ireg;
 unsigned long flags;
 
 if (mwifiex_read_data_sync(adapter, card->mp_regs,
< at >< at > -1284,7 +1284,7 < at >< at > static int mwifiex_process_int_status(struct mwifiex_adapter *adapter)
 
 if (mwifiex_sdio_card_to_host_mp_aggr(adapter, skb,
       port)) {
-u32 cr = 0;
+u8 cr = 0;
 
 dev_err(adapter->dev, "card_to_host_mpa failed:"
 " int status=%#x\n", sdio_ireg);
< at >< at > -1644,7 +1644,7 < at >< at > static int mwifiex_init_sdio(struct mwifiex_adapter *adapter)
 struct sdio_mmc_card *card = adapter->card;
 const struct mwifiex_sdio_card_reg *reg = card->reg;
 int ret;
-u32 sdio_ireg;
+u8 sdio_ireg;
 
 /*
  * Read the HOST_INT_STATUS_REG for ACK the first interrupt got

[PATCH v2 12/17] mwifiex: code rearrangement in mwifiex_get_rd_port()

Bing Zhao — 2013-05-18T00:53:56

From: Amitkumar Karwar <akarwar-eYqpPyKDWXRBDgjK7y7TUQ< at >public.gmane.org>

Get rid of 'if else' usage by returning in 'if' block.
This improves readability by removing indentations.

Signed-off-by: Amitkumar Karwar <akarwar-eYqpPyKDWXRBDgjK7y7TUQ< at >public.gmane.org>
Signed-off-by: Bing Zhao <bzhao-eYqpPyKDWXRBDgjK7y7TUQ< at >public.gmane.org>
---
 drivers/net/wireless/mwifiex/sdio.c | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/drivers/net/wireless/mwifiex/sdio.c b/drivers/net/wireless/mwifiex/sdio.c
index e4357a6..a18a5b4 100644
--- a/drivers/net/wireless/mwifiex/sdio.c
+++ b/drivers/net/wireless/mwifiex/sdio.c
< at >< at > -512,22 +512,23 < at >< at > static int mwifiex_get_rd_port(struct mwifiex_adapter *adapter, u8 *port)
 *port = CTRL_PORT;
 dev_dbg(adapter->dev, "data: port=%d mp_rd_bitmap=0x%08x\n",
 *port, card->mp_rd_bitmap);
-} else {
-if (card->mp_rd_bitmap & (1 << card->curr_rd_port)) {
-card->mp_rd_bitmap &= (u32)
-(~(1 << card->curr_rd_port));
-*port = card->curr_rd_port;
+return 0;
+}
 
-if (++card->curr_rd_port == card->max_ports)
-card->curr_rd_port = reg->start_rd_port;
-} else {
-return -1;
-}
+if (!(card->mp_rd_bitmap & (1 << card->curr_rd_port)))
+return -1;
+
+/* We are now handling the SDIO data ports */
+card->mp_rd_bitmap &= (u32)(~(1 << card->curr_rd_port));
+*port = card->curr_rd_port;
+
+if (++card->curr_rd_port == card->max_ports)
+card->curr_rd_port = reg->start_rd_port;
+
+dev_dbg(adapter->dev,
+"data: port=%d mp_rd_bitmap=0x%08x -> 0x%08x\n",
+*port, rd_bitmap, card->mp_rd_bitmap);
 
-dev_dbg(adapter->dev,
-"data: port=%d mp_rd_bitmap=0x%08x -> 0x%08x\n",
-*port, rd_bitmap, card->mp_rd_bitmap);
-}
 return 0;
 }

[PATCH v2 00/17] mwifiex updates for 3.11

Bing Zhao — 2013-05-18T00:50:17

This series adds support for new chipset SD8897, calibration data
downloading, del_station handler, as well as some random cleanups
and updates.

v2: fix cmd53 single port address overwriting
    (13/17 and 17/17 only, no change for other pathes)


Amitkumar Karwar (12):
  mwifiex: rename mwifiex_free_adapter() routine in init.c
  mwifiex: scan delay timer cleanup in unload path
  mwifiex: remove global user_scan_cfg variable
  mwifiex: add calibration data download feature
  mwifiex: use u32 variables for SDIO read/write port bitmap
  mwifiex: store SDIO chip specific information in separate structure
  mwifiex: replace unnecessary u32 variables with u8 in sdio.c
  mwifiex: code rearrangement in mwifiex_get_rd_port()
  mwifiex: do port calculations separately
  mwifiex: define a macro for MPA base address
  mwifiex: remove unnecessary macros in sdio.h
  mwifiex: code rearrangement in multiport aggregation path

Avinash Patil (3):
  mwifiex: avoid deleting all stations during mwifiex_del_sta_entry()
  mwifiex: add del_station handler
  mwifiex: replace spin_lock_irqsave with spin_lock and fix warn_on

Bing Zhao (1):
  mwifiex: abort remaining scan commands when association started

Yogesh Ashok Powar (1):
  mwifiex: add support for Marvell SD8897 chipset

 drivers/net/wireless/mwifiex/Kconfig       |   4 +-
 drivers/net/wireless/mwifiex/cfg80211.c    |  77 ++++-
 drivers/net/wireless/mwifiex/cmdevt.c      |   1 +
 drivers/net/wireless/mwifiex/fw.h          |  17 ++
 drivers/net/wireless/mwifiex/init.c        |  53 ++--
 drivers/net/wireless/mwifiex/main.c        |  14 +
 drivers/net/wireless/mwifiex/main.h        |   5 +-
 drivers/net/wireless/mwifiex/scan.c        |  23 +-
 drivers/net/wireless/mwifiex/sdio.c        | 463 ++++++++++++++++++++---------
 drivers/net/wireless/mwifiex/sdio.h        | 340 ++++++++++++++-------
 drivers/net/wireless/mwifiex/sta_cmd.c     |  62 ++++
 drivers/net/wireless/mwifiex/sta_cmdresp.c |  17 ++
 drivers/net/wireless/mwifiex/uap_cmd.c     |  21 ++
 drivers/net/wireless/mwifiex/uap_event.c   |  25 +-
 14 files changed, 808 insertions(+), 314 deletions(-)

[RFC 0/2] cfg80211: SME refactoring

Johannes Berg — 2013-05-17T14:25:41

After the cleanups, this is really what I was after, separating
the cfg80211 internal software SME from the SME event processing
that is needed for all three SMEs (userspace, cfg80211, driver.)

I have only lightly tested it so far, any help would be welcome :-)

johannes
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA< at >public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 3.10] mac80211: fix direct probe auth

Stanislaw Gruszka — 2013-05-17T11:43:04

We send direct probe to broadcast address, as some APs do not respond to
unicast PROBE frames when unassociated. Broadcast frames are not acked,
so we can not use that for trigger MLME state machine, but we need to
use old timeout mechanism.

This fixes authentication timed out like below:

[ 1024.671974] wlan6: authenticate with 54:e6:fc:98:63:fe
[ 1024.694125] wlan6: direct probe to 54:e6:fc:98:63:fe (try 1/3)
[ 1024.695450] wlan6: direct probe to 54:e6:fc:98:63:fe (try 2/3)
[ 1024.700586] wlan6: send auth to 54:e6:fc:98:63:fe (try 3/3)
[ 1024.701441] wlan6: authentication with 54:e6:fc:98:63:fe timed out

With fix, we have:

[ 4524.198978] wlan6: authenticate with 54:e6:fc:98:63:fe
[ 4524.220692] wlan6: direct probe to 54:e6:fc:98:63:fe (try 1/3)
[ 4524.421784] wlan6: send auth to 54:e6:fc:98:63:fe (try 2/3)
[ 4524.423272] wlan6: authenticated
[ 4524.423811] wlan6: associate with 54:e6:fc:98:63:fe (try 1/3)
[ 4524.427492] wlan6: RX AssocResp from 54:e6:fc:98:63:fe (capab=0x431 status=0 aid=1)

Cc: stable-u79uwXL29TY76Z2rM5mHXA< at >public.gmane.org # 3.9
Signed-off-by: Stanislaw Gruszka <sgruszka-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
---
 net/mac80211/mlme.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 346ad4c..0a60f40 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
< at >< at > -3182,10 +3182,6 < at >< at > static int ieee80211_probe_auth(struct ieee80211_sub_if_data *sdata)
 if (WARN_ON_ONCE(!auth_data))
 return -EINVAL;
 
-if (local->hw.flags & IEEE80211_HW_REPORTS_TX_ACK_STATUS)
-tx_flags = IEEE80211_TX_CTL_REQ_TX_STATUS |
-   IEEE80211_TX_INTFL_MLME_CONN_TX;
-
 auth_data->tries++;
 
 if (auth_data->tries > IEEE80211_AUTH_MAX_TRIES) {
< at >< at > -3219,6 +3215,10 < at >< at > static int ieee80211_probe_auth(struct ieee80211_sub_if_data *sdata)
 auth_data->expected_transaction = trans;
 }
 
+if (local->hw.flags & IEEE80211_HW_REPORTS_TX_ACK_STATUS)
+tx_flags = IEEE80211_TX_CTL_REQ_TX_STATUS |
+   IEEE80211_TX_INTFL_MLME_CONN_TX;
+
 ieee80211_send_auth(sdata, trans, auth_data->algorithm, status,
     auth_data->data, auth_data->data_len,
     auth_data->bss->bssid,
< at >< at > -3242,12 +3242,12 < at >< at > static int ieee80211_probe_auth(struct ieee80211_sub_if_data *sdata)
  * will not answer to direct packet in unassociated state.
  */
 ieee80211_send_probe_req(sdata, NULL, ssidie + 2, ssidie[1],
- NULL, 0, (u32) -1, true, tx_flags,
+ NULL, 0, (u32) -1, true, 0,
  auth_data->bss->channel, false);
 rcu_read_unlock();
 }
 
-if (!(local->hw.flags & IEEE80211_HW_REPORTS_TX_ACK_STATUS)) {
+if (tx_flags == 0) {
 auth_data->timeout = jiffies + IEEE80211_AUTH_TIMEOUT;
 ifmgd->auth_data->timeout_started = true;
 run_again(ifmgd, auth_data->timeout);

[PATCH v2 3.10 1/3] ath9k: fix aggregation stop/flush handling

Felix Fietkau — 2013-05-17T10:58:24

When aggregation stop is requested, don't run the mac80211 aggregation
stop callback yet, while the session is still blocked.
Also, when aggregation flush is requested, don't run the callback at all.

Signed-off-by: Felix Fietkau <nbd-p3rKhJxN3npAfugRpC6u6w< at >public.gmane.org>
---
 drivers/net/wireless/ath/ath9k/ath9k.h |  4 ++-
 drivers/net/wireless/ath/ath9k/main.c  |  8 +++--
 drivers/net/wireless/ath/ath9k/xmit.c  | 61 ++++++++++++++++++++++------------
 3 files changed, 48 insertions(+), 25 deletions(-)

diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index 8a1888d..366002f 100644
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
< at >< at > -254,6 +254,7 < at >< at > struct ath_atx_tid {
 int sched;
 int paused;
 u8 state;
+bool stop_cb;
 };
 
 struct ath_node {
< at >< at > -351,7 +352,8 < at >< at > void ath_tx_tasklet(struct ath_softc *sc);
 void ath_tx_edma_tasklet(struct ath_softc *sc);
 int ath_tx_aggr_start(struct ath_softc *sc, struct ieee80211_sta *sta,
       u16 tid, u16 *ssn);
-void ath_tx_aggr_stop(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid);
+bool ath_tx_aggr_stop(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid,
+      bool flush);
 void ath_tx_aggr_resume(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid);
 
 void ath_tx_aggr_wakeup(struct ath_softc *sc, struct ath_node *an);
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index a18414b..2382d12 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
< at >< at > -1687,6 +1687,7 < at >< at > static int ath9k_ampdu_action(struct ieee80211_hw *hw,
       u16 tid, u16 *ssn, u8 buf_size)
 {
 struct ath_softc *sc = hw->priv;
+bool flush = false;
 int ret = 0;
 
 local_bh_disable();
< at >< at > -1703,12 +1704,13 < at >< at > static int ath9k_ampdu_action(struct ieee80211_hw *hw,
 ieee80211_start_tx_ba_cb_irqsafe(vif, sta->addr, tid);
 ath9k_ps_restore(sc);
 break;
-case IEEE80211_AMPDU_TX_STOP_CONT:
 case IEEE80211_AMPDU_TX_STOP_FLUSH:
 case IEEE80211_AMPDU_TX_STOP_FLUSH_CONT:
+flush = true;
+case IEEE80211_AMPDU_TX_STOP_CONT:
 ath9k_ps_wakeup(sc);
-ath_tx_aggr_stop(sc, sta, tid);
-ieee80211_stop_tx_ba_cb_irqsafe(vif, sta->addr, tid);
+if (ath_tx_aggr_stop(sc, sta, tid, flush))
+ieee80211_stop_tx_ba_cb_irqsafe(vif, sta->addr, tid);
 ath9k_ps_restore(sc);
 break;
 case IEEE80211_AMPDU_TX_OPERATIONAL:
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index eab0fcb..a47bf69 100644
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
< at >< at > -164,7 +164,20 < at >< at > static void ath_set_rates(struct ieee80211_vif *vif, struct ieee80211_sta *sta,
        ARRAY_SIZE(bf->rates));
 }
 
-static void ath_tx_flush_tid(struct ath_softc *sc, struct ath_atx_tid *tid)
+static void ath_tx_clear_tid(struct ath_softc *sc, struct ath_atx_tid *tid)
+{
+tid->state &= ~AGGR_ADDBA_COMPLETE;
+tid->state &= ~AGGR_CLEANUP;
+if (!tid->stop_cb)
+return;
+
+ieee80211_start_tx_ba_cb_irqsafe(tid->an->vif, tid->an->sta->addr,
+ tid->tidno);
+tid->stop_cb = false;
+}
+
+static void ath_tx_flush_tid(struct ath_softc *sc, struct ath_atx_tid *tid,
+     bool flush_packets)
 {
 struct ath_txq *txq = tid->ac->txq;
 struct sk_buff *skb;
< at >< at > -181,16 +194,15 < at >< at > static void ath_tx_flush_tid(struct ath_softc *sc, struct ath_atx_tid *tid)
 while ((skb = __skb_dequeue(&tid->buf_q))) {
 fi = get_frame_info(skb);
 bf = fi->bf;
+if (!bf && !flush_packets)
+bf = ath_tx_setup_buffer(sc, txq, tid, skb);
 
 if (!bf) {
-bf = ath_tx_setup_buffer(sc, txq, tid, skb);
-if (!bf) {
-ieee80211_free_txskb(sc->hw, skb);
-continue;
-}
+ieee80211_free_txskb(sc->hw, skb);
+continue;
 }
 
-if (fi->retries) {
+if (fi->retries || flush_packets) {
 list_add_tail(&bf->list, &bf_head);
 ath_tx_update_baw(sc, tid, bf->bf_state.seqno);
 ath_tx_complete_buf(sc, bf, txq, &bf_head, &ts, 0);
< at >< at > -201,12 +213,10 < at >< at > static void ath_tx_flush_tid(struct ath_softc *sc, struct ath_atx_tid *tid)
 }
 }
 
-if (tid->baw_head == tid->baw_tail) {
-tid->state &= ~AGGR_ADDBA_COMPLETE;
-tid->state &= ~AGGR_CLEANUP;
-}
+if (tid->baw_head == tid->baw_tail)
+ath_tx_clear_tid(sc, tid);
 
-if (sendbar) {
+if (sendbar && !flush_packets) {
 ath_txq_unlock(sc, txq);
 ath_send_bar(tid, tid->seq_start);
 ath_txq_lock(sc, txq);
< at >< at > -602,7 +612,7 < at >< at > static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
 }
 
 if (tid->state & AGGR_CLEANUP)
-ath_tx_flush_tid(sc, tid);
+ath_tx_flush_tid(sc, tid, false);
 
 rcu_read_unlock();
 
< at >< at > -1256,18 +1266,23 < at >< at > int ath_tx_aggr_start(struct ath_softc *sc, struct ieee80211_sta *sta,
 return 0;
 }
 
-void ath_tx_aggr_stop(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid)
+bool ath_tx_aggr_stop(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid,
+      bool flush)
 {
 struct ath_node *an = (struct ath_node *)sta->drv_priv;
 struct ath_atx_tid *txtid = ATH_AN_2_TID(an, tid);
 struct ath_txq *txq = txtid->ac->txq;
+bool ret = !flush;
+
+if (flush)
+txtid->stop_cb = false;
 
 if (txtid->state & AGGR_CLEANUP)
-return;
+return false;
 
 if (!(txtid->state & AGGR_ADDBA_COMPLETE)) {
 txtid->state &= ~AGGR_ADDBA_PROGRESS;
-return;
+return ret;
 }
 
 ath_txq_lock(sc, txq);
< at >< at > -1279,13 +1294,17 < at >< at > void ath_tx_aggr_stop(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid)
  * TID can only be reused after all in-progress subframes have been
  * completed.
  */
-if (txtid->baw_head != txtid->baw_tail)
+if (txtid->baw_head != txtid->baw_tail) {
 txtid->state |= AGGR_CLEANUP;
-else
+ret = false;
+txtid->stop_cb = !flush;
+} else {
 txtid->state &= ~AGGR_ADDBA_COMPLETE;
+}
 
-ath_tx_flush_tid(sc, txtid);
+ath_tx_flush_tid(sc, txtid, flush);
 ath_txq_unlock_complete(sc, txq);
+return ret;
 }
 
 void ath_tx_aggr_sleep(struct ieee80211_sta *sta, struct ath_softc *sc,
< at >< at > -2415,6 +2434,7 < at >< at > void ath_tx_node_init(struct ath_softc *sc, struct ath_node *an)
 tid->ac = &an->ac[acno];
 tid->state &= ~AGGR_ADDBA_COMPLETE;
 tid->state &= ~AGGR_ADDBA_PROGRESS;
+tid->stop_cb = false;
 }
 
 for (acno = 0, ac = &an->ac[acno];
< at >< at > -2451,8 +2471,7 < at >< at > void ath_tx_node_cleanup(struct ath_softc *sc, struct ath_node *an)
 }
 
 ath_tid_drain(sc, txq, tid);
-tid->state &= ~AGGR_ADDBA_COMPLETE;
-tid->state &= ~AGGR_CLEANUP;
+ath_tx_clear_tid(sc, tid);
 
 ath_txq_unlock(sc, txq);
 }

[PATCH 3.10 1/3] ath9k: fix aggregation stop/flush handling

Felix Fietkau — 2013-05-17T09:36:21

When aggregation stop is requested, don't run the mac80211 aggregation
stop callback yet, while the session is still blocked.
Also, when aggregation flush is requested, don't run the callback at all.

Signed-off-by: Felix Fietkau <nbd-p3rKhJxN3npAfugRpC6u6w< at >public.gmane.org>
---
 drivers/net/wireless/ath/ath9k/ath9k.h |  4 ++-
 drivers/net/wireless/ath/ath9k/main.c  |  9 +++--
 drivers/net/wireless/ath/ath9k/xmit.c  | 61 ++++++++++++++++++++++------------
 3 files changed, 49 insertions(+), 25 deletions(-)

diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index 8a1888d..366002f 100644
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
< at >< at > -254,6 +254,7 < at >< at > struct ath_atx_tid {
 int sched;
 int paused;
 u8 state;
+bool stop_cb;
 };
 
 struct ath_node {
< at >< at > -351,7 +352,8 < at >< at > void ath_tx_tasklet(struct ath_softc *sc);
 void ath_tx_edma_tasklet(struct ath_softc *sc);
 int ath_tx_aggr_start(struct ath_softc *sc, struct ieee80211_sta *sta,
       u16 tid, u16 *ssn);
-void ath_tx_aggr_stop(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid);
+bool ath_tx_aggr_stop(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid,
+      bool flush);
 void ath_tx_aggr_resume(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid);
 
 void ath_tx_aggr_wakeup(struct ath_softc *sc, struct ath_node *an);
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index a18414b..690a5d6 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
< at >< at > -1687,6 +1687,7 < at >< at > static int ath9k_ampdu_action(struct ieee80211_hw *hw,
       u16 tid, u16 *ssn, u8 buf_size)
 {
 struct ath_softc *sc = hw->priv;
+bool flush = false, cb;
 int ret = 0;
 
 local_bh_disable();
< at >< at > -1703,12 +1704,14 < at >< at > static int ath9k_ampdu_action(struct ieee80211_hw *hw,
 ieee80211_start_tx_ba_cb_irqsafe(vif, sta->addr, tid);
 ath9k_ps_restore(sc);
 break;
-case IEEE80211_AMPDU_TX_STOP_CONT:
 case IEEE80211_AMPDU_TX_STOP_FLUSH:
 case IEEE80211_AMPDU_TX_STOP_FLUSH_CONT:
+flush = true;
+case IEEE80211_AMPDU_TX_STOP_CONT:
 ath9k_ps_wakeup(sc);
-ath_tx_aggr_stop(sc, sta, tid);
-ieee80211_stop_tx_ba_cb_irqsafe(vif, sta->addr, tid);
+cb = ath_tx_aggr_stop(sc, sta, tid, flush);
+if (cb)
+ieee80211_stop_tx_ba_cb_irqsafe(vif, sta->addr, tid);
 ath9k_ps_restore(sc);
 break;
 case IEEE80211_AMPDU_TX_OPERATIONAL:
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index eab0fcb..a47bf69 100644
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
< at >< at > -164,7 +164,20 < at >< at > static void ath_set_rates(struct ieee80211_vif *vif, struct ieee80211_sta *sta,
        ARRAY_SIZE(bf->rates));
 }
 
-static void ath_tx_flush_tid(struct ath_softc *sc, struct ath_atx_tid *tid)
+static void ath_tx_clear_tid(struct ath_softc *sc, struct ath_atx_tid *tid)
+{
+tid->state &= ~AGGR_ADDBA_COMPLETE;
+tid->state &= ~AGGR_CLEANUP;
+if (!tid->stop_cb)
+return;
+
+ieee80211_start_tx_ba_cb_irqsafe(tid->an->vif, tid->an->sta->addr,
+ tid->tidno);
+tid->stop_cb = false;
+}
+
+static void ath_tx_flush_tid(struct ath_softc *sc, struct ath_atx_tid *tid,
+     bool flush_packets)
 {
 struct ath_txq *txq = tid->ac->txq;
 struct sk_buff *skb;
< at >< at > -181,16 +194,15 < at >< at > static void ath_tx_flush_tid(struct ath_softc *sc, struct ath_atx_tid *tid)
 while ((skb = __skb_dequeue(&tid->buf_q))) {
 fi = get_frame_info(skb);
 bf = fi->bf;
+if (!bf && !flush_packets)
+bf = ath_tx_setup_buffer(sc, txq, tid, skb);
 
 if (!bf) {
-bf = ath_tx_setup_buffer(sc, txq, tid, skb);
-if (!bf) {
-ieee80211_free_txskb(sc->hw, skb);
-continue;
-}
+ieee80211_free_txskb(sc->hw, skb);
+continue;
 }
 
-if (fi->retries) {
+if (fi->retries || flush_packets) {
 list_add_tail(&bf->list, &bf_head);
 ath_tx_update_baw(sc, tid, bf->bf_state.seqno);
 ath_tx_complete_buf(sc, bf, txq, &bf_head, &ts, 0);
< at >< at > -201,12 +213,10 < at >< at > static void ath_tx_flush_tid(struct ath_softc *sc, struct ath_atx_tid *tid)
 }
 }
 
-if (tid->baw_head == tid->baw_tail) {
-tid->state &= ~AGGR_ADDBA_COMPLETE;
-tid->state &= ~AGGR_CLEANUP;
-}
+if (tid->baw_head == tid->baw_tail)
+ath_tx_clear_tid(sc, tid);
 
-if (sendbar) {
+if (sendbar && !flush_packets) {
 ath_txq_unlock(sc, txq);
 ath_send_bar(tid, tid->seq_start);
 ath_txq_lock(sc, txq);
< at >< at > -602,7 +612,7 < at >< at > static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
 }
 
 if (tid->state & AGGR_CLEANUP)
-ath_tx_flush_tid(sc, tid);
+ath_tx_flush_tid(sc, tid, false);
 
 rcu_read_unlock();
 
< at >< at > -1256,18 +1266,23 < at >< at > int ath_tx_aggr_start(struct ath_softc *sc, struct ieee80211_sta *sta,
 return 0;
 }
 
-void ath_tx_aggr_stop(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid)
+bool ath_tx_aggr_stop(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid,
+      bool flush)
 {
 struct ath_node *an = (struct ath_node *)sta->drv_priv;
 struct ath_atx_tid *txtid = ATH_AN_2_TID(an, tid);
 struct ath_txq *txq = txtid->ac->txq;
+bool ret = !flush;
+
+if (flush)
+txtid->stop_cb = false;
 
 if (txtid->state & AGGR_CLEANUP)
-return;
+return false;
 
 if (!(txtid->state & AGGR_ADDBA_COMPLETE)) {
 txtid->state &= ~AGGR_ADDBA_PROGRESS;
-return;
+return ret;
 }
 
 ath_txq_lock(sc, txq);
< at >< at > -1279,13 +1294,17 < at >< at > void ath_tx_aggr_stop(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid)
  * TID can only be reused after all in-progress subframes have been
  * completed.
  */
-if (txtid->baw_head != txtid->baw_tail)
+if (txtid->baw_head != txtid->baw_tail) {
 txtid->state |= AGGR_CLEANUP;
-else
+ret = false;
+txtid->stop_cb = !flush;
+} else {
 txtid->state &= ~AGGR_ADDBA_COMPLETE;
+}
 
-ath_tx_flush_tid(sc, txtid);
+ath_tx_flush_tid(sc, txtid, flush);
 ath_txq_unlock_complete(sc, txq);
+return ret;
 }
 
 void ath_tx_aggr_sleep(struct ieee80211_sta *sta, struct ath_softc *sc,
< at >< at > -2415,6 +2434,7 < at >< at > void ath_tx_node_init(struct ath_softc *sc, struct ath_node *an)
 tid->ac = &an->ac[acno];
 tid->state &= ~AGGR_ADDBA_COMPLETE;
 tid->state &= ~AGGR_ADDBA_PROGRESS;
+tid->stop_cb = false;
 }
 
 for (acno = 0, ac = &an->ac[acno];
< at >< at > -2451,8 +2471,7 < at >< at > void ath_tx_node_cleanup(struct ath_softc *sc, struct ath_node *an)
 }
 
 ath_tid_drain(sc, txq, tid);
-tid->state &= ~AGGR_ADDBA_COMPLETE;
-tid->state &= ~AGGR_CLEANUP;
+ath_tx_clear_tid(sc, tid);
 
 ath_txq_unlock(sc, txq);
 }

AR9227: Can't set master mode

Felix Blanke — 2013-05-17T08:54:50

Hi,

first: Please CC me as I'm not subscribed to the list.

I have the following wireless card: 04:02.0 Network controller:
Atheros Communications Inc. AR9227 Wireless Network Adapter (rev 01)

I can't set it to master mode, but this card should support it:

server ~ # iwconfig wlp4s2
wlp4s2    IEEE 802.11bgn  ESSID:off/any
          Mode:Managed  Access Point: Not-Associated   Tx-Power=19 dBm
          Retry  long limit:7   RTS thr:off   Fragment thr:off
          Encryption key:off
          Power Management:off

server ~ # iwconfig wlp4s2 mode Master
Error for wireless request "Set Mode" (8B06) :
    SET failed on device wlp4s2 ; Invalid argument.


My kernel config should be correct:

server linux # cat .config | grep ATH9K
CONFIG_ATH9K_HW=y
CONFIG_ATH9K_COMMON=y
# CONFIG_ATH9K_BTCOEX_SUPPORT is not set
CONFIG_ATH9K=y
CONFIG_ATH9K_PCI=y
# CONFIG_ATH9K_AHB is not set
# CONFIG_ATH9K_DEBUGFS is not set
CONFIG_ATH9K_RATE_CONTROL=y
# CONFIG_ATH9K_HTC is not set

server linux # cat .config | grep MAC80211
CONFIG_MAC80211=y
CONFIG_MAC80211_HAS_RC=y
CONFIG_MAC80211_RC_MINSTREL=y
CONFIG_MAC80211_RC_MINSTREL_HT=y
CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
# CONFIG_MAC80211_MESH is not set
CONFIG_MAC80211_LEDS=y
# CONFIG_MAC80211_DEBUGFS is not set
# CONFIG_MAC80211_MESSAGE_TRACING is not set
# CONFIG_MAC80211_DEBUG_MENU is not set
# CONFIG_MAC80211_HWSIM is not set


I can scan for wireless networks and probably also connect to them
(never tested because this is not an use case for me).

Any ideas? Thanks in advance!

Kind regards,
Felix
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA< at >public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH] regulatory: enable channels 52-64 and 100-144 for world roaming

Johannes Berg — 2013-05-16T21:06:52

From: Johannes Berg <johannes.berg-ral2JQCrhuEAvxtiuMwx3w< at >public.gmane.org>

If allowed in a country, these channels typically require DFS
so mark them as such. Channel 144 is a bit special, it's coming
into use now to allow more VHT 80 channels, but world roaming
with passive scanning is acceptable anyway. It seems fairly
unlikely that it'll be used as the control channel for a VHT
AP, but it needs to be present to allow a full VHT connection
to an AP that uses it as one of the secondary channels.

Also enable VHT 160 on these channels, and also for channels
36-48 to be able to use VHT 160 there.

Signed-off-by: Johannes Berg <johannes.berg-ral2JQCrhuEAvxtiuMwx3w< at >public.gmane.org>
---
 net/wireless/reg.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index cc35fba..e713051 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
< at >< at > -184,11 +184,21 < at >< at > static const struct ieee80211_regdomain world_regdom = {
 NL80211_RRF_NO_IBSS |
 NL80211_RRF_NO_OFDM),
 /* IEEE 802.11a, channel 36..48 */
-REG_RULE(5180-10, 5240+10, 80, 6, 20,
+REG_RULE(5180-10, 5240+10, 160, 6, 20,
                         NL80211_RRF_PASSIVE_SCAN |
                         NL80211_RRF_NO_IBSS),
 
-/* NB: 5260 MHz - 5700 MHz requires DFS */
+/* IEEE 802.11a, channel 52..64 - DFS required */
+REG_RULE(5260-10, 5320+10, 160, 6, 20,
+NL80211_RRF_PASSIVE_SCAN |
+NL80211_RRF_NO_IBSS |
+NL80211_RRF_DFS),
+
+/* IEEE 802.11a, channel 100..144 - DFS required */
+REG_RULE(5500-10, 5720+10, 160, 6, 20,
+NL80211_RRF_PASSIVE_SCAN |
+NL80211_RRF_NO_IBSS |
+NL80211_RRF_DFS),
 
 /* IEEE 802.11a, channel 149..165 */
 REG_RULE(5745-10, 5825+10, 80, 6, 20,

[PATCH 0/9] cfg80211 spring cleaning

Johannes Berg — 2013-05-16T21:03:29

Motivated by the bugs Ben Greear keeps reporting, I decided to do
some locking and general cleanup in cfg80211.

This is the first series. I'm working on more changes to actually
separate the SME and MLME code much better to avoid such strange
issues as we had before with their state (sme_state and current_bss)
getting confused, but that'll take a bit longer.

johannes

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA< at >public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

pull-request: iwlwifi-fixes 2013-05-16

Johannes Berg — 2013-05-16T20:59:25

John,

And another one for iwlwifi, much fewer commits though.

I have fixes for a firmware crash during resume, multicast RX,
aggregation and a workaround for a firmware scanning bug.

Please pull. Thanks,
johannes



The following changes since commit 61f1598278876527314f5fc1d00cf0a4d525c1f7:

  Merge branch 'wireless' (2013-05-10 09:44:05 -0700)

are available in the git repository at:


  git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes.git for-john

for you to fetch changes up to e3d4bc8cc0230e8dc8033484666f03f87392a8c4:

  iwlwifi: mvm: fix aggregation drain flow (2013-05-16 22:39:07 +0200)

----------------------------------------------------------------
Alexander Bondar (1):
      iwlwifi: mvm: Prevent setting assoc flag in MAC_CONTEXT_CMD

Emmanuel Grumbach (2):
      iwlwifi: mvm: tell firmware to let multicast frames in
      iwlwifi: mvm: fix aggregation drain flow

Ilan Peer (1):
      iwlwifi: mvm: Always use SCAN_TYPE_FORCED

 drivers/net/wireless/iwlwifi/mvm/fw-api.h   | 27 ++++++++++++++++
 drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 12 +++++---
 drivers/net/wireless/iwlwifi/mvm/mac80211.c | 17 +++++++++-
 drivers/net/wireless/iwlwifi/mvm/mvm.h      |  1 +
 drivers/net/wireless/iwlwifi/mvm/ops.c      |  1 +
 drivers/net/wireless/iwlwifi/mvm/scan.c     |  6 ++++
 drivers/net/wireless/iwlwifi/mvm/sta.c      | 13 ++++++--
 drivers/net/wireless/iwlwifi/mvm/sta.h      |  2 --
 drivers/net/wireless/iwlwifi/mvm/tx.c       | 48 +++++++++++++++++++++--------
 9 files changed, 105 insertions(+), 22 deletions(-)

pull-request: mac80211 2013-05-16

Johannes Berg — 2013-05-16T20:52:48

John,

Here's my first pull request for the 3.10 fixes stream. Unfortunately, a
fairly large number of these also had to be tagged for stable.

This is what I have:
 * a patch from Felix to fix RCU usage in his rate table code
 * a patch from Ilan to add the wdev id to some notifications so they
can
   actually be used by userspace
 * Sasha Levin found an issue in how hwsim handles devices
 * a fix for a bug in the wiphy_register() error path that's been there
forever
 * three fixes for WoWLAN
 * AP mode frame matching was erroneously giving frames to all virtual
AP
   interfaces (reported by Jouni)
 * a fix for HT handling in my CSA changes, found by Sujith
 * a fix for some locking simplifications gone wrong
 * Ben Greear found more cfg80211/mac80211 state confusion
 * and a fix for another bug found by Jouni: local state changes need to
be
   reported by mac80211 to cfg80211 so it disconnects properly.

Please pull. Thanks,
johannes



The following changes since commit 61f1598278876527314f5fc1d00cf0a4d525c1f7:

  Merge branch 'wireless' (2013-05-10 09:44:05 -0700)

are available in the git repository at:


  git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git for-john

for you to fetch changes up to e248ad30204eff6559b4d2d94d49d9d46c08185a:

  cfg80211: fix sending WoWLAN TCP wakeup settings (2013-05-16 22:38:09 +0200)

----------------------------------------------------------------
Felix Fietkau (1):
      mac80211: fix spurious RCU warning and update documentation

Ilan Peer (1):
      nl80211: Add wdev identifier to some nl80211 notifications

Johannes Berg (9):
      cfg80211: fix wiphy_register error path
      cfg80211: fix WoWLAN wakeup tracing
      mac80211: fix IEEE80211_SDATA_DISCONNECT_RESUME
      mac80211: fix HT beacon-based channel switch handling
      mac80211: use just spin_lock() in ieee80211_get_tkip_p2k()
      mac80211: fix AP-mode frame matching
      cfg80211: fix interface down/disconnect state handling
      mac80211: report deauth to cfg80211 for local state change
      cfg80211: fix sending WoWLAN TCP wakeup settings

Sasha Levin (1):
      mac80211_hwsim: correctly register the platform driver

 drivers/net/wireless/mac80211_hwsim.c | 18 +++++------
 include/net/mac80211.h                | 12 ++++---
 net/mac80211/ieee80211_i.h            |  1 +
 net/mac80211/mlme.c                   | 61 +++++++++++++++++++++++++++++------
 net/mac80211/rate.c                   |  9 +++++-
 net/mac80211/rx.c                     |  3 ++
 net/mac80211/tkip.c                   |  4 +--
 net/mac80211/util.c                   |  7 ++++
 net/wireless/core.c                   | 17 ++++++----
 net/wireless/nl80211.c                |  4 +++
 net/wireless/sme.c                    |  3 +-
 net/wireless/trace.h                  | 23 +++++++------
 12 files changed, 118 insertions(+), 44 deletions(-)