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

Commit 7110fe47 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'aquantia' 



David VomLehn says:

====================
net: ethernet: aquantia: Add AQtion 2.5/5 GB NIC driver

This series introduces the AQtion NIC driver for the aQuantia
AQC107/AQC108 network devices.

v1: Initial version
v2: o Make necessary drivers/net/ethernet changes to integrate software
    o Drop intermediate atlantic directory
    o Remove Makefile things only appropriate to out of tree module
      building
v3: o Move changes to drivers/net/ethernet/{Kconfig,Makefile} to the last
      patch to ensure clean bisection.
    o Removed inline attribute aq_hw_write_req() as it was defined in
      only one .c file.
    o #included pci.h in aq_common.h to get struct pci definition.
    o Modified code to unlock based execution flow rather than using a
      flag.
    o Made a number of functions that were only used in a single file
      static.
    o Cleaned up error and return code handling in various places.
    o Remove AQ_CFG_IP_ALIGN definition.
    o Other minor code clean up.
v4: o Using do_div for 64 bit division.
    o Modified NIC statistics code.
    o Using build_skb instead netdev_alloc_skb for single fragment packets.
    o Removed extra aq_nic.o from Makefile
v5: o Removed extra newline at the end of the files.
v6: o Removed unnecessary cast from void*.
    o Reworked strings array for ethtool statistics.
    o Added stringset == ETH_SS_STATS checking.
    o AQ_OBJ_HEADER replaced to aq_obj_header_s struct.
    o AQ_OBJ_SET/TST/CLR macroses replaced to inline functions.
    o Driver sources placed in to atlantic directory.
    o Fixed compilation warnings (Make W=1)
    o Added firmware version checking.
    o Code cleaning.
v7  o Removed unnecessary cast from memory allocation function (aq_ring.c).
v8  o Switched to using kcalloc instead kzalloc.
    o Now provide bus_info for ethtool
    o Used div() to avoid __bad_udelay build error.

Signed-off-by: default avatarAlexander Loktionov <Alexander.Loktionov@aquantia.com>
Signed-off-by: default avatarDmitrii Tarakanov <Dmitrii.Tarakanov@aquantia.com>
Signed-off-by: default avatarPavel Belous <Pavel.Belous@aquantia.com>
Signed-off-by: default avatarDavid M. VomLehn <vomlehn@texas.net>
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 82272db8 aa13f7ce

drivers/net/ethernet/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ source "drivers/net/ethernet/amazon/Kconfig" 
source "drivers/net/ethernet/amd/Kconfig"

source "drivers/net/ethernet/apm/Kconfig"

source "drivers/net/ethernet/apple/Kconfig"

source "drivers/net/ethernet/aquantia/Kconfig"

source "drivers/net/ethernet/arc/Kconfig"

source "drivers/net/ethernet/atheros/Kconfig"

source "drivers/net/ethernet/aurora/Kconfig"

drivers/net/ethernet/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ obj-$(CONFIG_NET_VENDOR_AMAZON) += amazon/ 
obj-$(CONFIG_NET_VENDOR_AMD) += amd/

obj-$(CONFIG_NET_XGENE) += apm/

obj-$(CONFIG_NET_VENDOR_APPLE) += apple/

obj-$(CONFIG_NET_VENDOR_AQUANTIA) += aquantia/

obj-$(CONFIG_NET_VENDOR_ARC) += arc/

obj-$(CONFIG_NET_VENDOR_ATHEROS) += atheros/

obj-$(CONFIG_NET_VENDOR_AURORA) += aurora/

drivers/net/ethernet/aquantia/Kconfig

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

# aQuantia device configuration

#



config NET_VENDOR_AQUANTIA

	bool "aQuantia devices"

	default y

	---help---

	  Set this to y if you have an Ethernet network cards that uses the aQuantia

	  AQC107/AQC108 chipset.



	  This option does not build any drivers; it casues the aQuantia

	  drivers that can be built to appear in the list of Ethernet drivers.





if NET_VENDOR_AQUANTIA



config AQTION

	tristate "aQuantia AQtion(tm) Support"

	depends on PCI && X86_64

	---help---

	  This enables the support for the aQuantia AQtion(tm) Ethernet card.



endif # NET_VENDOR_AQUANTIA

drivers/net/ethernet/aquantia/Makefile

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

# Makefile for the aQuantia device drivers.

#



obj-$(CONFIG_AQTION) += atlantic/

drivers/net/ethernet/aquantia/atlantic/Makefile

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

#

# aQuantia Ethernet Controller AQtion Linux Driver

# Copyright(c) 2014-2017 aQuantia Corporation.

#

# This program is free software; you can redistribute it and/or modify it

# under the terms and conditions of the GNU General Public License,

# version 2, as published by the Free Software Foundation.

#

# This program is distributed in the hope it will be useful, but WITHOUT

# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

# more details.

#

# You should have received a copy of the GNU General Public License along

# with this program. If not, see <http://www.gnu.org/licenses/>.

#

# The full GNU General Public License is included in this distribution in

# the file called "COPYING".

#

# Contact Information: <rdc-drv@aquantia.com>

# aQuantia Corporation, 105 E. Tasman Dr. San Jose, CA 95134, USA

#

################################################################################



#

# Makefile for the AQtion(tm) Ethernet driver

#



obj-$(CONFIG_AQTION) += atlantic.o



atlantic-objs := aq_main.o \

	aq_nic.o \

	aq_pci_func.o \

	aq_vec.o \

	aq_ring.o \

	aq_hw_utils.o \

	aq_ethtool.o \

	hw_atl/hw_atl_a0.o \

	hw_atl/hw_atl_b0.o \

	hw_atl/hw_atl_utils.o \

	hw_atl/hw_atl_llh.o