Finally fix the annoying BCM4704 segfault issues (#2035) - tested with WL-500gP Thanks to jhansen and Wolfram Joost for the fixes and to ryd for the test hardware. Seems like the user space segfaults actually came from this patch: http://lkml.org/lkml/2006/12/12/158
SVN-Revision: 9285v19.07.3_mercusys_ac12_duma
Felix Fietkau
17 years ago
parent
22fef3d916
commit
465ae7a447
@ -1,274 +0,0 @@
|
||||
Index: linux-2.6.23/drivers/net/b44.c
|
||||
===================================================================
|
||||
--- linux-2.6.23.orig/drivers/net/b44.c 2007-10-13 02:46:38.946989430 +0200
|
||||
+++ linux-2.6.23/drivers/net/b44.c 2007-10-13 03:15:34.889915180 +0200
|
||||
@@ -129,7 +129,7 @@
|
||||
unsigned long offset,
|
||||
enum dma_data_direction dir)
|
||||
{
|
||||
- dma_sync_single_range_for_device(&sdev->dev, dma_base,
|
||||
+ dma_sync_single_range_for_device(sdev->dev, dma_base,
|
||||
offset & dma_desc_align_mask,
|
||||
dma_desc_sync_size, dir);
|
||||
}
|
||||
@@ -139,7 +139,7 @@
|
||||
unsigned long offset,
|
||||
enum dma_data_direction dir)
|
||||
{
|
||||
- dma_sync_single_range_for_cpu(&sdev->dev, dma_base,
|
||||
+ dma_sync_single_range_for_cpu(sdev->dev, dma_base,
|
||||
offset & dma_desc_align_mask,
|
||||
dma_desc_sync_size, dir);
|
||||
}
|
||||
@@ -563,7 +563,7 @@
|
||||
|
||||
BUG_ON(skb == NULL);
|
||||
|
||||
- dma_unmap_single(&bp->sdev->dev,
|
||||
+ dma_unmap_single(bp->sdev->dev,
|
||||
pci_unmap_addr(rp, mapping),
|
||||
skb->len,
|
||||
DMA_TO_DEVICE);
|
||||
@@ -603,7 +603,7 @@
|
||||
if (skb == NULL)
|
||||
return -ENOMEM;
|
||||
|
||||
- mapping = dma_map_single(&bp->sdev->dev, skb->data,
|
||||
+ mapping = dma_map_single(bp->sdev->dev, skb->data,
|
||||
RX_PKT_BUF_SZ,
|
||||
DMA_FROM_DEVICE);
|
||||
|
||||
@@ -613,18 +613,18 @@
|
||||
mapping + RX_PKT_BUF_SZ > DMA_30BIT_MASK) {
|
||||
/* Sigh... */
|
||||
if (!dma_mapping_error(mapping))
|
||||
- dma_unmap_single(&bp->sdev->dev, mapping, RX_PKT_BUF_SZ,DMA_FROM_DEVICE);
|
||||
+ dma_unmap_single(bp->sdev->dev, mapping, RX_PKT_BUF_SZ,DMA_FROM_DEVICE);
|
||||
dev_kfree_skb_any(skb);
|
||||
skb = __netdev_alloc_skb(bp->dev, RX_PKT_BUF_SZ, GFP_ATOMIC|GFP_DMA);
|
||||
if (skb == NULL)
|
||||
return -ENOMEM;
|
||||
- mapping = dma_map_single(&bp->sdev->dev, skb->data,
|
||||
+ mapping = dma_map_single(bp->sdev->dev, skb->data,
|
||||
RX_PKT_BUF_SZ,
|
||||
DMA_FROM_DEVICE);
|
||||
if (dma_mapping_error(mapping) ||
|
||||
mapping + RX_PKT_BUF_SZ > DMA_30BIT_MASK) {
|
||||
if (!dma_mapping_error(mapping))
|
||||
- dma_unmap_single(&bp->sdev->dev, mapping, RX_PKT_BUF_SZ,DMA_FROM_DEVICE);
|
||||
+ dma_unmap_single(bp->sdev->dev, mapping, RX_PKT_BUF_SZ,DMA_FROM_DEVICE);
|
||||
dev_kfree_skb_any(skb);
|
||||
return -ENOMEM;
|
||||
}
|
||||
@@ -700,7 +700,7 @@
|
||||
dest_idx * sizeof(dest_desc),
|
||||
DMA_BIDIRECTIONAL);
|
||||
|
||||
- dma_sync_single_for_device(&bp->sdev->dev, le32_to_cpu(src_desc->addr),
|
||||
+ dma_sync_single_for_device(bp->sdev->dev, le32_to_cpu(src_desc->addr),
|
||||
RX_PKT_BUF_SZ,
|
||||
DMA_FROM_DEVICE);
|
||||
}
|
||||
@@ -722,7 +722,7 @@
|
||||
struct rx_header *rh;
|
||||
u16 len;
|
||||
|
||||
- dma_sync_single_for_cpu(&bp->sdev->dev, map,
|
||||
+ dma_sync_single_for_cpu(bp->sdev->dev, map,
|
||||
RX_PKT_BUF_SZ,
|
||||
DMA_FROM_DEVICE);
|
||||
rh = (struct rx_header *) skb->data;
|
||||
@@ -756,7 +756,7 @@
|
||||
skb_size = b44_alloc_rx_skb(bp, cons, bp->rx_prod);
|
||||
if (skb_size < 0)
|
||||
goto drop_it;
|
||||
- dma_unmap_single(&bp->sdev->dev, map,
|
||||
+ dma_unmap_single(bp->sdev->dev, map,
|
||||
skb_size, DMA_FROM_DEVICE);
|
||||
/* Leave out rx_header */
|
||||
skb_put(skb, len + RX_PKT_OFFSET);
|
||||
@@ -928,23 +928,23 @@
|
||||
goto err_out;
|
||||
}
|
||||
|
||||
- mapping = dma_map_single(&bp->sdev->dev, skb->data, len, DMA_TO_DEVICE);
|
||||
+ mapping = dma_map_single(bp->sdev->dev, skb->data, len, DMA_TO_DEVICE);
|
||||
if (dma_mapping_error(mapping) || mapping + len > DMA_30BIT_MASK) {
|
||||
struct sk_buff *bounce_skb;
|
||||
|
||||
/* Chip can't handle DMA to/from >1GB, use bounce buffer */
|
||||
if (!dma_mapping_error(mapping))
|
||||
- dma_unmap_single(&bp->sdev->dev, mapping, len, DMA_TO_DEVICE);
|
||||
+ dma_unmap_single(bp->sdev->dev, mapping, len, DMA_TO_DEVICE);
|
||||
|
||||
bounce_skb = __dev_alloc_skb(len, GFP_ATOMIC | GFP_DMA);
|
||||
if (!bounce_skb)
|
||||
goto err_out;
|
||||
|
||||
- mapping = dma_map_single(&bp->sdev->dev, bounce_skb->data,
|
||||
+ mapping = dma_map_single(bp->sdev->dev, bounce_skb->data,
|
||||
len, DMA_TO_DEVICE);
|
||||
if (dma_mapping_error(mapping) || mapping + len > DMA_30BIT_MASK) {
|
||||
if (!dma_mapping_error(mapping))
|
||||
- dma_unmap_single(&bp->sdev->dev, mapping,
|
||||
+ dma_unmap_single(bp->sdev->dev, mapping,
|
||||
len, DMA_TO_DEVICE);
|
||||
dev_kfree_skb_any(bounce_skb);
|
||||
goto err_out;
|
||||
@@ -1043,7 +1043,7 @@
|
||||
|
||||
if (rp->skb == NULL)
|
||||
continue;
|
||||
- dma_unmap_single(&bp->sdev->dev,
|
||||
+ dma_unmap_single(bp->sdev->dev,
|
||||
pci_unmap_addr(rp, mapping),
|
||||
RX_PKT_BUF_SZ,
|
||||
DMA_FROM_DEVICE);
|
||||
@@ -1057,7 +1057,7 @@
|
||||
|
||||
if (rp->skb == NULL)
|
||||
continue;
|
||||
- dma_unmap_single(&bp->sdev->dev,
|
||||
+ dma_unmap_single(bp->sdev->dev,
|
||||
pci_unmap_addr(rp, mapping),
|
||||
rp->skb->len,
|
||||
DMA_TO_DEVICE);
|
||||
@@ -1082,12 +1082,12 @@
|
||||
memset(bp->tx_ring, 0, B44_TX_RING_BYTES);
|
||||
|
||||
if (bp->flags & B44_FLAG_RX_RING_HACK)
|
||||
- dma_sync_single_for_device(&bp->sdev->dev, bp->rx_ring_dma,
|
||||
+ dma_sync_single_for_device(bp->sdev->dev, bp->rx_ring_dma,
|
||||
DMA_TABLE_BYTES,
|
||||
DMA_BIDIRECTIONAL);
|
||||
|
||||
if (bp->flags & B44_FLAG_TX_RING_HACK)
|
||||
- dma_sync_single_for_device(&bp->sdev->dev, bp->tx_ring_dma,
|
||||
+ dma_sync_single_for_device(bp->sdev->dev, bp->tx_ring_dma,
|
||||
DMA_TABLE_BYTES,
|
||||
DMA_TO_DEVICE);
|
||||
|
||||
@@ -1109,24 +1109,24 @@
|
||||
bp->tx_buffers = NULL;
|
||||
if (bp->rx_ring) {
|
||||
if (bp->flags & B44_FLAG_RX_RING_HACK) {
|
||||
- dma_unmap_single(&bp->sdev->dev, bp->rx_ring_dma,
|
||||
+ dma_unmap_single(bp->sdev->dev, bp->rx_ring_dma,
|
||||
DMA_TABLE_BYTES,
|
||||
DMA_BIDIRECTIONAL);
|
||||
kfree(bp->rx_ring);
|
||||
} else
|
||||
- dma_free_coherent(&bp->sdev->dev, DMA_TABLE_BYTES,
|
||||
+ dma_free_coherent(bp->sdev->dev, DMA_TABLE_BYTES,
|
||||
bp->rx_ring, bp->rx_ring_dma);
|
||||
bp->rx_ring = NULL;
|
||||
bp->flags &= ~B44_FLAG_RX_RING_HACK;
|
||||
}
|
||||
if (bp->tx_ring) {
|
||||
if (bp->flags & B44_FLAG_TX_RING_HACK) {
|
||||
- dma_unmap_single(&bp->sdev->dev, bp->tx_ring_dma,
|
||||
+ dma_unmap_single(bp->sdev->dev, bp->tx_ring_dma,
|
||||
DMA_TABLE_BYTES,
|
||||
DMA_TO_DEVICE);
|
||||
kfree(bp->tx_ring);
|
||||
} else
|
||||
- dma_free_coherent(&bp->sdev->dev, DMA_TABLE_BYTES,
|
||||
+ dma_free_coherent(bp->sdev->dev, DMA_TABLE_BYTES,
|
||||
bp->tx_ring, bp->tx_ring_dma);
|
||||
bp->tx_ring = NULL;
|
||||
bp->flags &= ~B44_FLAG_TX_RING_HACK;
|
||||
@@ -1152,7 +1152,7 @@
|
||||
goto out_err;
|
||||
|
||||
size = DMA_TABLE_BYTES;
|
||||
- bp->rx_ring = dma_alloc_coherent(&bp->sdev->dev, size, &bp->rx_ring_dma, GFP_ATOMIC);
|
||||
+ bp->rx_ring = dma_alloc_coherent(bp->sdev->dev, size, &bp->rx_ring_dma, GFP_ATOMIC);
|
||||
if (!bp->rx_ring) {
|
||||
/* Allocation may have failed due to pci_alloc_consistent
|
||||
insisting on use of GFP_DMA, which is more restrictive
|
||||
@@ -1164,7 +1164,7 @@
|
||||
if (!rx_ring)
|
||||
goto out_err;
|
||||
|
||||
- rx_ring_dma = dma_map_single(&bp->sdev->dev, rx_ring,
|
||||
+ rx_ring_dma = dma_map_single(bp->sdev->dev, rx_ring,
|
||||
DMA_TABLE_BYTES,
|
||||
DMA_BIDIRECTIONAL);
|
||||
|
||||
@@ -1179,7 +1179,7 @@
|
||||
bp->flags |= B44_FLAG_RX_RING_HACK;
|
||||
}
|
||||
|
||||
- bp->tx_ring = dma_alloc_coherent(&bp->sdev->dev, size, &bp->tx_ring_dma, GFP_ATOMIC);
|
||||
+ bp->tx_ring = dma_alloc_coherent(bp->sdev->dev, size, &bp->tx_ring_dma, GFP_ATOMIC);
|
||||
if (!bp->tx_ring) {
|
||||
/* Allocation may have failed due to dma_alloc_coherent
|
||||
insisting on use of GFP_DMA, which is more restrictive
|
||||
@@ -1191,7 +1191,7 @@
|
||||
if (!tx_ring)
|
||||
goto out_err;
|
||||
|
||||
- tx_ring_dma = dma_map_single(&bp->sdev->dev, tx_ring,
|
||||
+ tx_ring_dma = dma_map_single(bp->sdev->dev, tx_ring,
|
||||
DMA_TABLE_BYTES,
|
||||
DMA_TO_DEVICE);
|
||||
|
||||
@@ -2288,7 +2288,7 @@
|
||||
bp->flags |= B44_FLAG_BUGGY_TXPTR;
|
||||
*/
|
||||
|
||||
- if (bp->sdev->dev->id.revision >= 7)
|
||||
+ if (bp->sdev->id.revision >= 7)
|
||||
bp->flags |= B44_FLAG_B0_ANDLATER;
|
||||
|
||||
return err;
|
||||
@@ -2298,7 +2298,6 @@
|
||||
const struct ssb_device_id *ent)
|
||||
{
|
||||
static int b44_version_printed = 0;
|
||||
- unsigned long b44reg_base, b44reg_len;
|
||||
struct net_device *dev;
|
||||
struct b44 *bp;
|
||||
int err, i;
|
||||
@@ -2310,13 +2309,13 @@
|
||||
|
||||
dev = alloc_etherdev(sizeof(*bp));
|
||||
if (!dev) {
|
||||
- dev_err(&pdev->dev, "Etherdev alloc failed, aborting.\n");
|
||||
+ dev_err(sdev->dev, "Etherdev alloc failed, aborting.\n");
|
||||
err = -ENOMEM;
|
||||
goto out;
|
||||
}
|
||||
|
||||
SET_MODULE_OWNER(dev);
|
||||
- SET_NETDEV_DEV(dev,&sdev->dev);
|
||||
+ SET_NETDEV_DEV(dev,sdev->dev);
|
||||
|
||||
/* No interesting netdevice features in this card... */
|
||||
dev->features |= 0;
|
||||
@@ -2354,7 +2353,7 @@
|
||||
|
||||
err = b44_get_invariants(bp);
|
||||
if (err) {
|
||||
- dev_err(&sdev->dev,
|
||||
+ dev_err(sdev->dev,
|
||||
"Problem fetching invariants of chip, aborting.\n");
|
||||
goto err_out_free_dev;
|
||||
}
|
||||
@@ -2375,7 +2374,7 @@
|
||||
|
||||
err = register_netdev(dev);
|
||||
if (err) {
|
||||
- dev_err(&sdev->dev, "Cannot register net device, aborting.\n");
|
||||
+ dev_err(sdev->dev, "Cannot register net device, aborting.\n");
|
||||
goto out;
|
||||
}
|
||||
|
||||
@@ -2454,7 +2453,6 @@
|
||||
rc = request_irq(dev->irq, b44_interrupt, IRQF_SHARED, dev->name, dev);
|
||||
if (rc) {
|
||||
printk(KERN_ERR PFX "%s: request_irq failed\n", dev->name);
|
||||
- pci_disable_device(pdev);
|
||||
return rc;
|
||||
}
|
||||
|
||||
@ -0,0 +1,13 @@
|
||||
Index: linux-2.6.23/include/asm-mips/cacheflush.h
|
||||
===================================================================
|
||||
--- linux-2.6.23.orig/include/asm-mips/cacheflush.h 2007-10-13 11:01:52.780284289 +0200
|
||||
+++ linux-2.6.23/include/asm-mips/cacheflush.h 2007-10-13 11:02:16.289624011 +0200
|
||||
@@ -32,7 +32,7 @@
|
||||
extern void (*flush_cache_all)(void);
|
||||
extern void (*__flush_cache_all)(void);
|
||||
extern void (*flush_cache_mm)(struct mm_struct *mm);
|
||||
-#define flush_cache_dup_mm(mm) do { (void) (mm); } while (0)
|
||||
+#define flush_cache_dup_mm(mm) flush_cache_mm(mm)
|
||||
extern void (*flush_cache_range)(struct vm_area_struct *vma,
|
||||
unsigned long start, unsigned long end);
|
||||
extern void (*flush_cache_page)(struct vm_area_struct *vma, unsigned long page, unsigned long pfn);
|
||||
@ -0,0 +1,71 @@
|
||||
Index: linux-2.6.23/arch/mips/mm/init.c
|
||||
===================================================================
|
||||
--- linux-2.6.23.orig/arch/mips/mm/init.c 2007-10-13 11:46:58.762489429 +0200
|
||||
+++ linux-2.6.23/arch/mips/mm/init.c 2007-10-13 11:47:36.092616749 +0200
|
||||
@@ -205,31 +205,6 @@
|
||||
preempt_check_resched();
|
||||
}
|
||||
|
||||
-void copy_user_highpage(struct page *to, struct page *from,
|
||||
- unsigned long vaddr, struct vm_area_struct *vma)
|
||||
-{
|
||||
- void *vfrom, *vto;
|
||||
-
|
||||
- vto = kmap_atomic(to, KM_USER1);
|
||||
- if (cpu_has_dc_aliases && cpu_use_kmap_coherent && !Page_dcache_dirty(from)) {
|
||||
- vfrom = kmap_coherent(from, vaddr);
|
||||
- copy_page(vto, vfrom);
|
||||
- kunmap_coherent();
|
||||
- } else {
|
||||
- vfrom = kmap_atomic(from, KM_USER0);
|
||||
- copy_page(vto, vfrom);
|
||||
- kunmap_atomic(vfrom, KM_USER0);
|
||||
- }
|
||||
- if (((vma->vm_flags & VM_EXEC) && !cpu_has_ic_fills_f_dc) ||
|
||||
- pages_do_alias((unsigned long)vto, vaddr & PAGE_MASK))
|
||||
- flush_data_cache_page((unsigned long)vto);
|
||||
- kunmap_atomic(vto, KM_USER1);
|
||||
- /* Make sure this page is cleared on other CPU's too before using it */
|
||||
- smp_wmb();
|
||||
-}
|
||||
-
|
||||
-EXPORT_SYMBOL(copy_user_highpage);
|
||||
-
|
||||
void copy_to_user_page(struct vm_area_struct *vma,
|
||||
struct page *page, unsigned long vaddr, void *dst, const void *src,
|
||||
unsigned long len)
|
||||
Index: linux-2.6.23/include/asm-mips/page.h
|
||||
===================================================================
|
||||
--- linux-2.6.23.orig/include/asm-mips/page.h 2007-10-13 11:45:50.518600430 +0200
|
||||
+++ linux-2.6.23/include/asm-mips/page.h 2007-10-13 11:47:26.472068504 +0200
|
||||
@@ -35,6 +35,7 @@
|
||||
#ifndef __ASSEMBLY__
|
||||
|
||||
#include <linux/pfn.h>
|
||||
+#include <asm/cpu-features.h>
|
||||
#include <asm/io.h>
|
||||
|
||||
/*
|
||||
@@ -67,13 +68,16 @@
|
||||
flush_data_cache_page((unsigned long)addr);
|
||||
}
|
||||
|
||||
-extern void copy_user_page(void *vto, void *vfrom, unsigned long vaddr,
|
||||
- struct page *to);
|
||||
-struct vm_area_struct;
|
||||
-extern void copy_user_highpage(struct page *to, struct page *from,
|
||||
- unsigned long vaddr, struct vm_area_struct *vma);
|
||||
+static inline void copy_user_page(void *vto, void *vfrom, unsigned long vaddr,
|
||||
+ struct page *to)
|
||||
+{
|
||||
+ extern void (*flush_data_cache_page)(unsigned long addr);
|
||||
|
||||
-#define __HAVE_ARCH_COPY_USER_HIGHPAGE
|
||||
+ copy_page(vto, vfrom);
|
||||
+ if (!cpu_has_ic_fills_f_dc ||
|
||||
+ pages_do_alias((unsigned long)vto, vaddr & PAGE_MASK))
|
||||
+ flush_data_cache_page((unsigned long)vto);
|
||||
+}
|
||||
|
||||
/*
|
||||
* These are used to make use of C type-checking..
|
||||
Loading…
Reference in New Issue