Commit 8d9da467 authored by Amit Cohen's avatar Amit Cohen Committed by David S. Miller
Browse files

mlxsw: pci: Move software reset code to a separate function 



In general, the existing flow of software reset in the driver is:
1. Wait for system ready status.
2. Send MRSR command, to start the reset.
3. Wait for system ready status.

This flow will be extended once a new reset command is supported. As a
preparation, move step #2 to a separate function.

Signed-off-by: default avatarAmit Cohen <amcohen@nvidia.com>
Reviewed-by: default avatarPetr Machata <petrm@nvidia.com>
Signed-off-by: default avatarIdo Schimmel <idosch@nvidia.com>
Signed-off-by: default avatarPetr Machata <petrm@nvidia.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bdf85f3a

drivers/net/ethernet/mellanox/mlxsw/pci.c

+9 −3
Original line number Diff line number Diff line
@@ -1476,11 +1476,18 @@ static int mlxsw_pci_sys_ready_wait(struct mlxsw_pci *mlxsw_pci, 
	return -EBUSY;

}



static int mlxsw_pci_reset_sw(struct mlxsw_pci *mlxsw_pci)

{

	char mrsr_pl[MLXSW_REG_MRSR_LEN];



	mlxsw_reg_mrsr_pack(mrsr_pl, MLXSW_REG_MRSR_COMMAND_SOFTWARE_RESET);

	return mlxsw_reg_write(mlxsw_pci->core, MLXSW_REG(mrsr), mrsr_pl);

}



static int

mlxsw_pci_reset(struct mlxsw_pci *mlxsw_pci, const struct pci_device_id *id)

{

	struct pci_dev *pdev = mlxsw_pci->pdev;

	char mrsr_pl[MLXSW_REG_MRSR_LEN];

	u32 sys_status;

	int err;
@@ -1491,8 +1498,7 @@ mlxsw_pci_reset(struct mlxsw_pci *mlxsw_pci, const struct pci_device_id *id) 
		return err;

	}



	mlxsw_reg_mrsr_pack(mrsr_pl, MLXSW_REG_MRSR_COMMAND_SOFTWARE_RESET);

	err = mlxsw_reg_write(mlxsw_pci->core, MLXSW_REG(mrsr), mrsr_pl);

	err = mlxsw_pci_reset_sw(mlxsw_pci);

	if (err)

		return err;