sfc: commonise drain event handling (850b7227) · Commits · 戴 / test

drivers/net/ethernet/sfc/ef10.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -3117,14 +3117,6 @@ fail:
		netif_err(efx, hw, efx->net_dev, "%s: failed rc=%d\n", __func__, rc);
		}

		void efx_ef10_handle_drain_event(struct efx_nic *efx)
		{
		if (atomic_dec_and_test(&efx->active_queues))
		wake_up(&efx->flush_wq);

		WARN_ON(atomic_read(&efx->active_queues) < 0);
		}

		static int efx_ef10_fini_dmaq(struct efx_nic *efx)
		{
		struct efx_tx_queue *tx_queue;

+9 −1

Original line number	Diff line number	Diff line
		@@ -1299,6 +1299,14 @@ static void efx_mcdi_abandon(struct efx_nic *efx)
		efx_schedule_reset(efx, RESET_TYPE_MCDI_TIMEOUT);
		}

		static void efx_handle_drain_event(struct efx_nic *efx)
		{
		if (atomic_dec_and_test(&efx->active_queues))
		wake_up(&efx->flush_wq);

		WARN_ON(atomic_read(&efx->active_queues) < 0);
		}

		/* Called from efx_farch_ev_process and efx_ef10_ev_process for MCDI events */
		void efx_mcdi_process_event(struct efx_channel *channel,
		efx_qword_t *event)
		@@ -1371,7 +1379,7 @@ void efx_mcdi_process_event(struct efx_channel *channel,
		BUILD_BUG_ON(MCDI_EVENT_TX_FLUSH_TO_DRIVER_LBN !=
		MCDI_EVENT_RX_FLUSH_TO_DRIVER_LBN);
		if (!MCDI_EVENT_FIELD(*event, TX_FLUSH_TO_DRIVER))
		efx_ef10_handle_drain_event(efx);
		efx_handle_drain_event(efx);
		break;
		case MCDI_EVENT_CODE_TX_ERR:
		case MCDI_EVENT_CODE_RX_ERR:

+0 −1

Original line number	Diff line number	Diff line
		@@ -376,7 +376,6 @@ void falcon_stop_nic_stats(struct efx_nic *efx);
		int falcon_reset_xaui(struct efx_nic *efx);
		void efx_farch_dimension_resources(struct efx_nic *efx, unsigned sram_lim_qw);
		void efx_farch_init_common(struct efx_nic *efx);
		void efx_ef10_handle_drain_event(struct efx_nic *efx);
		void efx_farch_rx_push_indir_table(struct efx_nic *efx);
		void efx_farch_rx_pull_indir_table(struct efx_nic *efx);