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

Commit b85c715c 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. Extension to PPS/PTP to allow for PHC devices where pulses are
   subject to a variable but measurable delay.
2. PPS/PTP/PHC support for Solarflare boards with a timestamping
   peripheral.
3. MTD support for updating the timestamping peripheral on those boards.
4. Fix for potential over-length requests to firmware.
====================

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

drivers/net/ethernet/sfc/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -34,3 +34,10 @@ config SFC_SRIOV 
	  This enables support for the SFC9000 I/O Virtualization

	  features, allowing accelerated network performance in

	  virtualized environments.

config SFC_PTP

	bool "Solarflare SFC9000-family PTP support"

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

	default y

	---help---

	  This enables support for the Precision Time Protocol (PTP)

	  on SFC9000-family NICs

drivers/net/ethernet/sfc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -5,5 +5,6 @@ sfc-y += efx.o nic.o falcon.o siena.o tx.o rx.o filter.o \ 
			   mcdi.o mcdi_phy.o mcdi_mon.o

sfc-$(CONFIG_SFC_MTD)	+= mtd.o

sfc-$(CONFIG_SFC_SRIOV)	+= siena_sriov.o

sfc-$(CONFIG_SFC_PTP)	+= ptp.o



obj-$(CONFIG_SFC)	+= sfc.o

drivers/net/ethernet/sfc/efx.c

+16 −1
Original line number Diff line number Diff line
@@ -734,6 +734,7 @@ static void efx_remove_channel(struct efx_channel *channel) 
	efx_for_each_possible_channel_tx_queue(tx_queue, channel)

		efx_remove_tx_queue(tx_queue);

	efx_remove_eventq(channel);

	channel->type->post_remove(channel);

}



static void efx_remove_channels(struct efx_nic *efx)
@@ -852,6 +853,7 @@ void efx_schedule_slow_fill(struct efx_rx_queue *rx_queue) 


static const struct efx_channel_type efx_default_channel_type = {

	.pre_probe		= efx_channel_dummy_op_int,

	.post_remove		= efx_channel_dummy_op_void,

	.get_name		= efx_get_channel_name,

	.copy			= efx_copy_channel,

	.keep_eventq		= false,
@@ -862,6 +864,10 @@ int efx_channel_dummy_op_int(struct efx_channel *channel) 
	return 0;

}



void efx_channel_dummy_op_void(struct efx_channel *channel)

{

}



/**************************************************************************

 *

 * Port handling
@@ -1451,10 +1457,16 @@ static void efx_set_channels(struct efx_nic *efx) 
	efx->tx_channel_offset =

		separate_tx_channels ? efx->n_channels - efx->n_tx_channels : 0;



	/* We need to adjust the TX queue numbers if we have separate

	/* We need to mark which channels really have RX and TX

	 * queues, and adjust the TX queue numbers if we have separate

	 * RX-only and TX-only channels.

	 */

	efx_for_each_channel(channel, efx) {

		if (channel->channel < efx->n_rx_channels)

			channel->rx_queue.core_index = channel->channel;

		else

			channel->rx_queue.core_index = -1;



		efx_for_each_channel_tx_queue(tx_queue, channel)

			tx_queue->queue -= (efx->tx_channel_offset *

					    EFX_TXQ_TYPES);
@@ -1767,6 +1779,9 @@ static int efx_ioctl(struct net_device *net_dev, struct ifreq *ifr, int cmd) 
	struct efx_nic *efx = netdev_priv(net_dev);

	struct mii_ioctl_data *data = if_mii(ifr);



	if (cmd == SIOCSHWTSTAMP)

		return efx_ptp_ioctl(efx, ifr, cmd);



	/* Convert phy_id from older PRTAD/DEVAD format */

	if ((cmd == SIOCGMIIREG || cmd == SIOCSMIIREG) &&

	    (data->phy_id & 0xfc00) == 0x0400)

drivers/net/ethernet/sfc/efx.h

+1 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ static inline void efx_filter_rfs_expire(struct efx_channel *channel) {} 


/* Channels */

extern int efx_channel_dummy_op_int(struct efx_channel *channel);

extern void efx_channel_dummy_op_void(struct efx_channel *channel);

extern void efx_process_channel_now(struct efx_channel *channel);

extern int

efx_realloc_channels(struct efx_nic *efx, u32 rxq_entries, u32 txq_entries);

drivers/net/ethernet/sfc/ethtool.c

+1 −0
Original line number Diff line number Diff line
@@ -1174,6 +1174,7 @@ const struct ethtool_ops efx_ethtool_ops = { 
	.get_rxfh_indir_size	= efx_ethtool_get_rxfh_indir_size,

	.get_rxfh_indir		= efx_ethtool_get_rxfh_indir,

	.set_rxfh_indir		= efx_ethtool_set_rxfh_indir,

	.get_ts_info		= efx_ptp_get_ts_info,

	.get_module_info	= efx_ethtool_get_module_info,

	.get_module_eeprom	= efx_ethtool_get_module_eeprom,

};