aboutsummaryrefslogtreecommitdiff
path: root/drivers/atm/solos-pci.c
AgeCommit message (Collapse)Author
2010-03-30include cleanup: Update gfp.h and slab.h includes to prepare for breaking ↵Tejun Heo
implicit slab.h inclusion from percpu.h percpu.h is included by sched.h and module.h and thus ends up being included when building most .c files. percpu.h includes slab.h which in turn includes gfp.h making everything defined by the two files universally available and complicating inclusion dependencies. percpu.h -> slab.h dependency is about to be removed. Prepare for this change by updating users of gfp and slab facilities include those headers directly instead of assuming availability. As this conversion needs to touch large number of source files, the following script is used as the basis of conversion. http://userweb.kernel.org/~tj/misc/slabh-sweep.py The script does the followings. * Scan files for gfp and slab usages and update includes such that only the necessary includes are there. ie. if only gfp is used, gfp.h, if slab is used, slab.h. * When the script inserts a new include, it looks at the include blocks and try to put the new include such that its order conforms to its surrounding. It's put in the include block which contains core kernel includes, in the same order that the rest are ordered - alphabetical, Christmas tree, rev-Xmas-tree or at the end if there doesn't seem to be any matching order. * If the script can't find a place to put a new include (mostly because the file doesn't have fitting include block), it prints out an error message indicating which .h file needs to be added to the file. The conversion was done in the following steps. 1. The initial automatic conversion of all .c files updated slightly over 4000 files, deleting around 700 includes and adding ~480 gfp.h and ~3000 slab.h inclusions. The script emitted errors for ~400 files. 2. Each error was manually checked. Some didn't need the inclusion, some needed manual addition while adding it to implementation .h or embedding .c file was more appropriate for others. This step added inclusions to around 150 files. 3. The script was run again and the output was compared to the edits from #2 to make sure no file was left behind. 4. Several build tests were done and a couple of problems were fixed. e.g. lib/decompress_*.c used malloc/free() wrappers around slab APIs requiring slab.h to be added manually. 5. The script was run on all .h files but without automatically editing them as sprinkling gfp.h and slab.h inclusions around .h files could easily lead to inclusion dependency hell. Most gfp.h inclusion directives were ignored as stuff from gfp.h was usually wildly available and often used in preprocessor macros. Each slab.h inclusion directive was examined and added manually as necessary. 6. percpu.h was updated not to include slab.h. 7. Build test were done on the following configurations and failures were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my distributed build env didn't work with gcov compiles) and a few more options had to be turned off depending on archs to make things build (like ipr on powerpc/64 which failed due to missing writeq). * x86 and x86_64 UP and SMP allmodconfig and a custom test config. * powerpc and powerpc64 SMP allmodconfig * sparc and sparc64 SMP allmodconfig * ia64 SMP allmodconfig * s390 SMP allmodconfig * alpha SMP allmodconfig * um on x86_64 SMP allmodconfig 8. percpu.h modifications were reverted so that it could be applied as a separate patch and serve as bisection point. Given the fact that I had only a couple of failures from tests on step 6, I'm fairly confident about the coverage of this conversion patch. If there is a breakage, it's likely to be something in one of the arch headers which should be easily discoverable easily on most builds of the specific arch. Signed-off-by: Tejun Heo <tj@kernel.org> Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2009-11-18drivers/atm/solos-pci.c: fix warning/bug, clean up codeAndrew Morton
drivers/atm/solos-pci.c: In function 'flash_upgrade': drivers/atm/solos-pci.c:528: warning: 'fw_name' may be used uninitialized in this function Cc: Chas Williams <chas@cmf.nrl.navy.mil> Cc: David Woodhouse <David.Woodhouse@intel.com> Cc: Nathan Williams <nathan@traverse.com.au> Cc: David S. Miller <davem@davemloft.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Acked-By: David Woodhouse <David.Woodhouse@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2009-11-10solos-pci: declare MODULE_FIRMWAREBen Hutchings
Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
2009-09-22Merge branch 'master' of git://git.infradead.org/users/dwmw2/solos-2.6David S. Miller
2009-07-27drivers/atm: Correct redundant testJulia Lawall
str has already been tested. It seems that this test should be on the recently returned value snr. A simplified version of the semantic match that finds this problem is as follows: (http://www.emn.fr/x-info/coccinelle/) // <smpl> @r exists@ local idexpression x; expression E; @@ if (x == NULL || ...) { ... when forall return ...; } ... when != \(x=E\|x--\|x++\|--x\|++x\|x-=E\|x+=E\|x|=E\|x&=E\|&x\) ( *x == NULL | *x != NULL ) // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Signed-off-by: David S. Miller <davem@davemloft.net>
2009-04-13Replace all DMA_nBIT_MASK macro with DMA_BIT_MASK(n)Yang Hongyang
This is the second go through of the old DMA_nBIT_MASK macro,and there're not so many of them left,so I put them into one patch.I hope this is the last round. After this the definition of the old DMA_nBIT_MASK macro could be removed. Signed-off-by: Yang Hongyang <yanghy@cn.fujitsu.com> Cc: Russell King <rmk@arm.linux.org.uk> Cc: Tony Lindgren <tony@atomide.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: James Bottomley <James.Bottomley@HansenPartnership.com> Cc: Greg KH <greg@kroah.com> Cc: Takashi Iwai <tiwai@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-03-25solos: Check for rogue received packetsNathan Williams
Sometimes there can be received packets with the size field set to 0xFFFF. This seems to only occur after an FPGA or firmware upgrade. This patch discards packets with an invalid size. Signed-off-by: Nathan Williams <nathan@traverse.com.au> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-03-25solos: support new FPGA RAM layoutNathan Williams
Buffer sizes have been changed to 2048 bytes. Flash upgrades use a dedicated RAM block. Add support for daughterboard. Signed-off-by: Nathan Williams <nathan@traverse.com.au> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-03-21Merge branch 'master' of git://git.infradead.org/~dwmw2/solos-2.6David S. Miller
2009-03-17solos: Disable DMA until we have an FPGA update with it actually implemented.David Woodhouse
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-03-17solos: Automatically determine number of portsNathan Williams
Signed-off-by: Nathan Williams <nathan@traverse.com.au> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-03-17solos: Reset device on unload, free pending skbsDavid Woodhouse
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-02-08drivers/atm: introduce missing kfreeJulia Lawall
Error handling code following a kmalloc should free the allocated data. The semantic match that finds the problem is as follows: (http://www.emn.fr/x-info/coccinelle/) // <smpl> @r exists@ local idexpression x; statement S; expression E; identifier f,l; position p1,p2; expression *ptr != NULL; @@ ( if ((x@p1 = \(kmalloc\|kzalloc\|kcalloc\)(...)) == NULL) S | x@p1 = \(kmalloc\|kzalloc\|kcalloc\)(...); ... if (x == NULL) S ) <... when != x when != if (...) { <+...x...+> } x->f = E ...> ( return \(0\|<+...x...+>\|ptr\); | return@p2 ...; ) @script:python@ p1 << r.p1; p2 << r.p2; @@ print "* file: %s kmalloc %s return %s" % (p1[0].file,p1[0].line,p2[0].line) // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Signed-off-by: David S. Miller <davem@davemloft.net>
2009-01-30solos: Swap upstream/downstream rates in status packet, clean up some moreDavid Woodhouse
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-01-30solos: Set RX empty flag at startup only for !dma modeDavid Woodhouse
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-01-30solos: Don't clear config registers at startupDavid Woodhouse
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-01-30solos: Tidy up status interrupt handling, cope with 'ERROR' statusDavid Woodhouse
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-01-30solos: Add 'reset' module parameter to reset the DSL chips on loadDavid Woodhouse
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-01-29solos: Remove debugging, commented-out test codeDavid Woodhouse
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-01-29solos: Clean up handling of card->tx_mask a littleDavid Woodhouse
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-01-29solos: Fix various bugs in status packet handlingDavid Woodhouse
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-01-29solos: Remove superfluous wait_queue_head_t from struct solos_paramDavid Woodhouse
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-01-29solos: Remove IRQF_DISABLED, don't frob IRQ enable on the FPGA in solos_irq()David Woodhouse
Neither of these are necessary. Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-01-29solos: Remove unused loopback debug stuffDavid Woodhouse
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-01-29solos: Tidy up tx_mask handling for ports which need TXDavid Woodhouse
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-01-29solos: Tidy up DMA handling a little. Still untestedDavid Woodhouse
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-01-28solos: First attempt at DMA supportDavid Woodhouse
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-01-28solos: Remove parameter group from sysfs on ATM dev deregisterDavid Woodhouse
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-01-28solos: Fix under-allocation of skb size for get/set parametersDavid Woodhouse
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-01-28solos: Add SNR and Attn to status packet, fix oops on loadDavid Woodhouse
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-01-27solos: Reject non-AAL5 connections.... for nowDavid Woodhouse
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-01-27solos: Kill existing connections on link down eventDavid Woodhouse
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-01-27solos: Handle new line status change packets, hook up to ATM layer infoDavid Woodhouse
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-01-27solos: Add initial list of parametersDavid Woodhouse
I don't much like the trick with multiple inclusions of solos-attrlist.c but don't really see a saner way to do it without repeating the list. Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-01-27solos: Handle attribute show/store in kernel more sanelyDavid Woodhouse
There are still a _lot_ of attributes, but for at least the basic ones we want to be able to get/set them from the kernel. Especially the ones we want to inform the ATM core about (link state, speed). Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-01-27solos: Kill global 'opens' count.David Woodhouse
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-01-27solos: Clean up firmware loading codeDavid Woodhouse
We no longer try to load firmware while the ATM is up and running. However, this means that we _do_ make init_module() wait for it, and it takes a long time for now (since we're using ultra-conservative code in the FPGA for that too). The inner loop which uses swahb32p() was by Simon Farnsworth. Simon has patches which migrate us to request_firmware_nowait(), for which we'll actually need to take down the ATM devices, do the upgrade, then reregister them. Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-01-27solos: FPGA and firmware update support.Simon Farnsworth
This is just a straight pull in of changes, syncing us up to 0.07 from openadsl.sf.net Signed-off-by: Nathan Williams <nathan@traverse.com.au> Signed-off-by: Simon Farnsworth <simon@farnz.org.uk> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-01-27solos: Slight debugging improvementsSimon Farnsworth
Print a message if pskb_expand_head fails. Make atmdebug writable by root, so that you can turn printing of data sent to and received from the card on and off at runtime - useful for tracking corruption. Signed-off-by: Simon Farnsworth <simon@farnz.org.uk> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-01-27solos: Fix length header in FPGA transfersDavid Woodhouse
The length field shouldn't ever include the size of the header itself. This fixes the problem that some people were seeing with 1500-byte packets. Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2008-12-26atm: Driver for Solos PCI ADSL2+ card.David Woodhouse
This adds basic support for the 'Solos' PCI ADSL2+ cards being developed by Traverse Technologies and Xrio Ltd: http://www.traverse.com.au/productview.php?product_id=116 Signed-off-by: Nathan Williams <nathan@traverse.com.au> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>