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

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

Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next 



Ben Hutchings says:

====================
1. A little more refactoring.
2. Remove the unnecessary use of atomic_t that you pointed out.
3. Add support for starting or queueing firmware requests from atomic
context.
4. Add hwmon support for additional sensors found on some new boards.
5. Add support for the EF10 controller architecture, the SFC9100 family
and specifically the SFC9120 controller.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 34aedd3f f7a6d2c4

drivers/net/ethernet/sfc/Kconfig

+5 −4
Original line number Diff line number Diff line 
config SFC

	tristate "Solarflare SFC4000/SFC9000-family support"

	tristate "Solarflare SFC4000/SFC9000/SFC9100-family support"

	depends on PCI

	select MDIO

	select CRC32
@@ -8,12 +8,13 @@ config SFC 
	select PTP_1588_CLOCK

	---help---

	  This driver supports 10-gigabit Ethernet cards based on

	  the Solarflare SFC4000 and SFC9000-family controllers.

	  the Solarflare SFC4000, SFC9000-family and SFC9100-family

	  controllers.



	  To compile this driver as a module, choose M here.  The module

	  will be called sfc.

config SFC_MTD

	bool "Solarflare SFC4000/SFC9000-family MTD support"

	bool "Solarflare SFC4000/SFC9000/SFC9100-family MTD support"

	depends on SFC && MTD && !(SFC=y && MTD=m)

	default y

	---help---
@@ -21,7 +22,7 @@ config SFC_MTD 
	  (e.g. /dev/mtd1).  This is required to update the firmware or

	  the boot configuration under Linux.

config SFC_MCDI_MON

	bool "Solarflare SFC9000-family hwmon support"

	bool "Solarflare SFC9000/SFC9100-family hwmon support"

	depends on SFC && HWMON && !(SFC=y && HWMON=m)

	default y

	---help---

drivers/net/ethernet/sfc/Makefile

+2 −2
Original line number Diff line number Diff line 
sfc-y			+= efx.o nic.o farch.o falcon.o siena.o tx.o rx.o \

			   selftest.o ethtool.o qt202x_phy.o mdio_10g.o \

sfc-y			+= efx.o nic.o farch.o falcon.o siena.o ef10.o tx.o \

			   rx.o selftest.o ethtool.o qt202x_phy.o mdio_10g.o \

			   tenxpress.o txc43128_phy.o falcon_boards.o \

			   mcdi.o mcdi_port.o mcdi_mon.o ptp.o

sfc-$(CONFIG_SFC_MTD)	+= mtd.o

drivers/net/ethernet/sfc/bitfield.h

+6 −2
Original line number Diff line number Diff line 
/****************************************************************************

 * Driver for Solarflare Solarstorm network controllers and boards

 * Driver for Solarflare network controllers and boards

 * Copyright 2005-2006 Fen Systems Ltd.

 * Copyright 2006-2009 Solarflare Communications Inc.

 * Copyright 2006-2013 Solarflare Communications Inc.

 *

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

 * under the terms of the GNU General Public License version 2 as published
@@ -29,6 +29,10 @@ 
/* Lowest bit numbers and widths */

#define EFX_DUMMY_FIELD_LBN 0

#define EFX_DUMMY_FIELD_WIDTH 0

#define EFX_WORD_0_LBN 0

#define EFX_WORD_0_WIDTH 16

#define EFX_WORD_1_LBN 16

#define EFX_WORD_1_WIDTH 16

#define EFX_DWORD_0_LBN 0

#define EFX_DWORD_0_WIDTH 32

#define EFX_DWORD_1_LBN 32