sfc: Move Falcon board/PHY/MAC monitoring code to falcon.c (fe75820b) · Commits · 戴 / test

drivers/net/sfc/efx.c

+1 −10

Original line number	Diff line number	Diff line
		@@ -1293,7 +1293,6 @@ static void efx_monitor(struct work_struct *data)
		{
		struct efx_nic *efx = container_of(data, struct efx_nic,
		monitor_work.work);
		int rc;

		EFX_TRACE(efx, "hardware monitor executing on CPU %d\n",
		raw_smp_processor_id());
		@@ -1305,15 +1304,7 @@ static void efx_monitor(struct work_struct *data)
		goto out_requeue;
		if (!efx->port_enabled)
		goto out_unlock;
		rc = falcon_board(efx)->type->monitor(efx);
		if (rc) {
		EFX_ERR(efx, "Board sensor %s; shutting down PHY\n",
		(rc == -ERANGE) ? "reported fault" : "failed");
		efx->phy_mode \|= PHY_MODE_LOW_POWER;
		falcon_sim_phy_event(efx);
		}
		efx->phy_op->poll(efx);
		efx->mac_op->poll(efx);
		falcon_monitor(efx);

		out_unlock:
		mutex_unlock(&efx->mac_lock);

+15 −0

Original line number	Diff line number	Diff line
		@@ -2612,6 +2612,21 @@ fail5:
		return rc;
		}

		void falcon_monitor(struct efx_nic *efx)
		{
		int rc;

		rc = falcon_board(efx)->type->monitor(efx);
		if (rc) {
		EFX_ERR(efx, "Board sensor %s; shutting down PHY\n",
		(rc == -ERANGE) ? "reported fault" : "failed");
		efx->phy_mode \|= PHY_MODE_LOW_POWER;
		falcon_sim_phy_event(efx);
		}
		efx->phy_op->poll(efx);
		efx->mac_op->poll(efx);
		}

		/* Zeroes out the SRAM contents. This routine must be called in
		* process context and is allowed to sleep.
		*/

+1 −0

Original line number	Diff line number	Diff line
		@@ -158,6 +158,7 @@ extern int falcon_probe_nic(struct efx_nic *efx);
		extern int falcon_init_nic(struct efx_nic *efx);
		extern int falcon_flush_queues(struct efx_nic *efx);
		extern int falcon_reset_hw(struct efx_nic *efx, enum reset_type method);
		extern void falcon_monitor(struct efx_nic *efx);
		extern void falcon_remove_nic(struct efx_nic *efx);
		extern void falcon_update_nic_stats(struct efx_nic *efx);
		extern void falcon_start_nic_stats(struct efx_nic *efx);