Merge branch 'sfc-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-2.6 (c0212fb1) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/net/sfc/efx.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -328,7 +328,8 @@ static int efx_poll(struct napi_struct *napi, int budget)
		* processing to finish, then directly poll (and ack ) the eventq.
		* Finally reenable NAPI and interrupts.
		*
		* Since we are touching interrupts the caller should hold the suspend lock
		* This is for use only during a loopback self-test. It must not
		* deliver any packets up the stack as this can result in deadlock.
		*/
		void efx_process_channel_now(struct efx_channel *channel)
		{
		@@ -336,6 +337,7 @@ void efx_process_channel_now(struct efx_channel *channel)

		BUG_ON(channel->channel >= efx->n_channels);
		BUG_ON(!channel->enabled);
		BUG_ON(!efx->loopback_selftest);

		/* Disable interrupts and wait for ISRs to complete */
		efx_nic_disable_interrupts(efx);
		@@ -1436,7 +1438,7 @@ static void efx_start_all(struct efx_nic *efx)
		* restart the transmit interface early so the watchdog timer stops */
		efx_start_port(efx);

		if (efx_dev_registered(efx))
		if (efx_dev_registered(efx) && !efx->port_inhibited)
		netif_tx_wake_all_queues(efx->net_dev);

		efx_for_each_channel(channel, efx)

drivers/net/sfc/io.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -152,6 +152,7 @@ static inline void efx_reado(struct efx_nic efx, efx_oword_t value,

		spin_lock_irqsave(&efx->biu_lock, flags);
		value->u32[0] = _efx_readd(efx, reg + 0);
		rmb();
		value->u32[1] = _efx_readd(efx, reg + 4);
		value->u32[2] = _efx_readd(efx, reg + 8);
		value->u32[3] = _efx_readd(efx, reg + 12);
		@@ -174,6 +175,7 @@ static inline void efx_sram_readq(struct efx_nic efx, void __iomem membase,
		value->u64[0] = (__force __le64)__raw_readq(membase + addr);
		#else
		value->u32[0] = (__force __le32)__raw_readl(membase + addr);
		rmb();
		value->u32[1] = (__force __le32)__raw_readl(membase + addr + 4);
		#endif
		spin_unlock_irqrestore(&efx->biu_lock, flags);

drivers/net/sfc/net_driver.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -330,7 +330,6 @@ enum efx_rx_alloc_method {
		* @eventq_mask: Event queue pointer mask
		* @eventq_read_ptr: Event queue read pointer
		* @last_eventq_read_ptr: Last event queue read pointer value.
		* @magic_count: Event queue test event count
		* @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
		@@ -360,7 +359,6 @@ struct efx_channel {
		unsigned int eventq_mask;
		unsigned int eventq_read_ptr;
		unsigned int last_eventq_read_ptr;
		unsigned int magic_count;

		unsigned int irq_count;
		unsigned int irq_mod_score;

drivers/net/sfc/nic.c

+15 −7

Original line number	Diff line number	Diff line
		@@ -84,7 +84,8 @@ static inline void efx_write_buf_tbl(struct efx_nic efx, efx_qword_t value,
		static inline efx_qword_t efx_event(struct efx_channel channel,
		unsigned int index)
		{
		return ((efx_qword_t *) (channel->eventq.addr)) + index;
		return ((efx_qword_t *) (channel->eventq.addr)) +
		(index & channel->eventq_mask);
		}

		/* See if an event is present
		@@ -673,7 +674,8 @@ void efx_nic_eventq_read_ack(struct efx_channel *channel)
		efx_dword_t reg;
		struct efx_nic *efx = channel->efx;

		EFX_POPULATE_DWORD_1(reg, FRF_AZ_EVQ_RPTR, channel->eventq_read_ptr);
		EFX_POPULATE_DWORD_1(reg, FRF_AZ_EVQ_RPTR,
		channel->eventq_read_ptr & channel->eventq_mask);
		efx_writed_table(efx, &reg, efx->type->evq_rptr_tbl_base,
		channel->channel);
		}
		@@ -908,7 +910,7 @@ efx_handle_generated_event(struct efx_channel channel, efx_qword_t event)

		code = EFX_QWORD_FIELD(*event, FSF_AZ_DRV_GEN_EV_MAGIC);
		if (code == EFX_CHANNEL_MAGIC_TEST(channel))
		++channel->magic_count;
		; /* ignore */
		else if (code == EFX_CHANNEL_MAGIC_FILL(channel))
		/* The queue must be empty, so we won't receive any rx
		* events, so efx_process_channel() won't refill the
		@@ -1015,8 +1017,7 @@ int efx_nic_process_eventq(struct efx_channel *channel, int budget)
		/* Clear this event by marking it all ones */
		EFX_SET_QWORD(*p_event);

		/* Increment read pointer */
		read_ptr = (read_ptr + 1) & channel->eventq_mask;
		++read_ptr;

		ev_code = EFX_QWORD_FIELD(event, FSF_AZ_EV_CODE);

		@@ -1060,6 +1061,13 @@ out:
		return spent;
		}

		/* Check whether an event is present in the eventq at the current
		* read pointer. Only useful for self-test.
		*/
		bool efx_nic_event_present(struct efx_channel *channel)
		{
		return efx_event_present(efx_event(channel, channel->eventq_read_ptr));
		}

		/* Allocate buffer table entries for event queue */
		int efx_nic_probe_eventq(struct efx_channel *channel)
		@@ -1165,7 +1173,7 @@ static void efx_poll_flush_events(struct efx_nic *efx)
		struct efx_tx_queue *tx_queue;
		struct efx_rx_queue *rx_queue;
		unsigned int read_ptr = channel->eventq_read_ptr;
		unsigned int end_ptr = (read_ptr - 1) & channel->eventq_mask;
		unsigned int end_ptr = read_ptr + channel->eventq_mask - 1;

		do {
		efx_qword_t *event = efx_event(channel, read_ptr);
		@@ -1205,7 +1213,7 @@ static void efx_poll_flush_events(struct efx_nic *efx)
		* it's ok to throw away every non-flush event */
		EFX_SET_QWORD(*event);

		read_ptr = (read_ptr + 1) & channel->eventq_mask;
		++read_ptr;
		} while (read_ptr != end_ptr);

		channel->eventq_read_ptr = read_ptr;

drivers/net/sfc/nic.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -184,6 +184,7 @@ extern void efx_nic_fini_eventq(struct efx_channel *channel);
		extern void efx_nic_remove_eventq(struct efx_channel *channel);
		extern int efx_nic_process_eventq(struct efx_channel *channel, int rx_quota);
		extern void efx_nic_eventq_read_ack(struct efx_channel *channel);
		extern bool efx_nic_event_present(struct efx_channel *channel);

		/* MAC/PHY */
		extern void falcon_drain_tx_fifo(struct efx_nic *efx);