upgrade orion to 2.6.26-rc9

[openwrt.git] / package / b43 / src / pio.h

diff --git a/package/b43/src/pio.h b/package/b43/src/pio.h
index 46d6d2e..6c174c9 100644 (file)
--- a/package/b43/src/pio.h
+++ b/package/b43/src/pio.h
@@ -4,112 +4,181 @@
 #include "b43.h"
 
 #include <linux/interrupt.h>
 #include "b43.h"
 
 #include <linux/interrupt.h>

+#include <linux/io.h>

 #include <linux/list.h>
 #include <linux/skbuff.h>
 
 #include <linux/list.h>
 #include <linux/skbuff.h>
 

-#define B43_PIO_TXCTL          0x00
-#define B43_PIO_TXDATA         0x02
-#define B43_PIO_TXQBUFSIZE             0x04
-#define B43_PIO_RXCTL          0x08
-#define B43_PIO_RXDATA         0x0A
-
-#define B43_PIO_TXCTL_WRITELO  (1 << 0)
-#define B43_PIO_TXCTL_WRITEHI  (1 << 1)
-#define B43_PIO_TXCTL_COMPLETE (1 << 2)
-#define B43_PIO_TXCTL_INIT             (1 << 3)
-#define B43_PIO_TXCTL_SUSPEND  (1 << 7)
-
-#define B43_PIO_RXCTL_DATAAVAILABLE    (1 << 0)
-#define B43_PIO_RXCTL_READY            (1 << 1)

 
 

-/* PIO constants */
-#define B43_PIO_MAXTXDEVQPACKETS       31
-#define B43_PIO_TXQADJUST              80
+/*** Registers for PIO queues up to revision 7. ***/
+/* TX queue. */
+#define B43_PIO_TXCTL                  0x00
+#define  B43_PIO_TXCTL_WRITELO         0x0001
+#define  B43_PIO_TXCTL_WRITEHI         0x0002
+#define  B43_PIO_TXCTL_EOF             0x0004
+#define  B43_PIO_TXCTL_FREADY          0x0008
+#define  B43_PIO_TXCTL_FLUSHREQ                0x0020
+#define  B43_PIO_TXCTL_FLUSHPEND       0x0040
+#define  B43_PIO_TXCTL_SUSPREQ         0x0080
+#define  B43_PIO_TXCTL_QSUSP           0x0100
+#define  B43_PIO_TXCTL_COMMCNT         0xFC00
+#define  B43_PIO_TXCTL_COMMCNT_SHIFT   10
+#define B43_PIO_TXDATA                 0x02
+#define B43_PIO_TXQBUFSIZE             0x04
+/* RX queue. */
+#define B43_PIO_RXCTL                  0x00
+#define  B43_PIO_RXCTL_FRAMERDY                0x0001
+#define  B43_PIO_RXCTL_DATARDY         0x0002
+#define B43_PIO_RXDATA                 0x02
+
+/*** Registers for PIO queues revision 8 and later. ***/
+/* TX queue */
+#define B43_PIO8_TXCTL                 0x00
+#define  B43_PIO8_TXCTL_0_7            0x00000001
+#define  B43_PIO8_TXCTL_8_15           0x00000002
+#define  B43_PIO8_TXCTL_16_23          0x00000004
+#define  B43_PIO8_TXCTL_24_31          0x00000008
+#define  B43_PIO8_TXCTL_EOF            0x00000010
+#define  B43_PIO8_TXCTL_FREADY         0x00000080
+#define  B43_PIO8_TXCTL_SUSPREQ                0x00000100
+#define  B43_PIO8_TXCTL_QSUSP          0x00000200
+#define  B43_PIO8_TXCTL_FLUSHREQ       0x00000400
+#define  B43_PIO8_TXCTL_FLUSHPEND      0x00000800
+#define B43_PIO8_TXDATA                        0x04
+/* RX queue */
+#define B43_PIO8_RXCTL                 0x00
+#define  B43_PIO8_RXCTL_FRAMERDY       0x00000001
+#define  B43_PIO8_RXCTL_DATARDY                0x00000002
+#define B43_PIO8_RXDATA                        0x04
+
+
+/* The maximum number of TX-packets the HW can handle. */
+#define B43_PIO_MAX_NR_TXPACKETS       32

 
 

-/* PIO tuning knobs */
-#define B43_PIO_MAXTXPACKETS   256

 
 #ifdef CONFIG_B43_PIO
 
 
 #ifdef CONFIG_B43_PIO
 

-struct b43_pioqueue;
-struct b43_xmitstatus;
-

 struct b43_pio_txpacket {
 struct b43_pio_txpacket {

-       struct b43_pioqueue *queue;
+       /* Pointer to the TX queue we belong to. */
+       struct b43_pio_txqueue *queue;
+       /* The TX data packet. */

        struct sk_buff *skb;
        struct sk_buff *skb;

-       struct ieee80211_tx_status txstat;
+       /* Index in the (struct b43_pio_txqueue)->packets array. */
+       u8 index;
+

        struct list_head list;
 };
 
        struct list_head list;
 };
 

-#define pio_txpacket_getindex(packet) ((int)((packet) - (packet)->queue->tx_packets_cache))
-
-struct b43_pioqueue {
+struct b43_pio_txqueue {

        struct b43_wldev *dev;
        struct b43_wldev *dev;

+       spinlock_t lock;

        u16 mmio_base;
 
        u16 mmio_base;
 

-       bool tx_suspended;
-       bool tx_frozen;
-       bool need_workarounds;  /* Workarounds needed for core.rev < 3 */
-
-       /* Adjusted size of the device internal TX buffer. */
-       u16 tx_devq_size;
-       /* Used octets of the device internal TX buffer. */
-       u16 tx_devq_used;
-       /* Used packet slots in the device internal TX buffer. */
-       u8 tx_devq_packets;
-       /* Packets from the txfree list can
-        * be taken on incoming TX requests.
-        */
-       struct list_head txfree;
-       unsigned int nr_txfree;
-       /* Packets on the txqueue are queued,
-        * but not completely written to the chip, yet.
-        */
-       struct list_head txqueue;
-       /* Packets on the txrunning queue are completely
-        * posted to the device. We are waiting for the txstatus.
-        */
-       struct list_head txrunning;
-       /* Total number or packets sent.
-        * (This counter can obviously wrap).
-        */
+       /* The device queue buffer size in bytes. */
+       u16 buffer_size;
+       /* The number of used bytes in the device queue buffer. */
+       u16 buffer_used;
+       /* The number of packets that can still get queued.
+        * This is decremented on queueing a packet and incremented
+        * after receiving the transmit status. */
+       u16 free_packet_slots;
+
+       /* True, if the mac80211 queue was stopped due to overflow at TX. */
+       bool stopped;
+       /* Our b43 queue index number */
+       u8 index;
+       /* The mac80211 QoS queue priority. */
+       u8 queue_prio;
+
+       /* Buffer for TX packet meta data. */
+       struct b43_pio_txpacket packets[B43_PIO_MAX_NR_TXPACKETS];
+       struct list_head packets_list;
+
+       /* Total number of transmitted packets. */

        unsigned int nr_tx_packets;
        unsigned int nr_tx_packets;

-       struct tasklet_struct txtask;
-       struct b43_pio_txpacket tx_packets_cache[B43_PIO_MAXTXPACKETS];
+
+       /* Shortcut to the 802.11 core revision. This is to
+        * avoid horrible pointer dereferencing in the fastpaths. */
+       u8 rev;

 };
 
 };
 

-static inline u16 b43_pio_read(struct b43_pioqueue *queue, u16 offset)
+struct b43_pio_rxqueue {
+       struct b43_wldev *dev;
+       spinlock_t lock;
+       u16 mmio_base;
+
+       /* Work to reduce latency issues on RX. */
+       struct work_struct rx_work;
+
+       /* Shortcut to the 802.11 core revision. This is to
+        * avoid horrible pointer dereferencing in the fastpaths. */
+       u8 rev;
+};
+
+
+static inline u16 b43_piotx_read16(struct b43_pio_txqueue *q, u16 offset)
+{
+       return b43_read16(q->dev, q->mmio_base + offset);
+}
+
+static inline u32 b43_piotx_read32(struct b43_pio_txqueue *q, u16 offset)
+{
+       return b43_read32(q->dev, q->mmio_base + offset);
+}
+
+static inline void b43_piotx_write16(struct b43_pio_txqueue *q,
+                                    u16 offset, u16 value)

 {
 {

-       return b43_read16(queue->dev, queue->mmio_base + offset);
+       b43_write16(q->dev, q->mmio_base + offset, value);

 }
 
 }
 

-static inline
-    void b43_pio_write(struct b43_pioqueue *queue, u16 offset, u16 value)
+static inline void b43_piotx_write32(struct b43_pio_txqueue *q,
+                                    u16 offset, u32 value)

 {
 {

-       b43_write16(queue->dev, queue->mmio_base + offset, value);
-       mmiowb();
+       b43_write32(q->dev, q->mmio_base + offset, value);

 }
 
 }
 

+
+static inline u16 b43_piorx_read16(struct b43_pio_rxqueue *q, u16 offset)
+{
+       return b43_read16(q->dev, q->mmio_base + offset);
+}
+
+static inline u32 b43_piorx_read32(struct b43_pio_rxqueue *q, u16 offset)
+{
+       return b43_read32(q->dev, q->mmio_base + offset);
+}
+
+static inline void b43_piorx_write16(struct b43_pio_rxqueue *q,
+                                    u16 offset, u16 value)
+{
+       b43_write16(q->dev, q->mmio_base + offset, value);
+}
+
+static inline void b43_piorx_write32(struct b43_pio_rxqueue *q,
+                                    u16 offset, u32 value)
+{
+       b43_write32(q->dev, q->mmio_base + offset, value);
+}
+
+

 int b43_pio_init(struct b43_wldev *dev);
 int b43_pio_init(struct b43_wldev *dev);

+void b43_pio_stop(struct b43_wldev *dev);

 void b43_pio_free(struct b43_wldev *dev);
 
 void b43_pio_free(struct b43_wldev *dev);
 

-int b43_pio_tx(struct b43_wldev *dev,
-              struct sk_buff *skb, struct ieee80211_tx_control *ctl);
+int b43_pio_tx(struct b43_wldev *dev, struct sk_buff *skb);

 void b43_pio_handle_txstatus(struct b43_wldev *dev,
                             const struct b43_txstatus *status);
 void b43_pio_get_tx_stats(struct b43_wldev *dev,
                          struct ieee80211_tx_queue_stats *stats);
 void b43_pio_handle_txstatus(struct b43_wldev *dev,
                             const struct b43_txstatus *status);
 void b43_pio_get_tx_stats(struct b43_wldev *dev,
                          struct ieee80211_tx_queue_stats *stats);

-void b43_pio_rx(struct b43_pioqueue *queue);
+void b43_pio_rx(struct b43_pio_rxqueue *q);
+
+void b43_pio_tx_suspend(struct b43_wldev *dev);
+void b43_pio_tx_resume(struct b43_wldev *dev);

 
 

-/* Suspend TX queue in hardware. */
-void b43_pio_tx_suspend(struct b43_pioqueue *queue);
-void b43_pio_tx_resume(struct b43_pioqueue *queue);
-/* Suspend (freeze) the TX tasklet (software level). */
-void b43_pio_freeze_txqueues(struct b43_wldev *dev);
-void b43_pio_thaw_txqueues(struct b43_wldev *dev);

 
 #else /* CONFIG_B43_PIO */
 
 
 #else /* CONFIG_B43_PIO */
 

+

 static inline int b43_pio_init(struct b43_wldev *dev)
 {
        return 0;
 static inline int b43_pio_init(struct b43_wldev *dev)
 {
        return 0;


@@ -117,35 +186,29 @@ static inline int b43_pio_init(struct b43_wldev *dev)
 static inline void b43_pio_free(struct b43_wldev *dev)
 {
 }
 static inline void b43_pio_free(struct b43_wldev *dev)
 {
 }

-static inline
-    int b43_pio_tx(struct b43_wldev *dev,
-                  struct sk_buff *skb, struct ieee80211_tx_control *ctl)
+static inline void b43_pio_stop(struct b43_wldev *dev)

 {
 {

-       return 0;

 }
 }

-static inline
-    void b43_pio_handle_txstatus(struct b43_wldev *dev,
-                                const struct b43_txstatus *status)
-{
-}
-static inline
-    void b43_pio_get_tx_stats(struct b43_wldev *dev,
-                             struct ieee80211_tx_queue_stats *stats)
+static inline int b43_pio_tx(struct b43_wldev *dev,
+                            struct sk_buff *skb)

 {
 {

+       return 0;

 }
 }

-static inline void b43_pio_rx(struct b43_pioqueue *queue)
+static inline void b43_pio_handle_txstatus(struct b43_wldev *dev,
+                                          const struct b43_txstatus *status)

 {
 }
 {
 }

-static inline void b43_pio_tx_suspend(struct b43_pioqueue *queue)
+static inline void b43_pio_get_tx_stats(struct b43_wldev *dev,
+                                       struct ieee80211_tx_queue_stats *stats)

 {
 }
 {
 }

-static inline void b43_pio_tx_resume(struct b43_pioqueue *queue)
+static inline void b43_pio_rx(struct b43_pio_rxqueue *q)

 {
 }
 {
 }

-static inline void b43_pio_freeze_txqueues(struct b43_wldev *dev)
+static inline void b43_pio_tx_suspend(struct b43_wldev *dev)

 {
 }
 {
 }

-static inline void b43_pio_thaw_txqueues(struct b43_wldev *dev)
+static inline void b43_pio_tx_resume(struct b43_wldev *dev)

 {
 }
 
 {
 }