* open bugzilla reports
From: Andrew Morton @ 2006-02-03 23:11 UTC (permalink / raw)
To: linux-kernel, video4linux-list, linux-fbdev-devel, linux-fsdevel,
linux1394-devel, netdev, linux-ide, linux-scsi, linux-usb-devel
This is a listing of the 263 bugzilla records which I felt worth keeping an
eye on. It would be appreciated if the various maintenance teams could
take a look, close off any which are fixed and see if we can fix any which
aren't.
There's probably not a lot of point in replying to this email for any
particular bug: please do that within bugzilla and I can update this list
based upon any bugzilla updates.
If you do reply to this email, please trim the cc list to something
appropriate, thanks.
agp/drm/video/X
===============
[Bug 5163] x crashes at startup
http://bugzilla.kernel.org/show_bug.cgi?id=5163
alsa
====
[Bug 5398] ES1988 Allegro-1 : No sound after boot
http://bugzilla.kernel.org/show_bug.cgi?id=5398
[Bug 5420] SiS CMI onboard sound card not working
http://bugzilla.kernel.org/show_bug.cgi?id=5420
[Bug 5523] Alsa Broken on 2.6.14
http://bugzilla.kernel.org/show_bug.cgi?id=5523
[Bug 5568] opl3sa driver broken in 2.6.14
http://bugzilla.kernel.org/show_bug.cgi?id=5568
[Bug 5824] EMU8000 does not depend on SB
http://bugzilla.kernel.org/show_bug.cgi?id=5824
[Bug 5852] emu10k1 doesn't work
http://bugzilla.kernel.org/show_bug.cgi?id=5852
[Bug 5126] No sound on Thinkpad X31 (Intel
http://bugzilla.kernel.org/show_bug.cgi?id=5126
[Bug 5207] Sound system crashes when using the
http://bugzilla.kernel.org/show_bug.cgi?id=5207
[Bug 5828] mplayer093 crash after update to
http://bugzilla.kernel.org/show_bug.cgi?id=5828
[Bug 5892] Impossible to congigure hda_intel
http://bugzilla.kernel.org/show_bug.cgi?id=5892
[Bug 5912] Can't record audio with mencoder
http://bugzilla.kernel.org/show_bug.cgi?id=5912
[Bug 5621] no sound with snd-via82xx after resume
http://bugzilla.kernel.org/show_bug.cgi?id=5621
[Bug 5628] snd_intel8x0 crash with Java application
http://bugzilla.kernel.org/show_bug.cgi?id=5628
[Bug 5634] ALSA fails with SB16 value
http://bugzilla.kernel.org/show_bug.cgi?id=5634
[Bug 5705] cmipci - No 5.1
http://bugzilla.kernel.org/show_bug.cgi?id=5705
[Bug 5723] No sound with SB Live (Chip: SigmaTel
http://bugzilla.kernel.org/show_bug.cgi?id=5723
[Bug 5726] soundblaster live 5.1 soundcard gets
http://bugzilla.kernel.org/show_bug.cgi?id=5726
[Bug 5761] intel hda with some wrong
http://bugzilla.kernel.org/show_bug.cgi?id=5761
[Bug 5763] ali5451 sound module hangs on swsusp
http://bugzilla.kernel.org/show_bug.cgi?id=5763
[Bug 5792] ENS1371 codec read timeout
http://bugzilla.kernel.org/show_bug.cgi?id=5792
[Bug 5937] regression: 2.6.15 and 2.6.16-rc1:
http://bugzilla.kernel.org/show_bug.cgi?id=5937
[Bug 5986] speaker/headphone output selection
http://bugzilla.kernel.org/show_bug.cgi?id=5986
block
=====
[Bug 5485] cdrom door locked when pktcdvd is
http://bugzilla.kernel.org/show_bug.cgi?id=5485
[Bug 5900] Extremely slow sync with anticipatory
http://bugzilla.kernel.org/show_bug.cgi?id=5900
bluetooth
=========
[Bug 5886] Immediate reboot when cancel file
http://bugzilla.kernel.org/show_bug.cgi?id=5886
[Bug 5944] killing hciattach causes kernel oops if
http://bugzilla.kernel.org/show_bug.cgi?id=5944
[Bug 5959] bluetooth CF card is broken by
http://bugzilla.kernel.org/show_bug.cgi?id=5959
core kernel
===========
[Bug 5823] complete freeze
http://bugzilla.kernel.org/show_bug.cgi?id=5823
[Bug 5042] setrlimit/getrlimit broken on 32-bit
http://bugzilla.kernel.org/show_bug.cgi?id=5042
[Bug 5074] /sys/module/*/parameters/* not working
http://bugzilla.kernel.org/show_bug.cgi?id=5074
[Bug 5127] Lost ticks compensation fires when it
http://bugzilla.kernel.org/show_bug.cgi?id=5127
[Bug 5138] 64bit put_unaligned/get_unaligned does
http://bugzilla.kernel.org/show_bug.cgi?id=5138
[Bug 5877] Suspected scheduling starvation
http://bugzilla.kernel.org/show_bug.cgi?id=5877
[Bug 3927] AMD64/ATI : timer is running twice as fast as it should
http://bugzilla.kernel.org/show_bug.cgi?id=3927
[Bug 5645] [ELF] SIGKILL for n*0x1000 sized ELF
http://bugzilla.kernel.org/show_bug.cgi?id=5645
cpufreq
=======
[Bug 5353] cpufreq_conservative: cpu always in
http://bugzilla.kernel.org/show_bug.cgi?id=5353
[Bug 5495] changing cpu frequency causes fatal USB
http://bugzilla.kernel.org/show_bug.cgi?id=5495
[Bug 5553] speedstep-smi fails to load if
http://bugzilla.kernel.org/show_bug.cgi?id=5553
[Bug 5860] ondemand and speedstep-ich fail on
http://bugzilla.kernel.org/show_bug.cgi?id=5860
[Bug 5122] cpufreq/powernowd is still not working
http://bugzilla.kernel.org/show_bug.cgi?id=5122
[Bug 5771] OOPS in libata when scaling cpu
http://bugzilla.kernel.org/show_bug.cgi?id=5771
[Bug 5773] hang on reboot
http://bugzilla.kernel.org/show_bug.cgi?id=5773
[Bug 5779] A very strange bug - possibly a BIOS
http://bugzilla.kernel.org/show_bug.cgi?id=5779
[Bug 5934] System locks if cpufreq set to lowest
http://bugzilla.kernel.org/show_bug.cgi?id=5934
[Bug 5951] Acer Aspire BIOS 3A29 reports to high
http://bugzilla.kernel.org/show_bug.cgi?id=5951
[Bug 5985] speedstep-smi not detecting
http://bugzilla.kernel.org/show_bug.cgi?id=5985
[Bug 6005] can't change cpu frequency on pentium M
http://bugzilla.kernel.org/show_bug.cgi?id=6005
device mapper
=============
[Bug 5297] Memory problem with kcopyd under LVM2 lvremove execution and copying data at the same time.
http://bugzilla.kernel.org/show_bug.cgi?id=5297
[Bug 5733] Oops writing to SATA RAID disks
http://bugzilla.kernel.org/show_bug.cgi?id=5733
[Bug 5948] Oops when accessing loading IDE and
http://bugzilla.kernel.org/show_bug.cgi?id=5948
drm
===
[Bug 5823] complete freeze
http://bugzilla.kernel.org/show_bug.cgi?id=5823
[Bug 5641] Xinerama blocks chipset and GLX fails
http://bugzilla.kernel.org/show_bug.cgi?id=5641
[Bug 5762] sigkill leaves process running with
http://bugzilla.kernel.org/show_bug.cgi?id=5762
dvb
===
[Bug 5228] reboot fails on 2.6.13 when skystar2
http://bugzilla.kernel.org/show_bug.cgi?id=5228
[Bug 5895] With DVB drivers enabled snd_87x (ALSA)
http://bugzilla.kernel.org/show_bug.cgi?id=5895
http://bugzilla.kernel.org/show_bug.cgi?id=5851
[Bug 5902] pluto2 driver in P4 celeron (128kB
http://bugzilla.kernel.org/show_bug.cgi?id=5902
[Bug 5669] sound fix in SAA7134 tv-tuner
http://bugzilla.kernel.org/show_bug.cgi?id=5669
[Bug 5699] saa7134 tuner no longer detected (i2c
http://bugzilla.kernel.org/show_bug.cgi?id=5699
[Bug 5760] No sound with snd_intel8x0 & ALi M5455
http://bugzilla.kernel.org/show_bug.cgi?id=5760
[Bug 5774] saa7134 module doesn't like suspend2
http://bugzilla.kernel.org/show_bug.cgi?id=5774
[Bug 5941] DVB-T Pluto2: When changing from one
http://bugzilla.kernel.org/show_bug.cgi?id=5941
fbdev
=====
[Bug 5482] Black screen with radeonfb
http://bugzilla.kernel.org/show_bug.cgi?id=5482
[Bug 4869] Screen stays blank upon resume
http://bugzilla.kernel.org/show_bug.cgi?id=4869
[Bug 5619] matroxfb: hard lock when switching
http://bugzilla.kernel.org/show_bug.cgi?id=5619
[Bug 5769] Framebuffer breaks after kernel 2.6.12.6
http://bugzilla.kernel.org/show_bug.cgi?id=5769
[Bug 5926] radeonfb somtimes hangs on x300
http://bugzilla.kernel.org/show_bug.cgi?id=5926
fs-misc
=======
[Bug 4821] Heavy load on smbfs gives
http://bugzilla.kernel.org/show_bug.cgi?id=4821
[Bug 4822] smb_allocate_request() possible problem
http://bugzilla.kernel.org/show_bug.cgi?id=4822
[Bug 4497] getdents gives empty/random result upon
http://bugme.osdl.org/show_bug.cgi?id=4497
[Bug 5535] Encountered kernel oops with file
http://bugzilla.kernel.org/show_bug.cgi?id=5535
[Bug 4585] EXT3 CORRUPTION ON BIG VOLUMES
http://bugzilla.kernel.org/show_bug.cgi?id=4585
[Bug 5856] Oops when fs nearly full
http://bugzilla.kernel.org/show_bug.cgi?id=5856
[Bug 5109] kernel BUG in hfsplus
http://bugzilla.kernel.org/show_bug.cgi?id=5109
[Bug 5416] journal block not found
http://bugzilla.kernel.org/show_bug.cgi?id=5416
[Bug 5615] odd cwd behavior
http://bugzilla.kernel.org/show_bug.cgi?id=5615
[Bug 5739] nls_cp936 doesn't handle characters in
http://bugzilla.kernel.org/show_bug.cgi?id=5739
[Bug 5750] NULL POINTER oops after CIFS automount
http://bugzilla.kernel.org/show_bug.cgi?id=5750
[Bug 5079] Possible file date underflow on ext2/3
http://bugzilla.kernel.org/show_bug.cgi?id=5079
[Bug 5954] Client performs retries of NLM_LOCK
http://bugzilla.kernel.org/show_bug.cgi?id=5954
[Bug 5956] Linux client sets block=false in
http://bugzilla.kernel.org/show_bug.cgi?id=5956
[Bug 5984] lockd kernel panic in
http://bugzilla.kernel.org/show_bug.cgi?id=5984
[Bug 6002] quota + 2.6.15.1
http://bugzilla.kernel.org/show_bug.cgi?id=6002
ieee1394
========
[Bug 4779] amd64: raw1394 returns EINVAL
http://bugzilla.kernel.org/show_bug.cgi?id=4779
[Bug 5998] oops on mount "kernel access of bad
http://bugzilla.kernel.org/show_bug.cgi?id=5998
input
=====
[Bug 5386] rmmod usbhid crashes
http://bugzilla.kernel.org/show_bug.cgi?id=5386
[Bug 5408] Wrong keymapping for logitech cordless
http://bugzilla.kernel.org/show_bug.cgi?id=5408
[Bug 5449] bug in psmouse.c "lost synchronization"
http://bugzilla.kernel.org/show_bug.cgi?id=5449
[Bug 5475] USB mouse freezes in X
http://bugzilla.kernel.org/show_bug.cgi?id=5475
[Bug 3830] Touchpad stopped working from 2.6.9 and beyond
http://bugzilla.kernel.org/show_bug.cgi?id=3830
[Bug 5850] grip module crashes system since 2.6.15
http://bugzilla.kernel.org/show_bug.cgi?id=5850
[Bug 5855] kde keeps displaying volume-osd
http://bugzilla.kernel.org/show_bug.cgi?id=5855
[Bug 4981] changes in 2.6.12-rc1 causes ati-remote
http://bugzilla.kernel.org/show_bug.cgi?id=4981
[Bug 5158] ps/2 keyboard on x86_64 does not work
http://bugzilla.kernel.org/show_bug.cgi?id=5158
[Bug 5197] Alps pad fails to reenable dualpoint on
http://bugzilla.kernel.org/show_bug.cgi?id=5197
[Bug 5233] usb hid 'relative' input events
http://bugzilla.kernel.org/show_bug.cgi?id=5233
[Bug 5690] First key pressed never responds
http://bugzilla.kernel.org/show_bug.cgi?id=5690
[Bug 5697] Input via atkbd.c and psmouse.c becomes
http://bugzilla.kernel.org/show_bug.cgi?id=5697
[Bug 5780] multimedia keys shouldn't repead
http://bugzilla.kernel.org/show_bug.cgi?id=5780
[Bug 5932] PS/2 keyboard does not work with
http://bugzilla.kernel.org/show_bug.cgi?id=5932
isdn
====
[Bug 5064] Oops Unable to handle NULL pointer
http://bugzilla.kernel.org/show_bug.cgi?id=5064
kbuild
======
[Bug 5756] ENHANCEMENT PATCH for
http://bugzilla.kernel.org/show_bug.cgi?id=5756
mm
==
[Bug 5665] CPU lockup when hitting OOM on
http://bugzilla.kernel.org/show_bug.cgi?id=5665
[Bug 5493] mprotect usage causing slow system performance and freezing
http://bugzilla.kernel.org/show_bug.cgi?id=5493
net
===
[Bug 5306] Oops on IPv6 route lookup
http://bugzilla.kernel.org/show_bug.cgi?id=5306
[Bug 5438] kernel BUG/Oops triggered by conntrack
http://bugzilla.kernel.org/show_bug.cgi?id=5438
[Bug 5591] KERNEL: assertion
http://bugzilla.kernel.org/show_bug.cgi?id=5591
[Bug 5857] errors in ppp
http://bugzilla.kernel.org/show_bug.cgi?id=5857
[Bug 5869] After pon: Kernel BUG at
http://bugzilla.kernel.org/show_bug.cgi?id=5869
[Bug 5156] llc2: llc_ui_bind() leaves llc->dev NULL
http://bugzilla.kernel.org/show_bug.cgi?id=5156
[Bug 5610] IP MTU Path Discovery now working
http://bugzilla.kernel.org/show_bug.cgi?id=5610
[Bug 5627] Network boot - IP-Config reports wrong
http://bugzilla.kernel.org/show_bug.cgi?id=5627
[Bug 5672] cannot get socket once accept(2) has
http://bugzilla.kernel.org/show_bug.cgi?id=5672
[Bug 5695] pppd hangs after disconnect on
http://bugzilla.kernel.org/show_bug.cgi?id=5695
[Bug 5803] Bridge code Oops with 2.6.14.2
http://bugzilla.kernel.org/show_bug.cgi?id=5803
[Bug 5936] Openswan tunnels + netfilter problem
http://bugzilla.kernel.org/show_bug.cgi?id=5936
[Bug 5946] KERNEL: assertion
http://bugzilla.kernel.org/show_bug.cgi?id=5946
netdev
======
[Bug 5280] Marvell Yukon E8053 pci-express LAN
http://bugzilla.kernel.org/show_bug.cgi?id=5280
[Bug 5379] skge driver turns off 3C940
http://bugzilla.kernel.org/show_bug.cgi?id=5379
[Bug 5527] new e1000 82541PI locks under load
http://bugme.osdl.org/show_bug.cgi?id=5527
[Bug 5806] Wake-On-LAN does not work on VIA
http://bugzilla.kernel.org/show_bug.cgi?id=5806
[Bug 5810] e100 IRQ problem
http://bugzilla.kernel.org/show_bug.cgi?id=5810
[Bug 5827] pppd with MPPE fails
http://bugzilla.kernel.org/show_bug.cgi?id=5827
[Bug 5839] uli526x partially recognizing interface
http://bugzilla.kernel.org/show_bug.cgi?id=5839
[Bug 5842] ipw2100 driver + WPA encryption = crash
http://bugzilla.kernel.org/show_bug.cgi?id=5842
[Bug 5870] SiS 190 doesn't download files
http://bugzilla.kernel.org/show_bug.cgi?id=5870
[Bug 4982] Usenet gateway crashes under heavy
http://bugzilla.kernel.org/show_bug.cgi?id=4982
[Bug 5030] kernel: eth1: Oversized Ethernet frame
http://bugzilla.kernel.org/show_bug.cgi?id=5030
[Bug 5039] high cpu usage (softirq takes 50% all
http://bugzilla.kernel.org/show_bug.cgi?id=5039
[Bug 5080] bonding related oops on boot
http://bugzilla.kernel.org/show_bug.cgi?id=5080
[Bug 5137] r8169 - network dies.
http://bugzilla.kernel.org/show_bug.cgi?id=5137
[Bug 5204] sk98lin driver blocks NIC for BIOS/dual
http://bugzilla.kernel.org/show_bug.cgi?id=5204
[Bug 5890] Driver sk98lin not working (no
http://bugzilla.kernel.org/show_bug.cgi?id=5890
[Bug 5896] [sk98lin] vpd errors on dfi lanparty ut
http://bugzilla.kernel.org/show_bug.cgi?id=5896
[Bug 5609] e1000, 2.6.1[34] - WOL not working
http://bugzilla.kernel.org/show_bug.cgi?id=5609
[Bug 5681] 8139cp has broken suspend/resume
http://bugzilla.kernel.org/show_bug.cgi?id=5681
[Bug 5698] IPW2100 driver loosing association with
http://bugzilla.kernel.org/show_bug.cgi?id=5698
[Bug 5711] ipw2200: NETDEV_TX_BUSY returned;
http://bugzilla.kernel.org/show_bug.cgi?id=5711
[Bug 5714] can't configure IPW2200 Monitor mode
http://bugzilla.kernel.org/show_bug.cgi?id=5714
[Bug 5718] NIC dont work with Toshiba Satellite
http://bugzilla.kernel.org/show_bug.cgi?id=5718
[Bug 5924] Starfire interface stopped working
http://bugzilla.kernel.org/show_bug.cgi?id=5924
[Bug 5927] TG3 driver unable to get memory resource
http://bugzilla.kernel.org/show_bug.cgi?id=5927
[Bug 5785] allocation failure and dead skge
http://bugzilla.kernel.org/show_bug.cgi?id=5785
[Bug 5940] ipw2100 version incompatible with
http://bugzilla.kernel.org/show_bug.cgi?id=5940
[Bug 5947] r8169 Losing some ticks
http://bugzilla.kernel.org/show_bug.cgi?id=5947
[Bug 5965] Problems with Intel Pro 1000 (82545GM)
http://bugzilla.kernel.org/show_bug.cgi?id=5965
[Bug 5973] Yukon / Marvell driver in kernel
http://bugzilla.kernel.org/show_bug.cgi?id=5973
[Bug 5992] r8169 driver - no network connection,
http://bugzilla.kernel.org/show_bug.cgi?id=5992
parport
=======
[Bug 5796] If the printer is turned off,
http://bugzilla.kernel.org/show_bug.cgi?id=5796
[Bug 4983] Paralell ZIP disappearing
http://bugzilla.kernel.org/show_bug.cgi?id=4983
pata
====
[Bug 5472] pktcdvd avoid to read iso9660 DVDs.
http://bugzilla.kernel.org/show_bug.cgi?id=5472
[Bug 5577] permanent compact flash change
http://bugzilla.kernel.org/show_bug.cgi?id=5577
[Bug 5581] CD DMA timout panic in ide-iops.c
http://bugzilla.kernel.org/show_bug.cgi?id=5581
[Bug 5371] Really slow dvd burning
http://bugzilla.kernel.org/show_bug.cgi?id=5371
[Bug 5880] Transcend CF pcmcia card no longer works
http://bugzilla.kernel.org/show_bug.cgi?id=5880
[Bug 5159] BUG: soft lockup detected on CPU#0!
http://bugzilla.kernel.org/show_bug.cgi?id=5159
[Bug 5911] siimage.c interrupts screaming
http://bugzilla.kernel.org/show_bug.cgi?id=5911
[Bug 5919] kernel: ata1: command 0x25 timeout,
http://bugzilla.kernel.org/show_bug.cgi?id=5919
[Bug 5599] HDIO_GET_ACOUSTIC failed: Inappropriate
http://bugzilla.kernel.org/show_bug.cgi?id=5599
[Bug 5673] hda and ide0 errors on resume from acpi
http://bugzilla.kernel.org/show_bug.cgi?id=5673
[Bug 5759] ATIIXP driver does not detect some MDMA
http://bugzilla.kernel.org/show_bug.cgi?id=5759
[Bug 5786] DMA access to CD-writer hangs IDE bus
http://bugzilla.kernel.org/show_bug.cgi?id=5786
[Bug 5928] problem reading files with ide-tape
http://bugzilla.kernel.org/show_bug.cgi?id=5928
[Bug 5929] DMA not working on ATAPI HL-DT-ST
http://bugzilla.kernel.org/show_bug.cgi?id=5929
[Bug 5938] Boot stalls on loading ide-cd. Crashed
http://bugzilla.kernel.org/show_bug.cgi?id=5938
[Bug 5901] Resume from suspend-to-memory worked in
http://bugzilla.kernel.org/show_bug.cgi?id=5901
pci
===
[Bug 5587] Toshiba M200 PCI fails to allocate
http://bugzilla.kernel.org/show_bug.cgi?id=5587
[Bug 5736] pci broken on PIIX/ICH laptop
http://bugzilla.kernel.org/show_bug.cgi?id=5736
pcmcia/cardbus
==============
[Bug 5569] xirc2ps_cs based pcmcia card stopped
http://bugzilla.kernel.org/show_bug.cgi?id=5569
[Bug 5062] kernel preemption breaks in several ways
http://bugzilla.kernel.org/show_bug.cgi?id=5062
[Bug 5848] pcmcia novatel merlin u530 not working
http://bugzilla.kernel.org/show_bug.cgi?id=5848
power management
================
[Bug 4919] APM resume: freeze at disk access
http://bugzilla.kernel.org/show_bug.cgi?id=4919
powerpc
=======
[Bug 5679] Kernel fails to boot
http://bugzilla.kernel.org/show_bug.cgi?id=5679
[Bug 5689] java crashes "JVMDG218: JVM is not
http://bugzilla.kernel.org/show_bug.cgi?id=5689
sata
====
[Bug 4860] sata_sx4 doesn't recognize Promise
http://bugzilla.kernel.org/show_bug.cgi?id=4860
[Bug 4920] IDE CD Driver not able to read audio
http://bugzilla.kernel.org/show_bug.cgi?id=4920
[Bug 5533] sata_via unable to see my Plextor 716SA
http://bugzilla.kernel.org/show_bug.cgi?id=5533
[Bug 5586] mv_sata doesn't detect any disk and
http://bugzilla.kernel.org/show_bug.cgi?id=5586
[Bug 5589] libata - Oops when sata drive under load
http://bugzilla.kernel.org/show_bug.cgi?id=5589
[Bug 5798] PLEXTOR 716sa SATA
http://bugzilla.kernel.org/show_bug.cgi?id=5798
[Bug 5863] ata_piix disables SATA drives at boot
http://bugzilla.kernel.org/show_bug.cgi?id=5863
[Bug 4968] sata_nv buffer I/O errors
http://bugzilla.kernel.org/show_bug.cgi?id=4968
[Bug 5047] sata hangs (Silicon Image and seagate
http://bugzilla.kernel.org/show_bug.cgi?id=5047
[Bug 5905] status=0x50 errors with SATA drives
http://bugzilla.kernel.org/show_bug.cgi?id=5905
[Bug 5914] recent davej kernels (2.6.15-git*-base)
http://bugzilla.kernel.org/show_bug.cgi?id=5914
[Bug 5596] Kernel panic on sata_mv driver durring
http://bugzilla.kernel.org/show_bug.cgi?id=5596
[Bug 5654] Serial Ata 3512a in 2.6.14
http://bugzilla.kernel.org/show_bug.cgi?id=5654
[Bug 5664] Data Corruption with Kernel Version
http://bugzilla.kernel.org/show_bug.cgi?id=5664
[Bug 5700] Panic: Fatal exception in interrupt w/
http://bugzilla.kernel.org/show_bug.cgi?id=5700
[Bug 5709] sata_promise: missing pci id for
http://bugzilla.kernel.org/show_bug.cgi?id=5709
[Bug 5721] libata does not report detailed info in
http://bugzilla.kernel.org/show_bug.cgi?id=5721
[Bug 5722] Buffer I/O error on device sr0,
http://bugzilla.kernel.org/show_bug.cgi?id=5722
[Bug 5922] sata_uli fails to see harddisks on PCI
http://bugzilla.kernel.org/show_bug.cgi?id=5922
[Bug 5789] ATAPI isn't working on sata-via
http://bugzilla.kernel.org/show_bug.cgi?id=5789
[Bug 5931] Oops when calling hddtemp on sata drive
http://bugzilla.kernel.org/show_bug.cgi?id=5931
[Bug 5969] IDE driver can't detect any hdd through
http://bugzilla.kernel.org/show_bug.cgi?id=5969
[Bug 5948] Oops when accessing SATA with device mapper on AMD 64 X2
http://bugzilla.kernel.org/show_bug.cgi?id=5948
[Bug 5987] Oopses at boot,
http://bugzilla.kernel.org/show_bug.cgi?id=5987
[Bug 5995] RAID with SATA fails on drive un-plug
http://bugzilla.kernel.org/show_bug.cgi?id=5995
scsi
====
[Bug 4880] dpt_i2o.c does not register itself with
http://bugzilla.kernel.org/show_bug.cgi?id=4880
[Bug 4929] problem with aic7xxx driver on 2.6.x
http://bugzilla.kernel.org/show_bug.cgi?id=4929
[Bug 5268] aic79xx scsi driver causing system to
http://bugzilla.kernel.org/show_bug.cgi?id=5268
[Bug 5378] aic7xxx deadlock/freeze on Adaptec
http://bugzilla.kernel.org/show_bug.cgi?id=5378
[Bug 5440] Perc4 megaraid: module doesn't detect
http://bugzilla.kernel.org/show_bug.cgi?id=5440
[Bug 5531] SCSI SR_MOD Doesn't Recognize CD after
http://bugzilla.kernel.org/show_bug.cgi?id=5531
[Bug 5566] scsi_eh_x/scsi_wq_x "zombie" processes
http://bugzilla.kernel.org/show_bug.cgi?id=5566
[Bug 5795] kernel boot oops
http://bugzilla.kernel.org/show_bug.cgi?id=5795
[Bug 5808] aic7xxx - half speed/frequency
http://bugzilla.kernel.org/show_bug.cgi?id=5808
[Bug 5154] 2.6.13 crashes on heavy used server
http://bugzilla.kernel.org/show_bug.cgi?id=5154
[Bug 5887] Erratic messages for a CDROM
http://bugzilla.kernel.org/show_bug.cgi?id=5887
[Bug 5910] tar to tape-drive kills keyboard,
http://bugzilla.kernel.org/show_bug.cgi?id=5910
[Bug 5921] SCSI bus crash when formating CDRW
http://bugzilla.kernel.org/show_bug.cgi?id=5921
[Bug 5656] system freeze
http://bugzilla.kernel.org/show_bug.cgi?id=5656
=?iso-8859-1?q?=5BBug_5659=5D_New=3A_Can=B4t_copy_fi?=
http://bugzilla.kernel.org/show_bug.cgi?id=5659
[Bug 5685] Symbios Logic 53c1030 Driver Not Running
http://bugzilla.kernel.org/show_bug.cgi?id=5685
[Bug 5712] mptscsih: ioc0: task abort messages at
http://bugzilla.kernel.org/show_bug.cgi?id=5712
[Bug 5735] System boot hangs Adaptec 2100S card
http://bugzilla.kernel.org/show_bug.cgi?id=5735
[Bug 5738] ahci + software raid (intel E7221,
http://bugzilla.kernel.org/show_bug.cgi?id=5738
[Bug 5755] 16 byte CDBs not enabled in Adaptec
http://bugzilla.kernel.org/show_bug.cgi?id=5755
[Bug 5775] when a scsi device is plugged in again,
http://bugzilla.kernel.org/show_bug.cgi?id=5775
[Bug 5776] initio: Kernel crash while launching
http://bugzilla.kernel.org/show_bug.cgi?id=5776
[Bug 5953] easyRAID F8 IDE2SCSI adaptor problems
http://bugzilla.kernel.org/show_bug.cgi?id=5953
[Bug 5955] Speed negotiation between scsi driver
http://bugzilla.kernel.org/show_bug.cgi?id=5955
sensors
=======
[Bug 5981] it87 chassis fan speed not reported,
http://bugzilla.kernel.org/show_bug.cgi?id=5981
serial
======
[Bug 5832] Enabling ACPI Plug and Play in kernels
http://bugzilla.kernel.org/show_bug.cgi?id=5832
[Bug 5875] quad RS232 port card detected as 8,
http://bugzilla.kernel.org/show_bug.cgi?id=5875
[Bug 5942] serial driver gives up and we get IRQ3
http://bugzilla.kernel.org/show_bug.cgi?id=5942
[Bug 5958] CF bluetooth card oopses machine when
http://bugzilla.kernel.org/show_bug.cgi?id=5958
suspend/resume
==============
[Bug 5528] iBook 14'' 1.42 Ghz sleep,
http://bugme.osdl.org/show_bug.cgi?id=5528
[Bug 5945] "scheduling while atomic" during wakeup
http://bugzilla.kernel.org/show_bug.cgi?id=5945
swsusp
======
[Bug 5671] pci=routeirq required for successful
http://bugzilla.kernel.org/show_bug.cgi?id=5671
time management
===============
[Bug 5366] synchronize_tsc_bp can zero the TSC
http://bugzilla.kernel.org/show_bug.cgi?id=5366
[Bug 5740] tsc ocassionally counts back with dual
http://bugzilla.kernel.org/show_bug.cgi?id=5740
usb
=====
[Bug 4776] uhci_hcd: host controller halted,
http://bugzilla.kernel.org/show_bug.cgi?id=4776
[Bug 4916] USB mouse stops working after inserting
http://bugzilla.kernel.org/show_bug.cgi?id=4916
[Bug 4917] Lacie 250Go USB
http://bugzilla.kernel.org/show_bug.cgi?id=4917
[Bug 5349] USB card detected,
http://bugzilla.kernel.org/show_bug.cgi?id=5349
[Bug 5541] oops in drivers/usb/ipaq when
http://bugzilla.kernel.org/show_bug.cgi?id=5541
[Bug 5835] High Speed USB devices don't work when
http://bugzilla.kernel.org/show_bug.cgi?id=5835
[Bug 5836] USB disconnect/connect continuously
http://bugzilla.kernel.org/show_bug.cgi?id=5836
[Bug 4966] ehci_hcd on x86_64 causes more than
http://bugzilla.kernel.org/show_bug.cgi?id=4966
[Bug 5086] unplugging webcam when stv680 is in use
http://bugzilla.kernel.org/show_bug.cgi?id=5086
[Bug 5143] USB HID,
http://bugzilla.kernel.org/show_bug.cgi?id=5143
[Bug 5164] pl2303 when unplugged while device is
http://bugzilla.kernel.org/show_bug.cgi?id=5164
[Bug 5215] USB OHCI pci card can not enable usb
http://bugzilla.kernel.org/show_bug.cgi?id=5215
[Bug 5253] usb storage disappears after hotplug
http://bugzilla.kernel.org/show_bug.cgi?id=5253
[Bug 5874] 2.6.15: USB vibration feedback gamepad
http://bugzilla.kernel.org/show_bug.cgi?id=5874
[Bug 5876] w9968cf oopses with creative webcam go
http://bugzilla.kernel.org/show_bug.cgi?id=5876
[Bug 5913] USB enclosure doesn't work
http://bugzilla.kernel.org/show_bug.cgi?id=5913
[Bug 5920] USB vibration feedback gamepad problem
http://bugzilla.kernel.org/show_bug.cgi?id=5920
[Bug 5600] suspend to disk and suspend to RAM
http://bugzilla.kernel.org/show_bug.cgi?id=5600
[Bug 5640] System doesn' shutdown when a device is
http://bugzilla.kernel.org/show_bug.cgi?id=5640
[Bug 5642] ohci_hcd temporary freeze on nForce4
http://bugzilla.kernel.org/show_bug.cgi?id=5642
[Bug 5652] Built in card reader doesn't work
http://bugzilla.kernel.org/show_bug.cgi?id=5652
[Bug 5682] USB hard drive disconnects
http://bugzilla.kernel.org/show_bug.cgi?id=5682
[Bug 5684] VT6205-DevH SD card reader (USB) will
http://bugzilla.kernel.org/show_bug.cgi?id=5684
[Bug 5730] FTDI USB serial adaptor problems
http://bugzilla.kernel.org/show_bug.cgi?id=5730
[Bug 5742] Suspend resume does not work on
http://bugzilla.kernel.org/show_bug.cgi?id=5742
[Bug 5744] usbnet connection to sharp zaurus
http://bugzilla.kernel.org/show_bug.cgi?id=5744
[Bug 5753] Problem initializing CSR bluetooth
http://bugzilla.kernel.org/show_bug.cgi?id=5753
[Bug 5777] ehci-hcd re-load necessary to use kbd
http://bugzilla.kernel.org/show_bug.cgi?id=5777
[Bug 5788] ASUS A6k Notebook hangs on boot while
http://bugzilla.kernel.org/show_bug.cgi?id=5788
[Bug 5935] boot process hangs in pci_init,
http://bugzilla.kernel.org/show_bug.cgi?id=5935
[Bug 5967] Novatel Wireless CDMA Card (V620)
http://bugzilla.kernel.org/show_bug.cgi?id=5967
[Bug 5974] if usb-storage atached - ps/2 keyboard
http://bugzilla.kernel.org/show_bug.cgi?id=5974
[Bug 5997] usbhid driver disable the Mouse and
http://bugzilla.kernel.org/show_bug.cgi?id=5997
x86
===
[Bug 5565] Guess of i386 APIC PTE area scribble
http://bugzilla.kernel.org/show_bug.cgi?id=5565
[Bug 5620] gcc miscompiles code using i386
http://bugzilla.kernel.org/show_bug.cgi?id=5620
[Bug 5636] Totally bogus BogoMips when
http://bugzilla.kernel.org/show_bug.cgi?id=5636
x86_64
======
[Bug 5343] IOMMU setup broken 2.6.13.2 -> 2.6.14-rc2
http://bugzilla.kernel.org/show_bug.cgi?id=5343
[Bug 5522] Timer going backward on an AMD64 dual
http://bugzilla.kernel.org/show_bug.cgi?id=5522
[Bug 5752] Dual Opteron - Memory missing
http://bugzilla.kernel.org/show_bug.cgi?id=5752
^ permalink raw reply
* Re: [2.6 patch] schedule eepro100.c for removal
From: Benjamin LaHaise @ 2006-02-03 22:18 UTC (permalink / raw)
To: Adrian Bunk; +Cc: Jeff Garzik, linux-kernel, netdev
In-Reply-To: <20060203213234.GS4408@stusta.de>
Where's the hunk to make the eepro100 driver spew messages about being
obsolete out upon loading?
-ben
On Fri, Feb 03, 2006 at 10:32:34PM +0100, Adrian Bunk wrote:
> Signed-off-by: Adrian Bunk <bunk@stusta.de>
>
> ---
>
> This patch was already sent on:
> - 18 Jan 2006
>
> --- linux-2.6.15-mm4-full/Documentation/feature-removal-schedule.txt.old 2006-01-18 08:38:57.000000000 +0100
> +++ linux-2.6.15-mm4-full/Documentation/feature-removal-schedule.txt 2006-01-18 08:39:59.000000000 +0100
> @@ -164,0 +165,6 @@
> +---------------------------
> +
> +What: eepro100 network driver
> +When: April 2006
> +Why: replaced by the e100 driver
> +Who: Adrian Bunk <bunk@stusta.de>
>
> -
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
"Ladies and gentlemen, I'm sorry to interrupt, but the police are here
and they've asked us to stop the party." Don't Email: <dont@kvack.org>.
^ permalink raw reply
* [2.6 patch] schedule eepro100.c for removal
From: Adrian Bunk @ 2006-02-03 21:32 UTC (permalink / raw)
To: Jeff Garzik; +Cc: linux-kernel, netdev
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
This patch was already sent on:
- 18 Jan 2006
--- linux-2.6.15-mm4-full/Documentation/feature-removal-schedule.txt.old 2006-01-18 08:38:57.000000000 +0100
+++ linux-2.6.15-mm4-full/Documentation/feature-removal-schedule.txt 2006-01-18 08:39:59.000000000 +0100
@@ -164,0 +165,6 @@
+---------------------------
+
+What: eepro100 network driver
+When: April 2006
+Why: replaced by the e100 driver
+Who: Adrian Bunk <bunk@stusta.de>
^ permalink raw reply
* [-mm patch] net/ipv4/fib_rules.c: make struct fib_rules static again
From: Adrian Bunk @ 2006-02-03 21:02 UTC (permalink / raw)
To: Andrew Morton, Robert Olsson, davem; +Cc: linux-kernel, netdev
In-Reply-To: <20060203000704.3964a39f.akpm@osdl.org>
On Fri, Feb 03, 2006 at 12:07:04AM -0800, Andrew Morton wrote:
>...
> Changes since 2.6.15-mm4:
>...
> git-net.patch
>...
> Git trees
>...
struct fib_rules became global for no good reason.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
--- linux-2.6.16-rc1-mm5-full/net/ipv4/fib_rules.c.old 2006-02-03 16:12:48.000000000 +0100
+++ linux-2.6.16-rc1-mm5-full/net/ipv4/fib_rules.c 2006-02-03 16:13:00.000000000 +0100
@@ -100,7 +100,7 @@
.r_action = RTN_UNICAST,
};
-struct hlist_head fib_rules;
+static struct hlist_head fib_rules;
/* writer func called from netlink -- rtnl_sem hold*/
^ permalink raw reply
* Re: FW: Performance evaluation of high speed TCPs
From: rhee @ 2006-02-03 20:17 UTC (permalink / raw)
To: Douglas Leith; +Cc: netdev, end2end-interest
In-Reply-To: <C0FF12BB5B83E44ABAEAA47149DA97350FE0F6@helios.eee.strath.ac.uk>
Let's get off this e2e list for this discussion. It is really unnecessary
to use this list for
this discussion. I don't understand why you keep sending your email to
this list even
though we are seating next to each other in the same conference. Isn't
this amusing
or abusing of this mailing list? :-)
--
to others in the list, Doug and I are attending pfldnet in japan now..
> Injong,
>
>>In fact, i contacted your student "Baruch" one month and half before we
>> posted our
> report -- it was CCed in the netdev mailing list as well and we gave him
> login and
> passwd on our result website (at that time we were just about to write the
> report)
> and we have not heard from your guys until just one week ago. At least we
> did try to
> make sure we are running a buggy version.
>
> We have no record of receiving such an email. Just a mix-up I guess.
>
> Doug
>
>
>>>Seriously, we can't run the tests for every fix and bug report.
>>
>> Perhaps best to view it as returning a favour. You may recall that we
>> re-ran all our own experimental tests last year (all data and code
>> available online at www.hamilton.ie/net/eval/) on discovering a
>> previously
>> unreported bug introduced by the linux folks when implementing bic.
>> Something similar has happened with importing htcp into linux.
>>
>> Seriously, where's the value in comparing buggy implementations - isn't
>> that just a waste of all our time ? If we are genuine about wanting to
>> understand tcp performance then I think we just have to take the hit
>> from
>> issues such as this that are outside all of our control.
>>
>> Doug
>>
>> Hamilton Institute
>> www.hamilton.ie
>>
>
>
>
>
^ permalink raw reply
* Re: [patch 3/4] net: Percpufy frequently used variables -- proto.sockets_allocated
From: Andrew Morton @ 2006-02-03 20:13 UTC (permalink / raw)
To: Ravikiran G Thirumalai
Cc: dada1, davem, linux-kernel, shai, netdev, pravins, bcrl
In-Reply-To: <20060203193714.GB3653@localhost.localdomain>
Ravikiran G Thirumalai <kiran@scalex86.org> wrote:
>
> On Thu, Feb 02, 2006 at 07:16:00PM -0800, Andrew Morton wrote:
> > Ravikiran G Thirumalai <kiran@scalex86.org> wrote:
> > >
> > > On Fri, Jan 27, 2006 at 03:01:06PM -0800, Andrew Morton wrote:
> > > Here's an implementation which delegates tuning of batching to the user. We
> > > don't really need local_t at all as percpu_counter_mod is not safe against
> > > interrupts and softirqs as it is. If we have a counter which could be
> > > modified in process context and irq/bh context, we just have to use a
> > > wrapper like percpu_counter_mod_bh which will just disable and enable bottom
> > > halves. Reads on the counters are safe as they are atomic_reads, and the
> > > cpu local variables are always accessed by that cpu only.
> > >
> > > (PS: the maxerr for ext2/ext3 is just guesstimate)
> >
> > Well that's the problem. We need to choose production-quality values for
> > use in there.
>
> The guesstimate was loosely based on keeping the per-cpu batch at atleast 8
> on reasonably sized systems, while not letting maxerr grow too big. I guess
> machines with cpu counts more than 128 don't use ext3 :). And if they do,
> they can tune the counters with a higher maxerr. I guess it might be a bit
> ugly on the user side with all the if num_possibl_cpus(), but is there a
> better alternative?
>
> (I plan to test the counter values for ext2 and ext3 on a 16 way box, and
> change these if they turn out to be not so good)
OK, thanks. Frankly I think I went overboard on the scalability thing when
adding percpu counters to ext2 and ext3. I suspect they're not providing
significant benefit over per-sb-spinlock and a ulong.
> >
> > > Comments?
> >
> > Using num_possible_cpus() in that header file is just asking for build
> > errors. Probably best to uninline the function rather than adding the
> > needed include of cpumask.h.
>
> Yup,
>
> Here it is.
>
> Change the percpu_counter interface so that user can specify the maximum
> tolerable deviation.
OK, thanks. I need to sit down and a) remember why we're even discussing
this and b) see what we've merged thus far and work out what it all does ;)
^ permalink raw reply
* Please pull dscape-upsteam of bcm43xx driver
From: Michael Buesch @ 2006-02-03 20:03 UTC (permalink / raw)
To: Linville, John W.
Cc: netdev-u79uwXL29TY76Z2rM5mHXA, bcm43xx-dev-0fE9KPoRgkgATYTw5x5z8w
[-- Attachment #1: Type: text/plain, Size: 1527 bytes --]
Please do a
git pull git://bu3sch.de/wireless-2.6 dscape-upstream
to pull latest bcm43xx updates into dscape-all:
Michael Buesch:
[bcm43xx] add DEBUG Kconfig option. Also fix indention.
[bcm43xx] fix Kconfig "depends on" typo.
[bcm43xx] Fix makefile. Remove all the "out-of-tree" stuff.
[bcm43xx-d80211] Add more initvals sanity checks and error out, if one sanity check fails.
[bcm43xx] Add more initvals sanity checks and error out, if one sanity check fails.
[bcm43xx-d80211] [patch] basic ethtool support
[bcm43xx-d80211] [patch] basic ethtool support (CONTINUED)
[bcm43xx] Wireless Ext update:
[bcm43xx-d80211] Add beacon template uploading code
drivers/net/wireless/Kconfig | 19 ++
drivers/net/wireless/bcm43xx-d80211/Makefile | 87 +----------
drivers/net/wireless/bcm43xx-d80211/bcm43xx.h | 41 +----
.../net/wireless/bcm43xx-d80211/bcm43xx_debugfs.c | 8 +
.../net/wireless/bcm43xx-d80211/bcm43xx_debugfs.h | 6 -
drivers/net/wireless/bcm43xx-d80211/bcm43xx_dma.c | 8 +
drivers/net/wireless/bcm43xx-d80211/bcm43xx_dma.h | 4 -
.../net/wireless/bcm43xx-d80211/bcm43xx_ethtool.c | 50 +++++++
.../net/wireless/bcm43xx-d80211/bcm43xx_ethtool.h | 8 +
drivers/net/wireless/bcm43xx-d80211/bcm43xx_main.c | 156 +++++++++++---------
drivers/net/wireless/bcm43xx-d80211/bcm43xx_phy.c | 6 -
11 files changed, 196 insertions(+), 197 deletions(-)
--
Greetings Michael.
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply
* Please pull softmac-upsteam of bcm43xx driver
From: Michael Buesch @ 2006-02-03 19:49 UTC (permalink / raw)
To: Linville, John W.
Cc: netdev-u79uwXL29TY76Z2rM5mHXA, bcm43xx-dev-0fE9KPoRgkgATYTw5x5z8w
[-- Attachment #1: Type: text/plain, Size: 1202 bytes --]
Please do a
git pull git://bu3sch.de/wireless-2.6 softmac-upstream
to pull latest bcm43xx updates into softmac-all:
Michael Buesch:
[bcm43xx] add DEBUG Kconfig option. Also fix indention.
[bcm43xx] Fix makefile. Remove all the "out-of-tree" stuff.
[bcm43xx] Add more initvals sanity checks and error out, if one sanity check fails.
[bcm43xx] Remove function bcm43xx_channel_is_allowed(). Geographical restriction should become part of the 80211 stack, so every driver does not have to duplicate it.
[bcm43xx] [patch] basic ethtool support
[bcm43xx] Wireless Ext update:
drivers/net/wireless/Kconfig | 19 +-
drivers/net/wireless/bcm43xx/Makefile | 88 ---------
drivers/net/wireless/bcm43xx/bcm43xx.h | 6 -
drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c | 8 -
drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c | 50 +++++
drivers/net/wireless/bcm43xx/bcm43xx_ethtool.h | 8 +
drivers/net/wireless/bcm43xx/bcm43xx_main.c | 241 +++++-------------------
drivers/net/wireless/bcm43xx/bcm43xx_wx.c | 12 +
8 files changed, 144 insertions(+), 288 deletions(-)
--
Greetings Michael.
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply
* Re: [patch 3/4] net: Percpufy frequently used variables -- proto.sockets_allocated
From: Ravikiran G Thirumalai @ 2006-02-03 19:37 UTC (permalink / raw)
To: Andrew Morton; +Cc: dada1, davem, linux-kernel, shai, netdev, pravins, bcrl
In-Reply-To: <20060202191600.3bf3a64a.akpm@osdl.org>
On Thu, Feb 02, 2006 at 07:16:00PM -0800, Andrew Morton wrote:
> Ravikiran G Thirumalai <kiran@scalex86.org> wrote:
> >
> > On Fri, Jan 27, 2006 at 03:01:06PM -0800, Andrew Morton wrote:
> > Here's an implementation which delegates tuning of batching to the user. We
> > don't really need local_t at all as percpu_counter_mod is not safe against
> > interrupts and softirqs as it is. If we have a counter which could be
> > modified in process context and irq/bh context, we just have to use a
> > wrapper like percpu_counter_mod_bh which will just disable and enable bottom
> > halves. Reads on the counters are safe as they are atomic_reads, and the
> > cpu local variables are always accessed by that cpu only.
> >
> > (PS: the maxerr for ext2/ext3 is just guesstimate)
>
> Well that's the problem. We need to choose production-quality values for
> use in there.
The guesstimate was loosely based on keeping the per-cpu batch at atleast 8
on reasonably sized systems, while not letting maxerr grow too big. I guess
machines with cpu counts more than 128 don't use ext3 :). And if they do,
they can tune the counters with a higher maxerr. I guess it might be a bit
ugly on the user side with all the if num_possibl_cpus(), but is there a
better alternative?
(I plan to test the counter values for ext2 and ext3 on a 16 way box, and
change these if they turn out to be not so good)
>
> > Comments?
>
> Using num_possible_cpus() in that header file is just asking for build
> errors. Probably best to uninline the function rather than adding the
> needed include of cpumask.h.
Yup,
Here it is.
Change the percpu_counter interface so that user can specify the maximum
tolerable deviation.
Signed-off-by: Ravikiran Thirumalai <kiran@scalex86.org>
Index: linux-2.6.16-rc1mm4/include/linux/percpu_counter.h
===================================================================
--- linux-2.6.16-rc1mm4.orig/include/linux/percpu_counter.h 2006-02-02 11:18:54.000000000 -0800
+++ linux-2.6.16-rc1mm4/include/linux/percpu_counter.h 2006-02-03 11:04:05.000000000 -0800
@@ -16,24 +16,20 @@
struct percpu_counter {
atomic_long_t count;
+ int percpu_batch;
long *counters;
};
-#if NR_CPUS >= 16
-#define FBC_BATCH (NR_CPUS*2)
-#else
-#define FBC_BATCH (NR_CPUS*4)
-#endif
-
-static inline void percpu_counter_init(struct percpu_counter *fbc)
-{
- atomic_long_set(&fbc->count, 0);
- fbc->counters = alloc_percpu(long);
-}
+/*
+ * Choose maxerr carefully. maxerr/num_possible_cpus indicates per-cpu
+ * batching. Set maximum tolerance for better performance on large systems.
+ */
+void percpu_counter_init(struct percpu_counter *fbc, unsigned int maxerr);
static inline void percpu_counter_destroy(struct percpu_counter *fbc)
{
- free_percpu(fbc->counters);
+ if (fbc->percpu_batch)
+ free_percpu(fbc->counters);
}
void percpu_counter_mod(struct percpu_counter *fbc, long amount);
@@ -63,7 +59,8 @@ struct percpu_counter {
long count;
};
-static inline void percpu_counter_init(struct percpu_counter *fbc)
+static inline void percpu_counter_init(struct percpu_counter *fbc,
+ unsigned int maxerr)
{
fbc->count = 0;
}
Index: linux-2.6.16-rc1mm4/mm/swap.c
===================================================================
--- linux-2.6.16-rc1mm4.orig/mm/swap.c 2006-01-29 20:20:20.000000000 -0800
+++ linux-2.6.16-rc1mm4/mm/swap.c 2006-02-03 11:02:05.000000000 -0800
@@ -468,15 +468,39 @@ static int cpu_swap_callback(struct noti
#endif /* CONFIG_SMP */
#ifdef CONFIG_SMP
+
+/*
+ * Choose maxerr carefully. maxerr/num_possible_cpus indicates per-cpu
+ * batching. Set maximum tolerance for better performance on large systems.
+ */
+void percpu_counter_init(struct percpu_counter *fbc, unsigned int maxerr)
+{
+ atomic_long_set(&fbc->count, 0);
+ fbc->percpu_batch = maxerr/num_possible_cpus();
+ if (fbc->percpu_batch) {
+ fbc->counters = alloc_percpu(long);
+ if (!fbc->counters)
+ fbc->percpu_batch = 0;
+ }
+
+}
+
void percpu_counter_mod(struct percpu_counter *fbc, long amount)
{
- long count;
long *pcount;
- int cpu = get_cpu();
+ long count;
+ int cpu;
+ /* Slow mode */
+ if (unlikely(!fbc->percpu_batch)) {
+ atomic_long_add(amount, &fbc->count);
+ return;
+ }
+
+ cpu = get_cpu();
pcount = per_cpu_ptr(fbc->counters, cpu);
count = *pcount + amount;
- if (count >= FBC_BATCH || count <= -FBC_BATCH) {
+ if (count >= fbc->percpu_batch || count <= -fbc->percpu_batch) {
atomic_long_add(count, &fbc->count);
count = 0;
}
@@ -484,6 +508,7 @@ void percpu_counter_mod(struct percpu_co
put_cpu();
}
EXPORT_SYMBOL(percpu_counter_mod);
+EXPORT_SYMBOL(percpu_counter_init);
#endif
/*
Index: linux-2.6.16-rc1mm4/fs/ext2/super.c
===================================================================
--- linux-2.6.16-rc1mm4.orig/fs/ext2/super.c 2006-02-03 11:03:54.000000000 -0800
+++ linux-2.6.16-rc1mm4/fs/ext2/super.c 2006-02-03 11:04:10.000000000 -0800
@@ -610,6 +610,7 @@ static int ext2_fill_super(struct super_
int db_count;
int i, j;
__le32 features;
+ int maxerr;
sbi = kmalloc(sizeof(*sbi), GFP_KERNEL);
if (!sbi)
@@ -835,9 +836,14 @@ static int ext2_fill_super(struct super_
printk ("EXT2-fs: not enough memory\n");
goto failed_mount;
}
- percpu_counter_init(&sbi->s_freeblocks_counter);
- percpu_counter_init(&sbi->s_freeinodes_counter);
- percpu_counter_init(&sbi->s_dirs_counter);
+
+ if (num_possible_cpus() <= 16 )
+ maxerr = 256;
+ else
+ maxerr = 1024;
+ percpu_counter_init(&sbi->s_freeblocks_counter, maxerr);
+ percpu_counter_init(&sbi->s_freeinodes_counter, maxerr);
+ percpu_counter_init(&sbi->s_dirs_counter, maxerr);
bgl_lock_init(&sbi->s_blockgroup_lock);
sbi->s_debts = kmalloc(sbi->s_groups_count * sizeof(*sbi->s_debts),
GFP_KERNEL);
Index: linux-2.6.16-rc1mm4/fs/ext3/super.c
===================================================================
--- linux-2.6.16-rc1mm4.orig/fs/ext3/super.c 2006-02-03 11:03:54.000000000 -0800
+++ linux-2.6.16-rc1mm4/fs/ext3/super.c 2006-02-03 11:04:10.000000000 -0800
@@ -1353,6 +1353,7 @@ static int ext3_fill_super (struct super
int i;
int needs_recovery;
__le32 features;
+ int maxerr;
sbi = kmalloc(sizeof(*sbi), GFP_KERNEL);
if (!sbi)
@@ -1578,9 +1579,14 @@ static int ext3_fill_super (struct super
goto failed_mount;
}
- percpu_counter_init(&sbi->s_freeblocks_counter);
- percpu_counter_init(&sbi->s_freeinodes_counter);
- percpu_counter_init(&sbi->s_dirs_counter);
+ if (num_possible_cpus() <= 16)
+ maxerr = 256;
+ else
+ maxerr = 1024;
+
+ percpu_counter_init(&sbi->s_freeblocks_counter, maxerr);
+ percpu_counter_init(&sbi->s_freeinodes_counter, maxerr);
+ percpu_counter_init(&sbi->s_dirs_counter, maxerr);
bgl_lock_init(&sbi->s_blockgroup_lock);
for (i = 0; i < db_count; i++) {
^ permalink raw reply
* Re: Linux 2.6.15.2
From: Andrew Morton @ 2006-02-03 19:14 UTC (permalink / raw)
To: Holger Eitzenberger; +Cc: gregkh, linux-kernel, stable, torvalds, netdev
In-Reply-To: <20060203120925.GA4393@kruemel.my-eitzenberger.de>
Holger Eitzenberger <holger@my-eitzenberger.de> wrote:
>
> On Mon, Jan 30, 2006 at 11:34:27PM -0800, Andrew Morton wrote:
>
> > - A skbuff_head_cache leak causes oom-killings.
> >
> > All of these only seem to affect a small minority of machines.
>
> Hi,
>
> I have searched for a description for the above mentioned bug report,
> but havent found any. Can you tell me?
http://www.mail-archive.com/netdev@vger.kernel.org/msg06355.html
> The reason why I am asking that I am facing a similar problem on
> kernel 2.6.10. During performance tests (Intel XEON, SMP, PCI-X,
> e1000, 2 - 4 Gig RAM) the machine was out of memory.
>
> Tests showed that LowFree went linearly down to a few megabytes, where
> most of the memory was used in skb_head_cache and size-1024 slab
> caches. These two summed up to ~270 MG, which was the reason for
> that.
>
> /proc/net/tcp showed that most of the memory was stuck in the RX
> queues of some processes (two processes with ~1000 sockets each).
>
> A look into /proc/sys/net/ipv4/tcp_mem showed that that the values in
> there were way to high. I hope that a reduction of these values will
> help (not done yet).
>
Sounds different. Please test a more recent kernel and if the problem is
still there, send a report to linux-kernel and cc netdev@vger.kernel.org.
Include the contents of /proc/meminfo and /proc/slabinfo. Thanks.
^ permalink raw reply
* Re: FW: Performance evaluation of high speed TCPs
From: Douglas Leith @ 2006-02-03 14:06 UTC (permalink / raw)
To: rhee; +Cc: netdev, end2end-interest
In-Reply-To: <48677.60.44.142.168.1138935007.squirrel@webmail.ncsu.edu>
[-- Attachment #1: Type: text/plain, Size: 1262 bytes --]
Injong,
>In fact, i contacted your student "Baruch" one month and half before we posted our
report -- it was CCed in the netdev mailing list as well and we gave him login and
passwd on our result website (at that time we were just about to write the report)
and we have not heard from your guys until just one week ago. At least we did try to
make sure we are running a buggy version.
We have no record of receiving such an email. Just a mix-up I guess.
Doug
>>Seriously, we can't run the tests for every fix and bug report.
>
> Perhaps best to view it as returning a favour. You may recall that we
> re-ran all our own experimental tests last year (all data and code
> available online at www.hamilton.ie/net/eval/) on discovering a previously
> unreported bug introduced by the linux folks when implementing bic.
> Something similar has happened with importing htcp into linux.
>
> Seriously, where's the value in comparing buggy implementations - isn't
> that just a waste of all our time ? If we are genuine about wanting to
> understand tcp performance then I think we just have to take the hit from
> issues such as this that are outside all of our control.
>
> Doug
>
> Hamilton Institute
> www.hamilton.ie
>
[-- Attachment #2: Type: text/html, Size: 1885 bytes --]
^ permalink raw reply
* Re: [PATCH] acx: make firmware statistics parsing more intelligent
From: Andreas Mohr @ 2006-02-03 13:56 UTC (permalink / raw)
To: acx100-devel; +Cc: netdev
In-Reply-To: <200602031528.29945.vda@ilport.com.ua>
Hi,
On Fri, Feb 03, 2006 at 03:28:29PM +0200, Denis Vlasenko wrote:
> On Friday 03 February 2006 14:39, Denis Vlasenko wrote:
> > Well, gcc obviously failed to realize that "% 16" == "& 15".
> > I'll file a bug.
>
> -ENOTABUG. It's incorrect for signed integers,
> and gcc uses idiv insn instead.
...which is one of the performance reasons why it may be a good idea
to use unsigned ints wherever signedness isn't required (unsigned int
is said to be faster sometimes, on many platforms).
Andreas Mohr
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
^ permalink raw reply
* Re: [PATCH] acx: make firmware statistics parsing more intelligent
From: Denis Vlasenko @ 2006-02-03 13:28 UTC (permalink / raw)
To: acx100-devel; +Cc: Andreas Mohr, netdev
In-Reply-To: <200602031439.14467.vda@ilport.com.ua>
On Friday 03 February 2006 14:39, Denis Vlasenko wrote:
> Well, gcc obviously failed to realize that "% 16" == "& 15".
> I'll file a bug.
-ENOTABUG. It's incorrect for signed integers,
and gcc uses idiv insn instead.
--
vda
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
^ permalink raw reply
* Re: [PATCH] acx: make firmware statistics parsing more intelligent
From: Denis Vlasenko @ 2006-02-03 12:39 UTC (permalink / raw)
To: acx100-devel; +Cc: Andreas Mohr, netdev
In-Reply-To: <20060203105857.GB11173@rhlx01.fht-esslingen.de>
On Friday 03 February 2006 12:58, Andreas Mohr wrote:
> - adev->tx_head = (head + 1) % TX_CNT;
> + /* slower: adev->tx_head = (head + 1) % TX_CNT; */
> + adev->tx_head = head + 1;
> + if (adev->tx_head >= TX_CNT)
> + adev->tx_head = 0;
struct a {
int tx_head;
};
#define TX_CNT 16
void f(struct a *adev, int head) {
adev->tx_head = (head + 1) % TX_CNT;
}
void g(struct a *adev, int head) {
adev->tx_head = head + 1;
if (adev->tx_head >= TX_CNT)
adev->tx_head = 0;
}
gcc -Os -S t.c -fomit-frame-pointer -falign-functions=1 -falign-labels=1 -falign-loops=1 -falign-jumps=1 -mtune=i386 -march=i386
produces:
f:
movl 8(%esp), %eax
incl %eax
movl $16, %edx
movl %edx, %ecx
cltd
idivl %ecx
movl 4(%esp), %eax
movl %edx, (%eax)
ret
.size f, .-f
.globl g
.type g, @function
g:
movl 4(%esp), %edx
movl 8(%esp), %eax
incl %eax
movl %eax, (%edx)
cmpl $15, %eax
jle .L6
movl $0, (%edx)
.L6:
ret
.size g, .-g
.ident "GCC: (GNU) 4.0.0"
Well, gcc obviously failed to realize that "% 16" == "& 15".
I'll file a bug. Meanwhile, with & 15 f() is better:
f:
movl 8(%esp), %eax
incl %eax
andl $15, %eax
movl 4(%esp), %edx
movl %eax, (%edx)
ret
.size f, .-f
.globl g
.type g, @function
g:
movl 4(%esp), %edx
movl 8(%esp), %eax
incl %eax
movl %eax, (%edx)
cmpl $15, %eax
jle .L6
movl $0, (%edx)
.L6:
ret
.size g, .-g
.ident "GCC: (GNU) 4.0.0"
--
vda
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid\x103432&bid#0486&dat\x121642
^ permalink raw reply
* [PATCH] acxsm: merge from acx 0.3.32
From: Denis Vlasenko @ 2006-02-03 12:14 UTC (permalink / raw)
To: John W. Linville; +Cc: netdev, acx100-devel
[-- Attachment #1: Type: text/plain, Size: 298 bytes --]
Standalone acx driver had several fixes since
acxsm fork, this patch merges them:
- initial support for new TNETW1450 USB chip
- support for firmware 2.3.1.31
Also we had one report that acxsm is actually working.
That's quite unexpected.
Signed-off-by: Denis Vlasenko <vda@ilport.com.ua>
--
vda
[-- Attachment #2: acx.diff --]
[-- Type: text/x-diff, Size: 60797 bytes --]
diff -urpN wireless-2.6.git/drivers/net/wireless/tiacx/Changelog wireless-2.6.git.acx/drivers/net/wireless/tiacx/Changelog
--- wireless-2.6.git/drivers/net/wireless/tiacx/Changelog Thu Feb 2 17:17:50 2006
+++ wireless-2.6.git.acx/drivers/net/wireless/tiacx/Changelog Fri Feb 3 13:38:12 2006
@@ -70,6 +70,12 @@ TODO: from Efthym <efthym@gmx.net>:
13:13:32 wlan0: tx error 0x20, buf 05!
13:13:32 wlan0: tx error 0x20, buf 06!
+[20060203] 0.4.3
+* merge from acx 0.3.32
+
+[20060123] 0.4.2
+* conv.c removed
+
[20060117] 0.4.1
* Lots of code commented out
diff -urpN wireless-2.6.git/drivers/net/wireless/tiacx/acx_config.h wireless-2.6.git.acx/drivers/net/wireless/tiacx/acx_config.h
--- wireless-2.6.git/drivers/net/wireless/tiacx/acx_config.h Thu Feb 2 17:17:50 2006
+++ wireless-2.6.git.acx/drivers/net/wireless/tiacx/acx_config.h Fri Feb 3 13:38:12 2006
@@ -1,10 +1,10 @@
-#define ACX_RELEASE "v0.4.2"
+#define ACX_RELEASE "v0.4.3"
/* set to 0 if you don't want any debugging code to be compiled in */
/* set to 1 if you want some debugging */
/* set to 2 if you want extensive debug log */
#define ACX_DEBUG 2
-#define ACX_DEFAULT_MSG 0
+#define ACX_DEFAULT_MSG (L_ASSOC|L_INIT)
/* assume 32bit I/O width
* (16bit is also compatible with Compact Flash) */
diff -urpN wireless-2.6.git/drivers/net/wireless/tiacx/acx_func.h wireless-2.6.git.acx/drivers/net/wireless/tiacx/acx_func.h
--- wireless-2.6.git/drivers/net/wireless/tiacx/acx_func.h Thu Feb 2 17:17:50 2006
+++ wireless-2.6.git.acx/drivers/net/wireless/tiacx/acx_func.h Fri Feb 3 13:38:12 2006
@@ -565,14 +565,7 @@ acx_l_tx_data(acx_device_t *adev, tx_t *
static inline wlan_hdr_t*
acx_get_wlan_hdr(acx_device_t *adev, const rxbuffer_t *rxbuf)
{
- if (!(adev->rx_config_1 & RX_CFG1_INCLUDE_PHY_HDR))
- return (wlan_hdr_t*)&rxbuf->hdr_a3;
-
- /* take into account phy header in front of packet */
- if (IS_ACX111(adev))
- return (wlan_hdr_t*)((u8*)&rxbuf->hdr_a3 + 8);
-
- return (wlan_hdr_t*)((u8*)&rxbuf->hdr_a3 + 4);
+ return (wlan_hdr_t*)((u8*)&rxbuf->hdr_a3 + adev->phy_header_len);
}
void acxpci_l_power_led(acx_device_t *adev, int enable);
diff -urpN wireless-2.6.git/drivers/net/wireless/tiacx/acx_struct.h wireless-2.6.git.acx/drivers/net/wireless/tiacx/acx_struct.h
--- wireless-2.6.git/drivers/net/wireless/tiacx/acx_struct.h Thu Feb 2 17:17:50 2006
+++ wireless-2.6.git.acx/drivers/net/wireless/tiacx/acx_struct.h Fri Feb 3 13:38:12 2006
@@ -105,6 +105,10 @@ enum { acx_debug = 0 };
#define DEVTYPE_PCI 0
#define DEVTYPE_USB 1
+#if !defined(CONFIG_ACX_PCI) && !defined(CONFIG_ACX_USB)
+#error Driver must include PCI and/or USB support. You selected neither.
+#endif
+
#if defined(CONFIG_ACX_PCI)
#if !defined(CONFIG_ACX_USB)
#define IS_PCI(adev) 1
@@ -148,6 +152,7 @@ enum { acx_debug = 0 };
#define RADIO_UNKNOWN_17 0x17
/* FwRad19.bin was found in a Safecom driver; must be an ACX111 radio: */
#define RADIO_UNKNOWN_19 0x19
+#define RADIO_UNKNOWN_1B 0x1b /* radio in SafeCom SWLUT-54125 USB adapter; entirely unknown!! */
/* Controller Commands */
/* can be found in table cmdTable in firmware "Rev. 1.5.0" (FW150) */
@@ -174,13 +179,18 @@ enum { acx_debug = 0 };
#define ACX1xx_CMD_WAKE 0x10
#define ACX1xx_CMD_UNKNOWN_11 0x11 /* mapped to unknownCMD in FW150 */
#define ACX100_CMD_INIT_MEMORY 0x12
+#define ACX1FF_CMD_DISABLE_RADIO 0x12 /* new firmware? TNETW1450? */
#define ACX1xx_CMD_CONFIG_BEACON 0x13
#define ACX1xx_CMD_CONFIG_PROBE_RESPONSE 0x14
#define ACX1xx_CMD_CONFIG_NULL_DATA 0x15
#define ACX1xx_CMD_CONFIG_PROBE_REQUEST 0x16
-#define ACX1xx_CMD_TEST 0x17
+#define ACX1xx_CMD_FCC_TEST 0x17
#define ACX1xx_CMD_RADIOINIT 0x18
#define ACX111_CMD_RADIOCALIB 0x19
+#define ACX1FF_CMD_NOISE_HISTOGRAM 0x1c /* new firmware? TNETW1450? */
+#define ACX1FF_CMD_RX_RESET 0x1d /* new firmware? TNETW1450? */
+#define ACX1FF_CMD_LNA_CONTROL 0x20 /* new firmware? TNETW1450? */
+#define ACX1FF_CMD_CONTROL_DBG_TRACE 0x21 /* new firmware? TNETW1450? */
/* 'After Interrupt' Commands */
#define ACX_AFTER_IRQ_CMD_STOP_SCAN 0x01
@@ -229,18 +239,22 @@ enum { acx_debug = 0 };
/* these are handled by real_cfgtable in firmware "Rev 1.5.0" (FW150) */
DEF_IE(1xx_IE_UNKNOWN_00 ,0x0000, -1); /* mapped to cfgInvalid in FW150 */
DEF_IE(100_IE_ACX_TIMER ,0x0001, 0x10);
-DEF_IE(1xx_IE_POWER_MGMT ,0x0002, 0x06);
+DEF_IE(1xx_IE_POWER_MGMT ,0x0002, 0x06); /* TNETW1450: length 0x18!! */
DEF_IE(1xx_IE_QUEUE_CONFIG ,0x0003, 0x1c);
DEF_IE(100_IE_BLOCK_SIZE ,0x0004, 0x02);
+DEF_IE(1FF_IE_SLOT_TIME ,0x0004, 0x08); /* later firmware versions only? */
DEF_IE(1xx_IE_MEMORY_CONFIG_OPTIONS ,0x0005, 0x14);
-DEF_IE(1xx_IE_RATE_FALLBACK ,0x0006, 0x01);
+DEF_IE(1FF_IE_QUEUE_HEAD ,0x0005, 0x14 /* FIXME: length? */);
+DEF_IE(1xx_IE_RATE_FALLBACK ,0x0006, 0x01); /* TNETW1450: length 2 */
DEF_IE(100_IE_WEP_OPTIONS ,0x0007, 0x03);
DEF_IE(111_IE_RADIO_BAND ,0x0007, -1);
-DEF_IE(1xx_IE_MEMORY_MAP ,0x0008, 0x28); /* huh? */
+DEF_IE(1FF_IE_TIMING_CFG ,0x0007, -1); /* later firmware versions; TNETW1450 only? */
DEF_IE(100_IE_SSID ,0x0008, 0x20); /* huh? */
+DEF_IE(1xx_IE_MEMORY_MAP ,0x0008, 0x28); /* huh? TNETW1450 has length 0x40!! */
DEF_IE(1xx_IE_SCAN_STATUS ,0x0009, 0x04); /* mapped to cfgInvalid in FW150 */
DEF_IE(1xx_IE_ASSOC_ID ,0x000a, 0x02);
DEF_IE(1xx_IE_UNKNOWN_0B ,0x000b, -1); /* mapped to cfgInvalid in FW150 */
+DEF_IE(1FF_IE_TX_POWER_LEVEL_TABLE ,0x000b, 0x18); /* later firmware versions; TNETW1450 only? */
DEF_IE(100_IE_UNKNOWN_0C ,0x000c, -1); /* very small implementation in FW150! */
/* ACX100 has an equivalent struct in the cmd mailbox directly after reset.
* 0x14c seems extremely large, will trash stack on failure (memset!)
@@ -253,30 +267,47 @@ DEF_IE(1xx_IE_RXCONFIG ,0x0010, 0x04);
DEF_IE(100_IE_UNKNOWN_11 ,0x0011, -1); /* NONBINARY: large implementation in FW150! link quality readings or so? */
DEF_IE(111_IE_QUEUE_THRESH ,0x0011, -1);
DEF_IE(100_IE_UNKNOWN_12 ,0x0012, -1); /* NONBINARY: VERY large implementation in FW150!! */
-DEF_IE(111_IE_BSS_POWER_SAVE ,0x0012, -1);
-DEF_IE(1xx_IE_FIRMWARE_STATISTICS ,0x0013, 0x9c);
+DEF_IE(111_IE_BSS_POWER_SAVE ,0x0012, /* -1 */ 2);
+DEF_IE(1xx_IE_FIRMWARE_STATISTICS ,0x0013, 0x9c); /* TNETW1450: length 0x134!! */
+DEF_IE(1FF_IE_RX_INTR_CONFIG ,0x0014, 0x14); /* later firmware versions, TNETW1450 only? */
DEF_IE(1xx_IE_FEATURE_CONFIG ,0x0015, 0x08);
DEF_IE(111_IE_KEY_CHOOSE ,0x0016, 0x04); /* for rekeying. really len=4?? */
+DEF_IE(1FF_IE_MISC_CONFIG_TABLE ,0x0017, 0x04); /* later firmware versions, TNETW1450 only? */
+DEF_IE(1FF_IE_WONE_CONFIG ,0x0018, -1); /* later firmware versions, TNETW1450 only? */
+DEF_IE(1FF_IE_TID_CONFIG ,0x001a, 0x2c); /* later firmware versions, TNETW1450 only? */
+DEF_IE(1FF_IE_CALIB_ASSESSMENT ,0x001e, 0x04); /* later firmware versions, TNETW1450 only? */
+DEF_IE(1FF_IE_BEACON_FILTER_OPTIONS ,0x001f, 0x02); /* later firmware versions, TNETW1450 only? */
+DEF_IE(1FF_IE_LOW_RSSI_THRESH_OPT ,0x0020, 0x04); /* later firmware versions, TNETW1450 only? */
+DEF_IE(1FF_IE_NOISE_HISTOGRAM_RESULTS ,0x0021, 0x30); /* later firmware versions, TNETW1450 only? */
+DEF_IE(1FF_IE_PACKET_DETECT_THRESH ,0x0023, 0x04); /* later firmware versions, TNETW1450 only? */
+DEF_IE(1FF_IE_TX_CONFIG_OPTIONS ,0x0024, 0x04); /* later firmware versions, TNETW1450 only? */
+DEF_IE(1FF_IE_CCA_THRESHOLD ,0x0025, 0x02); /* later firmware versions, TNETW1450 only? */
+DEF_IE(1FF_IE_EVENT_MASK ,0x0026, 0x08); /* later firmware versions, TNETW1450 only? */
+DEF_IE(1FF_IE_DTIM_PERIOD ,0x0027, 0x02); /* later firmware versions, TNETW1450 only? */
+DEF_IE(1FF_IE_ACI_CONFIG_SET ,0x0029, 0x06); /* later firmware versions; maybe TNETW1450 only? */
+DEF_IE(1FF_IE_EEPROM_VER ,0x0030, 0x04); /* later firmware versions; maybe TNETW1450 only? */
DEF_IE(1xx_IE_DOT11_STATION_ID ,0x1001, 0x06);
DEF_IE(100_IE_DOT11_UNKNOWN_1002 ,0x1002, -1); /* mapped to cfgInvalid in FW150 */
-DEF_IE(111_IE_DOT11_FRAG_THRESH ,0x1002, -1); /* mapped to cfgInvalid in FW150 */
+DEF_IE(111_IE_DOT11_FRAG_THRESH ,0x1002, -1); /* mapped to cfgInvalid in FW150; TNETW1450 has length 2!! */
DEF_IE(100_IE_DOT11_BEACON_PERIOD ,0x1003, 0x02); /* mapped to cfgInvalid in FW150 */
DEF_IE(1xx_IE_DOT11_DTIM_PERIOD ,0x1004, -1); /* mapped to cfgInvalid in FW150 */
-DEF_IE(1xx_IE_DOT11_SHORT_RETRY_LIMIT ,0x1005, 0x01);
-DEF_IE(1xx_IE_DOT11_LONG_RETRY_LIMIT ,0x1006, 0x01);
-DEF_IE(100_IE_DOT11_WEP_DEFAULT_KEY_WRITE ,0x1007, 0x20); /* configure default keys */
+DEF_IE(1FF_IE_DOT11_MAX_RX_LIFETIME ,0x1004, -1); /* later firmware versions; maybe TNETW1450 only? */
+DEF_IE(1xx_IE_DOT11_SHORT_RETRY_LIMIT ,0x1005, 0x01); /* TNETW1450: length 2 */
+DEF_IE(1xx_IE_DOT11_LONG_RETRY_LIMIT ,0x1006, 0x01); /* TNETW1450: length 2 */
+DEF_IE(100_IE_DOT11_WEP_DEFAULT_KEY_WRITE ,0x1007, 0x20); /* configure default keys; TNETW1450 has length 0x24!! */
DEF_IE(1xx_IE_DOT11_MAX_XMIT_MSDU_LIFETIME ,0x1008, 0x04);
DEF_IE(1xx_IE_DOT11_GROUP_ADDR ,0x1009, -1);
DEF_IE(1xx_IE_DOT11_CURRENT_REG_DOMAIN ,0x100a, 0x02);
//It's harmless to have larger struct. Use USB case always.
DEF_IE(1xx_IE_DOT11_CURRENT_ANTENNA ,0x100b, 0x02); /* in fact len=1 for PCI */
DEF_IE(1xx_IE_DOT11_UNKNOWN_100C ,0x100c, -1); /* mapped to cfgInvalid in FW150 */
-DEF_IE(1xx_IE_DOT11_TX_POWER_LEVEL ,0x100d, 0x01);
+DEF_IE(1xx_IE_DOT11_TX_POWER_LEVEL ,0x100d, 0x01); /* TNETW1450 has length 2!! */
DEF_IE(1xx_IE_DOT11_CURRENT_CCA_MODE ,0x100e, 0x02); /* in fact len=1 for PCI */
//USB doesn't return anything - len==0?!
DEF_IE(100_IE_DOT11_ED_THRESHOLD ,0x100f, 0x04);
-DEF_IE(1xx_IE_DOT11_WEP_DEFAULT_KEY_SET ,0x1010, 0x01); /* set default key ID */
+DEF_IE(1xx_IE_DOT11_WEP_DEFAULT_KEY_SET ,0x1010, 0x01); /* set default key ID; TNETW1450: length 2 */
DEF_IE(100_IE_DOT11_UNKNOWN_1011 ,0x1011, -1); /* mapped to cfgInvalid in FW150 */
+DEF_IE(1FF_IE_DOT11_CURR_5GHZ_REGDOM ,0x1011, -1); /* later firmware versions; maybe TNETW1450 only? */
DEF_IE(100_IE_DOT11_UNKNOWN_1012 ,0x1012, -1); /* mapped to cfgInvalid in FW150 */
DEF_IE(100_IE_DOT11_UNKNOWN_1013 ,0x1013, -1); /* mapped to cfgInvalid in FW150 */
@@ -479,15 +510,15 @@ typedef struct phy_hdr {
* Some seem to have different meanings... */
#define RXBUF_HDRSIZE 12
-#define PHY_HDR(rxbuf) ((phy_hdr_t*)&rxbuf->hdr_a3)
-#define RXBUF_BYTES_RCVD(rxbuf) (le16_to_cpu(rxbuf->mac_cnt_rcvd) & 0xfff)
+#define RXBUF_BYTES_RCVD(adev, rxbuf) \
+ ((le16_to_cpu((rxbuf)->mac_cnt_rcvd) & 0xfff) - (adev)->phy_header_len)
#define RXBUF_BYTES_USED(rxbuf) \
- ((le16_to_cpu(rxbuf->mac_cnt_rcvd) & 0xfff) + RXBUF_HDRSIZE)
+ ((le16_to_cpu((rxbuf)->mac_cnt_rcvd) & 0xfff) + RXBUF_HDRSIZE)
/* USBism */
-#define RXBUF_IS_TXSTAT(rxbuf) (le16_to_cpu(rxbuf->mac_cnt_rcvd) & 0x8000)
+#define RXBUF_IS_TXSTAT(rxbuf) (le16_to_cpu((rxbuf)->mac_cnt_rcvd) & 0x8000)
/*
mac_cnt_rcvd:
- 12 bits: length of frame from control field to last byte of FCS
+ 12 bits: length of frame from control field to first byte of FCS
3 bits: reserved
1 bit: 1 = it's a tx status info, not a rx packet (USB only)
@@ -603,31 +634,6 @@ typedef struct fw_ver {
#define FW_ID_SIZE 20
-
-/*--- WEP stuff --------------------------------------------------------------*/
-#define DOT11_MAX_DEFAULT_WEP_KEYS 4
-
-/* non-firmware struct, no packing necessary */
-typedef struct wep_key {
- size_t size; /* most often used member first */
- u8 index;
- u8 key[29];
- u16 strange_filler;
-} wep_key_t; /* size = 264 bytes (33*8) */
-/* FIXME: We don't have size 264! Or is there 2 bytes beyond the key
- * (strange_filler)? */
-
-/* non-firmware struct, no packing necessary */
-typedef struct key_struct {
- u8 addr[ETH_ALEN]; /* 0x00 */
- u16 filler1; /* 0x06 */
- u32 filler2; /* 0x08 */
- u32 index; /* 0x0c */
- u16 len; /* 0x10 */
- u8 key[29]; /* 0x12; is this long enough??? */
-} key_struct_t; /* size = 276. FIXME: where is the remaining space?? */
-
-
/*--- Client (peer) info -----------------------------------------------------*/
/* adev->sta_list[] is used for:
** accumulating and processing of scan results
@@ -1108,6 +1114,9 @@ struct acx_device {
/* most frequent accesses first (dereferencing and cache line!) */
/*** Locking ***/
+ /* FIXME: try to convert semaphore to more efficient mutex according
+ to Ingo Molnar's docs (but not before driver is in mainline or
+ pre-mutex Linux 2.6.10 is very outdated). */
struct semaphore sem;
spinlock_t lock;
#if defined(PARANOID_LOCKING) /* Lock debugging */
@@ -1286,14 +1295,6 @@ struct acx_device {
u8 rate_supported_len;
u8 rate_supported[13];
- /*** Encryption settings (WEP) ***/
- u32 auth_alg; /* used in transmit_authen1 */
- u8 wep_enabled;
- u8 wep_restricted;
- u8 wep_current_index;
- wep_key_t wep_keys[DOT11_MAX_DEFAULT_WEP_KEYS]; /* the default WEP keys */
- key_struct_t wep_key_struct[10];
-
/*** Unknown ***/
u8 dtim_interval;
@@ -1303,6 +1304,7 @@ struct acx_device {
u16 memblocksize;
unsigned int tx_free;
unsigned int tx_head; /* keep as close as possible to Tx stuff below (cache line) */
+ u16 phy_header_len;
/*************************************************************************
*** PCI/USB/... must be last or else hw agnostic code breaks horribly ***
@@ -1380,9 +1382,10 @@ struct acx_device {
static inline acx_device_t*
ndev2adev(struct net_device *ndev)
{
- return ieee80211softmac_priv(ndev);
+ return ieee80211softmac_priv(ndev);
}
+
/* For use with ACX1xx_IE_RXCONFIG */
/* bit description
* 13 include additional header (length etc.) *required*
@@ -1852,7 +1855,7 @@ typedef struct acx_joinbss {
*/
typedef struct mem_read_write {
u16 addr ACX_PACKED;
- u16 type ACX_PACKED; /* 0x0 int. RAM / 0xffff MAC reg. / 0x81 PHY RAM / 0x82 PHY reg. */
+ u16 type ACX_PACKED; /* 0x0 int. RAM / 0xffff MAC reg. / 0x81 PHY RAM / 0x82 PHY reg.; or maybe it's actually 0x30 for MAC? Better verify it by writing and reading back and checking whether the value holds! */
u32 len ACX_PACKED;
u32 data ACX_PACKED;
} mem_read_write_t;
diff -urpN wireless-2.6.git/drivers/net/wireless/tiacx/common.c wireless-2.6.git.acx/drivers/net/wireless/tiacx/common.c
--- wireless-2.6.git/drivers/net/wireless/tiacx/common.c Thu Feb 2 17:17:50 2006
+++ wireless-2.6.git.acx/drivers/net/wireless/tiacx/common.c Fri Feb 3 13:38:12 2006
@@ -631,13 +631,6 @@ acx_s_get_firmware_version(acx_device_t
printk("acx: firmware '%s' is known to be buggy, "
"please upgrade\n", adev->firmware_version);
}
- if (adev->firmware_numver == 0x02030131) {
- /* With this one, all rx packets look mangled
- ** Most probably we simply do not know how to use it
- ** properly */
- printk("acx: firmware '%s' does not work well "
- "with this driver\n", adev->firmware_version);
- }
}
adev->firmware_id = le32_to_cpu(fw.hw_id);
@@ -655,6 +648,9 @@ acx_s_get_firmware_version(acx_device_t
case 0x03010000:
adev->chip_name = "TNETW1130";
break;
+ case 0x04030000: /* 0x04030101 is TNETW1450 */
+ adev->chip_name = "TNETW1450";
+ break;
default:
printk("acx: unknown chip ID 0x%08X, "
"please report\n", adev->firmware_id);
@@ -679,9 +675,6 @@ acx_display_hardware_details(acx_device_
switch (adev->radio_type) {
case RADIO_MAXIM_0D:
- /* hmm, the DWL-650+ seems to have two variants,
- * according to a windows driver changelog comment:
- * RFMD and Maxim. */
radio_str = "Maxim";
break;
case RADIO_RFMD_11:
@@ -701,8 +694,11 @@ acx_display_hardware_details(acx_device_
case RADIO_UNKNOWN_19:
radio_str = "A radio used by Safecom cards?! Please report";
break;
+ case RADIO_UNKNOWN_1B:
+ radio_str = "An unknown radio used by TNETW1450 USB adapters";
+ break;
default:
- radio_str = "UNKNOWN, please report the radio type name!";
+ radio_str = "UNKNOWN, please report radio type name!";
break;
}
@@ -861,6 +857,32 @@ acx100_ie_len[] = {
0,
ACX1xx_IE_FEATURE_CONFIG_LEN,
ACX111_IE_KEY_CHOOSE_LEN,
+ ACX1FF_IE_MISC_CONFIG_TABLE_LEN,
+ ACX1FF_IE_WONE_CONFIG_LEN,
+ 0,
+ ACX1FF_IE_TID_CONFIG_LEN,
+ 0,
+ 0,
+ 0,
+ ACX1FF_IE_CALIB_ASSESSMENT_LEN,
+ ACX1FF_IE_BEACON_FILTER_OPTIONS_LEN,
+ ACX1FF_IE_LOW_RSSI_THRESH_OPT_LEN,
+ ACX1FF_IE_NOISE_HISTOGRAM_RESULTS_LEN,
+ 0,
+ ACX1FF_IE_PACKET_DETECT_THRESH_LEN,
+ ACX1FF_IE_TX_CONFIG_OPTIONS_LEN,
+ ACX1FF_IE_CCA_THRESHOLD_LEN,
+ ACX1FF_IE_EVENT_MASK_LEN,
+ ACX1FF_IE_DTIM_PERIOD_LEN,
+ 0,
+ ACX1FF_IE_ACI_CONFIG_SET_LEN,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ ACX1FF_IE_EEPROM_VER_LEN,
};
static const u16
@@ -912,6 +934,32 @@ acx111_ie_len[] = {
0,
ACX1xx_IE_FEATURE_CONFIG_LEN,
ACX111_IE_KEY_CHOOSE_LEN,
+ ACX1FF_IE_MISC_CONFIG_TABLE_LEN,
+ ACX1FF_IE_WONE_CONFIG_LEN,
+ 0,
+ ACX1FF_IE_TID_CONFIG_LEN,
+ 0,
+ 0,
+ 0,
+ ACX1FF_IE_CALIB_ASSESSMENT_LEN,
+ ACX1FF_IE_BEACON_FILTER_OPTIONS_LEN,
+ ACX1FF_IE_LOW_RSSI_THRESH_OPT_LEN,
+ ACX1FF_IE_NOISE_HISTOGRAM_RESULTS_LEN,
+ 0,
+ ACX1FF_IE_PACKET_DETECT_THRESH_LEN,
+ ACX1FF_IE_TX_CONFIG_OPTIONS_LEN,
+ ACX1FF_IE_CCA_THRESHOLD_LEN,
+ ACX1FF_IE_EVENT_MASK_LEN,
+ ACX1FF_IE_DTIM_PERIOD_LEN,
+ 0,
+ ACX1FF_IE_ACI_CONFIG_SET_LEN,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ ACX1FF_IE_EEPROM_VER_LEN,
};
static const u16
@@ -992,6 +1040,8 @@ acx_s_interrogate_debug(acx_device_t *ad
u16 len;
int res;
+ /* FIXME: no check whether this exceeds the array yet.
+ * We should probably remember the number of entries... */
if (type < 0x1000)
len = adev->ie_len[type];
else
@@ -1137,8 +1187,8 @@ acx_s_proc_diag_output(char *buf, acx_de
"WEP ena %d, restricted %d, idx %d\n",
adev->essid, adev->essid_active, (int)adev->essid_len,
adev->essid_for_assoc, adev->nick,
- adev->wep_enabled, adev->wep_restricted,
- adev->wep_current_index);
+ adev->ieee->sec.enabled, adev->ieee->sec.auth_mode,
+ adev->ieee->sec.active_key);
p += sprintf(p, "dev_addr "MACSTR"\n", MAC(adev->dev_addr));
p += sprintf(p, "bssid "MACSTR"\n", MAC(adev->bssid));
p += sprintf(p, "ap_filter "MACSTR"\n", MAC(adev->ap));
@@ -2087,6 +2137,12 @@ acx_s_initialize_rx_config(acx_device_t
}
adev->rx_config_1 |= RX_CFG1_INCLUDE_RXBUF_HDR;
+ if ((adev->rx_config_1 & RX_CFG1_INCLUDE_PHY_HDR)
+ || (adev->firmware_numver >= 0x02000000))
+ adev->phy_header_len = IS_ACX111(adev) ? 8 : 4;
+ else
+ adev->phy_header_len = 0;
+
log(L_INIT, "setting RXconfig to %04X:%04X\n",
adev->rx_config_1, adev->rx_config_2);
cfg.rx_cfg1 = cpu_to_le16(adev->rx_config_1);
@@ -2105,6 +2161,19 @@ acx_s_set_defaults(acx_device_t *adev)
FN_ENTER;
+ /* do it before getting settings, prevent bogus channel 0 warning */
+ adev->channel = 1;
+
+ /* query some settings from the card.
+ * NOTE: for some settings, e.g. CCA and ED (ACX100!), an initial
+ * query is REQUIRED, otherwise the card won't work correctly! */
+ adev->get_mask = GETSET_ANTENNA|GETSET_SENSITIVITY|GETSET_STATION_ID|GETSET_REG_DOMAIN;
+ /* Only ACX100 supports ED and CCA */
+ if (IS_ACX100(adev))
+ adev->get_mask |= GETSET_CCA|GETSET_ED_THRESH;
+
+ acx_s_update_card_settings(adev);
+
acx_lock(adev, flags);
/* set our global interrupt mask */
@@ -2115,8 +2184,11 @@ acx_s_set_defaults(acx_device_t *adev)
adev->brange_max_quality = 60; /* LED blink max quality is 60 */
adev->brange_time_last_state_change = jiffies;
+ /* copy the MAC address we just got from the card
+ * into our MAC address used during current 802.11 session */
MAC_COPY(adev->dev_addr, adev->ndev->dev_addr);
MAC_BCAST(adev->ap);
+
adev->essid_len =
snprintf(adev->essid, sizeof(adev->essid), "STA%02X%02X%02X",
adev->dev_addr[3], adev->dev_addr[4], adev->dev_addr[5]);
@@ -2131,23 +2203,19 @@ acx_s_set_defaults(acx_device_t *adev)
adev->reg_dom_id = adev->cfgopt_domains.list[0];
}
- adev->channel = 1;
/* 0xffff would be better, but then we won't get a "scan complete"
* interrupt, so our current infrastructure will fail: */
adev->scan_count = 1;
adev->scan_mode = ACX_SCAN_OPT_ACTIVE;
-
adev->scan_duration = 100;
adev->scan_probe_delay = 200;
/* reported to break scanning: adev->scan_probe_delay = adev->cfgopt_probe_delay; */
adev->scan_rate = ACX_SCAN_RATE_1;
- adev->auth_alg = WLAN_AUTH_ALG_OPENSYSTEM;
- adev->preamble_mode = 2; /* auto */
+ adev->mode = ACX_MODE_2_STA;
+ adev->ieee->sec.auth_mode = WLAN_AUTH_OPEN;
adev->listen_interval = 100;
adev->beacon_interval = DEFAULT_BEACON_INTERVAL;
- adev->mode = ACX_MODE_2_STA;
- adev->monitor_type = ARPHRD_IEEE80211_PRISM;
adev->dtim_interval = DEFAULT_DTIM_INTERVAL;
adev->msdu_lifetime = DEFAULT_MSDU_LIFETIME;
@@ -2159,6 +2227,7 @@ acx_s_set_defaults(acx_device_t *adev)
adev->short_retry = 7; /* max. retries for (short) non-RTS packets */
adev->long_retry = 4; /* max. retries for long (RTS) packets */
+ adev->preamble_mode = 2; /* auto */
adev->fallback_threshold = 3;
adev->stepup_threshold = 10;
adev->rate_bcast = RATE111_1;
@@ -2170,9 +2239,12 @@ acx_s_set_defaults(acx_device_t *adev)
} else {
adev->rate_oper = RATE111_ACX100_COMPAT;
}
- /* build 802.11 style ratevector (802.11 7.3.2.2) */
+
+ /* Supported Rates element - the rates here are given in units of
+ * 500 kbit/s, plus 0x80 added. See 802.11-1999.pdf item 7.3.2.2 */
acx_l_update_ratevector(adev);
+ /* set some more defaults */
if (IS_ACX111(adev)) {
/* 30mW (15dBm) is default, at least in my acx111 card: */
adev->tx_level_dbm = 15;
@@ -2183,7 +2255,6 @@ acx_s_set_defaults(acx_device_t *adev)
adev->tx_level_dbm = 18;
}
/* adev->tx_level_auto = 1; */
-
if (IS_ACX111(adev)) {
/* start with sensitivity level 1 out of 3: */
adev->sensitivity = 1;
@@ -2204,31 +2275,24 @@ acx_s_set_defaults(acx_device_t *adev)
adev->ps_enhanced_transition_time = 0;
#endif
+ /* These settings will be set in fw on ifup */
adev->set_mask = 0
- /* better re-init the antenna value we got */
- | GETSET_ANTENNA
- | GETSET_TXPOWER
- | SET_RXCONFIG
- /* configure card to do rate fallback when in auto rate mode. */
| GETSET_RETRY
| SET_MSDU_LIFETIME
+ /* configure card to do rate fallback when in auto rate mode */
| SET_RATE_FALLBACK
+ | SET_RXCONFIG
+ | GETSET_TXPOWER
+ /* better re-init the antenna value we got above */
+ | GETSET_ANTENNA
#if POWER_SAVE_80211
| GETSET_POWER_80211
#endif
;
- /* query some settings from the card.
- * NOTE: for some settings, e.g. CCA and ED (ACX100!), an initial
- * query is REQUIRED, otherwise the card won't work correctly!! */
- adev->get_mask = GETSET_ANTENNA|GETSET_SENSITIVITY|GETSET_STATION_ID|GETSET_REG_DOMAIN;
- /* Only ACX100 supports ED and CCA */
- if (IS_ACX100(adev))
- adev->get_mask |= GETSET_CCA|GETSET_ED_THRESH;
acx_unlock(adev, flags);
acx_lock_unhold(); /* hold time 844814 CPU ticks @2GHz */
- acx_s_update_card_settings(adev);
acx_s_initialize_rx_config(adev);
FN_EXIT0;
@@ -2576,14 +2640,14 @@ void
acx_l_process_rxbuf(acx_device_t *adev, rxbuffer_t *rxbuf)
{
struct wlan_hdr *hdr;
- unsigned int buf_len;
unsigned int qual;
+ int buf_len;
u16 fc;
hdr = acx_get_wlan_hdr(adev, rxbuf);
- /* length of frame from control field to last byte of FCS */
fc = le16_to_cpu(hdr->fc);
- buf_len = RXBUF_BYTES_RCVD(rxbuf);
+ /* length of frame from control field to first byte of FCS */
+ buf_len = RXBUF_BYTES_RCVD(adev, rxbuf);
if ( ((WF_FC_FSTYPE & fc) != WF_FSTYPE_BEACON)
|| (acx_debug & L_XFER_BEACON)
@@ -2739,16 +2803,14 @@ acx_l_softmac_process_rxbuf(acx_device_t
struct ieee80211_rx_stats stats;
struct wlan_hdr *hdr;
struct sk_buff *skb;
- int buf_len;
int skb_len;
- int payload_offset;
u16 fc;
FN_ENTER;
+ skb_len = RXBUF_BYTES_RCVD(adev, rxbuf);
hdr = acx_get_wlan_hdr(adev, rxbuf);
fc = le16_to_cpu(hdr->fc);
- buf_len = RXBUF_BYTES_RCVD(rxbuf);
if ( ((WF_FC_FSTYPE & fc) != WF_FSTYPE_BEACON)
|| (acx_debug & L_XFER_BEACON)
@@ -2758,7 +2820,7 @@ acx_l_softmac_process_rxbuf(acx_device_t
"phystat:%02X phyrate:%u status:%u\n",
acx_get_packet_type_string(fc),
le32_to_cpu(rxbuf->time),
- buf_len,
+ skb_len,
acx_signal_to_winlevel(rxbuf->phy_level),
acx_signal_to_winlevel(rxbuf->phy_snr),
rxbuf->mac_status,
@@ -2768,8 +2830,8 @@ acx_l_softmac_process_rxbuf(acx_device_t
}
if (unlikely(acx_debug & L_DATA)) {
- printk("rx: 802.11 buf[%u]: ", buf_len);
- acx_dump_bytes(hdr, buf_len);
+ printk("rx: 802.11 buf[%u]: ", skb_len);
+ acx_dump_bytes(hdr, skb_len);
}
/* FIXME: should check for Rx errors (rxbuf->mac_status?
@@ -2779,8 +2841,6 @@ acx_l_softmac_process_rxbuf(acx_device_t
/* we are in big luck: the acx100 doesn't modify any of the fields */
/* in the 802.11 frame. just pass this packet into the PF_PACKET */
/* subsystem. yeah. */
- payload_offset = ((u8*)acx_get_wlan_hdr(adev, rxbuf) - (u8*)rxbuf);
- skb_len = RXBUF_BYTES_USED(rxbuf) - payload_offset;
/* sanity check */
if (unlikely(skb_len > WLAN_A4FR_MAXLEN_WEP)) {
@@ -2798,7 +2858,7 @@ acx_l_softmac_process_rxbuf(acx_device_t
}
skb_put(skb, skb_len);
- memcpy(skb->data, ((unsigned char*)rxbuf)+payload_offset, skb_len);
+ memcpy(skb->data, hdr, skb_len);
memset(&stats, 0, sizeof(stats));
stats.mac_time = le16_to_cpu(rxbuf->time);
@@ -3477,7 +3537,7 @@ acx_i_timer(unsigned long address)
case ACX_STATUS_3_AUTHENTICATED:
/* was set to 0 by set_status() */
if (++adev->auth_or_assoc_retries < 10) {
- log(L_ASSOC, "resend assoc request (attempt %d)\n",
+ log(L_ASSOC, "resend assoc request (attempt %d)\n",
adev->auth_or_assoc_retries + 1);
//sm? acx_l_transmit_assoc_req(adev);
} else {
@@ -4061,10 +4121,10 @@ acx_l_process_data_frame_master(acx_devi
/* To_DS = 0, From_DS = 1 */
hdr->fc = WF_FC_FROMDSi + WF_FTYPE_DATAi;
- len = RXBUF_BYTES_RCVD(rxbuf);
txbuf = acx_l_get_txbuf(adev, tx);
if (txbuf) {
- memcpy(txbuf, &rxbuf->hdr_a3, len);
+ len = RXBUF_BYTES_RCVD(adev, rxbuf);
+ memcpy(txbuf, hdr, len);
acx_l_tx_data(adev, tx, len);
} else {
acx_l_dealloc_tx(adev, tx);
@@ -4219,7 +4279,7 @@ acx_l_process_mgmt_frame(acx_device_t *a
return NOT_OK;
}
- len = RXBUF_BYTES_RCVD(rxbuf);
+ len = RXBUF_BYTES_RCVD(adev, rxbuf);
if (WF_FC_ISWEPi & hdr->fc)
len -= 0x10;
@@ -5434,14 +5494,14 @@ acx100_s_set_wepkey(acx_device_t *adev)
ie_dot11WEPDefaultKey_t dk;
int i;
- for (i = 0; i < DOT11_MAX_DEFAULT_WEP_KEYS; i++) {
- if (adev->wep_keys[i].size != 0) {
+ for (i = 0; i < WEP_KEYS; i++) {
+ if (adev->ieee->sec.key_sizes[i] != 0) {
log(L_INIT, "setting WEP key: %d with "
- "total size: %d\n", i, (int) adev->wep_keys[i].size);
+ "total size: %d\n", i, (int) adev->ieee->sec.key_sizes[i]);
dk.action = 1;
- dk.keySize = adev->wep_keys[i].size;
+ dk.keySize = adev->ieee->sec.key_sizes[i];
dk.defaultKeyNum = i;
- memcpy(dk.key, adev->wep_keys[i].key, dk.keySize);
+ memcpy(dk.key, adev->ieee->sec.keys[i], dk.keySize);
acx_s_configure(adev, &dk, ACX100_IE_DOT11_WEP_DEFAULT_KEY_WRITE);
}
}
@@ -5453,20 +5513,20 @@ acx111_s_set_wepkey(acx_device_t *adev)
acx111WEPDefaultKey_t dk;
int i;
- for (i = 0; i < DOT11_MAX_DEFAULT_WEP_KEYS; i++) {
- if (adev->wep_keys[i].size != 0) {
+ for (i = 0; i < WEP_KEYS; i++) {
+ if (adev->ieee->sec.key_sizes[i] != 0) {
log(L_INIT, "setting WEP key: %d with "
- "total size: %d\n", i, (int) adev->wep_keys[i].size);
+ "total size: %d\n", i, (int) adev->ieee->sec.key_sizes[i]);
memset(&dk, 0, sizeof(dk));
dk.action = cpu_to_le16(1); /* "add key"; yes, that's a 16bit value */
- dk.keySize = adev->wep_keys[i].size;
+ dk.keySize = adev->ieee->sec.key_sizes[i];
/* are these two lines necessary? */
dk.type = 0; /* default WEP key */
dk.index = 0; /* ignored when setting default key */
dk.defaultKeyNum = i;
- memcpy(dk.key, adev->wep_keys[i].key, dk.keySize);
+ memcpy(dk.key, adev->ieee->sec.keys[i], dk.keySize);
acx_s_issue_cmd(adev, ACX1xx_CMD_WEP_MGMT, &dk, sizeof(dk));
}
}
@@ -5513,7 +5573,7 @@ acx100_s_init_wep(acx_device_t *adev)
}
/* let's choose maximum setting: 4 default keys, plus 10 other keys: */
- options.NumKeys = cpu_to_le16(DOT11_MAX_DEFAULT_WEP_KEYS + 10);
+ options.NumKeys = cpu_to_le16(WEP_KEYS + 10);
options.WEPOption = 0x00;
log(L_ASSOC, "%s: writing WEP options\n", __func__);
@@ -5521,10 +5581,10 @@ acx100_s_init_wep(acx_device_t *adev)
acx100_s_set_wepkey(adev);
- if (adev->wep_keys[adev->wep_current_index].size != 0) {
+ if (adev->ieee->sec.key_sizes[adev->ieee->sec.active_key] != 0) {
log(L_ASSOC, "setting active default WEP key number: %d\n",
- adev->wep_current_index);
- dk.KeyID = adev->wep_current_index;
+ adev->ieee->sec.active_key);
+ dk.KeyID = adev->ieee->sec.active_key;
acx_s_configure(adev, &dk, ACX1xx_IE_DOT11_WEP_DEFAULT_KEY_SET); /* 0x1010 */
}
/* FIXME!!! wep_key_struct is filled nowhere! But adev
@@ -6580,7 +6640,7 @@ acx_s_update_card_settings(acx_device_t
acx_s_set_wepkey(adev);
- dkey.KeyID = adev->wep_current_index;
+ dkey.KeyID = adev->ieee->sec.active_key;
log(L_INIT, "setting WEP key %u as default\n", dkey.KeyID);
acx_s_configure(adev, &dkey, ACX1xx_IE_DOT11_WEP_DEFAULT_KEY_SET);
#ifdef DEBUG_WEP
@@ -6601,7 +6661,7 @@ acx_s_update_card_settings(acx_device_t
/* let's choose maximum setting: 4 default keys,
* plus 10 other keys: */
- options.NumKeys = cpu_to_le16(DOT11_MAX_DEFAULT_WEP_KEYS + 10);
+ options.NumKeys = cpu_to_le16(WEP_KEYS + 10);
/* don't decrypt default key only,
* don't override decryption: */
options.WEPOption = 0;
@@ -6904,7 +6964,7 @@ acx_update_capabilities(acx_device_t *ad
/* other types of stations do not emit beacons */
}
- if (adev->wep_restricted) {
+ if (adev->ieee->sec.auth_mode == WLAN_AUTH_SHARED_KEY) {
SET_BIT(cap, WF_MGMT_CAP_PRIVACY);
}
if (adev->cfgopt_dot11ShortPreambleOption) {
@@ -7134,10 +7194,74 @@ module_exit(acx_e_cleanup_module)
//SM
void
-acx_e_ieee80211_set_security(struct net_device *dev,
+acx_e_ieee80211_set_security(struct net_device *ndev,
struct ieee80211_security *sec)
{
-//todo
+/* Shamelessly copied from the rt2x00 project. */
+ acx_device_t *adev = ndev2adev(ndev);
+ unsigned long flags;
+ int i;
+
+ acx_sem_lock(adev);
+ acx_lock(adev, flags);
+
+ for (i = 0; i < WEP_KEYS; ++i) {
+ /* This gives us the flag for the 4 WEP keys. */
+ if (sec->flags & (1 << i)) {
+ adev->ieee->sec.encode_alg[i] = sec->encode_alg[i];
+ adev->ieee->sec.key_sizes[i] = sec->key_sizes[i];
+
+ if (sec->key_sizes[i] != 0) {
+ memcpy(adev->ieee->sec.keys[i], sec->keys[i],
+ sec->key_sizes[i]);
+ /* Make sure WEP flag is set. */
+ adev->ieee->sec.flags |= (1 << i);
+ } else if (sec->level != SEC_LEVEL_1)
+ /* Make sure WEP flag isn't set. */
+ adev->ieee->sec.flags &= ~(1 << i);
+ }
+ SET_BIT(adev->set_mask, SET_WEP_OPTIONS);
+ }
+
+ if (sec->flags & SEC_ACTIVE_KEY) {
+ /* Check the key number is valid. */
+ if (sec->active_key < WEP_KEYS) {
+ adev->ieee->sec.active_key = sec->active_key;
+ adev->ieee->sec.flags |= SEC_ACTIVE_KEY;
+ } else
+ adev->ieee->sec.flags &= ~SEC_ACTIVE_KEY;
+
+ } else
+ adev->ieee->sec.flags &= ~SEC_ACTIVE_KEY;
+
+ if (sec->flags & SEC_AUTH_MODE) {
+ adev->ieee->sec.auth_mode = sec->auth_mode;
+ adev->ieee->sec.flags |= SEC_AUTH_MODE;
+ SET_BIT(adev->set_mask, SET_WEP_OPTIONS);
+ }
+
+ if (sec->flags & SEC_ENCRYPT) {
+ adev->ieee->sec.encrypt = sec->encrypt;
+ adev->ieee->sec.flags |= SEC_ENCRYPT;
+ SET_BIT(adev->set_mask, GETSET_WEP);
+ }
+
+ if (sec->flags & SEC_ENABLED) {
+ adev->ieee->sec.enabled = sec->enabled;
+ adev->ieee->sec.flags |= SEC_ENABLED;
+ SET_BIT(adev->set_mask, GETSET_WEP);
+ }
+
+ if (sec->flags & SEC_LEVEL) {
+ adev->ieee->sec.level = sec->level;
+ adev->ieee->sec.flags |= SEC_LEVEL;
+ SET_BIT(adev->set_mask, GETSET_WEP);
+ }
+
+ acx_unlock(adev, flags);
+ acx_sem_unlock(adev);
+
+ acx_s_update_card_settings(adev);
}
diff -urpN wireless-2.6.git/drivers/net/wireless/tiacx/ioctl.c wireless-2.6.git.acx/drivers/net/wireless/tiacx/ioctl.c
--- wireless-2.6.git/drivers/net/wireless/tiacx/ioctl.c Thu Feb 2 17:17:50 2006
+++ wireless-2.6.git.acx/drivers/net/wireless/tiacx/ioctl.c Fri Feb 3 13:38:12 2006
@@ -1024,7 +1024,7 @@ acx_ioctl_set_encode(
if (dwrq->length > 0) {
/* if index is 0 or invalid, use default key */
if ((index < 0) || (index > 3))
- index = (int)adev->wep_current_index;
+ index = (int)adev->ieee->sec.active_key;
if (0 == (dwrq->flags & IW_ENCODE_NOKEY)) {
if (dwrq->length > 29)
@@ -1032,26 +1032,26 @@ acx_ioctl_set_encode(
if (dwrq->length > 13) {
/* 29*8 == 232, WEP256 */
- adev->wep_keys[index].size = 29;
+ adev->ieee->sec.key_sizes[index] = 29;
} else if (dwrq->length > 5) {
/* 13*8 == 104bit, WEP128 */
- adev->wep_keys[index].size = 13;
+ adev->ieee->sec.key_sizes[index] = 13;
} else if (dwrq->length > 0) {
/* 5*8 == 40bit, WEP64 */
- adev->wep_keys[index].size = 5;
+ adev->ieee->sec.key_sizes[index] = 5;
} else {
/* disable key */
- adev->wep_keys[index].size = 0;
+ adev->ieee->sec.key_sizes[index] = 0;
}
- memset(adev->wep_keys[index].key, 0,
- sizeof(adev->wep_keys[index].key));
- memcpy(adev->wep_keys[index].key, extra, dwrq->length);
+ memset(adev->ieee->sec.keys[index], 0,
+ sizeof(adev->ieee->sec.keys[index]));
+ memcpy(adev->ieee->sec.keys[index], extra, dwrq->length);
}
} else {
/* set transmit key */
if ((index >= 0) && (index <= 3))
- adev->wep_current_index = index;
+ adev->ieee->sec.active_key = index;
else if (0 == (dwrq->flags & IW_ENCODE_MODE)) {
/* complain if we were not just setting
* the key mode */
@@ -1060,15 +1060,13 @@ acx_ioctl_set_encode(
}
}
- adev->wep_enabled = !(dwrq->flags & IW_ENCODE_DISABLED);
+ adev->ieee->sec.enabled = !(dwrq->flags & IW_ENCODE_DISABLED);
if (dwrq->flags & IW_ENCODE_OPEN) {
- adev->auth_alg = WLAN_AUTH_ALG_OPENSYSTEM;
- adev->wep_restricted = 0;
+ adev->ieee->sec.auth_mode = WLAN_AUTH_OPEN;
} else if (dwrq->flags & IW_ENCODE_RESTRICTED) {
- adev->auth_alg = WLAN_AUTH_ALG_SHAREDKEY;
- adev->wep_restricted = 1;
+ adev->ieee->sec.auth_mode = WLAN_AUTH_SHARED_KEY;
}
/* set flag to make sure the card WEP settings get updated */
@@ -1078,11 +1076,11 @@ acx_ioctl_set_encode(
dwrq->length, extra, dwrq->flags);
for (index = 0; index <= 3; index++) {
- if (adev->wep_keys[index].size) {
+ if (adev->ieee->sec.key_sizes[index]) {
log(L_IOCTL, "index=%d, size=%d, key at 0x%p\n",
- adev->wep_keys[index].index,
- (int) adev->wep_keys[index].size,
- adev->wep_keys[index].key);
+ adev->ieee->sec.active_key,
+ (int) adev->ieee->sec.key_sizes[index],
+ adev->ieee->sec.keys[index]);
}
}
result = -EINPROGRESS;
@@ -1111,18 +1109,18 @@ acx_ioctl_get_encode(
FN_ENTER;
- if (adev->wep_enabled == 0) {
+ if (adev->ieee->sec.enabled == 0) {
dwrq->flags = IW_ENCODE_DISABLED;
} else {
if ((index < 0) || (index > 3))
- index = (int)adev->wep_current_index;
+ index = (int)adev->ieee->sec.active_key;
- dwrq->flags = (adev->wep_restricted == 1) ?
+ dwrq->flags = (adev->ieee->sec.auth_mode == WLAN_AUTH_SHARED_KEY) ?
IW_ENCODE_RESTRICTED : IW_ENCODE_OPEN;
- dwrq->length = adev->wep_keys[index].size;
+ dwrq->length = adev->ieee->sec.key_sizes[index];
- memcpy(extra, adev->wep_keys[index].key,
- adev->wep_keys[index].size);
+ memcpy(extra, adev->ieee->sec.keys[index],
+ adev->ieee->sec.key_sizes[index]);
}
/* set the current index */
diff -urpN wireless-2.6.git/drivers/net/wireless/tiacx/pci.c wireless-2.6.git.acx/drivers/net/wireless/tiacx/pci.c
--- wireless-2.6.git/drivers/net/wireless/tiacx/pci.c Thu Feb 2 17:17:50 2006
+++ wireless-2.6.git.acx/drivers/net/wireless/tiacx/pci.c Fri Feb 3 13:38:12 2006
@@ -476,23 +476,23 @@ acxpci_s_write_phy_reg(acx_device_t *ade
**
** Arguments:
** adev wlan device structure
-** apfw_image firmware image.
+** fw_image firmware image.
**
** Returns:
** 1 firmware image corrupted
** 0 success
*/
static int
-acxpci_s_write_fw(acx_device_t *adev, const firmware_image_t *apfw_image, u32 offset)
+acxpci_s_write_fw(acx_device_t *adev, const firmware_image_t *fw_image, u32 offset)
{
int len, size;
u32 sum, v32;
/* we skip the first four bytes which contain the control sum */
- const u8 *image = (u8*)apfw_image + 4;
+ const u8 *p = (u8*)fw_image + 4;
/* start the image checksum by adding the image size value */
- sum = image[0]+image[1]+image[2]+image[3];
- image += 4;
+ sum = p[0]+p[1]+p[2]+p[3];
+ p += 4;
write_reg32(adev, IO_ACX_SLV_END_CTL, 0);
@@ -505,12 +505,12 @@ acxpci_s_write_fw(acx_device_t *adev, co
#endif
len = 0;
- size = le32_to_cpu(apfw_image->size) & (~3);
+ size = le32_to_cpu(fw_image->size) & (~3);
while (likely(len < size)) {
- v32 = be32_to_cpu(*(u32*)image);
- sum += image[0]+image[1]+image[2]+image[3];
- image += 4;
+ v32 = be32_to_cpu(*(u32*)p);
+ sum += p[0]+p[1]+p[2]+p[3];
+ p += 4;
len += 4;
#if NO_AUTO_INCREMENT
@@ -521,10 +521,10 @@ acxpci_s_write_fw(acx_device_t *adev, co
}
log(L_DEBUG, "firmware written, size:%d sum1:%x sum2:%x\n",
- size, sum, le32_to_cpu(apfw_image->chksum));
+ size, sum, le32_to_cpu(fw_image->chksum));
/* compare our checksum with the stored image checksum */
- return (sum != le32_to_cpu(apfw_image->chksum));
+ return (sum != le32_to_cpu(fw_image->chksum));
}
@@ -536,25 +536,25 @@ acxpci_s_write_fw(acx_device_t *adev, co
**
** Arguments:
** adev wlan device structure
-** apfw_image firmware image.
+** fw_image firmware image.
**
** Returns:
** NOT_OK firmware image corrupted or not correctly written
** OK success
*/
static int
-acxpci_s_validate_fw(acx_device_t *adev, const firmware_image_t *apfw_image,
+acxpci_s_validate_fw(acx_device_t *adev, const firmware_image_t *fw_image,
u32 offset)
{
u32 sum, v32, w32;
int len, size;
int result = OK;
/* we skip the first four bytes which contain the control sum */
- const u8 *image = (u8*)apfw_image + 4;
+ const u8 *p = (u8*)fw_image + 4;
/* start the image checksum by adding the image size value */
- sum = image[0]+image[1]+image[2]+image[3];
- image += 4;
+ sum = p[0]+p[1]+p[2]+p[3];
+ p += 4;
write_reg32(adev, IO_ACX_SLV_END_CTL, 0);
@@ -566,11 +566,11 @@ acxpci_s_validate_fw(acx_device_t *adev,
#endif
len = 0;
- size = le32_to_cpu(apfw_image->size) & (~3);
+ size = le32_to_cpu(fw_image->size) & (~3);
while (likely(len < size)) {
- v32 = be32_to_cpu(*(u32*)image);
- image += 4;
+ v32 = be32_to_cpu(*(u32*)p);
+ p += 4;
len += 4;
#if NO_AUTO_INCREMENT
@@ -593,7 +593,7 @@ acxpci_s_validate_fw(acx_device_t *adev,
/* sum control verification */
if (result != NOT_OK) {
- if (sum != le32_to_cpu(apfw_image->chksum)) {
+ if (sum != le32_to_cpu(fw_image->chksum)) {
printk("acx: FATAL: firmware upload: "
"checksums don't match!\n");
result = NOT_OK;
@@ -612,10 +612,10 @@ acxpci_s_validate_fw(acx_device_t *adev,
static int
acxpci_s_upload_fw(acx_device_t *adev)
{
- firmware_image_t *apfw_image = NULL;
+ firmware_image_t *fw_image = NULL;
int res = NOT_OK;
int try;
- u32 size;
+ u32 file_size;
char filename[sizeof("tiacx1NNcNN")];
FN_ENTER;
@@ -625,22 +625,22 @@ acxpci_s_upload_fw(acx_device_t *adev)
snprintf(filename, sizeof(filename), "tiacx1%02dc%02X",
IS_ACX111(adev)*11, adev->radio_type);
- apfw_image = acx_s_read_fw(&adev->pdev->dev, filename, &size);
- if (!apfw_image) {
+ fw_image = acx_s_read_fw(&adev->pdev->dev, filename, &file_size);
+ if (!fw_image) {
adev->need_radio_fw = 1;
filename[sizeof("tiacx1NN")-1] = '\0';
- apfw_image = acx_s_read_fw(&adev->pdev->dev, filename, &size);
- if (!apfw_image) {
+ fw_image = acx_s_read_fw(&adev->pdev->dev, filename, &file_size);
+ if (!fw_image) {
FN_EXIT1(NOT_OK);
return NOT_OK;
}
}
for (try = 1; try <= 5; try++) {
- res = acxpci_s_write_fw(adev, apfw_image, 0);
+ res = acxpci_s_write_fw(adev, fw_image, 0);
log(L_DEBUG|L_INIT, "acx_write_fw (main/combined):%d\n", res);
if (OK == res) {
- res = acxpci_s_validate_fw(adev, apfw_image, 0);
+ res = acxpci_s_validate_fw(adev, fw_image, 0);
log(L_DEBUG|L_INIT, "acx_validate_fw "
"(main/combined):%d\n", res);
}
@@ -654,7 +654,7 @@ acxpci_s_upload_fw(acx_device_t *adev)
acx_s_msleep(1000); /* better wait for a while... */
}
- vfree(apfw_image);
+ vfree(fw_image);
FN_EXIT1(res);
return res;
@@ -930,22 +930,22 @@ acxpci_s_reset_dev(acx_device_t *adev)
acx_unlock(adev, flags);
/* need to know radio type before fw load */
- /* Need to wait for arrival of this information in a loop,
- * most probably since eCPU runs some init code from EEPROM
- * (started burst read in reset_mac()) which also
- * sets the radio type ID */
-
- count = 0xffff;
- do {
- hardware_info = read_reg16(adev, IO_ACX_EEPROM_INFORMATION);
- if (!--count) {
- msg = "eCPU didn't indicate radio type";
- goto end_fail;
- }
- cpu_relax();
- } while (!(hardware_info & 0xff00)); /* radio type still zero? */
-
- /* printk("DEBUG: count %d\n", count); */
+ /* Need to wait for arrival of this information in a loop,
+ * most probably since eCPU runs some init code from EEPROM
+ * (started burst read in reset_mac()) which also
+ * sets the radio type ID */
+
+ count = 0xffff;
+ do {
+ hardware_info = read_reg16(adev, IO_ACX_EEPROM_INFORMATION);
+ if (!--count) {
+ msg = "eCPU didn't indicate radio type";
+ goto end_fail;
+ }
+ cpu_relax();
+ } while (!(hardware_info & 0xff00)); /* radio type still zero? */
+
+ /* printk("DEBUG: count %d\n", count); */
adev->form_factor = hardware_info & 0xff;
adev->radio_type = hardware_info >> 8;
@@ -1641,6 +1641,10 @@ acxpci_e_probe(struct pci_dev *pdev, con
adev->softmac = ieee80211_priv(ndev);
adev->softmac->set_channel = acx_e_ieee80211_set_chan;
+ adev->ieee->sec.encrypt = 0;
+ adev->ieee->sec.enabled = 0;
+ adev->ieee->sec.auth_mode = WLAN_AUTH_OPEN;
+
#ifdef NONESSENTIAL_FEATURES
acx_show_card_eeprom_id(adev);
#endif /* NONESSENTIAL_FEATURES */
@@ -1668,9 +1672,6 @@ acxpci_e_probe(struct pci_dev *pdev, con
if (OK != acxpci_s_reset_dev(adev))
goto fail_reset;
- if (OK != acxpci_read_eeprom_byte(adev, 0x05, &adev->eeprom_version))
- goto fail_read_eeprom_version;
-
if (IS_ACX100(adev)) {
/* ACX100: configopt struct in cmd mailbox - directly after reset */
memcpy_fromio(&co, adev->cmd_area, sizeof(co));
@@ -1728,7 +1729,6 @@ fail_register_netdev:
pci_set_drvdata(pdev, NULL);
fail_init_mac:
-fail_read_eeprom_version:
fail_reset:
acxpci_s_device_chain_remove(ndev);
diff -urpN wireless-2.6.git/drivers/net/wireless/tiacx/usb.c wireless-2.6.git.acx/drivers/net/wireless/tiacx/usb.c
--- wireless-2.6.git/drivers/net/wireless/tiacx/usb.c Thu Feb 2 17:17:50 2006
+++ wireless-2.6.git.acx/drivers/net/wireless/tiacx/usb.c Fri Feb 3 13:54:06 2006
@@ -78,14 +78,25 @@
/***********************************************************************
*/
+/* ACX100 (TNETW1100) USB device: D-Link DWL-120+ */
#define ACX100_VENDOR_ID 0x2001
#define ACX100_PRODUCT_ID_UNBOOTED 0x3B01
#define ACX100_PRODUCT_ID_BOOTED 0x3B00
+/* TNETW1450 USB devices */
+#define VENDOR_ID_DLINK 0x07b8 /* D-Link Corp. */
+#define PRODUCT_ID_WUG2400 0xb21a /* AboCom WUG2400 or SafeCom SWLUT-54125 */
+#define VENDOR_ID_AVM_GMBH 0x057c
+#define PRODUCT_ID_AVM_WLAN_USB 0x5601
+#define VENDOR_ID_ZCOM 0x0cde
+#define PRODUCT_ID_ZCOM_XG750 0x0017 /* not tested yet */
+#define VENDOR_ID_TI 0x0451
+#define PRODUCT_ID_TI_UNKNOWN 0x60c5 /* not tested yet */
+
#define ACX_USB_CTRL_TIMEOUT 5500 /* steps in ms */
-/* Buffer size for fw upload */
-#define ACX_USB_RWMEM_MAXLEN 2048
+/* Buffer size for fw upload, same for both ACX100 USB and TNETW1450 */
+#define USB_RWMEM_MAXLEN 2048
/* The number of bulk URBs to use */
#define ACX_TX_URB_CNT 8
@@ -106,7 +117,7 @@ static void acxusb_i_complete_rx(struct
static int acxusb_e_open(struct net_device *);
static int acxusb_e_close(struct net_device *);
static void acxusb_i_set_rx_mode(struct net_device *);
-static int acxusb_boot(struct usb_device *);
+static int acxusb_boot(struct usb_device *, int is_tnetw1450, int *radio_type);
static void acxusb_l_poll_rx(acx_device_t *adev, usb_rx_t* rx);
@@ -132,6 +143,10 @@ static const struct usb_device_id
acxusb_ids[] = {
{ USB_DEVICE(ACX100_VENDOR_ID, ACX100_PRODUCT_ID_BOOTED) },
{ USB_DEVICE(ACX100_VENDOR_ID, ACX100_PRODUCT_ID_UNBOOTED) },
+ { USB_DEVICE(VENDOR_ID_DLINK, PRODUCT_ID_WUG2400) },
+ { USB_DEVICE(VENDOR_ID_AVM_GMBH, PRODUCT_ID_AVM_WLAN_USB) },
+ { USB_DEVICE(VENDOR_ID_ZCOM, PRODUCT_ID_ZCOM_XG750) },
+ { USB_DEVICE(VENDOR_ID_TI, PRODUCT_ID_TI_UNKNOWN) },
{}
};
@@ -443,107 +458,262 @@ bad:
** firmware and transmitting the checksum, the device resets and appears
** as a new device on the USB bus (the device we can finally deal with)
*/
+static inline int
+acxusb_fw_needs_padding(firmware_image_t *fw_image, unsigned int usb_maxlen)
+{
+ unsigned int num_xfers = ((fw_image->size - 1) / usb_maxlen) + 1;
+
+ return ((num_xfers % 2) == 0);
+}
+
static int
-acxusb_boot(struct usb_device *usbdev)
+acxusb_boot(struct usb_device *usbdev, int is_tnetw1450, int *radio_type)
{
- static const char filename[] = "tiacx100usb";
+ char filename[sizeof("tiacx1NNusbcRR")];
- char *firmware = NULL;
+ firmware_image_t *fw_image = NULL;
char *usbbuf;
unsigned int offset;
- unsigned int len, inpipe, outpipe;
- u32 checksum;
- u32 size;
- int result;
+ unsigned int blk_len, inpipe, outpipe;
+ u32 num_processed;
+ u32 img_checksum, sum;
+ u32 file_size;
+ int result = -EIO;
+ int i;
FN_ENTER;
- usbbuf = kmalloc(ACX_USB_RWMEM_MAXLEN, GFP_KERNEL);
+ /* dump_device(usbdev); */
+
+ usbbuf = kmalloc(USB_RWMEM_MAXLEN, GFP_KERNEL);
if (!usbbuf) {
- printk(KERN_ERR "acx: no memory for USB transfer buffer ("
- STRING(ACX_USB_RWMEM_MAXLEN)" bytes)\n");
+ printk(KERN_ERR "acx: no memory for USB transfer buffer (%d bytes)\n", USB_RWMEM_MAXLEN);
result = -ENOMEM;
goto end;
}
- firmware = (char *)acx_s_read_fw(&usbdev->dev, filename, &size);
- if (!firmware) {
+ if (is_tnetw1450) {
+ /* Obtain the I/O pipes */
+ outpipe = usb_sndbulkpipe(usbdev, 1);
+ inpipe = usb_rcvbulkpipe(usbdev, 2);
+
+ printk(KERN_DEBUG "wait for device ready\n");
+ for (i = 0; i <= 2; i++) {
+ result = usb_bulk_msg(usbdev, inpipe,
+ usbbuf,
+ USB_RWMEM_MAXLEN,
+ &num_processed,
+ 2000
+ );
+
+ if ((*(u32 *)&usbbuf[4] == 0x40000001)
+ && (*(u16 *)&usbbuf[2] == 0x1)
+ && ((*(u16 *)usbbuf & 0x3fff) == 0)
+ && ((*(u16 *)usbbuf & 0xc000) == 0xc000))
+ break;
+ msleep(10);
+ }
+ if (i == 2)
+ goto fw_end;
+
+ *radio_type = usbbuf[8];
+ } else {
+ /* Obtain the I/O pipes */
+ outpipe = usb_sndctrlpipe(usbdev, 0);
+ inpipe = usb_rcvctrlpipe(usbdev, 0);
+
+ /* FIXME: shouldn't be hardcoded */
+ *radio_type = RADIO_MAXIM_0D;
+ }
+
+ snprintf(filename, sizeof(filename), "tiacx1%02dusbc%02X",
+ is_tnetw1450 * 11, *radio_type);
+
+ fw_image = acx_s_read_fw(&usbdev->dev, filename, &file_size);
+ if (!fw_image) {
result = -EIO;
goto end;
}
- log(L_INIT, "firmware size: %d bytes\n", size);
+ log(L_INIT, "firmware size: %d bytes\n", file_size);
- /* Obtain the I/O pipes */
- outpipe = usb_sndctrlpipe(usbdev, 0);
- inpipe = usb_rcvctrlpipe(usbdev, 0);
+ img_checksum = le32_to_cpu(fw_image->chksum);
+
+ if (is_tnetw1450) {
+ u8 cmdbuf[20];
+ const u8 *p;
+ u8 need_padding;
+ u32 tmplen, val;
+
+ memset(cmdbuf, 0, 16);
+
+ need_padding = acxusb_fw_needs_padding(fw_image, USB_RWMEM_MAXLEN);
+ tmplen = need_padding ? file_size-4 : file_size-8;
+ *(u16 *)&cmdbuf[0] = 0xc000;
+ *(u16 *)&cmdbuf[2] = 0x000b;
+ *(u32 *)&cmdbuf[4] = tmplen;
+ *(u32 *)&cmdbuf[8] = file_size-8;
+ *(u32 *)&cmdbuf[12] = img_checksum;
+
+ result = usb_bulk_msg(usbdev, outpipe, cmdbuf, 16, &num_processed, HZ);
+ if (result < 0)
+ goto fw_end;
+
+ p = (const u8 *)&fw_image->size;
+
+ /* first calculate checksum for image size part */
+ sum = p[0]+p[1]+p[2]+p[3];
+ p += 4;
+
+ /* now continue checksum for firmware data part */
+ tmplen = le32_to_cpu(fw_image->size);
+ for (i = 0; i < tmplen /* image size */; i++) {
+ sum += *p++;
+ }
+
+ if (sum != le32_to_cpu(fw_image->chksum)) {
+ printk("acx: FATAL: firmware upload: "
+ "checksums don't match! "
+ "(0x%08x vs. 0x%08x)\n",
+ sum, fw_image->chksum);
+ goto fw_end;
+ }
+
+ offset = 8;
+ while (offset < file_size) {
+ blk_len = file_size - offset;
+ if (blk_len > USB_RWMEM_MAXLEN) {
+ blk_len = USB_RWMEM_MAXLEN;
+ }
+
+ log(L_INIT, "uploading firmware (%d bytes, offset=%d)\n",
+ blk_len, offset);
+ memcpy(usbbuf, ((u8 *)fw_image) + offset, blk_len);
+
+ p = usbbuf;
+ for (i = 0; i < blk_len; i += 4) {
+ *(u32 *)p = be32_to_cpu(*(u32 *)p);
+ p += 4;
+ }
- /* now upload the firmware, slice the data into blocks */
- offset = 8;
- while (offset < size) {
- len = size - offset;
- if (len >= ACX_USB_RWMEM_MAXLEN) {
- len = ACX_USB_RWMEM_MAXLEN;
+ result = usb_bulk_msg(usbdev, outpipe, usbbuf, blk_len, &num_processed, HZ);
+ if ((result < 0) || (num_processed != blk_len))
+ goto fw_end;
+ offset += blk_len;
+ }
+ if (need_padding) {
+ printk(KERN_DEBUG "send padding\n");
+ memset(usbbuf, 0, 4);
+ result = usb_bulk_msg(usbdev, outpipe, usbbuf, 4, &num_processed, HZ);
+ if ((result < 0) || (num_processed != 4))
+ goto fw_end;
+ }
+ printk(KERN_DEBUG "read firmware upload result\n");
+ memset(cmdbuf, 0, 20); /* additional memset */
+ result = usb_bulk_msg(usbdev, inpipe, cmdbuf, 20, &num_processed, 2000);
+ if (result < 0)
+ goto fw_end;
+ if (*(u32 *)&cmdbuf[4] == 0x40000003)
+ goto fw_end;
+ if (*(u32 *)&cmdbuf[4])
+ goto fw_end;
+ if (*(u16 *)&cmdbuf[16] != 1)
+ goto fw_end;
+
+ val = *(u32 *)&cmdbuf[0];
+ if ((val & 0x3fff)
+ || ((val & 0xc000) != 0xc000))
+ goto fw_end;
+
+ val = *(u32 *)&cmdbuf[8];
+ if (val & 2) {
+ result = usb_bulk_msg(usbdev, inpipe, cmdbuf, 20, &num_processed, 2000);
+ if (result < 0)
+ goto fw_end;
+ val = *(u32 *)&cmdbuf[8];
+ }
+ /* yup, no "else" here! */
+ if (val & 1) {
+ memset(usbbuf, 0, 4);
+ result = usb_bulk_msg(usbdev, outpipe, usbbuf, 4, &num_processed, HZ);
+ if ((result < 0) || (!num_processed))
+ goto fw_end;
}
- log(L_INIT, "uploading firmware (%d bytes, offset=%d)\n",
- len, offset);
+
+ printk("TNETW1450 firmware upload successful!\n");
result = 0;
- memcpy(usbbuf, firmware + offset, len);
+ goto end;
+fw_end:
+ result = -EIO;
+ goto end;
+ } else {
+ /* ACX100 USB */
+
+ /* now upload the firmware, slice the data into blocks */
+ offset = 8;
+ while (offset < file_size) {
+ blk_len = file_size - offset;
+ if (blk_len > USB_RWMEM_MAXLEN) {
+ blk_len = USB_RWMEM_MAXLEN;
+ }
+ log(L_INIT, "uploading firmware (%d bytes, offset=%d)\n",
+ blk_len, offset);
+ memcpy(usbbuf, ((u8 *)fw_image) + offset, blk_len);
+ result = usb_control_msg(usbdev, outpipe,
+ ACX_USB_REQ_UPLOAD_FW,
+ USB_TYPE_VENDOR|USB_DIR_OUT,
+ (file_size - 8) & 0xffff, /* value */
+ (file_size - 8) >> 16, /* index */
+ usbbuf, /* dataptr */
+ blk_len, /* size */
+ 3000 /* timeout in ms */
+ );
+ offset += blk_len;
+ if (result < 0) {
+ printk(KERN_ERR "acx: error %d during upload "
+ "of firmware, aborting\n", result);
+ goto end;
+ }
+ }
+
+ /* finally, send the checksum and reboot the device */
+ /* does this trigger the reboot? */
result = usb_control_msg(usbdev, outpipe,
ACX_USB_REQ_UPLOAD_FW,
USB_TYPE_VENDOR|USB_DIR_OUT,
- size - 8, /* value */
- 0, /* index */
+ img_checksum & 0xffff, /* value */
+ img_checksum >> 16, /* index */
+ NULL, /* dataptr */
+ 0, /* size */
+ 3000 /* timeout in ms */
+ );
+ if (result < 0) {
+ printk(KERN_ERR "acx: error %d during tx of checksum, "
+ "aborting\n", result);
+ goto end;
+ }
+ result = usb_control_msg(usbdev, inpipe,
+ ACX_USB_REQ_ACK_CS,
+ USB_TYPE_VENDOR|USB_DIR_IN,
+ img_checksum & 0xffff, /* value */
+ img_checksum >> 16, /* index */
usbbuf, /* dataptr */
- len, /* size */
+ 8, /* size */
3000 /* timeout in ms */
);
- offset += len;
if (result < 0) {
- printk(KERN_ERR "acx: error %d during upload "
- "of firmware, aborting\n", result);
+ printk(KERN_ERR "acx: error %d during ACK of checksum, "
+ "aborting\n", result);
goto end;
}
+ if (*usbbuf != 0x10) {
+ printk(KERN_ERR "acx: invalid checksum?\n");
+ result = -EINVAL;
+ goto end;
+ }
+ result = 0;
}
- /* finally, send the checksum and reboot the device */
- checksum = le32_to_cpu(*(u32 *)firmware);
- /* is this triggers the reboot? */
- result = usb_control_msg(usbdev, outpipe,
- ACX_USB_REQ_UPLOAD_FW,
- USB_TYPE_VENDOR|USB_DIR_OUT,
- checksum & 0xffff, /* value */
- checksum >> 16, /* index */
- NULL, /* dataptr */
- 0, /* size */
- 3000 /* timeout in ms */
- );
- if (result < 0) {
- printk(KERN_ERR "acx: error %d during tx of checksum, "
- "aborting\n", result);
- goto end;
- }
- result = usb_control_msg(usbdev, inpipe,
- ACX_USB_REQ_ACK_CS,
- USB_TYPE_VENDOR|USB_DIR_IN,
- checksum & 0xffff, /* value */
- checksum >> 16, /* index */
- usbbuf, /* dataptr */
- 8, /* size */
- 3000 /* timeout in ms */
- );
- if (result < 0) {
- printk(KERN_ERR "acx: error %d during ACK of checksum, "
- "aborting\n", result);
- goto end;
- }
- if (*usbbuf != 0x10) {
- kfree(usbbuf);
- printk(KERN_ERR "acx: invalid checksum?\n");
- result = -EINVAL;
- goto end;
- }
- result = 0;
end:
- vfree(firmware);
+ vfree(fw_image);
kfree(usbbuf);
FN_EXIT1(result);
@@ -551,16 +721,28 @@ end:
}
+/* FIXME: maybe merge it with usual eeprom reading, into common code? */
+static void
+acxusb_s_read_eeprom_version(acx_device_t *adev)
+{
+ u8 eeprom_ver[0x8];
+
+ memset(eeprom_ver, 0, sizeof(eeprom_ver));
+ acx_s_interrogate(adev, &eeprom_ver, ACX1FF_IE_EEPROM_VER);
+
+ /* FIXME: which one of those values to take? */
+ adev->eeprom_version = eeprom_ver[5];
+}
+
+
/*
* temporary helper function to at least fill important cfgopt members with
* useful replacement values until we figure out how one manages to fetch
* the configoption struct in the USB device case...
*/
-int
+static int
acxusb_s_fill_configoption(acx_device_t *adev)
{
- printk("FIXME: haven't figured out how to fetch configoption struct "
- "from USB device, passing hardcoded values instead\n");
adev->cfgopt_probe_delay = 200;
adev->cfgopt_dot11CCAModes = 4;
adev->cfgopt_dot11Diversity = 1;
@@ -572,6 +754,7 @@ acxusb_s_fill_configoption(acx_device_t
return OK;
}
+
/***********************************************************************
** acxusb_e_probe()
**
@@ -598,28 +781,41 @@ acxusb_e_probe(struct usb_interface *int
int numconfigs, numfaces, numep;
int result = OK;
int i;
+ int radio_type;
+ /* this one needs to be more precise in case there appears a TNETW1450 from the same vendor */
+ int is_tnetw1450 = (usbdev->descriptor.idVendor != ACX100_VENDOR_ID);
FN_ENTER;
- /* First check if this is the "unbooted" hardware */
- if ((usbdev->descriptor.idVendor == ACX100_VENDOR_ID)
- && (usbdev->descriptor.idProduct == ACX100_PRODUCT_ID_UNBOOTED)) {
+ if (is_tnetw1450) {
/* Boot the device (i.e. upload the firmware) */
- acxusb_boot(usbdev);
+ acxusb_boot(usbdev, is_tnetw1450, &radio_type);
- /* OK, we are done with booting. Normally, the
- ** ID for the unbooted device should disappear
- ** and it will not need a driver anyway...so
- ** return a NULL
- */
- log(L_INIT, "finished booting, returning from probe()\n");
- result = OK; /* success */
- goto end;
- }
+ /* TNETW1450-based cards will continue right away with
+ * the same USB ID after booting */
+ } else {
+ /* First check if this is the "unbooted" hardware */
+ if (usbdev->descriptor.idProduct == ACX100_PRODUCT_ID_UNBOOTED) {
- if ((usbdev->descriptor.idVendor != ACX100_VENDOR_ID)
- || (usbdev->descriptor.idProduct != ACX100_PRODUCT_ID_BOOTED)) {
- goto end_nodev;
+ /* Boot the device (i.e. upload the firmware) */
+ acxusb_boot(usbdev, is_tnetw1450, &radio_type);
+
+ /* DWL-120+ will first boot the firmware,
+ * then later have a *separate* probe() run
+ * since its USB ID will have changed after
+ * firmware boot!
+ * Since the first probe() run has no
+ * other purpose than booting the firmware,
+ * simply return immediately.
+ */
+ log(L_INIT, "finished booting, returning from probe()\n");
+ result = OK; /* success */
+ goto end;
+ }
+ else
+ /* device not unbooted, but invalid USB ID!? */
+ if (usbdev->descriptor.idProduct != ACX100_PRODUCT_ID_BOOTED)
+ goto end_nodev;
}
/* Ok, so it's our device and it has already booted */
@@ -656,10 +852,15 @@ acxusb_e_probe(struct usb_interface *int
adev->ndev = ndev;
adev->dev_type = DEVTYPE_USB;
- adev->chip_type = CHIPTYPE_ACX100;
-
- /* FIXME: should be read from register (via firmware) using standard ACX code */
- adev->radio_type = RADIO_MAXIM_0D;
+ adev->radio_type = radio_type;
+ if (is_tnetw1450) {
+ /* well, actually it's a TNETW1450, but since it
+ * seems to be sufficiently similar to TNETW1130,
+ * I don't want to change large amounts of code now */
+ adev->chip_type = CHIPTYPE_ACX111;
+ } else {
+ adev->chip_type = CHIPTYPE_ACX100;
+ }
adev->usbdev = usbdev;
spin_lock_init(&adev->lock); /* initial state: unlocked */
@@ -677,6 +878,10 @@ acxusb_e_probe(struct usb_interface *int
adev->softmac = ieee80211_priv(ndev);
adev->softmac->set_channel = acx_e_ieee80211_set_chan;
+ adev->ieee->sec.enabled = 0;
+ adev->ieee->sec.encrypt = 0;
+ adev->ieee->sec.auth_mode = WLAN_AUTH_OPEN;
+
/* Check that this is really the hardware we know about.
** If not sure, at least notify the user that he
** may be in trouble...
@@ -698,27 +903,32 @@ acxusb_e_probe(struct usb_interface *int
numep = ifdesc->bNumEndpoints;
log(L_DEBUG, "# of endpoints: %d\n", numep);
- /* obtain information about the endpoint
- ** addresses, begin with some default values
- */
- adev->bulkoutep = 1;
- adev->bulkinep = 1;
- for (i = 0; i < numep; i++) {
+ if (is_tnetw1450) {
+ adev->bulkoutep = 1;
+ adev->bulkinep = 2;
+ } else {
+ /* obtain information about the endpoint
+ ** addresses, begin with some default values
+ */
+ adev->bulkoutep = 1;
+ adev->bulkinep = 1;
+ for (i = 0; i < numep; i++) {
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11)
- ep = usbdev->ep_in[i];
- if (!ep)
- continue;
- epdesc = &ep->desc;
+ ep = usbdev->ep_in[i];
+ if (!ep)
+ continue;
+ epdesc = &ep->desc;
#else
- epdesc = usb_epnum_to_ep_desc(usbdev, i);
- if (!epdesc)
- continue;
+ epdesc = usb_epnum_to_ep_desc(usbdev, i);
+ if (!epdesc)
+ continue;
#endif
- if (epdesc->bmAttributes & USB_ENDPOINT_XFER_BULK) {
- if (epdesc->bEndpointAddress & 0x80)
- adev->bulkinep = epdesc->bEndpointAddress & 0xF;
- else
- adev->bulkoutep = epdesc->bEndpointAddress & 0xF;
+ if (epdesc->bmAttributes & USB_ENDPOINT_XFER_BULK) {
+ if (epdesc->bEndpointAddress & 0x80)
+ adev->bulkinep = epdesc->bEndpointAddress & 0xF;
+ else
+ adev->bulkoutep = epdesc->bEndpointAddress & 0xF;
+ }
}
}
log(L_DEBUG, "bulkout ep: 0x%X\n", adev->bulkoutep);
@@ -773,12 +983,13 @@ acxusb_e_probe(struct usb_interface *int
/* put acx out of sleep mode and initialize it */
acx_s_issue_cmd(adev, ACX1xx_CMD_WAKE, NULL, 0);
- acxusb_s_fill_configoption(adev);
-
result = acx_s_init_mac(adev);
if (result)
goto end;
+ /* TODO: see similar code in pci.c */
+ acxusb_s_read_eeprom_version(adev);
+ acxusb_s_fill_configoption(adev);
acx_s_set_defaults(adev);
acx_s_get_firmware_version(adev);
acx_display_hardware_details(adev);
@@ -1622,11 +1833,13 @@ dump_device(struct usb_device *usbdev)
/* This saw a change after 2.6.10 */
printk(" ep_in wMaxPacketSize: ");
for (i = 0; i < 16; ++i)
- printk("%d ", usbdev->ep_in[i]->desc.wMaxPacketSize);
+ if (usbdev->ep_in[i] != NULL)
+ printk("%d:%d ", i, usbdev->ep_in[i]->desc.wMaxPacketSize);
printk("\n");
printk(" ep_out wMaxPacketSize: ");
for (i = 0; i < VEC_SIZE(usbdev->ep_out); ++i)
- printk("%d ", usbdev->ep_out[i]->desc.wMaxPacketSize);
+ if (usbdev->ep_out[i] != NULL)
+ printk("%d:%d ", i, usbdev->ep_out[i]->desc.wMaxPacketSize);
printk("\n");
#else
printk(" epmaxpacketin: ");
^ permalink raw reply
* [PATCH] acx: make firmware statistics parsing more intelligent
From: Andreas Mohr @ 2006-02-03 10:58 UTC (permalink / raw)
To: netdev; +Cc: acx100-devel
Hi all,
this patch does:
- implement much more flexible firmware statistics parsing
(for /proc/driver/acx_wlanX_diag)
This has the nice effect that we now get output for both the older
TNETW1100 USB and TNETW1450.
Since firmware statistics information has non-stable layout depending on
firmware version, please report if you suspect any parsing mismatch!
This improved version now uses 2kB more driver space, unfortunately.
- use "% 8" modulo instead of more complicated "% 5" calculation
- use
if (++idx >= count)
idx = 0;
instead of more bloaty
idx = (idx + 1) % count;
We might want to add a kernel macro for this *very* common and
performance-critical driver operation, say ring_advance_next or so,
in order to have the most optimized version for each architecture;
Or ($1 million question): Is there already such a beast somewhere!?
- tiny cleanup
Andreas Mohr
diff -urN acx-20060202/acx_func.h acx-20060202_stats/acx_func.h
--- acx-20060202/acx_func.h 2006-02-01 10:49:31.000000000 +0100
+++ acx-20060202_stats/acx_func.h 2006-02-05 06:21:35.000000000 +0100
@@ -257,7 +257,7 @@
** but may be run under lock
**
** A small number of local helpers do not have acx_[eisl]_ prefix.
-** They are always close to caller and are to be revieved locally.
+** They are always close to caller and are to be reviewed locally.
**
** Theory of operation:
**
diff -urN acx-20060202/acx_struct.h acx-20060202_stats/acx_struct.h
--- acx-20060202/acx_struct.h 2006-02-01 10:49:38.000000000 +0100
+++ acx-20060202_stats/acx_struct.h 2006-02-03 23:21:35.000000000 +0100
@@ -582,21 +582,34 @@
/*--- Firmware statistics ----------------------------------------------------*/
-typedef struct fw_stats {
- u32 val0x0 ACX_PACKED; /* hdr; */
+
+/* define a random 100 bytes more to catch firmware versions which
+ * provide a bigger struct */
+#define FW_STATS_FUTURE_EXTENSION 100
+
+typedef struct fw_stats_tx {
u32 tx_desc_of ACX_PACKED;
+} fw_stats_tx_t;
+
+typedef struct fw_stats_rx {
u32 rx_oom ACX_PACKED;
u32 rx_hdr_of ACX_PACKED;
- u32 rx_hdr_use_next ACX_PACKED;
+ u32 rx_hw_stuck ACX_PACKED; /* old: u32 rx_hdr_use_next */
u32 rx_dropped_frame ACX_PACKED;
u32 rx_frame_ptr_err ACX_PACKED;
u32 rx_xfr_hint_trig ACX_PACKED;
+ u32 rx_aci_events ACX_PACKED; /* later versions only */
+ u32 rx_aci_resets ACX_PACKED; /* later versions only */
+} fw_stats_rx_t;
+typedef struct fw_stats_dma {
u32 rx_dma_req ACX_PACKED;
u32 rx_dma_err ACX_PACKED;
u32 tx_dma_req ACX_PACKED;
u32 tx_dma_err ACX_PACKED;
+} fw_stats_dma_t;
+typedef struct fw_stats_irq {
u32 cmd_cplt ACX_PACKED;
u32 fiq ACX_PACKED;
u32 rx_hdrs ACX_PACKED;
@@ -604,23 +617,78 @@
u32 rx_mem_of ACX_PACKED;
u32 rx_rdys ACX_PACKED;
u32 irqs ACX_PACKED;
- u32 acx_trans_procs ACX_PACKED;
+ u32 tx_procs ACX_PACKED;
u32 decrypt_done ACX_PACKED;
u32 dma_0_done ACX_PACKED;
u32 dma_1_done ACX_PACKED;
u32 tx_exch_complet ACX_PACKED;
u32 commands ACX_PACKED;
- u32 acx_rx_procs ACX_PACKED;
+ u32 rx_procs ACX_PACKED;
u32 hw_pm_mode_changes ACX_PACKED;
u32 host_acks ACX_PACKED;
u32 pci_pm ACX_PACKED;
u32 acm_wakeups ACX_PACKED;
+} fw_stats_irq_t;
+typedef struct fw_stats_wep {
u32 wep_key_count ACX_PACKED;
u32 wep_default_key_count ACX_PACKED;
u32 dot11_def_key_mib ACX_PACKED;
u32 wep_key_not_found ACX_PACKED;
u32 wep_decrypt_fail ACX_PACKED;
+ u32 wep_pkt_decrypt ACX_PACKED;
+ u32 wep_decrypt_irqs ACX_PACKED;
+} fw_stats_wep_t;
+
+typedef struct fw_stats_pwr {
+ u32 tx_start_ctr ACX_PACKED;
+ u32 no_ps_tx_too_short ACX_PACKED;
+ u32 rx_start_ctr ACX_PACKED;
+ u32 no_ps_rx_too_short ACX_PACKED;
+ u32 lppd_started ACX_PACKED;
+ u32 no_lppd_too_noisy ACX_PACKED;
+ u32 no_lppd_too_short ACX_PACKED;
+ u32 no_lppd_matching_frame ACX_PACKED;
+} fw_stats_pwr_t;
+
+typedef struct fw_stats_mic {
+ u32 mic_rx_pkts ACX_PACKED;
+ u32 mic_calc_fail ACX_PACKED;
+} fw_stats_mic_t;
+
+typedef struct fw_stats_aes {
+ u32 aes_enc_fail ACX_PACKED;
+ u32 aes_dec_fail ACX_PACKED;
+ u32 aes_enc_pkts ACX_PACKED;
+ u32 aes_dec_pkts ACX_PACKED;
+ u32 aes_enc_irq ACX_PACKED;
+ u32 aes_dec_irq ACX_PACKED;
+} fw_stats_aes_t;
+
+typedef struct fw_stats_event {
+ u32 heartbeat ACX_PACKED;
+ u32 calibration ACX_PACKED;
+ u32 rx_mismatch ACX_PACKED;
+ u32 rx_mem_empty ACX_PACKED;
+ u32 rx_pool ACX_PACKED;
+ u32 oom_late ACX_PACKED;
+ u32 phy_tx_err ACX_PACKED;
+ u32 tx_stuck ACX_PACKED;
+} fw_stats_event_t;
+
+/* mainly for size calculation only */
+typedef struct fw_stats {
+ u16 type;
+ u16 len;
+ fw_stats_tx_t tx;
+ fw_stats_rx_t rx;
+ fw_stats_dma_t dma;
+ fw_stats_irq_t irq;
+ fw_stats_wep_t wep;
+ fw_stats_pwr_t pwr;
+ fw_stats_mic_t mic;
+ fw_stats_aes_t aes;
+ fw_stats_event_t evt;
} fw_stats_t;
/* Firmware version struct */
diff -urN acx-20060202/common.c acx-20060202_stats/common.c
--- acx-20060202/common.c 2006-02-01 10:49:37.000000000 +0100
+++ acx-20060202_stats/common.c 2006-02-05 06:23:21.000000000 +0100
@@ -851,7 +851,7 @@
ACX1xx_IE_RXCONFIG_LEN,
0,
0,
- ACX1xx_IE_FIRMWARE_STATISTICS_LEN,
+ sizeof(fw_stats_t)-4+FW_STATS_FUTURE_EXTENSION,
0,
ACX1xx_IE_FEATURE_CONFIG_LEN,
ACX111_IE_KEY_CHOOSE_LEN,
@@ -928,7 +928,7 @@
ACX1xx_IE_RXCONFIG_LEN,
0,
0,
- ACX1xx_IE_FIRMWARE_STATISTICS_LEN,
+ sizeof(fw_stats_t)-4+FW_STATS_FUTURE_EXTENSION,
0,
ACX1xx_IE_FEATURE_CONFIG_LEN,
ACX111_IE_KEY_CHOOSE_LEN,
@@ -1148,20 +1148,27 @@
acx_s_proc_diag_output(char *buf, acx_device_t *adev)
{
char *p = buf;
- fw_stats_t *fw_stats;
unsigned long flags;
+ unsigned int len = 0, partlen;
+ u32 temp1, temp2;
+ u8 *st, *st_end;
+#ifdef __BIG_ENDIAN
+ u8 *st2;
+#endif
+ fw_stats_t *fw_stats;
+ char *part_str = NULL;
+ fw_stats_tx_t *tx = NULL;
+ fw_stats_rx_t *rx = NULL;
+ fw_stats_dma_t *dma = NULL;
+ fw_stats_irq_t *irq = NULL;
+ fw_stats_wep_t *wep = NULL;
+ fw_stats_pwr_t *pwr = NULL;
+ fw_stats_mic_t *mic = NULL;
+ fw_stats_aes_t *aes = NULL;
+ fw_stats_event_t *evt = NULL;
FN_ENTER;
- /* TODO: may replace kmalloc/memset with kzalloc once
- * Linux 2.6.14 is widespread */
- fw_stats = kmalloc(sizeof(*fw_stats), GFP_KERNEL);
- if (!fw_stats) {
- FN_EXIT1(0);
- return 0;
- }
- memset(fw_stats, 0, sizeof(*fw_stats));
-
acx_lock(adev, flags);
if (IS_PCI(adev))
@@ -1205,63 +1212,322 @@
acx_unlock(adev, flags);
- if (OK != acx_s_interrogate(adev, fw_stats, ACX1xx_IE_FIRMWARE_STATISTICS))
- p += sprintf(p,
- "\n"
- "** Firmware **\n"
- "QUERY FAILED!!\n");
- else {
- p += sprintf(p,
- "\n"
- "** Firmware **\n"
- "version \"%s\"\n"
- "tx_desc_overfl %u, rx_OutOfMem %u, rx_hdr_overfl %u, rx_hdr_use_next %u\n"
- "rx_dropped_frame %u, rx_frame_ptr_err %u, rx_xfr_hint_trig %u, rx_dma_req %u\n"
- "rx_dma_err %u, tx_dma_req %u, tx_dma_err %u, cmd_cplt %u, fiq %u\n"
- "rx_hdrs %u, rx_cmplt %u, rx_mem_overfl %u, rx_rdys %u, irqs %u\n"
- "acx_trans_procs %u, decrypt_done %u, dma_0_done %u, dma_1_done %u\n",
- adev->firmware_version,
- le32_to_cpu(fw_stats->tx_desc_of),
- le32_to_cpu(fw_stats->rx_oom),
- le32_to_cpu(fw_stats->rx_hdr_of),
- le32_to_cpu(fw_stats->rx_hdr_use_next),
- le32_to_cpu(fw_stats->rx_dropped_frame),
- le32_to_cpu(fw_stats->rx_frame_ptr_err),
- le32_to_cpu(fw_stats->rx_xfr_hint_trig),
- le32_to_cpu(fw_stats->rx_dma_req),
- le32_to_cpu(fw_stats->rx_dma_err),
- le32_to_cpu(fw_stats->tx_dma_req),
- le32_to_cpu(fw_stats->tx_dma_err),
- le32_to_cpu(fw_stats->cmd_cplt),
- le32_to_cpu(fw_stats->fiq),
- le32_to_cpu(fw_stats->rx_hdrs),
- le32_to_cpu(fw_stats->rx_cmplt),
- le32_to_cpu(fw_stats->rx_mem_of),
- le32_to_cpu(fw_stats->rx_rdys),
- le32_to_cpu(fw_stats->irqs),
- le32_to_cpu(fw_stats->acx_trans_procs),
- le32_to_cpu(fw_stats->decrypt_done),
- le32_to_cpu(fw_stats->dma_0_done),
- le32_to_cpu(fw_stats->dma_1_done));
+ p += sprintf(p,
+ "\n"
+ "** Firmware **\n"
+ "NOTE: version dependent statistics layout, "
+ "please report if you suspect wrong parsing!\n"
+ "\n"
+ "version \"%s\"\n", adev->firmware_version);
+
+ /* TODO: may replace kmalloc/memset with kzalloc once
+ * Linux 2.6.14 is widespread */
+ fw_stats = kmalloc(sizeof(*fw_stats)+FW_STATS_FUTURE_EXTENSION, GFP_KERNEL);
+ if (!fw_stats) {
+ FN_EXIT1(0);
+ return 0;
+ }
+ memset(fw_stats, 0, sizeof(*fw_stats)+FW_STATS_FUTURE_EXTENSION);
+
+ st = (u8 *)fw_stats;
+
+ part_str = "statistics query command";
+
+ if (OK != acx_s_interrogate(adev, st, ACX1xx_IE_FIRMWARE_STATISTICS))
+ goto fw_stats_end;
+
+ st += sizeof(u16);
+ len = *(u16 *)st;
+
+ if (len > sizeof(*fw_stats)) {
p += sprintf(p,
- "tx_exch_complet %u, commands %u, acx_rx_procs %u\n"
- "hw_pm_mode_changes %u, host_acks %u, pci_pm %u, acm_wakeups %u\n"
- "wep_key_count %u, wep_default_key_count %u, dot11_def_key_mib %u\n"
- "wep_key_not_found %u, wep_decrypt_fail %u\n",
- le32_to_cpu(fw_stats->tx_exch_complet),
- le32_to_cpu(fw_stats->commands),
- le32_to_cpu(fw_stats->acx_rx_procs),
- le32_to_cpu(fw_stats->hw_pm_mode_changes),
- le32_to_cpu(fw_stats->host_acks),
- le32_to_cpu(fw_stats->pci_pm),
- le32_to_cpu(fw_stats->acm_wakeups),
- le32_to_cpu(fw_stats->wep_key_count),
- le32_to_cpu(fw_stats->wep_default_key_count),
- le32_to_cpu(fw_stats->dot11_def_key_mib),
- le32_to_cpu(fw_stats->wep_key_not_found),
- le32_to_cpu(fw_stats->wep_decrypt_fail));
+ "firmware version with bigger fw_stats struct detected\n"
+ "(%u vs. %u), PLEASE REPORT!!\n", len, sizeof(fw_stats_t));
+ if (len > sizeof(*fw_stats)+FW_STATS_FUTURE_EXTENSION) {
+ p += sprintf(p, "struct size exceeded allocation!\n");
+ len = sizeof(*fw_stats)+FW_STATS_FUTURE_EXTENSION;
+ }
+ }
+ st += sizeof(u16);
+ st_end = st - 2*sizeof(u16) + len;
+
+#ifdef __BIG_ENDIAN
+ /* let's make one bold assumption here:
+ * (hopefully!) *all* statistics fields are u32 only,
+ * thus if we need to make endianness corrections
+ * we can simply do them in one go, in advance */
+ st2 = (u8 *)fw_stats;
+ for (temp1 = 0; temp1 < len; temp1 += 4, st2 += 4)
+ *(u32 *)st2 = le32_to_cpu(*(u32 *)st2);
+#endif
+
+ part_str = "Rx/Tx";
+
+ /* directly at end of a struct part? --> no error! */
+ if (st == st_end)
+ goto fw_stats_end;
+
+ tx = (fw_stats_tx_t *)st;
+ st += sizeof(fw_stats_tx_t);
+ rx = (fw_stats_rx_t *)st;
+ st += sizeof(fw_stats_rx_t);
+ partlen = sizeof(fw_stats_tx_t) + sizeof(fw_stats_rx_t);
+
+ if (
+ (IS_PCI(adev) && IS_ACX100(adev))
+ || (IS_USB(adev) && IS_ACX100(adev))
+ ) {
+ /* at least ACX100 PCI F/W 1.9.8.b
+ * and ACX100 USB F/W 1.0.7-USB
+ * don't have those two fields... */
+ st -= 2*sizeof(u32);
+
+ /* our parsing doesn't quite match this firmware yet,
+ * log failure */
+ if (st > st_end)
+ goto fw_stats_fail;
+ temp1 = temp2 = 999999999;
+ } else {
+ if (st > st_end)
+ goto fw_stats_fail;
+ temp1 = rx->rx_aci_events;
+ temp2 = rx->rx_aci_resets;
}
+ p += sprintf(p,
+ "%s:\n"
+ " tx_desc_overfl %u\n"
+ " rx_OutOfMem %u, rx_hdr_overfl %u, rx_hw_stuck %u\n"
+ " rx_dropped_frame %u, rx_frame_ptr_err %u, rx_xfr_hint_trig %u\n"
+ " rx_aci_events %u, rx_aci_resets %u\n",
+ part_str,
+ tx->tx_desc_of,
+ rx->rx_oom,
+ rx->rx_hdr_of,
+ rx->rx_hw_stuck,
+ rx->rx_dropped_frame,
+ rx->rx_frame_ptr_err,
+ rx->rx_xfr_hint_trig,
+ temp1,
+ temp2);
+
+ part_str = "DMA";
+
+ if (st == st_end)
+ goto fw_stats_end;
+
+ dma = (fw_stats_dma_t *)st;
+ partlen = sizeof(fw_stats_dma_t);
+ st += partlen;
+
+ if (st > st_end)
+ goto fw_stats_fail;
+
+ p += sprintf(p,
+ "%s:\n"
+ " rx_dma_req %u, rx_dma_err %u, tx_dma_req %u, tx_dma_err %u\n",
+ part_str,
+ dma->rx_dma_req,
+ dma->rx_dma_err,
+ dma->tx_dma_req,
+ dma->tx_dma_err);
+
+ part_str = "IRQ";
+
+ if (st == st_end)
+ goto fw_stats_end;
+
+ irq = (fw_stats_irq_t *)st;
+ partlen = sizeof(fw_stats_irq_t);
+ st += partlen;
+
+ if (st > st_end)
+ goto fw_stats_fail;
+
+ p += sprintf(p,
+ "%s:\n"
+ " cmd_cplt %u, fiq %u\n"
+ " rx_hdrs %u, rx_cmplt %u, rx_mem_overfl %u, rx_rdys %u\n"
+ " irqs %u, tx_procs %u, decrypt_done %u\n"
+ " dma_0_done %u, dma_1_done %u, tx_exch_complet %u\n"
+ " commands %u, rx_procs %u, hw_pm_mode_changes %u\n"
+ " host_acks %u, pci_pm %u, acm_wakeups %u\n",
+ part_str,
+ irq->cmd_cplt,
+ irq->fiq,
+ irq->rx_hdrs,
+ irq->rx_cmplt,
+ irq->rx_mem_of,
+ irq->rx_rdys,
+ irq->irqs,
+ irq->tx_procs,
+ irq->decrypt_done,
+ irq->dma_0_done,
+ irq->dma_1_done,
+ irq->tx_exch_complet,
+ irq->commands,
+ irq->rx_procs,
+ irq->hw_pm_mode_changes,
+ irq->host_acks,
+ irq->pci_pm,
+ irq->acm_wakeups);
+
+ part_str = "WEP";
+
+ if (st == st_end)
+ goto fw_stats_end;
+
+ wep = (fw_stats_wep_t *)st;
+ partlen = sizeof(fw_stats_wep_t);
+ st += partlen;
+
+ if (
+ (IS_PCI(adev) && IS_ACX100(adev))
+ || (IS_USB(adev) && IS_ACX100(adev))
+ ) {
+ /* at least ACX100 PCI F/W 1.9.8.b
+ * and ACX100 USB F/W 1.0.7-USB
+ * don't have those two fields... */
+ st -= 2*sizeof(u32);
+ if (st > st_end)
+ goto fw_stats_fail;
+ temp1 = temp2 = 999999999;
+ } else {
+ if (st > st_end)
+ goto fw_stats_fail;
+ temp1 = wep->wep_pkt_decrypt;
+ temp2 = wep->wep_decrypt_irqs;
+ }
+
+ p += sprintf(p,
+ "%s:\n"
+ " wep_key_count %u, wep_default_key_count %u, dot11_def_key_mib %u\n"
+ " wep_key_not_found %u, wep_decrypt_fail %u\n"
+ " wep_pkt_decrypt %u, wep_decrypt_irqs %u\n",
+ part_str,
+ wep->wep_key_count,
+ wep->wep_default_key_count,
+ wep->dot11_def_key_mib,
+ wep->wep_key_not_found,
+ wep->wep_decrypt_fail,
+ temp1,
+ temp2);
+
+ part_str = "power";
+
+ if (st == st_end)
+ goto fw_stats_end;
+
+ pwr = (fw_stats_pwr_t *)st;
+ partlen = sizeof(fw_stats_pwr_t);
+ st += partlen;
+
+ if (st > st_end)
+ goto fw_stats_fail;
+
+ p += sprintf(p,
+ "%s:\n"
+ " tx_start_ctr %u, no_ps_tx_too_short %u\n"
+ " rx_start_ctr %u, no_ps_rx_too_short %u\n"
+ " lppd_started %u\n"
+ " no_lppd_too_noisy %u, no_lppd_too_short %u, no_lppd_matching_frame %u\n",
+ part_str,
+ pwr->tx_start_ctr,
+ pwr->no_ps_tx_too_short,
+ pwr->rx_start_ctr,
+ pwr->no_ps_rx_too_short,
+ pwr->lppd_started,
+ pwr->no_lppd_too_noisy,
+ pwr->no_lppd_too_short,
+ pwr->no_lppd_matching_frame);
+
+ part_str = "MIC";
+
+ if (st == st_end)
+ goto fw_stats_end;
+
+ mic = (fw_stats_mic_t *)st;
+ partlen = sizeof(fw_stats_mic_t);
+ st += partlen;
+
+ if (st > st_end)
+ goto fw_stats_fail;
+
+ p += sprintf(p,
+ "%s:\n"
+ " mic_rx_pkts %u, mic_calc_fail %u\n",
+ part_str,
+ mic->mic_rx_pkts,
+ mic->mic_calc_fail);
+
+ part_str = "AES";
+
+ if (st == st_end)
+ goto fw_stats_end;
+
+ aes = (fw_stats_aes_t *)st;
+ partlen = sizeof(fw_stats_aes_t);
+ st += partlen;
+
+ if (st > st_end)
+ goto fw_stats_fail;
+
+ p += sprintf(p,
+ "%s:\n"
+ " aes_enc_fail %u, aes_dec_fail %u\n"
+ " aes_enc_pkts %u, aes_dec_pkts %u\n"
+ " aes_enc_irq %u, aes_dec_irq %u\n",
+ part_str,
+ aes->aes_enc_fail,
+ aes->aes_dec_fail,
+ aes->aes_enc_pkts,
+ aes->aes_dec_pkts,
+ aes->aes_enc_irq,
+ aes->aes_dec_irq);
+
+ part_str = "event";
+
+ if (st == st_end)
+ goto fw_stats_end;
+
+ evt = (fw_stats_event_t *)st;
+ partlen = sizeof(fw_stats_event_t);
+ st += partlen;
+
+ if (st > st_end)
+ goto fw_stats_fail;
+
+ p += sprintf(p,
+ "%s:\n"
+ " heartbeat %u, calibration %u\n"
+ " rx_mismatch %u, rx_mem_empty %u, rx_pool %u\n"
+ " oom_late %u\n"
+ " phy_tx_err %u, tx_stuck %u\n",
+ part_str,
+ evt->heartbeat,
+ evt->calibration,
+ evt->rx_mismatch,
+ evt->rx_mem_empty,
+ evt->rx_pool,
+ evt->oom_late,
+ evt->phy_tx_err,
+ evt->tx_stuck);
+
+ if (st < st_end)
+ goto fw_stats_bigger;
+
+ goto fw_stats_end;
+
+fw_stats_fail:
+ st -= partlen;
+ p += sprintf(p,
+ "failed at %s part (size %u), offset %u (struct size %u), PLEASE REPORT!\n", part_str, partlen, (int)st - (int)fw_stats, len);
+fw_stats_bigger:
+ for (; st < st_end; st += 4)
+ p += sprintf(p,
+ "UNKN%3d: %u\n", (int)st - (int)fw_stats, *(u32 *)st);
+
+fw_stats_end:
kfree(fw_stats);
FN_EXIT1(p - buf);
diff -urN acx-20060202/pci.c acx-20060202_stats/pci.c
--- acx-20060202/pci.c 2006-02-01 10:49:33.000000000 +0100
+++ acx-20060202_stats/pci.c 2006-02-04 19:30:29.000000000 +0100
@@ -1058,13 +1058,13 @@
/* Test for IDLE state */
if (!cmd_status)
break;
- if (counter % 5 == 0) {
+ if (counter % 8 == 0) {
if (time_after(jiffies, timeout)) {
counter = 0;
break;
}
- /* we waited 5 iterations, no luck. Sleep 5 ms */
- acx_s_msleep(5);
+ /* we waited 8 iterations, no luck. Sleep 8 ms */
+ acx_s_msleep(8);
}
} while (likely(--counter));
@@ -1124,13 +1124,13 @@
break;
}
- if (counter % 5 == 0) {
+ if (counter % 8 == 0) {
if (time_after(jiffies, timeout)) {
counter = 0;
break;
}
- /* we waited 5 iterations, no luck. Sleep 5 ms */
- acx_s_msleep(5);
+ /* we waited 8 iterations, no luck. Sleep 8 ms */
+ acx_s_msleep(8);
}
} while (likely(--counter));
@@ -2307,7 +2307,9 @@
while (1) {
hostdesc = &adev->rxhostdesc_start[tail];
/* advance tail regardless of outcome of the below test */
- tail = (tail + 1) % RX_CNT;
+ /* smaller/less writes than: tail = (tail + 1) % RX_CNT; */
+ if (++tail >= RX_CNT)
+ tail = 0;
if ((hostdesc->Ctl_16 & cpu_to_le16(DESC_CTL_HOSTOWN))
&& (hostdesc->Status & cpu_to_le32(DESC_STATUS_FULL)))
@@ -2338,7 +2340,9 @@
|| !(hostdesc->Status & cpu_to_le32(DESC_STATUS_FULL)))
break;
- tail = (tail + 1) % RX_CNT;
+ /* slower: tail = (tail + 1) % RX_CNT; */
+ if (++tail >= RX_CNT)
+ tail = 0;
}
end:
adev->rx_tail = tail;
@@ -3065,7 +3069,10 @@
}
/* returning current descriptor, so advance to next free one */
- adev->tx_head = (head + 1) % TX_CNT;
+ /* slower: adev->tx_head = (head + 1) % TX_CNT; */
+ adev->tx_head = head + 1;
+ if (adev->tx_head >= TX_CNT)
+ adev->tx_head = 0;
end:
FN_EXIT0;
@@ -3497,7 +3504,9 @@
finger, ack_failures, rts_failures, rts_ok, r100);
/* update pointer for descr to be cleaned next */
- finger = (finger + 1) % TX_CNT;
+ /* slower: finger = (finger + 1) % TX_CNT; */
+ if (++finger >= TX_CNT)
+ finger = 0;
}
/* remember last position */
diff -urN acx-20060202/usb.c acx-20060202_stats/usb.c
--- acx-20060202/usb.c 2006-02-01 10:49:34.000000000 +0100
+++ acx-20060202_stats/usb.c 2006-02-03 10:24:07.000000000 +0100
@@ -1576,7 +1576,10 @@
head = adev->tx_head;
do {
- head = (head + 1) % ACX_TX_URB_CNT;
+ /* slower: head = (head + 1) % ACX_TX_URB_CNT; */
+ if (++head >= ACX_TX_URB_CNT)
+ head = 0;
+
if (!adev->usb_tx[head].busy) {
log(L_USBRXTX, "allocated tx %d\n", head);
tx = &adev->usb_tx[head];
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
^ permalink raw reply
* Re: [patch 3/4] net: Percpufy frequently used variables -- proto.sockets_allocated
From: Andrew Morton @ 2006-02-03 3:16 UTC (permalink / raw)
To: Ravikiran G Thirumalai
Cc: dada1, davem, linux-kernel, shai, netdev, pravins, bcrl
In-Reply-To: <20060203030547.GB3612@localhost.localdomain>
Ravikiran G Thirumalai <kiran@scalex86.org> wrote:
>
> On Fri, Jan 27, 2006 at 03:01:06PM -0800, Andrew Morton wrote:
> > Ravikiran G Thirumalai <kiran@scalex86.org> wrote:
> >
> >
> > > >
> > > > If the benchmarks say that we need to. If we cannot observe any problems
> > > > in testing of existing code and if we can't demonstrate any benefit from
> > > > the patched code then one option is to go off and do something else ;)
> > >
> > > We first tried plain per-CPU counters for memory_allocated, found that reads
> > > on memory_allocated was causing cacheline transfers, and then
> > > switched over to batching. So batching reads is useful. To avoid
> > > inaccuracy, we can maybe change percpu_counter_init to:
> > >
> > > void percpu_counter_init(struct percpu_counter *fbc, int maxdev)
> > >
> > > the percpu batching limit would then be maxdev/num_possible_cpus. One would
> > > use batching counters only when both reads and writes are frequent. With
> > > the above scheme, we would go fetch cachelines from other cpus for read
> > > often only on large cpu counts, which is not any worse than the global
> > > counter alternative, but it would still be beneficial on smaller machines,
> > > without sacrificing a pre-set deviation.
> > >
> > > Comments?
> >
> > Sounds sane.
> >
>
> Here's an implementation which delegates tuning of batching to the user. We
> don't really need local_t at all as percpu_counter_mod is not safe against
> interrupts and softirqs as it is. If we have a counter which could be
> modified in process context and irq/bh context, we just have to use a
> wrapper like percpu_counter_mod_bh which will just disable and enable bottom
> halves. Reads on the counters are safe as they are atomic_reads, and the
> cpu local variables are always accessed by that cpu only.
>
> (PS: the maxerr for ext2/ext3 is just guesstimate)
Well that's the problem. We need to choose production-quality values for
use in there.
> Comments?
Using num_possible_cpus() in that header file is just asking for build
errors. Probably best to uninline the function rather than adding the
needed include of cpumask.h.
^ permalink raw reply
* Re: [patch 3/4] net: Percpufy frequently used variables -- proto.sockets_allocated
From: Ravikiran G Thirumalai @ 2006-02-03 3:05 UTC (permalink / raw)
To: Andrew Morton; +Cc: dada1, davem, linux-kernel, shai, netdev, pravins, bcrl
In-Reply-To: <20060127150106.38b9e041.akpm@osdl.org>
On Fri, Jan 27, 2006 at 03:01:06PM -0800, Andrew Morton wrote:
> Ravikiran G Thirumalai <kiran@scalex86.org> wrote:
>
>
> > >
> > > If the benchmarks say that we need to. If we cannot observe any problems
> > > in testing of existing code and if we can't demonstrate any benefit from
> > > the patched code then one option is to go off and do something else ;)
> >
> > We first tried plain per-CPU counters for memory_allocated, found that reads
> > on memory_allocated was causing cacheline transfers, and then
> > switched over to batching. So batching reads is useful. To avoid
> > inaccuracy, we can maybe change percpu_counter_init to:
> >
> > void percpu_counter_init(struct percpu_counter *fbc, int maxdev)
> >
> > the percpu batching limit would then be maxdev/num_possible_cpus. One would
> > use batching counters only when both reads and writes are frequent. With
> > the above scheme, we would go fetch cachelines from other cpus for read
> > often only on large cpu counts, which is not any worse than the global
> > counter alternative, but it would still be beneficial on smaller machines,
> > without sacrificing a pre-set deviation.
> >
> > Comments?
>
> Sounds sane.
>
Here's an implementation which delegates tuning of batching to the user. We
don't really need local_t at all as percpu_counter_mod is not safe against
interrupts and softirqs as it is. If we have a counter which could be
modified in process context and irq/bh context, we just have to use a
wrapper like percpu_counter_mod_bh which will just disable and enable bottom
halves. Reads on the counters are safe as they are atomic_reads, and the
cpu local variables are always accessed by that cpu only.
(PS: the maxerr for ext2/ext3 is just guesstimate)
Comments?
Index: linux-2.6.16-rc1mm4/include/linux/percpu_counter.h
===================================================================
--- linux-2.6.16-rc1mm4.orig/include/linux/percpu_counter.h 2006-02-02 11:18:54.000000000 -0800
+++ linux-2.6.16-rc1mm4/include/linux/percpu_counter.h 2006-02-02 18:29:46.000000000 -0800
@@ -16,24 +16,32 @@
struct percpu_counter {
atomic_long_t count;
+ int percpu_batch;
long *counters;
};
-#if NR_CPUS >= 16
-#define FBC_BATCH (NR_CPUS*2)
-#else
-#define FBC_BATCH (NR_CPUS*4)
-#endif
-static inline void percpu_counter_init(struct percpu_counter *fbc)
+/*
+ * Choose maxerr carefully. maxerr/num_possible_cpus indicates per-cpu batching
+ * Set maximum tolerance for better performance on large systems.
+ */
+static inline void percpu_counter_init(struct percpu_counter *fbc,
+ unsigned int maxerr)
{
atomic_long_set(&fbc->count, 0);
- fbc->counters = alloc_percpu(long);
+ fbc->percpu_batch = maxerr/num_possible_cpus();
+ if (fbc->percpu_batch) {
+ fbc->counters = alloc_percpu(long);
+ if (!fbc->counters)
+ fbc->percpu_batch = 0;
+ }
+
}
static inline void percpu_counter_destroy(struct percpu_counter *fbc)
{
- free_percpu(fbc->counters);
+ if (fbc->percpu_batch)
+ free_percpu(fbc->counters);
}
void percpu_counter_mod(struct percpu_counter *fbc, long amount);
@@ -63,7 +71,8 @@ struct percpu_counter {
long count;
};
-static inline void percpu_counter_init(struct percpu_counter *fbc)
+static inline void percpu_counter_init(struct percpu_counter *fbc,
+ unsigned int maxerr)
{
fbc->count = 0;
}
Index: linux-2.6.16-rc1mm4/mm/swap.c
===================================================================
--- linux-2.6.16-rc1mm4.orig/mm/swap.c 2006-01-29 20:20:20.000000000 -0800
+++ linux-2.6.16-rc1mm4/mm/swap.c 2006-02-02 18:36:21.000000000 -0800
@@ -470,13 +470,20 @@ static int cpu_swap_callback(struct noti
#ifdef CONFIG_SMP
void percpu_counter_mod(struct percpu_counter *fbc, long amount)
{
- long count;
long *pcount;
- int cpu = get_cpu();
+ long count;
+ int cpu;
+ /* Slow mode */
+ if (unlikely(!fbc->percpu_batch)) {
+ atomic_long_add(amount, &fbc->count);
+ return;
+ }
+
+ cpu = get_cpu();
pcount = per_cpu_ptr(fbc->counters, cpu);
count = *pcount + amount;
- if (count >= FBC_BATCH || count <= -FBC_BATCH) {
+ if (count >= fbc->percpu_batch || count <= -fbc->percpu_batch) {
atomic_long_add(count, &fbc->count);
count = 0;
}
Index: linux-2.6.16-rc1mm4/fs/ext2/super.c
===================================================================
--- linux-2.6.16-rc1mm4.orig/fs/ext2/super.c 2006-02-02 18:30:28.000000000 -0800
+++ linux-2.6.16-rc1mm4/fs/ext2/super.c 2006-02-02 18:36:39.000000000 -0800
@@ -610,6 +610,7 @@ static int ext2_fill_super(struct super_
int db_count;
int i, j;
__le32 features;
+ int maxerr;
sbi = kmalloc(sizeof(*sbi), GFP_KERNEL);
if (!sbi)
@@ -835,9 +836,14 @@ static int ext2_fill_super(struct super_
printk ("EXT2-fs: not enough memory\n");
goto failed_mount;
}
- percpu_counter_init(&sbi->s_freeblocks_counter);
- percpu_counter_init(&sbi->s_freeinodes_counter);
- percpu_counter_init(&sbi->s_dirs_counter);
+
+ if (num_possible_cpus() <= 16 )
+ maxerr = 256;
+ else
+ maxerr = 1024;
+ percpu_counter_init(&sbi->s_freeblocks_counter, maxerr);
+ percpu_counter_init(&sbi->s_freeinodes_counter, maxerr);
+ percpu_counter_init(&sbi->s_dirs_counter, maxerr);
bgl_lock_init(&sbi->s_blockgroup_lock);
sbi->s_debts = kmalloc(sbi->s_groups_count * sizeof(*sbi->s_debts),
GFP_KERNEL);
Index: linux-2.6.16-rc1mm4/fs/ext3/super.c
===================================================================
--- linux-2.6.16-rc1mm4.orig/fs/ext3/super.c 2006-02-02 18:30:28.000000000 -0800
+++ linux-2.6.16-rc1mm4/fs/ext3/super.c 2006-02-02 18:38:10.000000000 -0800
@@ -1353,6 +1353,7 @@ static int ext3_fill_super (struct super
int i;
int needs_recovery;
__le32 features;
+ int maxerr;
sbi = kmalloc(sizeof(*sbi), GFP_KERNEL);
if (!sbi)
@@ -1578,9 +1579,14 @@ static int ext3_fill_super (struct super
goto failed_mount;
}
- percpu_counter_init(&sbi->s_freeblocks_counter);
- percpu_counter_init(&sbi->s_freeinodes_counter);
- percpu_counter_init(&sbi->s_dirs_counter);
+ if (num_possible_cpus() <= 16)
+ maxerr = 256;
+ else
+ maxerr = 1024;
+
+ percpu_counter_init(&sbi->s_freeblocks_counter, maxerr);
+ percpu_counter_init(&sbi->s_freeinodes_counter, maxerr);
+ percpu_counter_init(&sbi->s_dirs_counter, maxerr);
bgl_lock_init(&sbi->s_blockgroup_lock);
for (i = 0; i < db_count; i++) {
^ permalink raw reply
* Re: FW: Performance evaluation of high speed TCPs
From: Ian McDonald @ 2006-02-03 2:51 UTC (permalink / raw)
To: Douglas Leith; +Cc: netdev, end2end-interest
In-Reply-To: <C0FF12BB5B83E44ABAEAA47149DA9735082675@helios.eee.strath.ac.uk>
> Seriously, where's the value in comparing buggy implementations - isn't
> that just a waste of all our time ? If we are genuine about wanting to
> understand tcp performance then I think we just have to take the hit from
> issues such as this that are outside all of our control.
>
A real part of the problem here is that the Linux doesn't have a full
TCP testing suite and doesn't have build checking to check for
regressions in TCP variants. As I understand the only thing tested in
nightly builds is throughput for the default TCP.
Stephen Hemminger has done some work on TCP Probes but this is where I
think real progress could be made in improving Linux TCP. I may get
around to doing this myself at some point in my research but would
welcome other people doing it also!
Ian
--
Ian McDonald
http://wand.net.nz/~iam4
WAND Network Research Group
University of Waikato
New Zealand
^ permalink raw reply
* Re: FW: Performance evaluation of high speed TCPs
From: rhee @ 2006-02-03 2:50 UTC (permalink / raw)
To: Douglas Leith; +Cc: netdev, end2end-interest
In-Reply-To: <C0FF12BB5B83E44ABAEAA47149DA9735082675@helios.eee.strath.ac.uk>
Sure. Your comments about running the buggy implementation are well taken.
That is
why this type of reporting is helpful and we are committed to keep this
effort. Just that
it takes time to run the tests, and before we run a new set of tests, we
have to do some
batch of patches to reduce our effort level (but in this case of the HTCP
bug, rest assured
that we are running it now..it is just that there are a lot of other
things going on
that we have to catch a breath a little).
Then again, if we don't do the test and keep the report
up-to-date then it is difficult to find bugs as well...so these reportings
help us find
bugs and also improve TCP algorithms. (I hope our report did the same for
you). Also
sometimes we are not motivated to find the bugs ourselves.
In fact, i contacted your student "Baruch" one month and half before we
posted our
report -- it was CCed in the netdev mailing list as well and we gave him
login and
passwd on our result website (at that time we were just about to write the
report)
and we have not heard from your guys until just one week ago. At least we
did try to
make sure we are running a buggy version.
>>Seriously, we can't run the tests for every fix and bug report.
>
> Perhaps best to view it as returning a favour. You may recall that we
> re-ran all our own experimental tests last year (all data and code
> available online at www.hamilton.ie/net/eval/) on discovering a previously
> unreported bug introduced by the linux folks when implementing bic.
> Something similar has happened with importing htcp into linux.
>
> Seriously, where's the value in comparing buggy implementations - isn't
> that just a waste of all our time ? If we are genuine about wanting to
> understand tcp performance then I think we just have to take the hit from
> issues such as this that are outside all of our control.
>
> Doug
>
> Hamilton Institute
> www.hamilton.ie
>
^ permalink raw reply
* Re: FW: Performance evaluation of high speed TCPs
From: Douglas Leith @ 2006-02-03 2:24 UTC (permalink / raw)
To: rhee; +Cc: netdev, end2end-interest
In-Reply-To: <39307.60.44.142.168.1138932213.squirrel@webmail.ncsu.edu>
[-- Attachment #1: Type: text/plain, Size: 742 bytes --]
>Seriously, we can't run the tests for every fix and bug report.
Perhaps best to view it as returning a favour. You may recall that we re-ran all our own experimental tests last year (all data and code available online at www.hamilton.ie/net/eval/) on discovering a previously unreported bug introduced by the linux folks when implementing bic. Something similar has happened with importing htcp into linux.
Seriously, where's the value in comparing buggy implementations - isn't that just a waste of all our time ? If we are genuine about wanting to understand tcp performance then I think we just have to take the hit from issues such as this that are outside all of our control.
Doug
Hamilton Institute
www.hamilton.ie
[-- Attachment #2: Type: text/html, Size: 1200 bytes --]
^ permalink raw reply
* Re: [lock validator] inet6_destroy_sock(): soft-safe -> soft-unsafe lock dependency
From: David S. Miller @ 2006-02-03 1:01 UTC (permalink / raw)
To: herbert; +Cc: mingo, davem, linux-kernel, netdev, yoshfuji
In-Reply-To: <20060201104214.GA9085@gondor.apana.org.au>
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Wed, 1 Feb 2006 21:42:14 +1100
> OK this is definitely broken. We should never touch the dst lock in
> softirq context. Since inet6_destroy_sock may be called from that
> context due to the asynchronous nature of sockets, we can't take the
> lock there.
>
> In fact this sk_dst_reset is totally redundant since all IPv6 sockets
> use inet_sock_destruct as their socket destructor which always cleans
> up the dst anyway. So the solution is to simply remove the call.
>
> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Looks good, applied, thanks Herbert.
^ permalink raw reply
* [patch 0/2] natsemi: NAPI and a bugfix
From: Mark Brown @ 2006-02-02 23:27 UTC (permalink / raw)
To: Jeff Garzik, Tim Hockin; +Cc: netdev, linux-kernel
These patches provide a series of updates to the natsemi driver: the
NAPI patch I've submitted before and a workaround for an issue with the
hardware that is easier to provoke at higher data rates.
1/2: Convert the driver to NAPI
2/2: Fix hardware issue with RX state machine lock up
--
"You grabbed my hand and we fell into it, like a daydream - or a fever."
^ permalink raw reply
* Re: [PATCH RESEND] net: Move destructor from neigh->ops to neigh_params
From: YOSHIFUJI Hideaki / 吉藤英明 @ 2006-02-02 1:34 UTC (permalink / raw)
To: rdreier; +Cc: yoshfuji, netdev, davem, openib-general
In-Reply-To: <adabqxq1rdh.fsf@cisco.com>
In article <adabqxq1rdh.fsf@cisco.com> (at Wed, 01 Feb 2006 17:28:10 -0800), Roland Dreier <rdreier@cisco.com> says:
> Sorry to distract everyone from the VJ channel discussion, but on the
> other hand it looks like Dave is back... I'm resending this because
> I'd really like to get this problem fixed but I want to make sure
> we're doing it the right way. So either an ACK or a NAK with guidance
> would be great...
Sorry for silence.
Since we have "setup," it'd be natural to have destruct;
I seems sane to me.
--yoshfuji
^ permalink raw reply
* Re: [PATCH RESEND] net: Move destructor from neigh->ops to neigh_params
From: Roland Dreier @ 2006-02-02 1:33 UTC (permalink / raw)
To: David S. Miller; +Cc: netdev, openib-general
In-Reply-To: <20060201.173137.10844554.davem@davemloft.net>
David> It's sitting in my backlog, and will be a net-2.6.17 issue
David> not a net-2.6.16 one as we're in bug fix mode there.
David> Sorry if you need this in 2.6.16, but that's not really
David> practical.
No, that's fine... I was just resending in case you were using RED to
manage your backlog. This is a real issue but I don't think it's
hitting a lot of people.
- R.
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox