kernel.git/drivers/net/b44.c, branch linux-2.6.30.y

dma-mapping: replace all DMA_30BIT_MASK macro with DMA_BIT_MASK(30)

2009-04-07T15:31:11Z

Replace all DMA_30BIT_MASK macro with DMA_BIT_MASK(30) Signed-off-by: Yang Hongyang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

b44: Use kernel DMA addresses for the kernel DMA API

2009-04-07T00:51:29Z

We must not use the device DMA addresses for the kernel DMA API, because device DMA addresses have an additional offset added for the SSB translation. Use the original dma_addr_t for the sync operation. Cc: stable@kernel.org Signed-off-by: Michael Buesch Signed-off-by: David S. Miller

b44: Fix sizes passed to b44_sync_dma_desc_for_{device,cpu}()

2009-04-04T23:48:17Z

> > ------------[ cut here ]------------ > > WARNING: at lib/dma-debug.c:539 check_sync+0xe9/0x341() (Not tainted) > > Hardware name: HP Compaq nx6110 (PY501EA#AB9) > > b44 0000:02:0e.0: DMA-API: device driver tries to sync DMA memory it has not > > allocated [device address=0x0000000075941040] [size=1566 bytes] > > Modules linked in: llc bnep l2cap bluetooth autofs4 lm90 hwmon i2c_i801 sunrpc > > ipv6 cpufreq_ondemand acpi_cpufreq uinput snd_intel8x0m snd_intel8x0 > > snd_ac97_codec snd_seq_dummy ac97_bus snd_seq_oss snd_seq_midi_event snd_seq > > snd_seq_device snd_pcm_oss snd_mixer_oss snd_pcm b44 ssb firewire_ohci > > snd_timer ipw2200 iTCO_wdt mii firewire_core snd iTCO_vendor_support libipw > > yenta_socket crc_itu_t lib80211 rsrc_nonstatic soundcore snd_page_alloc joydev > > pcspkr wmi serio_raw ata_generic pata_acpi i915 drm i2c_algo_bit i2c_core video > > output [last unloaded: scsi_wait_scan] > > Pid: 2418, comm: S58ntpd Not tainted 2.6.29-16.fc10.i686.PAE #1 > > Call Trace: > > [] warn_slowpath+0x7c/0xbd > > [] ? register_lock_class+0x17/0x290 > > [] ? mark_lock+0x1e/0x349 > > [] ? _raw_spin_unlock+0x74/0x78 > > [] ? mark_lock+0x1e/0x349 > > [] ? check_sync+0x37/0x341 > > [] check_sync+0xe9/0x341 > > [] ? _spin_unlock_irqrestore+0x45/0x55 > > [] ? trace_hardirqs_on+0xb/0xd > > [] debug_dma_sync_single_for_device+0x2f/0x39 > > [] dma_sync_single_for_device+0x4a/0x59 [b44] > > [] ssb_dma_sync_single_for_device+0x3e/0x48 [b44] > > [] b44_recycle_rx+0x18c/0x196 [b44] > > [] b44_poll+0x277/0x3c0 [b44] > > [] net_rx_action+0xa1/0x1ca > > [] __do_softirq+0x9d/0x154 > > [] do_softirq+0x52/0x7e > > [] irq_exit+0x49/0x77 > > [] do_IRQ+0x97/0xad > > [] common_interrupt+0x2c/0x34 I don't know if this is related, but the following patch seems to fix some DMA mapping bug. Can somebody comment who does understand the code better than me? (completely untested) Signed-off-by: David S. Miller

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2009-03-02T05:35:16Z

Conflicts: drivers/net/wireless/iwlwifi/iwl-tx.c net/8021q/vlan_core.c net/core/dev.c

b44: Disable device on shutdown

2009-02-27T06:35:02Z

Disable the SSB core on device shutdown. This has two advantages: 1) A clean device shutdown is always desired here, because we disable the device's global crystal in the next statement. 2) This fixes a bug where the device will come up with the enable-bit set on the next initialization (without a reboot inbetween). This causes breakage on the second initialization due to code that checks this bit (ssb_device_is_enabled() checks). Reported-by: Pantelis Koukousoulas Signed-off-by: Michael Buesch Signed-off-by: David S. Miller

b44: Unconditionally enable interrupt routing on reset

2009-02-27T06:33:00Z

Unconditionally setup the IRQ routing on chip reset. It's safe to call ssb_pcicore_dev_irqvecs_enable() unconditionally, because it has internal checks for redundant calls. This fixes problems where hardware will not come up properly due to quirks in the enable-bit hardware. Reported-by: Pantelis Koukousoulas Signed-off-by: Michael Buesch Signed-off-by: David S. Miller

netdev: Use __netdev_alloc_skb() instead of __dev_alloc_skb().

2009-02-10T09:56:45Z

Signed-off-by: David S. Miller

net: Remove redundant NAPI functions

2009-01-21T22:33:50Z

Following the removal of the unused struct net_device * parameter from the NAPI functions named *netif_rx_* in commit 908a7a1, they are exactly equivalent to the corresponding *napi_* functions and are therefore redundant. Signed-off-by: Ben Hutchings Acked-by: Neil Horman Signed-off-by: David S. Miller

b44: GFP_DMA skb should not escape from driver

2009-01-15T23:29:35Z

b44 chip has some hardware limitations, that need GFP_DMA bounce buffers in some situations. In order to not deplete DMA zone, we should keep allocated GFP_DMA skb only for driver use. At rx time, we copy such skb to newly allocated skb, reusing existing copybreak infrastructure. On machines with low amount of memory, all skb meet the hardware limitation, so no copy is needed. We detect this situation using a new device flag, set to one if one GFP_DMA skb was ever allocated by b44_alloc_rx_skb(). Previously allocated skb, even outside from DMA zone will then be recycled, to have minimal impact on DMA zone use. Signed-off-by: Eric Dumazet Tested-by: Ionut Leonte Signed-off-by: David S. Miller

b44: fix misalignment and wasted space in rx handling

2009-01-11T08:04:12Z

Broadcom 4400 puts a header of configurable size (apparently needs to be at least 28 bytes) in front of received packets. When handling this, the previous code accidentally added the offset 30 *twice* for the software and once for the hardware, thereby cancelling out the IP alignment effect of the 30 byte padding and wasting an additional 30 bytes of memory per packet. This patch fixes this problem and improves routing throughput by about 30% on MIPS, where unaligned access is expensive. Signed-off-by: Felix Fietkau Signed-off-by: David S. Miller