Commit graph

40 commits

Author SHA1 Message Date
Andrew Morton
7adcdb4c11 drivers/atm/solos-pci.c: fix warning/bug, clean up code
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-18 05:03:32 -08:00
Ben Hutchings
9fca79d670 solos-pci: declare MODULE_FIRMWARE
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
2009-11-10 20:28:48 -08:00
David S. Miller
efb064dec6 Merge branch 'master' of git://git.infradead.org/users/dwmw2/solos-2.6 2009-09-22 15:18:59 -07:00
Julia Lawall
6cf5767c71 drivers/atm: Correct redundant test
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-07-27 11:38:52 -07:00
Yang Hongyang
e930438c42 Replace all DMA_nBIT_MASK macro with DMA_BIT_MASK(n)
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-04-13 15:04:33 -07:00
Nathan Williams
78f857f265 solos: Check for rogue received packets
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-25 11:17:49 +00:00
Nathan Williams
4dbedf43d2 solos: support new FPGA RAM layout
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-25 11:17:17 +00:00
David S. Miller
ed36604b25 Merge branch 'master' of git://git.infradead.org/~dwmw2/solos-2.6 2009-03-21 13:23:01 -07:00
David Woodhouse
1329f4550f solos: Disable DMA until we have an FPGA update with it actually implemented.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-03-17 15:10:51 +00:00
Nathan Williams
0fc36aa52a solos: Automatically determine number of ports
Signed-off-by: Nathan Williams <nathan@traverse.com.au>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-03-17 15:01:02 +00:00
David Woodhouse
97d759d3e8 solos: Reset device on unload, free pending skbs
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-03-17 14:59:34 +00:00
Julia Lawall
bc111d570b drivers/atm: introduce missing kfree
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-02-08 17:00:02 -08:00
David Woodhouse
f87b2ed225 solos: Swap upstream/downstream rates in status packet, clean up some more
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-01-30 14:57:48 +11:00
David Woodhouse
eab50f73ca solos: Set RX empty flag at startup only for !dma mode
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-01-30 14:27:26 +11:00
David Woodhouse
cd5549e0f4 solos: Don't clear config registers at startup
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-01-30 14:26:37 +11:00
David Woodhouse
95852f48c2 solos: Tidy up status interrupt handling, cope with 'ERROR' status
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-01-30 14:23:52 +11:00
David Woodhouse
cc3657e1f6 solos: Add 'reset' module parameter to reset the DSL chips on load
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-01-30 14:23:22 +11:00
David Woodhouse
bdc54625b6 solos: Remove debugging, commented-out test code
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-01-29 14:37:20 +11:00
David Woodhouse
35c2221ba1 solos: Clean up handling of card->tx_mask a little
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-01-29 14:24:55 +11:00
David Woodhouse
c6428e52fa solos: Fix various bugs in status packet handling
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-01-29 12:17:09 +11:00
David Woodhouse
a0641cc49a solos: Remove superfluous wait_queue_head_t from struct solos_param
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-01-29 11:31:28 +11:00
David Woodhouse
fcd82664cb solos: Remove IRQF_DISABLED, don't frob IRQ enable on the FPGA in solos_irq()
Neither of these are necessary.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-01-29 11:29:12 +11:00
David Woodhouse
cd2169fbfb solos: Remove unused loopback debug stuff
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-01-29 11:12:58 +11:00
David Woodhouse
f69e417033 solos: Tidy up tx_mask handling for ports which need TX
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-01-29 11:10:58 +11:00
David Woodhouse
eaf83e3935 solos: Tidy up DMA handling a little. Still untested
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-01-29 10:51:11 +11:00
David Woodhouse
909372317e solos: First attempt at DMA support
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-01-28 16:46:56 +11:00
David Woodhouse
c0fe30265a solos: Remove parameter group from sysfs on ATM dev deregister
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-01-28 14:34:34 +11:00
David Woodhouse
3456b22111 solos: Fix under-allocation of skb size for get/set parameters
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-01-28 10:39:23 +11:00
David Woodhouse
af7806560c solos: Add SNR and Attn to status packet, fix oops on load
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-01-28 10:22:57 +11:00
David Woodhouse
b28a4b9a38 solos: Reject non-AAL5 connections.... for now
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-01-27 21:50:59 +11:00
David Woodhouse
1e615df654 solos: Kill existing connections on link down event
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-01-27 21:47:47 +11:00
David Woodhouse
87ebb18627 solos: Handle new line status change packets, hook up to ATM layer info
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-01-27 20:02:30 +11:00
David Woodhouse
d057f0a4ef solos: Add initial list of parameters
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-27 16:52:07 +11:00
David Woodhouse
01e2ffac7d solos: Handle attribute show/store in kernel more sanely
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-27 16:20:04 +11:00
David Woodhouse
316bea7936 solos: Kill global 'opens' count.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2009-01-27 14:25:16 +11:00
David Woodhouse
fa755b9f2b solos: Clean up firmware loading code
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-27 14:19:26 +11:00
Simon Farnsworth
7c4015bdff solos: FPGA and firmware update support.
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-27 14:18:32 +11:00
Simon Farnsworth
4306cad6fe solos: Slight debugging improvements
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-27 14:18:17 +11:00
David Woodhouse
b76811af76 solos: Fix length header in FPGA transfers
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>
2009-01-27 10:18:51 +11:00
David Woodhouse
9c54004ea7 atm: Driver for Solos PCI ADSL2+ card.
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>
2008-12-26 01:26:11 -08:00