Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f9ffdff authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'Alacritech-SLIC-driver' 



Lino Sanfilippo says:

====================
Gigabit ethernet driver for Alacritechs SLIC devices (v4)

this is the forth version of the slicoss gigabit ethernet driver (which is a
rework of the driver from Alacritech which can currently be found under
drivers/staging/slicoss). The driver is supposed to support Mojave, Oasis and
Kalahari cards, for both copper and fiber.

If this code is accepted the staging version can be removed.

The driver has been tested on a SEN2104ET adapter (4 Port PCIe copper).

v4:
- fix wrong driver name in Kconfig file (reported by Rami Rosen)
- remove unused variable from driver struct (reported by Rami Rosen)
- return "err" instead of 0 in slic_load_rcvseq_firmware() (reported by Rami Rosen)
- Fix typos in constants, comments and error message (reported by Markus Böhme)
- fix various warnings concerning signedness (reported by Markus Böhme)
- improve line formatting (reported by Markus Böhme)
- add comment describing the need for SLIC_MAX_TX_COMPLETIONS (suggested by Florian Fainelli)
- do not zero out complete rx descriptor (suggested by Florian Fainelli)
- add missing write barrier (reported by Florian Fainelli)
- remove unneeded assignment of net_device to skb (reported by Florian Fainelli)
- use napi_complete_done() instead of napi_complete (suggested by Florian Fainelli)
- use napi_schedule_irqoff() instead of napi_schedule (suggested by Florian Fainelli)
- do not map error returned by slic_init() to -ENOMEM
- do proper dma syncs before and after rx descriptor status is set to 0
- if after dma sync for CPU rx descriptor is not used return it to HW by means of dma sync for device

v3:
- dont add defines to pci_ids.h but instead put it into the drivers header file
(requested by Greg Kroah-Hartman)

v2:
- remove unusual padding in statistic strings (suggested by Andrew Lunn)
- for mdio register and bit names use defines from mii.h instead of own ones
  (suggested by Andrew Lunn)
- remove unused defines
- ensure PCI flush at two more places
- use mmiowb before lock to prevent mmio writes leaking out of lock
- fix some typos in comments
- add copyright and GPL header
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a297569f b9567027

MAINTAINERS

+5 −0
Original line number Diff line number Diff line
@@ -577,6 +577,11 @@ T: git git://linuxtv.org/anttip/media_tree.git 
S:	Maintained

F:	drivers/media/usb/airspy/



ALACRITECH GIGABIT ETHERNET DRIVER

M:	Lino Sanfilippo <LinoSanfilippo@gmx.de>

S:	Maintained

F:	drivers/net/ethernet/alacritech/*



ALCATEL SPEEDTOUCH USB DRIVER

M:	Duncan Sands <duncan.sands@free.fr>

L:	linux-usb@vger.kernel.org

drivers/net/ethernet/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ source "drivers/net/ethernet/3com/Kconfig" 
source "drivers/net/ethernet/adaptec/Kconfig"

source "drivers/net/ethernet/aeroflex/Kconfig"

source "drivers/net/ethernet/agere/Kconfig"

source "drivers/net/ethernet/alacritech/Kconfig"

source "drivers/net/ethernet/allwinner/Kconfig"

source "drivers/net/ethernet/alteon/Kconfig"

source "drivers/net/ethernet/altera/Kconfig"

drivers/net/ethernet/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ obj-$(CONFIG_NET_VENDOR_8390) += 8390/ 
obj-$(CONFIG_NET_VENDOR_ADAPTEC) += adaptec/

obj-$(CONFIG_GRETH) += aeroflex/

obj-$(CONFIG_NET_VENDOR_AGERE) += agere/

obj-$(CONFIG_NET_VENDOR_ALACRITECH) += alacritech/

obj-$(CONFIG_NET_VENDOR_ALLWINNER) += allwinner/

obj-$(CONFIG_NET_VENDOR_ALTEON) += alteon/

obj-$(CONFIG_ALTERA_TSE) += altera/

drivers/net/ethernet/alacritech/Kconfig

0 → 100644
+28 −0
Original line number Diff line number Diff line 
config NET_VENDOR_ALACRITECH

	bool "Alacritech devices"

	default y

	---help---

	  If you have a network (Ethernet) card belonging to this class, say Y.



	  Note that the answer to this question doesn't directly affect the

	  kernel: saying N will just cause the configurator to skip all the

	  questions about Alacritech devices. If you say Y, you will be asked

	  for your specific device in the following questions.



if NET_VENDOR_ALACRITECH



config SLICOSS

	tristate "Alacritech Slicoss support"

	depends on PCI

	select CRC32

	---help---

	  This driver supports Gigabit Ethernet adapters based on the

	  Session Layer Interface (SLIC) technology by Alacritech.



	  Supported are Mojave (1 port) and Oasis (1, 2 and 4 port) cards,

	  both copper and fiber.



	  To compile this driver as a module, choose M here: the module

	  will be called slicoss. This is recommended.



endif # NET_VENDOR_ALACRITECH

drivers/net/ethernet/alacritech/Makefile

0 → 100644
+4 −0
Original line number Diff line number Diff line 
#

# Makefile for the Alacritech Slicoss driver

#

obj-$(CONFIG_SLICOSS) += slicoss.o