Commit 17030f48 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by John W. Linville
Browse files

b43: support new RX header, noticed to be used in 598.314+ fw


Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5d852905
...@@ -858,8 +858,17 @@ struct b43_dmaring *b43_setup_dmaring(struct b43_wldev *dev, ...@@ -858,8 +858,17 @@ struct b43_dmaring *b43_setup_dmaring(struct b43_wldev *dev,
ring->current_slot = -1; ring->current_slot = -1;
} else { } else {
if (ring->index == 0) { if (ring->index == 0) {
ring->rx_buffersize = B43_DMA0_RX_BUFFERSIZE; switch (dev->fw.hdr_format) {
ring->frameoffset = B43_DMA0_RX_FRAMEOFFSET; case B43_FW_HDR_598:
ring->rx_buffersize = B43_DMA0_RX_FW598_BUFSIZE;
ring->frameoffset = B43_DMA0_RX_FW598_FO;
break;
case B43_FW_HDR_410:
case B43_FW_HDR_351:
ring->rx_buffersize = B43_DMA0_RX_FW351_BUFSIZE;
ring->frameoffset = B43_DMA0_RX_FW351_FO;
break;
}
} else } else
B43_WARN_ON(1); B43_WARN_ON(1);
} }
......
...@@ -162,12 +162,15 @@ struct b43_dmadesc_generic { ...@@ -162,12 +162,15 @@ struct b43_dmadesc_generic {
/* Misc DMA constants */ /* Misc DMA constants */
#define B43_DMA_RINGMEMSIZE PAGE_SIZE #define B43_DMA_RINGMEMSIZE PAGE_SIZE
#define B43_DMA0_RX_FRAMEOFFSET 30 /* Offset of frame with actual data */
#define B43_DMA0_RX_FW598_FO 38
#define B43_DMA0_RX_FW351_FO 30
/* DMA engine tuning knobs */ /* DMA engine tuning knobs */
#define B43_TXRING_SLOTS 256 #define B43_TXRING_SLOTS 256
#define B43_RXRING_SLOTS 64 #define B43_RXRING_SLOTS 64
#define B43_DMA0_RX_BUFFERSIZE (B43_DMA0_RX_FRAMEOFFSET + IEEE80211_MAX_FRAME_LEN) #define B43_DMA0_RX_FW598_BUFSIZE (B43_DMA0_RX_FW598_FO + IEEE80211_MAX_FRAME_LEN)
#define B43_DMA0_RX_FW351_BUFSIZE (B43_DMA0_RX_FW351_FO + IEEE80211_MAX_FRAME_LEN)
/* Pointer poison */ /* Pointer poison */
#define B43_DMA_PTR_POISON ((void *)ERR_PTR(-ENOMEM)) #define B43_DMA_PTR_POISON ((void *)ERR_PTR(-ENOMEM))
......
...@@ -676,7 +676,15 @@ data_ready: ...@@ -676,7 +676,15 @@ data_ready:
goto rx_error; goto rx_error;
} }
macstat = le32_to_cpu(rxhdr->mac_status); switch (dev->fw.hdr_format) {
case B43_FW_HDR_598:
macstat = le32_to_cpu(rxhdr->format_598.mac_status);
break;
case B43_FW_HDR_410:
case B43_FW_HDR_351:
macstat = le32_to_cpu(rxhdr->format_351.mac_status);
break;
}
if (macstat & B43_RX_MAC_FCSERR) { if (macstat & B43_RX_MAC_FCSERR) {
if (!(q->dev->wl->filter_flags & FIF_FCSFAIL)) { if (!(q->dev->wl->filter_flags & FIF_FCSFAIL)) {
/* Drop frames with failed FCS. */ /* Drop frames with failed FCS. */
......
...@@ -653,8 +653,9 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr) ...@@ -653,8 +653,9 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr)
struct ieee80211_hdr *wlhdr; struct ieee80211_hdr *wlhdr;
const struct b43_rxhdr_fw4 *rxhdr = _rxhdr; const struct b43_rxhdr_fw4 *rxhdr = _rxhdr;
__le16 fctl; __le16 fctl;
u16 phystat0, phystat3, chanstat, mactime; u16 phystat0, phystat3;
u32 macstat; u16 uninitialized_var(chanstat), uninitialized_var(mactime);
u32 uninitialized_var(macstat);
u16 chanid; u16 chanid;
u16 phytype; u16 phytype;
int padding; int padding;
...@@ -664,9 +665,19 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr) ...@@ -664,9 +665,19 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr)
/* Get metadata about the frame from the header. */ /* Get metadata about the frame from the header. */
phystat0 = le16_to_cpu(rxhdr->phy_status0); phystat0 = le16_to_cpu(rxhdr->phy_status0);
phystat3 = le16_to_cpu(rxhdr->phy_status3); phystat3 = le16_to_cpu(rxhdr->phy_status3);
macstat = le32_to_cpu(rxhdr->mac_status); switch (dev->fw.hdr_format) {
mactime = le16_to_cpu(rxhdr->mac_time); case B43_FW_HDR_598:
chanstat = le16_to_cpu(rxhdr->channel); macstat = le32_to_cpu(rxhdr->format_598.mac_status);
mactime = le16_to_cpu(rxhdr->format_598.mac_time);
chanstat = le16_to_cpu(rxhdr->format_598.channel);
break;
case B43_FW_HDR_410:
case B43_FW_HDR_351:
macstat = le32_to_cpu(rxhdr->format_351.mac_status);
mactime = le16_to_cpu(rxhdr->format_351.mac_time);
chanstat = le16_to_cpu(rxhdr->format_351.channel);
break;
}
phytype = chanstat & B43_RX_CHAN_PHYTYPE; phytype = chanstat & B43_RX_CHAN_PHYTYPE;
if (unlikely(macstat & B43_RX_MAC_FCSERR)) { if (unlikely(macstat & B43_RX_MAC_FCSERR)) {
......
...@@ -250,9 +250,23 @@ struct b43_rxhdr_fw4 { ...@@ -250,9 +250,23 @@ struct b43_rxhdr_fw4 {
} __packed; } __packed;
__le16 phy_status2; /* PHY RX Status 2 */ __le16 phy_status2; /* PHY RX Status 2 */
__le16 phy_status3; /* PHY RX Status 3 */ __le16 phy_status3; /* PHY RX Status 3 */
__le32 mac_status; /* MAC RX status */ union {
__le16 mac_time; /* Tested with 598.314, 644.1001 and 666.2 */
__le16 channel; struct {
__le16 phy_status4; /* PHY RX Status 4 */
__le16 phy_status5; /* PHY RX Status 5 */
__le32 mac_status; /* MAC RX status */
__le16 mac_time;
__le16 channel;
} format_598 __packed;
/* Tested with 351.126, 410.2160, 478.104 and 508.* */
struct {
__le32 mac_status; /* MAC RX status */
__le16 mac_time;
__le16 channel;
} format_351 __packed;
} __packed;
} __packed; } __packed;
/* PHY RX Status 0 */ /* PHY RX Status 0 */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment