sfc: move various functions (190c736a) · Commits · 戴 / test

drivers/net/ethernet/sfc/ef10.c

+3 −18

Original line number	Diff line number	Diff line
		@@ -277,24 +277,9 @@ static int efx_ef10_init_datapath_caps(struct efx_nic *efx)
		u8 vi_window_mode = MCDI_BYTE(outbuf,
		GET_CAPABILITIES_V3_OUT_VI_WINDOW_MODE);

		switch (vi_window_mode) {
		case MC_CMD_GET_CAPABILITIES_V3_OUT_VI_WINDOW_MODE_8K:
		efx->vi_stride = 8192;
		break;
		case MC_CMD_GET_CAPABILITIES_V3_OUT_VI_WINDOW_MODE_16K:
		efx->vi_stride = 16384;
		break;
		case MC_CMD_GET_CAPABILITIES_V3_OUT_VI_WINDOW_MODE_64K:
		efx->vi_stride = 65536;
		break;
		default:
		netif_err(efx, probe, efx->net_dev,
		"Unrecognised VI window mode %d\n",
		vi_window_mode);
		return -EIO;
		}
		netif_dbg(efx, probe, efx->net_dev, "vi_stride = %u\n",
		efx->vi_stride);
		rc = efx_mcdi_window_mode_to_stride(efx, vi_window_mode);
		if (rc)
		return rc;
		} else {
		/* keep default VI stride */
		netif_dbg(efx, probe, efx->net_dev,

+0 −11

Original line number	Diff line number	Diff line
		@@ -692,17 +692,6 @@ int efx_net_stop(struct net_device *net_dev)
		return 0;
		}

		/* Context: process, dev_base_lock or RTNL held, non-blocking. */
		static void efx_net_stats(struct net_device *net_dev,
		struct rtnl_link_stats64 *stats)
		{
		struct efx_nic *efx = netdev_priv(net_dev);

		spin_lock_bh(&efx->stats_lock);
		efx->type->update_stats(efx, NULL, stats);
		spin_unlock_bh(&efx->stats_lock);
		}

		/* Context: netif_tx_lock held, BHs disabled. */
		static void efx_watchdog(struct net_device *net_dev, unsigned int txqueue)
		{

+10 −0

Original line number	Diff line number	Diff line
		@@ -454,6 +454,16 @@ void efx_stop_all(struct efx_nic *efx)
		efx_stop_datapath(efx);
		}

		/* Context: process, dev_base_lock or RTNL held, non-blocking. */
		void efx_net_stats(struct net_device net_dev, struct rtnl_link_stats64 stats)
		{
		struct efx_nic *efx = netdev_priv(net_dev);

		spin_lock_bh(&efx->stats_lock);
		efx->type->update_stats(efx, NULL, stats);
		spin_unlock_bh(&efx->stats_lock);
		}

		/* Push loopback/power/transmit disable settings to the PHY, and reconfigure
		* the MAC appropriately. All other PHY configuration changes are pushed
		* through phy_op->set_settings(), and pushed asynchronously to the MAC

+2 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,8 @@ void efx_fini_struct(struct efx_nic *efx);
		void efx_start_all(struct efx_nic *efx);
		void efx_stop_all(struct efx_nic *efx);

		void efx_net_stats(struct net_device net_dev, struct rtnl_link_stats64 stats);

		int efx_create_reset_workqueue(void);
		void efx_queue_reset_work(struct efx_nic *efx);
		void efx_flush_reset_workqueue(struct efx_nic *efx);

+0 −2

Original line number	Diff line number	Diff line
		@@ -348,8 +348,6 @@ void efx_mcdi_port_remove(struct efx_nic *efx);
		int efx_mcdi_port_reconfigure(struct efx_nic *efx);
		u32 efx_mcdi_phy_get_caps(struct efx_nic *efx);
		void efx_mcdi_process_link_change(struct efx_nic efx, efx_qword_t ev);
		int efx_mcdi_set_mac(struct efx_nic *efx);
		#define EFX_MC_STATS_GENERATION_INVALID ((__force __le64)(-1))
		void efx_mcdi_mac_start_stats(struct efx_nic *efx);
		void efx_mcdi_mac_stop_stats(struct efx_nic *efx);
		void efx_mcdi_mac_pull_stats(struct efx_nic *efx);