X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/6b3c1f56d16aa225b7ee2d96f24e74f1b9369954..2ebacb170665861e537e58ef30d7bd8d660b6d59:/package/madwifi/patches/300-napi_polling.patch diff --git a/package/madwifi/patches/300-napi_polling.patch b/package/madwifi/patches/300-napi_polling.patch index 878c949c5..b1e8d1f11 100644 --- a/package/madwifi/patches/300-napi_polling.patch +++ b/package/madwifi/patches/300-napi_polling.patch @@ -1,8 +1,8 @@ -Index: madwifi-dfs-r2996/ath/if_ath.c +Index: madwifi-trunk-r3280/ath/if_ath.c =================================================================== ---- madwifi-dfs-r2996.orig/ath/if_ath.c 2007-12-01 18:53:28.557716602 +0100 -+++ madwifi-dfs-r2996/ath/if_ath.c 2007-12-01 18:54:22.276777879 +0100 -@@ -189,7 +189,7 @@ +--- madwifi-trunk-r3280.orig/ath/if_ath.c 2008-01-28 17:29:22.989895792 +0100 ++++ madwifi-trunk-r3280/ath/if_ath.c 2008-01-28 20:00:09.319637124 +0100 +@@ -184,7 +184,7 @@ struct sk_buff *, int, int, u_int64_t); static void ath_setdefantenna(struct ath_softc *, u_int); static struct ath_txq *ath_txq_setup(struct ath_softc *, int, int); @@ -11,15 +11,15 @@ Index: madwifi-dfs-r2996/ath/if_ath.c static int ath_hardstart(struct sk_buff *, struct net_device *); static int ath_mgtstart(struct ieee80211com *, struct sk_buff *); #ifdef ATH_SUPERG_COMP -@@ -534,7 +534,6 @@ +@@ -542,7 +542,6 @@ ATH_TXBUF_LOCK_INIT(sc); ATH_RXBUF_LOCK_INIT(sc); - ATH_INIT_TQUEUE(&sc->sc_rxtq, ath_rx_tasklet, dev); - ATH_INIT_TQUEUE(&sc->sc_txtq, ath_tx_tasklet, dev); + ATH_INIT_TQUEUE(&sc->sc_txtq, ath_tx_tasklet, dev); ATH_INIT_TQUEUE(&sc->sc_bmisstq, ath_bmiss_tasklet, dev); ATH_INIT_TQUEUE(&sc->sc_bstucktq, ath_bstuck_tasklet, dev); -@@ -807,6 +806,8 @@ +@@ -816,6 +815,8 @@ dev->set_mac_address = ath_set_mac_address; dev->change_mtu = ath_change_mtu; dev->tx_queue_len = ATH_TXBUF - ATH_TXBUF_MGT_RESERVED; @@ -28,18 +28,18 @@ Index: madwifi-dfs-r2996/ath/if_ath.c #ifdef USE_HEADERLEN_RESV dev->hard_header_len += sizeof(struct ieee80211_qosframe) + sizeof(struct llc) + -@@ -2164,6 +2165,7 @@ - (status & HAL_INT_RXPHY) ? " HAL_INT_RXPHY" : "", - (status & HAL_INT_SWBA) ? " HAL_INT_SWBA" : ""); +@@ -2206,6 +2207,7 @@ + (status & HAL_INT_GLOBAL) ? " HAL_INT_GLOBAL" : "" + ); + sc->sc_isr = status; status &= sc->sc_imask; /* discard unasked for bits */ - if (status & HAL_INT_FATAL) { - sc->sc_stats.ast_hardware++; -@@ -2216,7 +2218,14 @@ + /* As soon as we know we have a real interrupt we intend to service, + * we will check to see if we need an initial hardware TSF reading. +@@ -2263,7 +2265,14 @@ } if (status & (HAL_INT_RX | HAL_INT_RXPHY)) { - ath_uapsd_processtriggers(sc); + ath_uapsd_processtriggers(sc, hw_tsf); - ATH_SCHEDULE_TQUEUE(&sc->sc_rxtq, &needmark); + sc->sc_isr &= ~HAL_INT_RX; + if (netif_rx_schedule_prep(dev)) { @@ -52,7 +52,7 @@ Index: madwifi-dfs-r2996/ath/if_ath.c } if (status & HAL_INT_TX) { #ifdef ATH_SUPERG_DYNTURBO -@@ -2242,6 +2251,11 @@ +@@ -2289,6 +2298,11 @@ } } #endif @@ -64,7 +64,7 @@ Index: madwifi-dfs-r2996/ath/if_ath.c ATH_SCHEDULE_TQUEUE(&sc->sc_txtq, &needmark); } if (status & HAL_INT_BMISS) { -@@ -3929,10 +3943,10 @@ +@@ -4011,10 +4025,10 @@ * * XXX Using in_softirq is not right since we might * be called from other soft irq contexts than @@ -77,16 +77,16 @@ Index: madwifi-dfs-r2996/ath/if_ath.c netif_stop_queue(dev); } -@@ -3945,7 +3959,7 @@ - DPRINTF(sc, ATH_DEBUG_KEYCACHE, "%s:\n", __func__); - netif_start_queue(dev); +@@ -4027,7 +4041,7 @@ + DPRINTF(sc, ATH_DEBUG_KEYCACHE, "End\n"); + netif_wake_queue(dev); if (!in_softirq()) /* NB: see above */ - tasklet_enable(&sc->sc_rxtq); + netif_poll_enable(dev); } /* -@@ -6252,13 +6266,12 @@ +@@ -6329,13 +6343,12 @@ sc->sc_rxotherant = 0; } @@ -102,19 +102,19 @@ Index: madwifi-dfs-r2996/ath/if_ath.c struct ath_buf *bf; struct ath_softc *sc = dev->priv; struct ieee80211com *ic = &sc->sc_ic; -@@ -6270,8 +6283,11 @@ +@@ -6347,8 +6360,11 @@ unsigned int len; int type; u_int phyerr; + u_int processed = 0, early_stop = 0; + u_int rx_limit = dev->quota; - DPRINTF(sc, ATH_DEBUG_RX_PROC, "%s\n", __func__); + DPRINTF(sc, ATH_DEBUG_RX_PROC, "invoked\n"); +process_rx_again: do { bf = STAILQ_FIRST(&sc->sc_rxbuf); if (bf == NULL) { /* XXX ??? can this happen */ -@@ -6295,6 +6311,13 @@ +@@ -6372,6 +6388,13 @@ /* NB: never process the self-linked entry at the end */ break; } @@ -127,8 +127,8 @@ Index: madwifi-dfs-r2996/ath/if_ath.c + skb = bf->bf_skb; if (skb == NULL) { - printk("%s: no skbuff (%s)\n", DEV_NAME(dev), __func__); -@@ -6339,6 +6362,7 @@ + EPRINTF(sc, "Dropping; buffer contains NULL skbuff.\n"); +@@ -6419,6 +6442,7 @@ sc->sc_stats.ast_rx_phyerr++; phyerr = rs->rs_phyerr & 0x1f; sc->sc_stats.ast_rx_phy[phyerr]++; @@ -136,20 +136,22 @@ Index: madwifi-dfs-r2996/ath/if_ath.c } if (rs->rs_status & HAL_RXERR_DECRYPT) { /* -@@ -6545,9 +6569,33 @@ +@@ -6614,9 +6638,35 @@ STAILQ_INSERT_TAIL(&sc->sc_rxbuf, bf, bf_list); ATH_RXBUF_UNLOCK_IRQ(sc); } while (ath_rxbuf_init(sc, bf) == 0); + if (!early_stop) { ++ unsigned long flags; + /* Check if more data is received while we were + * processing the descriptor chain. + */ +#ifndef ATH_PRECISE_TSF -+ ATH_DISABLE_INTR(); ++ local_irq_save(flags); + if (sc->sc_isr & HAL_INT_RX) { ++ u_int64_t hw_tsf = ath_hal_gettsf64(ah); + sc->sc_isr &= ~HAL_INT_RX; -+ ATH_ENABLE_INTR(); -+ ath_uapsd_processtriggers(sc); ++ local_irq_restore(flags); ++ ath_uapsd_processtriggers(sc, hw_tsf); + goto process_rx_again; + } +#endif @@ -158,7 +160,7 @@ Index: madwifi-dfs-r2996/ath/if_ath.c +#ifndef ATH_PRECISE_TSF + sc->sc_imask |= HAL_INT_RX; + ath_hal_intrset(ah, sc->sc_imask); -+ ATH_ENABLE_INTR(); ++ local_irq_restore(flags); +#endif + } + @@ -170,9 +172,11 @@ Index: madwifi-dfs-r2996/ath/if_ath.c #undef PA2DESC } -@@ -8170,11 +8218,22 @@ +@@ -8267,12 +8317,24 @@ + { struct net_device *dev = (struct net_device *)data; struct ath_softc *sc = dev->priv; ++ unsigned long flags; +process_tx_again: if (txqactive(sc->sc_ah, 0)) @@ -180,70 +184,73 @@ Index: madwifi-dfs-r2996/ath/if_ath.c if (txqactive(sc->sc_ah, sc->sc_cabq->axq_qnum)) ath_tx_processq(sc, sc->sc_cabq); -+ ATH_DISABLE_INTR(); ++ local_irq_save(flags); + if (sc->sc_isr & HAL_INT_TX) { + sc->sc_isr &= ~HAL_INT_TX; -+ ATH_ENABLE_INTR(); ++ local_irq_restore(flags); + goto process_tx_again; + } + sc->sc_imask |= HAL_INT_TX; + ath_hal_intrset(sc->sc_ah, sc->sc_imask); -+ ATH_ENABLE_INTR(); ++ local_irq_restore(flags); + netif_wake_queue(dev); if (sc->sc_softled) -@@ -8191,6 +8250,7 @@ +@@ -8288,7 +8350,9 @@ + { struct net_device *dev = (struct net_device *)data; struct ath_softc *sc = dev->priv; ++ unsigned long flags; +process_tx_again: /* * Process each active queue. */ -@@ -8211,6 +8271,16 @@ +@@ -8309,6 +8373,16 @@ if (sc->sc_uapsdq && txqactive(sc->sc_ah, sc->sc_uapsdq->axq_qnum)) ath_tx_processq(sc, sc->sc_uapsdq); -+ ATH_DISABLE_INTR(); ++ local_irq_save(flags); + if (sc->sc_isr & HAL_INT_TX) { + sc->sc_isr &= ~HAL_INT_TX; -+ ATH_ENABLE_INTR(); ++ local_irq_restore(flags); + goto process_tx_again; + } + sc->sc_imask |= HAL_INT_TX; + ath_hal_intrset(sc->sc_ah, sc->sc_imask); -+ ATH_ENABLE_INTR(); ++ local_irq_restore(flags); + netif_wake_queue(dev); if (sc->sc_softled) -@@ -8228,6 +8298,7 @@ +@@ -8324,13 +8398,25 @@ + struct net_device *dev = (struct net_device *)data; + struct ath_softc *sc = dev->priv; unsigned int i; ++ unsigned long flags; - /* Process each active queue. */ + /* Process each active queue. This includes sc_cabq, sc_xrtq and + * sc_uapsdq */ +process_tx_again: for (i = 0; i < HAL_NUM_TX_QUEUES; i++) if (ATH_TXQ_SETUP(sc, i) && txqactive(sc->sc_ah, i)) ath_tx_processq(sc, &sc->sc_txq[i]); -@@ -8236,6 +8307,16 @@ - ath_tx_processq(sc, sc->sc_xrtxq); - #endif -+ ATH_DISABLE_INTR(); ++ local_irq_save(flags); + if (sc->sc_isr & HAL_INT_TX) { + sc->sc_isr &= ~HAL_INT_TX; -+ ATH_ENABLE_INTR(); ++ local_irq_restore(flags); + goto process_tx_again; + } + sc->sc_imask |= HAL_INT_TX; + ath_hal_intrset(sc->sc_ah, sc->sc_imask); -+ ATH_ENABLE_INTR(); ++ local_irq_restore(flags); + netif_wake_queue(dev); if (sc->sc_softled) -@@ -8310,6 +8391,7 @@ +@@ -8405,6 +8491,7 @@ ath_draintxq(struct ath_softc *sc) { struct ath_hal *ah = sc->sc_ah; @@ -251,7 +258,7 @@ Index: madwifi-dfs-r2996/ath/if_ath.c unsigned int i; /* XXX return value */ -@@ -10077,9 +10159,9 @@ +@@ -10261,9 +10348,9 @@ dev->mtu = mtu; if ((dev->flags & IFF_RUNNING) && !sc->sc_invalid) { /* NB: the rx buffers may need to be reallocated */ @@ -263,10 +270,10 @@ Index: madwifi-dfs-r2996/ath/if_ath.c } ATH_UNLOCK(sc); -Index: madwifi-dfs-r2996/ath/if_athvar.h +Index: madwifi-trunk-r3280/ath/if_athvar.h =================================================================== ---- madwifi-dfs-r2996.orig/ath/if_athvar.h 2007-12-01 18:53:03.188270880 +0100 -+++ madwifi-dfs-r2996/ath/if_athvar.h 2007-12-01 18:53:44.626632316 +0100 +--- madwifi-trunk-r3280.orig/ath/if_athvar.h 2008-01-28 17:29:22.997896245 +0100 ++++ madwifi-trunk-r3280/ath/if_athvar.h 2008-01-28 17:45:06.903383316 +0100 @@ -50,6 +50,10 @@ #include #include @@ -278,7 +285,7 @@ Index: madwifi-dfs-r2996/ath/if_athvar.h /* * Deduce if tasklets are available. If not then * fall back to using the immediate work queue. -@@ -727,7 +731,6 @@ +@@ -728,7 +732,6 @@ struct ath_buf *sc_rxbufcur; /* current rx buffer */ u_int32_t *sc_rxlink; /* link ptr in last RX desc */ spinlock_t sc_rxbuflock; @@ -286,7 +293,7 @@ Index: madwifi-dfs-r2996/ath/if_athvar.h struct ATH_TQ_STRUCT sc_rxorntq; /* rxorn intr tasklet */ u_int8_t sc_defant; /* current default antenna */ u_int8_t sc_rxotherant; /* RXs on non-default antenna */ -@@ -740,6 +743,7 @@ +@@ -741,6 +744,7 @@ u_int sc_txintrperiod; /* tx interrupt batching */ struct ath_txq sc_txq[HAL_NUM_TX_QUEUES]; struct ath_txq *sc_ac2q[WME_NUM_AC]; /* WME AC -> h/w qnum */ @@ -294,7 +301,7 @@ Index: madwifi-dfs-r2996/ath/if_athvar.h struct ATH_TQ_STRUCT sc_txtq; /* tx intr tasklet */ u_int8_t sc_grppoll_str[GRPPOLL_RATE_STR_LEN]; struct ath_descdma sc_bdma; /* beacon descriptors */ -@@ -852,6 +856,8 @@ +@@ -854,6 +858,8 @@ #define ATH_TXBUF_LOCK_CHECK(_sc) #endif @@ -303,51 +310,119 @@ Index: madwifi-dfs-r2996/ath/if_athvar.h #define ATH_RXBUF_LOCK_INIT(_sc) spin_lock_init(&(_sc)->sc_rxbuflock) #define ATH_RXBUF_LOCK_DESTROY(_sc) -Index: madwifi-dfs-r2996/net80211/ieee80211_input.c +Index: madwifi-trunk-r3280/net80211/ieee80211_input.c =================================================================== ---- madwifi-dfs-r2996.orig/net80211/ieee80211_input.c 2007-12-01 18:47:16.968540943 +0100 -+++ madwifi-dfs-r2996/net80211/ieee80211_input.c 2007-12-01 18:53:44.638633004 +0100 -@@ -1178,7 +1178,7 @@ +--- madwifi-trunk-r3280.orig/net80211/ieee80211_input.c 2008-01-28 17:29:23.005896702 +0100 ++++ madwifi-trunk-r3280/net80211/ieee80211_input.c 2008-01-28 19:52:50.586635164 +0100 +@@ -1197,7 +1197,7 @@ /* attach vlan tag */ struct ieee80211_node *ni_tmp = SKB_CB(skb)->ni; if (vlan_hwaccel_receive_skb(skb, vap->iv_vlgrp, ni->ni_vlan) == NET_RX_DROP) { - /* If netif_rx dropped the packet because -+ /* If netif_receive_skb dropped the packet because ++ /* If netif_receive_skb dropped the packet because * device was too busy */ if (ni_tmp != NULL) { /* node reference was leaked */ -@@ -1189,8 +1189,8 @@ +@@ -1208,8 +1208,8 @@ skb = NULL; /* SKB is no longer ours */ } else { struct ieee80211_node *ni_tmp = SKB_CB(skb)->ni; - if (netif_rx(skb) == NET_RX_DROP) { - /* If netif_rx dropped the packet because + if (netif_receive_skb(skb) == NET_RX_DROP) { -+ /* If netif_receive_skb dropped the packet because ++ /* If netif_receive_skb dropped the packet because * device was too busy */ if (ni_tmp != NULL) { /* node reference was leaked */ -@@ -2299,8 +2299,8 @@ +@@ -2314,8 +2314,8 @@ skb1->protocol = __constant_htons(0x0019); /* ETH_P_80211_RAW */ ni_tmp = SKB_CB(skb1)->ni; - if (netif_rx(skb1) == NET_RX_DROP) { - /* If netif_rx dropped the packet because + if (netif_receive_skb(skb1) == NET_RX_DROP) { -+ /* If netif_receive_skb dropped the packet because ++ /* If netif_receive_skb dropped the packet because * device was too busy */ if (ni_tmp != NULL) { /* node reference was leaked */ -Index: madwifi-dfs-r2996/net80211/ieee80211_monitor.c +Index: madwifi-trunk-r3280/net80211/ieee80211_monitor.c =================================================================== ---- madwifi-dfs-r2996.orig/net80211/ieee80211_monitor.c 2007-12-01 18:45:14.000000000 +0100 -+++ madwifi-dfs-r2996/net80211/ieee80211_monitor.c 2007-12-01 18:53:44.642633230 +0100 -@@ -571,7 +571,7 @@ - skb1->protocol = __constant_htons(0x0019); /* ETH_P_80211_RAW */ +--- madwifi-trunk-r3280.orig/net80211/ieee80211_monitor.c 2008-01-28 17:29:23.013897159 +0100 ++++ madwifi-trunk-r3280/net80211/ieee80211_monitor.c 2008-01-28 17:29:26.430091834 +0100 +@@ -584,8 +584,8 @@ + skb1->protocol = + __constant_htons(0x0019); /* ETH_P_80211_RAW */ - ni_tmp = SKB_CB(skb1)->ni; - if (netif_rx(skb1) == NET_RX_DROP) { +- /* If netif_rx dropped the packet because + if (netif_receive_skb(skb1) == NET_RX_DROP) { - /* If netif_rx dropped the packet because - * device was too busy */ - if (ni_tmp != NULL) { ++ /* If netif_receive_skb dropped the packet because + * device was too busy, reclaim the ref. in + * the skb. */ + if (SKB_CB(skb1)->ni != NULL) +Index: madwifi-trunk-r3280/net80211/ieee80211_skb.c +=================================================================== +--- madwifi-trunk-r3280.orig/net80211/ieee80211_skb.c 2008-01-28 17:29:23.017897384 +0100 ++++ madwifi-trunk-r3280/net80211/ieee80211_skb.c 2008-01-28 17:29:26.446092748 +0100 +@@ -73,7 +73,7 @@ + #undef dev_queue_xmit + #undef kfree_skb + #undef kfree_skb_fast +-#undef netif_rx ++#undef netif_receive_skb + #undef pskb_copy + #undef skb_clone + #undef skb_copy +@@ -638,8 +638,8 @@ + grp, vlan_tag); + } + +-int netif_rx_debug(struct sk_buff *skb, const char* func, int line) { +- return netif_rx(untrack_skb(skb, 0, func, line, __func__, __LINE__)); ++int netif_receive_skb_debug(struct sk_buff *skb, const char* func, int line) { ++ return netif_receive_skb(untrack_skb(skb, 0, func, line, __func__, __LINE__)); + } + + struct sk_buff * alloc_skb_debug(unsigned int length, gfp_t gfp_mask, +@@ -760,7 +760,7 @@ + } + + EXPORT_SYMBOL(vlan_hwaccel_receive_skb_debug); +-EXPORT_SYMBOL(netif_rx_debug); ++EXPORT_SYMBOL(netif_receive_skb_debug); + EXPORT_SYMBOL(alloc_skb_debug); + EXPORT_SYMBOL(dev_alloc_skb_debug); + EXPORT_SYMBOL(skb_clone_debug); +Index: madwifi-trunk-r3280/net80211/ieee80211_skb.h +=================================================================== +--- madwifi-trunk-r3280.orig/net80211/ieee80211_skb.h 2008-01-28 17:29:23.029898072 +0100 ++++ madwifi-trunk-r3280/net80211/ieee80211_skb.h 2008-01-28 17:29:26.458093432 +0100 +@@ -116,7 +116,7 @@ + int vlan_hwaccel_receive_skb_debug(struct sk_buff *skb, + struct vlan_group *grp, unsigned short vlan_tag, + const char* func, int line); +-int netif_rx_debug(struct sk_buff *skb, const char* func, int line); ++int netif_receive_skb_debug(struct sk_buff *skb, const char* func, int line); + struct sk_buff * alloc_skb_debug(unsigned int length, gfp_t gfp_mask, + const char *func, int line); + struct sk_buff * dev_alloc_skb_debug(unsigned int length, +@@ -151,7 +151,7 @@ + #undef dev_queue_xmit + #undef kfree_skb + #undef kfree_skb_fast +-#undef netif_rx ++#undef netif_receive_skb + #undef pskb_copy + #undef skb_clone + #undef skb_copy +@@ -168,8 +168,8 @@ + skb_copy_expand_debug(_skb, _newheadroom, _newtailroom, _gfp_mask, __func__, __LINE__) + #define vlan_hwaccel_receive_skb(_skb, _grp, _tag) \ + vlan_hwaccel_receive_skb_debug(_skb, _grp, _tag, __func__, __LINE__) +-#define netif_rx(_skb) \ +- netif_rx_debug(_skb, __func__, __LINE__) ++#define netif_receive_skb(_skb) \ ++ netif_receive_skb_debug(_skb, __func__, __LINE__) + #define alloc_skb(_length, _gfp_mask) \ + alloc_skb_debug(_length, _gfp_mask, __func__, __LINE__) + #define dev_alloc_skb(_length) \