renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-19 10:44:14 +08:00
Code

wil6210: 'length' in Tx/Rx descriptors is little endian

Browse Source 
Hardware uses little endian for the Tx/Rx descriptors field 'length',
do appropriate conversions

Signed-off-by: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Vladimir Kondratiev 2013-05-12 14:43:32 +03:00 committed by John W. Linville
parent 2664d6665f
commit 7e59444444
3 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/wireless/ath/wil6210/debugfs.c
View File

@ -418,9 +418,15 @@ static int wil_txdesc_debugfs_show(struct seq_file *s, void *data)
if (skb) { if (skb) {
unsigned char printbuf[16 * 3 + 2]; unsigned char printbuf[16 * 3 + 2];
int i = 0; int i = 0;
int len = skb_headlen(skb); int len = le16_to_cpu(d->dma.length);
void *p = skb->data; void *p = skb->data;
if (len != skb_headlen(skb)) {
seq_printf(s, "!!! len: desc = %d skb = %d\n",
len, skb_headlen(skb));
len = min_t(int, len, skb_headlen(skb));
}
seq_printf(s, " len = %d\n", len); seq_printf(s, " len = %d\n", len);
while (i < len) { while (i < len) {

33
drivers/net/wireless/ath/wil6210/txrx.c
View File

@ -106,19 +106,21 @@ static void wil_vring_free(struct wil6210_priv *wil, struct vring *vring,
size_t sz = vring->size * sizeof(vring->va[0]); size_t sz = vring->size * sizeof(vring->va[0]);
while (!wil_vring_is_empty(vring)) { while (!wil_vring_is_empty(vring)) {
u16 dmalen;
if (tx) { if (tx) {
volatile struct vring_tx_desc *d = volatile struct vring_tx_desc *d =
&vring->va[vring->swtail].tx; &vring->va[vring->swtail].tx;
dma_addr_t pa = d->dma.addr_low | dma_addr_t pa = d->dma.addr_low |
((u64)d->dma.addr_high << 32); ((u64)d->dma.addr_high << 32);
struct sk_buff *skb = vring->ctx[vring->swtail]; struct sk_buff *skb = vring->ctx[vring->swtail];
dmalen = le16_to_cpu(d->dma.length);
if (skb) { if (skb) {
dma_unmap_single(dev, pa, d->dma.length, dma_unmap_single(dev, pa, dmalen,
DMA_TO_DEVICE); DMA_TO_DEVICE);
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);
vring->ctx[vring->swtail] = NULL; vring->ctx[vring->swtail] = NULL;
} else { } else {
dma_unmap_page(dev, pa, d->dma.length, dma_unmap_page(dev, pa, dmalen,
DMA_TO_DEVICE); DMA_TO_DEVICE);
} }
vring->swtail = wil_vring_next_tail(vring); vring->swtail = wil_vring_next_tail(vring);
@ -128,8 +130,8 @@ static void wil_vring_free(struct wil6210_priv *wil, struct vring *vring,
dma_addr_t pa = d->dma.addr_low | dma_addr_t pa = d->dma.addr_low |
((u64)d->dma.addr_high << 32); ((u64)d->dma.addr_high << 32);
struct sk_buff *skb = vring->ctx[vring->swhead]; struct sk_buff *skb = vring->ctx[vring->swhead];
dma_unmap_single(dev, pa, d->dma.length, dmalen = le16_to_cpu(d->dma.length);
DMA_FROM_DEVICE); dma_unmap_single(dev, pa, dmalen, DMA_FROM_DEVICE);
kfree_skb(skb); kfree_skb(skb);
wil_vring_advance_head(vring, 1); wil_vring_advance_head(vring, 1);
} }
@ -175,7 +177,7 @@ static int wil_vring_alloc_skb(struct wil6210_priv *wil, struct vring *vring,
/* b11 don't care */ /* b11 don't care */
/* error don't care */ /* error don't care */
d->dma.status = 0; /* BIT(0) should be 0 for HW_OWNED */ d->dma.status = 0; /* BIT(0) should be 0 for HW_OWNED */
d->dma.length = sz; d->dma.length = cpu_to_le16(sz);
vring->ctx[i] = skb; vring->ctx[i] = skb;
return 0; return 0;
@ -326,6 +328,7 @@ static struct sk_buff *wil_vring_reap_rx(struct wil6210_priv *wil,
struct sk_buff *skb; struct sk_buff *skb;
dma_addr_t pa; dma_addr_t pa;
unsigned int sz = RX_BUF_LEN; unsigned int sz = RX_BUF_LEN;
u16 dmalen;
u8 ftype; u8 ftype;
u8 ds_bits; u8 ds_bits;
@ -343,10 +346,11 @@ static struct sk_buff *wil_vring_reap_rx(struct wil6210_priv *wil,
pa = d->dma.addr_low | ((u64)d->dma.addr_high << 32); pa = d->dma.addr_low | ((u64)d->dma.addr_high << 32);
skb = vring->ctx[vring->swhead]; skb = vring->ctx[vring->swhead];
dma_unmap_single(dev, pa, sz, DMA_FROM_DEVICE); dma_unmap_single(dev, pa, sz, DMA_FROM_DEVICE);
skb_trim(skb, d->dma.length);
d1 = wil_skb_rxdesc(skb); d1 = wil_skb_rxdesc(skb);
*d1 = *d; *d1 = *d;
dmalen = le16_to_cpu(d1->dma.length);
skb_trim(skb, dmalen);
wil->stats.last_mcs_rx = wil_rxdesc_mcs(d1); wil->stats.last_mcs_rx = wil_rxdesc_mcs(d1);
@ -610,7 +614,7 @@ static int wil_tx_desc_map(volatile struct vring_tx_desc *d,
d->dma.b11 = 0/*14 | BIT(7)*/; d->dma.b11 = 0/*14 | BIT(7)*/;
d->dma.error = 0; d->dma.error = 0;
d->dma.status = 0; /* BIT(0) should be 0 for HW_OWNED */ d->dma.status = 0; /* BIT(0) should be 0 for HW_OWNED */
d->dma.length = len; d->dma.length = cpu_to_le16((u16)len);
d->dma.d0 = 0; d->dma.d0 = 0;
d->mac.d[0] = 0; d->mac.d[0] = 0;
d->mac.d[1] = 0; d->mac.d[1] = 0;
@ -705,14 +709,17 @@ static int wil_tx_vring(struct wil6210_priv *wil, struct vring *vring,
/* unmap what we have mapped */ /* unmap what we have mapped */
/* Note: increment @f to operate with positive index */ /* Note: increment @f to operate with positive index */
for (f++; f > 0; f--) { for (f++; f > 0; f--) {
u16 dmalen;
i = (swhead + f) % vring->size; i = (swhead + f) % vring->size;
d = &(vring->va[i].tx); d = &(vring->va[i].tx);
d->dma.status = TX_DMA_STATUS_DU; d->dma.status = TX_DMA_STATUS_DU;
pa = d->dma.addr_low | ((u64)d->dma.addr_high << 32); pa = d->dma.addr_low | ((u64)d->dma.addr_high << 32);
dmalen = le16_to_cpu(d->dma.length);
if (vring->ctx[i]) if (vring->ctx[i])
dma_unmap_single(dev, pa, d->dma.length, DMA_TO_DEVICE); dma_unmap_single(dev, pa, dmalen, DMA_TO_DEVICE);
else else
dma_unmap_page(dev, pa, d->dma.length, DMA_TO_DEVICE); dma_unmap_page(dev, pa, dmalen, DMA_TO_DEVICE);
} }
return -EINVAL; return -EINVAL;
@ -792,15 +799,17 @@ void wil_tx_complete(struct wil6210_priv *wil, int ringid)
struct vring_tx_desc dd, *d = &dd; struct vring_tx_desc dd, *d = &dd;
dma_addr_t pa; dma_addr_t pa;
struct sk_buff *skb; struct sk_buff *skb;
u16 dmalen;
dd = *d1; dd = *d1;
if (!(d->dma.status & TX_DMA_STATUS_DU)) if (!(d->dma.status & TX_DMA_STATUS_DU))
break; break;
dmalen = le16_to_cpu(d->dma.length);
wil_dbg_txrx(wil, wil_dbg_txrx(wil,
"Tx[%3d] : %d bytes, status 0x%02x err 0x%02x\n", "Tx[%3d] : %d bytes, status 0x%02x err 0x%02x\n",
vring->swtail, d->dma.length, d->dma.status, vring->swtail, dmalen, d->dma.status,
d->dma.error); d->dma.error);
wil_hex_dump_txrx("TxC ", DUMP_PREFIX_NONE, 32, 4, wil_hex_dump_txrx("TxC ", DUMP_PREFIX_NONE, 32, 4,
(const void *)d, sizeof(*d), false); (const void *)d, sizeof(*d), false);
@ -815,11 +824,11 @@ void wil_tx_complete(struct wil6210_priv *wil, int ringid)
ndev->stats.tx_errors++; ndev->stats.tx_errors++;
} }
dma_unmap_single(dev, pa, d->dma.length, DMA_TO_DEVICE); dma_unmap_single(dev, pa, dmalen, DMA_TO_DEVICE);
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);
vring->ctx[vring->swtail] = NULL; vring->ctx[vring->swtail] = NULL;
} else { } else {
dma_unmap_page(dev, pa, d->dma.length, DMA_TO_DEVICE); dma_unmap_page(dev, pa, dmalen, DMA_TO_DEVICE);
} }
d->dma.addr_low = 0; d->dma.addr_low = 0;
d->dma.addr_high = 0; d->dma.addr_high = 0;

4
drivers/net/wireless/ath/wil6210/txrx.h
View File

@ -222,7 +222,7 @@ struct vring_tx_dma {
u8 b11; /* 0..6: mac_length; 7:ip_version */ u8 b11; /* 0..6: mac_length; 7:ip_version */
u8 error; /* 0..2: err; 3..7: reserved; */ u8 error; /* 0..2: err; 3..7: reserved; */
u8 status; /* 0: used; 1..7; reserved */ u8 status; /* 0: used; 1..7; reserved */
u16 length; __le16 length;
} __packed; } __packed;
/* /*
@ -321,7 +321,7 @@ struct vring_rx_dma {
u8 b11; u8 b11;
u8 error; u8 error;
u8 status; u8 status;
u16 length; __le16 length;
} __packed; } __packed;
struct vring_tx_desc { struct vring_tx_desc {