Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next (d5038596) · Commits · 戴 / test

drivers/net/ethernet/sfc/efx.c

+60 −3

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@
		#include "net_driver.h"
		#include "efx.h"
		#include "nic.h"
		#include "selftest.h"

		#include "mcdi.h"
		#include "workarounds.h"
		@@ -163,12 +164,12 @@ static int phy_flash_cfg;
		module_param(phy_flash_cfg, int, 0644);
		MODULE_PARM_DESC(phy_flash_cfg, "Set PHYs into reflash mode initially");

		static unsigned irq_adapt_low_thresh = 10000;
		static unsigned irq_adapt_low_thresh = 8000;
		module_param(irq_adapt_low_thresh, uint, 0644);
		MODULE_PARM_DESC(irq_adapt_low_thresh,
		"Threshold score for reducing IRQ moderation");

		static unsigned irq_adapt_high_thresh = 20000;
		static unsigned irq_adapt_high_thresh = 16000;
		module_param(irq_adapt_high_thresh, uint, 0644);
		MODULE_PARM_DESC(irq_adapt_high_thresh,
		"Threshold score for increasing IRQ moderation");
		@@ -1564,8 +1565,9 @@ static void efx_start_all(struct efx_nic *efx)
		* since we're holding the rtnl_lock at this point. */
		static void efx_flush_all(struct efx_nic *efx)
		{
		/* Make sure the hardware monitor is stopped */
		/* Make sure the hardware monitor and event self-test are stopped */
		cancel_delayed_work_sync(&efx->monitor_work);
		efx_selftest_async_cancel(efx);
		/* Stop scheduled port reconfigurations */
		cancel_work_sync(&efx->mac_work);
		}
		@@ -1825,6 +1827,7 @@ static int efx_net_open(struct net_device *net_dev)
		efx_link_status_changed(efx);

		efx_start_all(efx);
		efx_selftest_async_start(efx);
		return 0;
		}

		@@ -2375,6 +2378,7 @@ static int efx_init_struct(struct efx_nic efx, const struct efx_nic_type type,
		#endif
		INIT_WORK(&efx->reset_work, efx_reset_work);
		INIT_DELAYED_WORK(&efx->monitor_work, efx_monitor);
		INIT_DELAYED_WORK(&efx->selftest_work, efx_selftest_async_work);
		efx->pci_dev = pci_dev;
		efx->msg_enable = debug;
		efx->state = STATE_INIT;
		@@ -2493,6 +2497,57 @@ static void efx_pci_remove(struct pci_dev *pci_dev)
		free_netdev(efx->net_dev);
		};

		/* NIC VPD information
		* Called during probe to display the part number of the
		* installed NIC. VPD is potentially very large but this should
		* always appear within the first 512 bytes.
		*/
		#define SFC_VPD_LEN 512
		static void efx_print_product_vpd(struct efx_nic *efx)
		{
		struct pci_dev *dev = efx->pci_dev;
		char vpd_data[SFC_VPD_LEN];
		ssize_t vpd_size;
		int i, j;

		/* Get the vpd data from the device */
		vpd_size = pci_read_vpd(dev, 0, sizeof(vpd_data), vpd_data);
		if (vpd_size <= 0) {
		netif_err(efx, drv, efx->net_dev, "Unable to read VPD\n");
		return;
		}

		/* Get the Read only section */
		i = pci_vpd_find_tag(vpd_data, 0, vpd_size, PCI_VPD_LRDT_RO_DATA);
		if (i < 0) {
		netif_err(efx, drv, efx->net_dev, "VPD Read-only not found\n");
		return;
		}

		j = pci_vpd_lrdt_size(&vpd_data[i]);
		i += PCI_VPD_LRDT_TAG_SIZE;
		if (i + j > vpd_size)
		j = vpd_size - i;

		/* Get the Part number */
		i = pci_vpd_find_info_keyword(vpd_data, i, j, "PN");
		if (i < 0) {
		netif_err(efx, drv, efx->net_dev, "Part number not found\n");
		return;
		}

		j = pci_vpd_info_field_size(&vpd_data[i]);
		i += PCI_VPD_INFO_FLD_HDR_SIZE;
		if (i + j > vpd_size) {
		netif_err(efx, drv, efx->net_dev, "Incomplete part number\n");
		return;
		}

		netif_info(efx, drv, efx->net_dev,
		"Part Number : %.*s\n", j, &vpd_data[i]);
		}


		/* Main body of NIC initialisation
		* This is called at module load (or hotplug insertion, theoretically).
		*/
		@@ -2582,6 +2637,8 @@ static int __devinit efx_pci_probe(struct pci_dev *pci_dev,
		netif_info(efx, probe, efx->net_dev,
		"Solarflare NIC detected\n");

		efx_print_product_vpd(efx);

		/* Set up basic I/O (BAR mappings etc) */
		rc = efx_init_io(efx);
		if (rc)

drivers/net/ethernet/sfc/efx.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -148,7 +148,7 @@ static inline void efx_schedule_channel(struct efx_channel *channel)

		static inline void efx_schedule_channel_irq(struct efx_channel *channel)
		{
		channel->last_irq_cpu = raw_smp_processor_id();
		channel->event_test_cpu = raw_smp_processor_id();
		efx_schedule_channel(channel);
		}

drivers/net/ethernet/sfc/falcon_boards.c

+0 −13

Original line number	Diff line number	Diff line
		@@ -709,8 +709,6 @@ static int sfe4003_init(struct efx_nic *efx)
		static const struct falcon_board_type board_types[] = {
		{
		.id = FALCON_BOARD_SFE4001,
		.ref_model = "SFE4001",
		.gen_type = "10GBASE-T adapter",
		.init = sfe4001_init,
		.init_phy = efx_port_dummy_op_void,
		.fini = sfe4001_fini,
		@@ -719,8 +717,6 @@ static const struct falcon_board_type board_types[] = {
		},
		{
		.id = FALCON_BOARD_SFE4002,
		.ref_model = "SFE4002",
		.gen_type = "XFP adapter",
		.init = sfe4002_init,
		.init_phy = sfe4002_init_phy,
		.fini = efx_fini_lm87,
		@@ -729,8 +725,6 @@ static const struct falcon_board_type board_types[] = {
		},
		{
		.id = FALCON_BOARD_SFE4003,
		.ref_model = "SFE4003",
		.gen_type = "10GBASE-CX4 adapter",
		.init = sfe4003_init,
		.init_phy = sfe4003_init_phy,
		.fini = efx_fini_lm87,
		@@ -739,8 +733,6 @@ static const struct falcon_board_type board_types[] = {
		},
		{
		.id = FALCON_BOARD_SFN4112F,
		.ref_model = "SFN4112F",
		.gen_type = "SFP+ adapter",
		.init = sfn4112f_init,
		.init_phy = sfn4112f_init_phy,
		.fini = efx_fini_lm87,
		@@ -763,11 +755,6 @@ int falcon_probe_board(struct efx_nic *efx, u16 revision_info)
		board->type = &board_types[i];

		if (board->type) {
		netif_info(efx, probe, efx->net_dev, "board is %s rev %c%d\n",
		(efx->pci_dev->subsystem_vendor ==
		PCI_VENDOR_ID_SOLARFLARE)
		? board->type->ref_model : board->type->gen_type,
		'A' + board->major, board->minor);
		return 0;
		} else {
		netif_err(efx, probe, efx->net_dev, "unknown board type %d\n",

drivers/net/ethernet/sfc/net_driver.h

+4 −4

Original line number	Diff line number	Diff line
		@@ -324,8 +324,7 @@ enum efx_rx_alloc_method {
		* @eventq: Event queue buffer
		* @eventq_mask: Event queue pointer mask
		* @eventq_read_ptr: Event queue read pointer
		* @last_eventq_read_ptr: Last event queue read pointer value.
		* @last_irq_cpu: Last CPU to handle interrupt for this channel
		* @event_test_cpu: Last CPU to handle interrupt or test event for this channel
		* @irq_count: Number of IRQs since last adaptive moderation decision
		* @irq_mod_score: IRQ moderation score
		* @rx_alloc_level: Watermark based heuristic counter for pushing descriptors
		@@ -355,9 +354,8 @@ struct efx_channel {
		struct efx_special_buffer eventq;
		unsigned int eventq_mask;
		unsigned int eventq_read_ptr;
		unsigned int last_eventq_read_ptr;
		int event_test_cpu;

		int last_irq_cpu;
		unsigned int irq_count;
		unsigned int irq_mod_score;
		#ifdef CONFIG_RFS_ACCEL
		@@ -678,6 +676,7 @@ struct vfdi_status;
		* @irq_status: Interrupt status buffer
		* @irq_zero_count: Number of legacy IRQs seen with queue flags == 0
		* @irq_level: IRQ level/index for IRQs not triggered by an event queue
		* @selftest_work: Work item for asynchronous self-test
		* @mtd_list: List of MTDs attached to the NIC
		* @nic_data: Hardware dependent state
		* @mac_lock: MAC access lock. Protects @port_enabled, @phy_mode,
		@@ -791,6 +790,7 @@ struct efx_nic {
		struct efx_buffer irq_status;
		unsigned irq_zero_count;
		unsigned irq_level;
		struct delayed_work selftest_work;

		#ifdef CONFIG_SFC_MTD
		struct list_head mtd_list;

drivers/net/ethernet/sfc/nic.c

+7 −4

Original line number	Diff line number	Diff line
		@@ -822,7 +822,6 @@ efx_handle_tx_event(struct efx_channel channel, efx_qword_t event)
		channel, tx_ev_q_label % EFX_TXQ_TYPES);
		tx_packets = ((tx_ev_desc_ptr - tx_queue->read_count) &
		tx_queue->ptr_mask);
		channel->irq_mod_score += tx_packets;
		efx_xmit_done(tx_queue, tx_ev_desc_ptr);
		} else if (EFX_QWORD_FIELD(*event, FSF_AZ_TX_EV_WQ_FF_FULL)) {
		/* Rewrite the FIFO write pointer */
		@@ -1084,7 +1083,7 @@ efx_handle_generated_event(struct efx_channel channel, efx_qword_t event)
		code = _EFX_CHANNEL_MAGIC_CODE(magic);

		if (magic == EFX_CHANNEL_MAGIC_TEST(channel)) {
		/* ignore */
		channel->event_test_cpu = raw_smp_processor_id();
		} else if (rx_queue && magic == EFX_CHANNEL_MAGIC_FILL(rx_queue)) {
		/* The queue must be empty, so we won't receive any rx
		* events, so efx_process_channel() won't refill the
		@@ -1333,8 +1332,10 @@ void efx_nic_remove_eventq(struct efx_channel *channel)
		}


		void efx_nic_generate_test_event(struct efx_channel *channel)
		void efx_nic_event_test_start(struct efx_channel *channel)
		{
		channel->event_test_cpu = -1;
		smp_wmb();
		efx_magic_event(channel, EFX_CHANNEL_MAGIC_TEST(channel));
		}

		@@ -1383,8 +1384,10 @@ void efx_nic_disable_interrupts(struct efx_nic *efx)
		* Interrupt must already have been enabled, otherwise nasty things
		* may happen.
		*/
		void efx_nic_generate_interrupt(struct efx_nic *efx)
		void efx_nic_irq_test_start(struct efx_nic *efx)
		{
		efx->last_irq_cpu = -1;
		smp_wmb();
		efx_nic_interrupts(efx, true, true);
		}

Admin message