summaryrefslogtreecommitdiffstats
path: root/drivers/atm
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'for-linus' of ↵Linus Torvalds2009-12-091-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (42 commits) tree-wide: fix misspelling of "definition" in comments reiserfs: fix misspelling of "journaled" doc: Fix a typo in slub.txt. inotify: remove superfluous return code check hdlc: spelling fix in find_pvc() comment doc: fix regulator docs cut-and-pasteism mtd: Fix comment in Kconfig doc: Fix IRQ chip docs tree-wide: fix assorted typos all over the place drivers/ata/libata-sff.c: comment spelling fixes fix typos/grammos in Documentation/edac.txt sysctl: add missing comments fs/debugfs/inode.c: fix comment typos sgivwfb: Make use of ARRAY_SIZE. sky2: fix sky2_link_down copy/paste comment error tree-wide: fix typos "couter" -> "counter" tree-wide: fix typos "offest" -> "offset" fix kerneldoc for set_irq_msi() spidev: fix double "of of" in comment comment typo fix: sybsystem -> subsystem ...
| * tree-wide: fix assorted typos all over the placeAndré Goddard Rosa2009-12-041-1/+1
| | | | | | | | | | | | | | | | | | | | That is "success", "unknown", "through", "performance", "[re|un]mapping" , "access", "default", "reasonable", "[con]currently", "temperature" , "channel", "[un]used", "application", "example","hierarchy", "therefore" , "[over|under]flow", "contiguous", "threshold", "enough" and others. Signed-off-by: André Goddard Rosa <andre.goddard@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
* | drivers/atm/solos-pci.c: fix warning/bug, clean up codeAndrew Morton2009-11-181-13/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | ambassador: declare MODULE_FIRMWAREBen Hutchings2009-11-101-0/+1
| | | | | | | | | | Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
* | solos-pci: declare MODULE_FIRMWAREBen Hutchings2009-11-101-0/+3
| | | | | | | | | | Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
* | atm: Cleanup redundant tests on unsignedroel kluin2009-10-292-3/+3
|/ | | | | | | | The variables are unsigned so the `< 0' test always fails, the other part of the test catches wrapped values. Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* net: Make setsockopt() optlen be unsigned.David S. Miller2009-09-307-14/+6
| | | | | | | | | | | | This provides safety against negative optlen at the type level instead of depending upon (sometimes non-trivial) checks against this sprinkled all over the the place, in each and every implementation. Based upon work done by Arjan van de Ven and feedback from Linus Torvalds. Signed-off-by: David S. Miller <davem@davemloft.net>
* atm: dereference of he_dev->rbps_virt in he_init_group()Juha Leppanen2009-09-281-7/+7
| | | | | | | | | The prefix decrement causes a very long loop if pci_pool_alloc() failed in the first iteration. Also I swapped rbps and rbpl arguments. Reported-by: Juha Leppanen <juha_motorsportcom@luukku.com> Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* Merge branch 'master' of git://git.infradead.org/users/dwmw2/solos-2.6David S. Miller2009-09-222-9/+77
|\
| * solos: Show Interleaving details for ADSL2 and 2+Simon Farnsworth2009-05-071-0/+4
| | | | | | | | | | | | | | | | | | InterleaveRDn and InterleaveRUp only apply to G.dmt. The equivalents for ADSL2 and 2+ are BisRDn and BisRUp. In addition, the INPdown and INPup statuses are useful when trying to track down instability on a line. Signed-off-by: Simon Farnsworth <simon@farnz.org.uk> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: Add some margin-related parametersDavid Woodhouse2009-04-301-0/+7
| | | | | | | | Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: Check for rogue received packetsNathan Williams2009-03-251-0/+4
| | | | | | | | | | | | | | | | | | 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>
| * solos: support new FPGA RAM layoutNathan Williams2009-03-251-9/+62
| | | | | | | | | | | | | | | | | | 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>
* | atm: dereference of he_dev->rbps_virt in he_init_group()roel kluin2009-09-221-9/+50
| | | | | | | | | | | | | | | | he_dev->rbps_virt or he_dev->rbpl_virt allocation may fail, s them. Make sure that he_init_group() cleans up after errors. Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | drivers/atm: Use DIV_ROUND_CLOSESTJulia Lawall2009-08-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The kernel.h macro DIV_ROUND_CLOSEST performs the computation (x + d/2)/d but is perhaps more readable. The semantic patch that makes this change is as follows: (http://www.emn.fr/x-info/coccinelle/) // <smpl> @haskernel@ @@ #include <linux/kernel.h> @depends on haskernel@ expression x,__divisor; @@ - (((x) + ((__divisor) / 2)) / (__divisor)) + DIV_ROUND_CLOSEST(x,__divisor) // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Signed-off-by: David S. Miller <davem@davemloft.net>
* | drivers/atm: Correct redundant testJulia Lawall2009-07-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Replace all DMA_nBIT_MASK macro with DMA_BIT_MASK(n)Yang Hongyang2009-04-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)Yang Hongyang2009-04-072-3/+3
| | | | | | | | | | | | | | | | Replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32) Signed-off-by: Yang Hongyang<yanghy@cn.fujitsu.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* | atm: fix non-const printk argumentStephen Hemminger2009-03-211-3/+1
| | | | | | | | | | | | | | Change printk() argument to fix compiler warning. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | Merge branch 'master' of git://git.infradead.org/~dwmw2/solos-2.6David S. Miller2009-03-212-160/+734
|\|
| * solos: Disable DMA until we have an FPGA update with it actually implemented.David Woodhouse2009-03-171-1/+1
| | | | | | | | Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: Automatically determine number of portsNathan Williams2009-03-171-1/+2
| | | | | | | | | | Signed-off-by: Nathan Williams <nathan@traverse.com.au> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: Reset device on unload, free pending skbsDavid Woodhouse2009-03-171-1/+29
| | | | | | | | Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: Swap upstream/downstream rates in status packet, clean up some moreDavid Woodhouse2009-01-301-26/+25
| | | | | | | | Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: Set RX empty flag at startup only for !dma modeDavid Woodhouse2009-01-301-2/+4
| | | | | | | | Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: Don't clear config registers at startupDavid Woodhouse2009-01-301-5/+1
| | | | | | | | Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: Tidy up status interrupt handling, cope with 'ERROR' statusDavid Woodhouse2009-01-301-4/+13
| | | | | | | | Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: Add 'reset' module parameter to reset the DSL chips on loadDavid Woodhouse2009-01-301-0/+10
| | | | | | | | Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: Remove debugging, commented-out test codeDavid Woodhouse2009-01-291-49/+3
| | | | | | | | Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: Clean up handling of card->tx_mask a littleDavid Woodhouse2009-01-291-25/+28
| | | | | | | | Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: Fix various bugs in status packet handlingDavid Woodhouse2009-01-291-21/+28
| | | | | | | | Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: Remove superfluous wait_queue_head_t from struct solos_paramDavid Woodhouse2009-01-291-1/+0
| | | | | | | | Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: Remove IRQF_DISABLED, don't frob IRQ enable on the FPGA in solos_irq()David Woodhouse2009-01-291-5/+1
| | | | | | | | | | | | Neither of these are necessary. Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: Remove unused loopback debug stuffDavid Woodhouse2009-01-291-23/+0
| | | | | | | | Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: Tidy up tx_mask handling for ports which need TXDavid Woodhouse2009-01-291-7/+13
| | | | | | | | Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: Tidy up DMA handling a little. Still untestedDavid Woodhouse2009-01-291-42/+53
| | | | | | | | Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: First attempt at DMA supportDavid Woodhouse2009-01-281-28/+90
| | | | | | | | Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: Remove parameter group from sysfs on ATM dev deregisterDavid Woodhouse2009-01-281-0/+2
| | | | | | | | Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: Fix under-allocation of skb size for get/set parametersDavid Woodhouse2009-01-281-2/+2
| | | | | | | | Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: Add SNR and Attn to status packet, fix oops on loadDavid Woodhouse2009-01-281-7/+23
| | | | | | | | Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: Reject non-AAL5 connections.... for nowDavid Woodhouse2009-01-271-0/+6
| | | | | | | | Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: Kill existing connections on link down eventDavid Woodhouse2009-01-271-2/+28
| | | | | | | | Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: Handle new line status change packets, hook up to ATM layer infoDavid Woodhouse2009-01-271-1/+92
| | | | | | | | Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: Add initial list of parametersDavid Woodhouse2009-01-272-6/+94
| | | | | | | | | | | | | | 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>
| * solos: Handle attribute show/store in kernel more sanelyDavid Woodhouse2009-01-271-0/+187
| | | | | | | | | | | | | | | | 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>
| * solos: Kill global 'opens' count.David Woodhouse2009-01-271-10/+0
| | | | | | | | Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: Clean up firmware loading codeDavid Woodhouse2009-01-271-136/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * solos: FPGA and firmware update support.Simon Farnsworth2009-01-271-2/+169
| | | | | | | | | | | | | | | | | | 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>
| * solos: Slight debugging improvementsSimon Farnsworth2009-01-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | 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>
| * solos: Fix length header in FPGA transfersDavid Woodhouse2009-01-271-4/+7
| | | | | | | | | | | | | | | | 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>