aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-11-25atp870u: Improve _probe()Ondrej Zary1-123/+113
Move scsi_host_alloc() to the top of _probe() to remove code duplication, *p and unneeded atpdev (de)allocation and copying. While at it, fix the error paths to return real error codes and also add missing pci_disble_device() call. Signed-off-by: Ondrej Zary <[email protected]> Reviewed-by: Hannes Reinicke <[email protected]> Acked-by: Christoph Hellwig <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
2015-11-25atp870u: Remove unused irq from struct atp_unitOndrej Zary1-1/+0
Signed-off-by: Ondrej Zary <[email protected]> Reviewed-by: Hannes Reinicke <[email protected]> Acked-by: Christoph Hellwig <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
2015-11-25atp870u: Remove useless and broken card countingOndrej Zary1-6/+4
Signed-off-by: Ondrej Zary <[email protected]> Reviewed-by: Hannes Reinicke <[email protected]> Acked-by: Christoph Hellwig <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
2015-11-25atp870u: Use n_io_port in request_region and release_regionOndrej Zary1-17/+3
Signed-off-by: Ondrej Zary <[email protected]> Reviewed-by: Hannes Reinicke <[email protected]> Acked-by: Christoph Hellwig <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
2015-11-25atp870u: Use module_pci_driverOndrej Zary1-19/+1
Signed-off-by: Ondrej Zary <[email protected]> Reviewed-by: Hannes Reinicke <[email protected]> Acked-by: Christoph Hellwig <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
2015-11-25atp870u: Remove empty tscam_885()Ondrej Zary1-14/+1
tscam_885() is empty (except a delay) so remove it. Signed-off-by: Ondrej Zary <[email protected]> Reviewed-by: Hannes Reinicke <[email protected]> Acked-by: Christoph Hellwig <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
2015-11-25atp870u: Reduce log spam on module load/unloadOndrej Zary1-6/+1
Signed-off-by: Ondrej Zary <[email protected]> Reviewed-by: Hannes Reinicke <[email protected]> Acked-by: Christoph Hellwig <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
2015-11-25atp870u: Introduce atp_set_host_idOndrej Zary1-39/+18
The code for setting host adapter ID is the same for all chips. Move it to a common function. Signed-off-by: Ondrej Zary <[email protected]> Reviewed-by: Hannes Reinicke <[email protected]> Acked-by: Christoph Hellwig <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
2015-11-25atp870u: Fix incorrect writeb_io access to register 0x3aOndrej Zary1-4/+4
The ioport region is 0x20 bytes long so accessing 0x3a register using writeb_io is incorrect. Use writeb_base instead. There's no change in behavior as 870 chips have ioport = baseport. Signed-off-by: Ondrej Zary <[email protected]> Reviewed-by: Hannes Reinicke <[email protected]> Acked-by: Christoph Hellwig <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
2015-11-25atp870u: Replace port 0x80 delay by udelayOndrej Zary1-9/+9
tscam() is using port 0x80 access for delays but that's x86-only. Use udelay(2) instead. Signed-off-by: Ondrej Zary <[email protected]> Reviewed-by: Hannes Reinicke <[email protected]> Acked-by: Christoph Hellwig <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
2015-11-25atp870u: Convert remaining in[bwl] and out[bwl] to wrappersOndrej Zary1-104/+118
Signed-off-by: Ondrej Zary <[email protected]> Reviewed-by: Hannes Reinicke <[email protected]> Acked-by: Christoph Hellwig <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
2015-11-25atp870u: Rename is885() to atp_is()Ondrej Zary1-6/+6
Now that all the is* functions except is885() are gone, rename is885() to atp_is() to avoid confusion. Don't know what "is" means, though... Signed-off-by: Ondrej Zary <[email protected]> Reviewed-by: Hannes Reinicke <[email protected]> Acked-by: Christoph Hellwig <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
2015-11-25atp870u: Remove is870()Ondrej Zary1-426/+1
Now that is885() supports everything from is870() and the rest of the code is almost identical, remove is870() and use is885() instead. Signed-off-by: Ondrej Zary <[email protected]> Reviewed-by: Hannes Reinicke <[email protected]> Acked-by: Christoph Hellwig <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
2015-11-25atp870u: Move 870-specific code out of is870()Ondrej Zary1-3/+2
Move few remaining 870-specific code lines out of is870() Signed-off-by: Ondrej Zary <[email protected]> Reviewed-by: Hannes Reinicke <[email protected]> Acked-by: Christoph Hellwig <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
2015-11-25atp870u: Add remaining 870 support to is885()Ondrej Zary1-14/+31
Add remaining 870 support to is885(): - different synw, no synuw - synu[4] = 0x0c - atp_writeb_io(dev, c, 0x04, 0x00); instead of atp_writeb_io(dev, c, 0x14, 0x00); (isn't that a bug?) - atp_writeb_io(dev, c, 0x14, 0xff); instead of atp_writeb_io(dev, c, 0x14, 0x06); - different mbuf[3] and mbuf[4] checks Signed-off-by: Ondrej Zary <[email protected]> Reviewed-by: Hannes Reinicke <[email protected]> Acked-by: Christoph Hellwig <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
2015-11-25atp870u: Add wide_chip parameter to is870() and is885()Ondrej Zary1-21/+25
Don't check chip_ver in is870() but add wide_chip parameter for that. Then add the non-wide support to is885(). Signed-off-by: Ondrej Zary <[email protected]> Reviewed-by: Hannes Reinicke <[email protected]> Acked-by: Christoph Hellwig <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
2015-11-25atp870u: Remove is880()Ondrej Zary1-571/+1
Now that is880() and is885() are almost identical (except for some cpu_relax() calls and debug printks), remove is880() and use is885() instead. Signed-off-by: Ondrej Zary <[email protected]> Reviewed-by: Hannes Reinicke <[email protected]> Acked-by: Christoph Hellwig <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
2015-11-25atp870u: Move chip-specific lines out of is880() and is885()Ondrej Zary1-14/+10
Move few chip-specifis lines out of is880() and is885() so they become almost identical. Signed-off-by: Ondrej Zary <[email protected]> Reviewed-by: Hannes Reinicke <[email protected]> Acked-by: Christoph Hellwig <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
2015-11-25atp870u: Add channel parameter to is870() and is880()Ondrej Zary1-342/+342
Add channel parameter to is870() and is880() functions to simplify comparing them with is885(). Signed-off-by: Ondrej Zary <[email protected]> Reviewed-by: Hannes Reinicke <[email protected]> Acked-by: Christoph Hellwig <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
2015-11-25atp870u: Unify code format in is870(), is880() and is885()Ondrej Zary1-69/+101
Unify code formatting in is870(), is880() and is885() functions to simplify comparing them. Signed-off-by: Ondrej Zary <[email protected]> Reviewed-by: Hannes Reinicke <[email protected]> Acked-by: Christoph Hellwig <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
2015-11-25atp870u: Convert is885() to use wrappersOndrej Zary1-179/+179
Signed-off-by: Ondrej Zary <[email protected]> Reviewed-by: Hannes Reinicke <[email protected]> Acked-by: Christoph Hellwig <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
2015-11-25atp870u: Convert is880() to use wrappersOndrej Zary1-176/+176
Subtract 0x40 to use _io access wrappers. Now it's obvious that is870() and is880() are very similar. Signed-off-by: Ondrej Zary <[email protected]> Reviewed-by: Hannes Reinicke <[email protected]> Acked-by: Christoph Hellwig <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
2015-11-25atp870u: Convert is870() to use wrappersOndrej Zary1-138/+138
Signed-off-by: Ondrej Zary <[email protected]> Reviewed-by: Hannes Reinicke <[email protected]> Acked-by: Christoph Hellwig <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
2015-11-25atp870u: Introduce HW access wrappersOndrej Zary1-220/+252
Introduce *_read? and *_write? wrappers to improve code readability. Also make sure that baseport is always initialized, not only for ATP880. Signed-off-by: Ondrej Zary <[email protected]> Reviewed-by: Hannes Reinicke <[email protected]> Acked-by: Christoph Hellwig <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
2015-11-25atp870u: Remove ugly gotos #5Ondrej Zary1-72/+62
Signed-off-by: Ondrej Zary <[email protected]> Reviewed-by: Hannes Reinicke <[email protected]> Acked-by: Christoph Hellwig <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
2015-11-25atp870u: Remove ugly gotos #4Ondrej Zary1-17/+15
Signed-off-by: Ondrej Zary <[email protected]> Reviewed-by: Hannes Reinicke <[email protected]> Acked-by: Christoph Hellwig <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
2015-11-25atp870u: Remove ugly gotos #3Ondrej Zary1-12/+6
Signed-off-by: Ondrej Zary <[email protected]> Reviewed-by: Hannes Reinicke <[email protected]> Acked-by: Christoph Hellwig <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
2015-11-25atp870u: Remove ugly gotos #2Ondrej Zary1-38/+30
Signed-off-by: Ondrej Zary <[email protected]> Reviewed-by: Hannes Reinicke <[email protected]> Acked-by: Christoph Hellwig <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
2015-11-25atp870u: Remove ugly gotosOndrej Zary1-54/+30
Signed-off-by: Ondrej Zary <[email protected]> Reviewed-by: Hannes Reinicke <[email protected]> Acked-by: Christoph Hellwig <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
2015-11-25atp870u: Untangle tmpcip #2Ondrej Zary1-16/+9
Untangle the tmpcip crap so it becomes obvious what ports are accessed. Signed-off-by: Ondrej Zary <[email protected]> Reviewed-by: Hannes Reinicke <[email protected]> Acked-by: Christoph Hellwig <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
2015-11-25atp870u: Untangle tmpcipOndrej Zary1-41/+23
Untangle the tmpcip crap so it becomes obvious what ports are accessed. Signed-off-by: Ondrej Zary <[email protected]> Reviewed-by: Hannes Reinicke <[email protected]> Acked-by: Christoph Hellwig <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
2015-11-25atp870u: Untangle tmport #8Ondrej Zary1-301/+177
Untangle the tmport crap so it becomes obvious what ports are accessed. Signed-off-by: Ondrej Zary <[email protected]> Reviewed-by: Hannes Reinicke <[email protected]> Acked-by: Christoph Hellwig <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
2015-11-25atp870u: Untangle tmport #7Ondrej Zary1-11/+5
Untangle the tmport crap so it becomes obvious what ports are accessed. Signed-off-by: Ondrej Zary <[email protected]> Reviewed-by: Hannes Reinicke <[email protected]> Acked-by: Christoph Hellwig <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
2015-11-25atp870u: Untangle tmport #6Ondrej Zary1-87/+49
Untangle the tmport crap so it becomes obvious what ports are accessed. Signed-off-by: Ondrej Zary <[email protected]> Reviewed-by: Hannes Reinicke <[email protected]> Acked-by: Christoph Hellwig <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
2015-11-25atp870u: Untangle tmport #5Ondrej Zary1-297/+173
Untangle the tmport crap so it becomes obvious what ports are accessed. Signed-off-by: Ondrej Zary <[email protected]> Reviewed-by: Hannes Reinicke <[email protected]> Acked-by: Christoph Hellwig <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
2015-11-25atp870u: Untangle tmport #4Ondrej Zary1-232/+138
Untangle the tmport crap so it becomes obvious what ports are accessed. Signed-off-by: Ondrej Zary <[email protected]> Reviewed-by: Hannes Reinicke <[email protected]> Acked-by: Christoph Hellwig <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
2015-11-25atp870u: Untangle tmport #3Ondrej Zary1-69/+49
Untangle the tmport crap so it becomes obvious what ports are accessed. Signed-off-by: Ondrej Zary <[email protected]> Reviewed-by: Hannes Reinicke <[email protected]> Acked-by: Christoph Hellwig <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
2015-11-25atp870u: Untangle tmport #2Ondrej Zary1-47/+32
Untangle the tmport crap so it becomes obvious what ports are accessed. Signed-off-by: Ondrej Zary <[email protected]> Reviewed-by: Hannes Reinicke <[email protected]> Acked-by: Christoph Hellwig <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
2015-11-25atp870u: Untangle tmportOndrej Zary1-115/+71
Untangle the tmport crap so it becomes obvious what ports are accessed. Signed-off-by: Ondrej Zary <[email protected]> Reviewed-by: Hannes Reinicke <[email protected]> Acked-by: Christoph Hellwig <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
2015-11-25atp870u: Remove tmport1Ondrej Zary1-4/+3
Remove tmport1 temporary variable to simplify the code. Signed-off-by: Ondrej Zary <[email protected]> Reviewed-by: Hannes Reinicke <[email protected]> Acked-by: Christoph Hellwig <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
2015-11-25atp870u: Remove workportOndrej Zary1-31/+28
Remove workport temporary variable to simplify the code. Signed-off-by: Ondrej Zary <[email protected]> Reviewed-by: Hannes Reinicke <[email protected]> Acked-by: Christoph Hellwig <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
2015-11-20SCSI: initio: remove duplicate module device tableArnd Bergmann1-16/+0
The initio driver has for many years had two copies of the same module device table. One of them is also used for registering the other driver, the other one is entirely useless after the large scale cleanup that Alan Cox did back in 2007. The compiler warns about this whenever the driver is built-in: drivers/scsi/initio.c:131:29: warning: 'i91u_pci_devices' defined but not used [-Wunused-variable] This removes the extraneous table and the warning. Signed-off-by: Arnd Bergmann <[email protected]> Fixes: 72d39fea901 ("[SCSI] initio: Convert into a real Linux driver and update to modern style") Reviewed-by: Christoph Hellwig <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
2015-11-18qla2xxx: Remove unavailable firmware filesHimanshu Madhani2-6/+0
Remove firmware binary names for the ISPs, which are not submitted to linux-firmware. Signed-off-by: Himanshu Madhani <[email protected]> Signed-off-by: Giridhar Malavali <[email protected]> Reviewed-by: Julian Calaby <[email protected]> Reviewed-by: Xose Vazquez Perez <[email protected]> Cc: Hannes Reinecke <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
2015-11-18st: Remove obsolete scsi_tape.max_pfnGeert Uytterhoeven1-2/+0
Its last user was removed 10 years ago, in commit 8b05b773b6030de5 ("[SCSI] convert st to use scsi_execute_async"). Signed-off-by: Geert Uytterhoeven <[email protected]> Reviewed-by: Ewan D. Milne <[email protected]> Acked-by: Kai Mäkisara <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
2015-11-17Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds84-3650/+1036
Pull networking fixes from David Miller: 1) Fix list tests in netfilter ingress support, from Florian Westphal. 2) Fix reversal of input and output interfaces in ingress hook invocation, from Pablo Neira Ayuso. 3) We have a use after free in r8169, caught by Dave Jones, fixed by Francois Romieu. 4) Splice use-after-free fix in AF_UNIX frmo Hannes Frederic Sowa. 5) Three ipv6 route handling bug fixes from Martin KaFai Lau: a) Don't create clone routes not managed by the fib6 tree b) Don't forget to check expiration of DST_NOCACHE routes. c) Handle rt->dst.from == NULL properly. 6) Several AF_PACKET fixes wrt transport header setting and SKB protocol setting, from Daniel Borkmann. 7) Fix thunder driver crash on shutdown, from Pavel Fedin. 8) Several Mellanox driver fixes (max MTU calculations, use of correct DMA unmap in TX path, etc.) from Saeed Mahameed, Tariq Toukan, Doron Tsur, Achiad Shochat, Eran Ben Elisha, and Noa Osherovich. 9) Several mv88e6060 DSA driver fixes (wrong bit definitions for certain registers, etc.) from Neil Armstrong. 10) Make sure to disable preemption while updating per-cpu stats of ip tunnels, from Jason A. Donenfeld. 11) Various ARM64 bpf JIT fixes, from Yang Shi. 12) Flush icache properly in ARM JITs, from Daniel Borkmann. 13) Fix masking of RX and TX interrupts in ravb driver, from Masaru Nagai. 14) Fix netdev feature propagation for devices not implementing ->ndo_set_features(). From Nikolay Aleksandrov. 15) Big endian fix in vmxnet3 driver, from Shrikrishna Khare. 16) RAW socket code increments incorrect SNMP counters, fix from Ben Cartwright-Cox. 17) IPv6 multicast SNMP counters are bumped twice, fix from Neil Horman. 18) Fix handling of VLAN headers on stacked devices when REORDER is disabled. From Vlad Yasevich. 19) Fix SKB leaks and use-after-free in ipvlan and macvlan drivers, from Sabrina Dubroca. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (83 commits) MAINTAINERS: Update Mellanox's Eth NIC driver entries net/core: revert "net: fix __netdev_update_features return.." and add comment af_unix: take receive queue lock while appending new skb rtnetlink: fix frame size warning in rtnl_fill_ifinfo net: use skb_clone to avoid alloc_pages failure. packet: Use PAGE_ALIGNED macro packet: Don't check frames_per_block against negative values net: phy: Use interrupts when available in NOLINK state phy: marvell: Add support for 88E1540 PHY arm64: bpf: make BPF prologue and epilogue align with ARM64 AAPCS macvlan: fix leak in macvlan_handle_frame ipvlan: fix use after free of skb ipvlan: fix leak in ipvlan_rcv_frame vlan: Do not put vlan headers back on bridge and macvlan ports vlan: Fix untag operations of stacked vlans with REORDER_HEADER off via-velocity: unconditionally drop frames with bad l2 length ipg: Remove ipg driver dl2k: Add support for IP1000A-based cards snmp: Remove duplicate OUTMCAST stat increment net: thunder: Check for driver data in nicvf_remove() ...
2015-11-17MAINTAINERS: Update Mellanox's Eth NIC driver entriesOr Gerlitz1-1/+9
Eugenia (Jenny) Emantayev is replacing Amir Vadai as the mlx4 Ethernet driver maintainer. Saeed Mahameed is assigned to maintain mlx5 Eth functionality. Signed-off-by: Or Gerlitz <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2015-11-17net/core: revert "net: fix __netdev_update_features return.." and add commentNikolay Aleksandrov1-1/+4
This reverts commit 00ee59271777 ("net: fix __netdev_update_features return on ndo_set_features failure") and adds a comment explaining why it's okay to return a value other than 0 upon error. Some drivers might actually change flags and return an error so it's better to fire a spurious notification rather than miss these. CC: Michał Mirosław <[email protected]> Signed-off-by: Nikolay Aleksandrov <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2015-11-17af_unix: take receive queue lock while appending new skbHannes Frederic Sowa1-1/+4
While possibly in future we don't necessarily need to use sk_buff_head.lock this is a rather larger change, as it affects the af_unix fd garbage collector, diag and socket cleanups. This is too much for a stable patch. For the time being grab sk_buff_head.lock without disabling bh and irqs, so don't use locked skb_queue_tail. Fixes: 869e7c62486e ("net: af_unix: implement stream sendpage support") Cc: Eric Dumazet <[email protected]> Signed-off-by: Hannes Frederic Sowa <[email protected]> Reported-by: Eric Dumazet <[email protected]> Acked-by: Eric Dumazet <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2015-11-17rtnetlink: fix frame size warning in rtnl_fill_ifinfoHannes Frederic Sowa1-122/+152
Fix the following warning: CC net/core/rtnetlink.o net/core/rtnetlink.c: In function ‘rtnl_fill_ifinfo’: net/core/rtnetlink.c:1308:1: warning: the frame size of 2864 bytes is larger than 2048 bytes [-Wframe-larger-than=] } ^ by splitting up the huge rtnl_fill_ifinfo into some smaller ones, so we don't have the huge frame allocations at the same time. Cc: Eric Dumazet <[email protected]> Signed-off-by: Hannes Frederic Sowa <[email protected]> Acked-by: Eric Dumazet <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2015-11-17net: use skb_clone to avoid alloc_pages failure.Martin Zhang1-1/+1
1. new skb only need dst and ip address(v4 or v6). 2. skb_copy may need high order pages, which is very rare on long running server. Signed-off-by: Junwei Zhang <[email protected]> Signed-off-by: Martin Zhang <[email protected]> Acked-by: Eric Dumazet <[email protected]> Signed-off-by: David S. Miller <[email protected]>