Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65b0a469 authored by Jacob Keller's avatar Jacob Keller Committed by Jeff Kirsher
Browse files

fm10k: move fm10k_prepare_for_reset and fm10k_handle_reset 



A future patch needs these functions defined earlier in the file. Move
them closer to above where they will be called.

Signed-off-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Tested-by: default avatarKrishneil Singh <krishneil.k.singh@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent dd5eede2

drivers/net/ethernet/intel/fm10k/fm10k_pci.c

+29 −29
Original line number Diff line number Diff line
@@ -132,35 +132,6 @@ static void fm10k_service_timer(unsigned long data) 
	fm10k_service_event_schedule(interface);

}



static void fm10k_detach_subtask(struct fm10k_intfc *interface)

{

	struct net_device *netdev = interface->netdev;

	u32 __iomem *hw_addr;

	u32 value;



	/* do nothing if device is still present or hw_addr is set */

	if (netif_device_present(netdev) || interface->hw.hw_addr)

		return;



	/* check the real address space to see if we've recovered */

	hw_addr = READ_ONCE(interface->uc_addr);

	value = readl(hw_addr);

	if (~value) {

		interface->hw.hw_addr = interface->uc_addr;

		netif_device_attach(netdev);

		set_bit(FM10K_FLAG_RESET_REQUESTED, interface->flags);

		netdev_warn(netdev, "PCIe link restored, device now attached\n");

		return;

	}



	rtnl_lock();



	if (netif_running(netdev))

		dev_close(netdev);



	rtnl_unlock();

}



static void fm10k_prepare_for_reset(struct fm10k_intfc *interface)

{

	struct net_device *netdev = interface->netdev;
@@ -270,6 +241,35 @@ static int fm10k_handle_reset(struct fm10k_intfc *interface) 
	return err;

}



static void fm10k_detach_subtask(struct fm10k_intfc *interface)

{

	struct net_device *netdev = interface->netdev;

	u32 __iomem *hw_addr;

	u32 value;



	/* do nothing if device is still present or hw_addr is set */

	if (netif_device_present(netdev) || interface->hw.hw_addr)

		return;



	/* check the real address space to see if we've recovered */

	hw_addr = READ_ONCE(interface->uc_addr);

	value = readl(hw_addr);

	if (~value) {

		interface->hw.hw_addr = interface->uc_addr;

		netif_device_attach(netdev);

		set_bit(FM10K_FLAG_RESET_REQUESTED, interface->flags);

		netdev_warn(netdev, "PCIe link restored, device now attached\n");

		return;

	}



	rtnl_lock();



	if (netif_running(netdev))

		dev_close(netdev);



	rtnl_unlock();

}



static void fm10k_reinit(struct fm10k_intfc *interface)

{

	int err;