summaryrefslogtreecommitdiffstats
path: root/drivers/net/niu.c
Commit message (Collapse)AuthorAgeFilesLines
* niu: Bump driver version and release date.David S. Miller2008-11-141-2/+2
| | | | | | | | | | This driver is pretty mature, and the worst of the known problems has been fixed (the 32-bit failures due to readq implementation). So let's finally give it a version of 1.0 Signed-off-by: David S. Miller <davem@davemloft.net>
* NIU: Add Sun CP3260 ATCA blade supportSantwona Behera2008-11-141-6/+280
| | | | | | | | | This patch adds support for the Sun CP3260 ATCA blade which is a N2 based ATCA blade with 2 NIU ports. The NIU ports do not have on-board PHY. Signed-off-by: Santwona Behera <santwona.behera@sun.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* niu: Fix readq implementation when architecture does not provide one.David S. Miller2008-11-121-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a TX hang reported by Jesper Dangaard Brouer. When an architecutre cannot provide a fully functional 64-bit atomic readq/writeq, the driver must implement it's own. This is because only the driver can say whether doing something like using two 32-bit reads to implement the full 64-bit read will actually work properly. In particular one of the issues is whether the top 32-bits or the bottom 32-bits of the 64-bit register should be read first. There could be side effects, and in fact that is exactly the problem here. The TX_CS register has counters in the upper 32-bits and state bits in the lower 32-bits. A read clears the state bits. We would read the counter half before the state bit half. That first read would clear the state bits, and then the driver thinks that no interrupts are pending because the interrupt indication state bits are seen clear every time. Fix this by reading the bottom half before the upper half. Tested-by: Jesper Dangaard Brouer <jdb@comx.dk> Signed-off-by: David S. Miller <davem@davemloft.net>
* niu: Use pci_ioremap_bar().David S. Miller2008-11-031-5/+1
| | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* Merge branch 'master' of ↵David S. Miller2008-09-161-0/+56
|\ | | | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 Conflicts: arch/sparc64/kernel/pci_psycho.c
| * niu: panic on resetSantwona Behera2008-09-121-0/+56
| | | | | | | | | | | | | | | | | | The reset_task function in the niu driver does not reset the tx and rx buffers properly. This leads to panic on reset. This patch is a modified implementation of the previously posted fix. Signed-off-by: Santwona Behera <santwona.behera@sun.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | sparc: Annotate of_device_id arrays with const or __initdata.David S. Miller2008-08-311-1/+1
|/ | | | | | As suggested by Stephen Rothwell. Signed-off-by: David S. Miller <davem@davemloft.net>
* niu: Fix error checking in niu_ethflow_to_class.Andreas Schwab2008-07-291-1/+1
| | | | | | | | The callers of niu_ethflow_to_class expect zero as error, but it returns -1 instead. Signed-off-by: Andreas Schwab <schwab@suse.de> Signed-off-by: David S. Miller <davem@davemloft.net>
* niu: Add TX multiqueue support.David S. Miller2008-07-171-20/+25
| | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* niu: Add support for rx flow hash configuration.Santwona Behera2008-07-021-0/+158
| | | | | | | | Implemented ethtool callback functions for configuring receive flow hashing in the niu driver. Signed-off-by: Santwona Behera <santwona.behera@sun.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* niu: Determine the # of ports from the card's VPD dataMatheos Worku2008-05-121-32/+21
| | | | | | | | | | | | Determine the number of physical ports from the card's VPD data. Previous fix failed on Maramba platform which doesn't have the "board-model" property. This fix uses the "model" property which exists on all cards and Neptune based motherboards. cstyle cleanup included. Signed-off-by: Matheos Worku <matheos.worku@sun.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* niu: Fix probing regression for maramba on-board chips.David S. Miller2008-05-041-4/+7
| | | | | | | | | | | | | | | | Changeset 7f7c4072ea552f97a0898331322f71986a97299c ("niu: Determine the # of ports from the card's VPD data") caused maramba on-board NIU ports to stop probing properly. The old code had a fallback that would use a num_ports value of 4 if all the probing methods failed, but that was removed. This restores the fallback of 4 ports, to get things working again. Bump driver version and release date. Signed-off-by: David S. Miller <davem@davemloft.net>
* niu: Add support for Neptune FEM/NEM cards for C10 server bladesMatheos Worku2008-04-241-30/+274
| | | | | | | | [ Minor coding style and whitespace corrections, also bump driver version and release date. -DaveM ] Signed-off-by: Matheos Worku <matheos.worku@sun.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* niu: Determine the # of ports from the card's VPD dataMatheos Worku2008-04-241-11/+56
| | | | | | | [ Fix minor whitespace and coding style stuff... -DaveM ] Signed-off-by: Matheos Worku <matheos.worku@sun.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* [NIU]: Add Support for Sun ATCA Blade Server.Matheos Worku2008-02-281-73/+628
| | | | | | | | | | Ports 0 and 1 of the NIU device are connected to extended fabric through SERDES. Ports 2 and 3 are connected using RGMII Fiber mode. [ Coding style cleanups... -DaveM ] Signed-off-by: Matheos Worku <matheos.worku@sun.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* [NIU]: More BMAC alt MAC address fixes.Matheos Worku2008-02-201-4/+5
| | | | | | | | | | | From: Matheos Worku <Matheos.Worku@Sun.COM> 1) niu_enable_alt_mac() needs to be adjusted so that the mask is computed properly for the BMAC case. 2) BMAC has 6 alt MAC addresses available, not 7. Signed-off-by: David S. Miller <davem@davemloft.net>
* [NIU]: Bump driver version and release date.David S. Miller2008-02-181-2/+2
| | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* [NIU]: Fix BMAC alternate MAC address indexing.Matheos Worku2008-02-181-1/+6
| | | | | | | | BMAC port alternate MAC address index needs to start at 1. Index 0 is used for the main MAC address. Signed-off-by: Matheos Worku <matheos.worku@sun.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* [NIU]: Use print_macJoe Perches2008-01-281-5/+3
| | | | | Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* [NIU]: Fix 1G PHY link state handling.David S. Miller2008-01-171-0/+3
| | | | | | | | | | | | The code in link_status_1g() computes the active speed and duplex but does not update the link config state with those values. As a result the link speed is not reported correctly and the XIF is not reprogrammed properly on link up events. Signed-off-by: David S. Miller <davem@davemloft.net>
* [NIU]: Support for Marvell PHYMirko Lindner2008-01-101-20/+198
| | | | | | | | | | | | | From: Mirko Lindner <mlindner@marvell.com> This patch makes necessary changes in the Neptune driver to support the new Marvell PHY. It also adds support for the LED blinking on Neptune cards with Marvell PHY. All registers are using defines in the niu.h header file as is already done for the BCM8704 registers. [ Coding style, etc. cleanups -DaveM ] Signed-off-by: David S. Miller <davem@davemloft.net>
* [NIU]: Update driver version and release date.David S. Miller2008-01-081-2/+2
| | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* [NIU]: Fix potentially stuck TCP socket send queues.David S. Miller2008-01-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | It is possible for the TX ring to have packets sit in it for unbounded amounts of time. The only way to defer TX interrupts in the chip is to periodically set "mark" bits, when processing of a TX descriptor with the mark bit set is complete it triggers the interrupt for the TX queue's LDG. A consequence of this kind of scheme is that if packet flow suddenly stops, the remaining TX packets will just sit there. If this happens, since those packets could be charged to TCP socket send queues, such sockets could get stuck. The simplest solution is to divorce the socket ownership of the packet once the device takes the SKB, by using skb_orphan() in niu_start_xmit(). In hindsight, it would have been much nicer if the chip provided two interrupt sources for TX (like basically every other ethernet chip does). Namely, keep the "mark" bit, but also signal the LDG when the TX queue becomes completely empty. That way there is no need to have a deadlock breaker like this. Signed-off-by: David S. Miller <davem@davemloft.net>
* [NIU]: Missing ->last_rx update.David S. Miller2008-01-081-0/+2
| | | | | | Noticed by Paul Lodridge. Signed-off-by: David S. Miller <davem@davemloft.net>
* [NIU]: Fix slowpath interrupt handling.Matheos Worku2008-01-081-11/+23
| | | | | | | | | | | | | | | niu_slowpath_interrupt() expects values to be setup in lp->{v0,v1,v2} but they aren't. That's only done by niu_schedule_napi() which is done later in the interrupt path. If niu_rx_error() returns zero, and v0 is clear, hit the RX_DMA_CTL_STATE register with a RX_DMA_CTL_STAT_MEX. Only emit verbose RX error logs if a fatal channel or port error is signalled. Other cases will be recorded into statistics by niu_log_rxchan_errors(). Signed-off-by: David S. Miller <davem@davemloft.net>
* [NIU]: Fix link LED handling.Mirko Lindner2007-12-071-4/+18
| | | | | | | | The LED in the current driver will not be controlled correctly. During a link change the carrier of the link is not available and the LED will never turn on. Signed-off-by: David S. Miller <davem@davemloft.net>
* [NIU]: Cleanup PAGE_SIZE checks a bitOlof Johansson2007-10-221-29/+5
| | | | | | | | | | | | | | | | | | | | | | I get the following warning from a powerpc allyesconfig of current mainline: drivers/net/niu.c: In function 'niu_size_rbr': drivers/net/niu.c:3113: warning: large integer implicitly truncated to unsigned type PAGE_SIZE in this case is 64KB, so I don't quite get why gcc can't tell that the line in question will never be reached. I suggest the following instead, but I can unfortunately not do anything but build test it. Also, the driver does some other checks to make sure that PAGE_SIZE is a power of two (BUILD_BUG_ON() in niu_init()), doesn't seem like that could ever be untrue? Or are there really archs with non-power-of-two PAGE_SIZE? Signed-off-by: Olof Johansson <olof@lixom.net> Signed-off-by: David S. Miller <davem@davemloft.net>
* [NIU]: getting rid of __ucmpdi2 in niu.oAl Viro2007-10-151-8/+7
| | | | | | | | By the time we get to that switch by PHY type, we have 8bit value. No need to keep it in u64 when u8 would do. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
* [NIU]: Fix write past end of array in niu_pci_probe_sprom().David S. Miller2007-10-151-2/+2
| | | | | | Noticed by Coverity checker and reported by Adrian Bunk. Signed-off-by: David S. Miller <davem@davemloft.net>
* [NIU]: Add Sun Neptune ethernet driver.David S. Miller2007-10-101-0/+7939
With cleanup suggestions and bugs spotted by Stephen Hemminger, Ingo Oeser, Matheos Worku, and Oliver Hartkopp. Signed-off-by: David S. Miller <davem@davemloft.net>
OpenPOWER on IntegriCloud