Commit b228cb16 authored by Igor Russkikh's avatar Igor Russkikh Committed by David S. Miller
Browse files

qed*: make use of devlink recovery infrastructure 



Remove forcible recovery trigger and put it as a normal devlink
callback.

This allows user to enable/disable it via

    devlink health set pci/0000:03:00.0 reporter fw_fatal auto_recover false

Signed-off-by: default avatarIgor Russkikh <irusskikh@marvell.com>
Signed-off-by: default avatarAlexander Lobakin <alobakin@marvell.com>
Signed-off-by: default avatarMichal Kalderon <michal.kalderon@marvell.com>
Acked-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4f5a8db2

drivers/net/ethernet/qlogic/qed/qed.h

+1 −0
Original line number Diff line number Diff line
@@ -981,6 +981,7 @@ void qed_bw_update(struct qed_hwfn *hwfn, struct qed_ptt *ptt); 
u32 qed_unzip_data(struct qed_hwfn *p_hwfn,

		   u32 input_len, u8 *input_buf,

		   u32 max_size, u8 *unzip_buf);

int qed_recovery_process(struct qed_dev *cdev);

void qed_schedule_recovery_handler(struct qed_hwfn *p_hwfn);

void qed_hw_error_occurred(struct qed_hwfn *p_hwfn,

			   enum qed_hw_err_type err_type);

drivers/net/ethernet/qlogic/qed/qed_devlink.c

+14 −0
Original line number Diff line number Diff line
@@ -32,8 +32,22 @@ int qed_report_fatal_error(struct devlink *devlink, enum qed_hw_err_type err_typ 
	return 0;

}



static int

qed_fw_fatal_reporter_recover(struct devlink_health_reporter *reporter,

			      void *priv_ctx,

			      struct netlink_ext_ack *extack)

{

	struct qed_devlink *qdl = devlink_health_reporter_priv(reporter);

	struct qed_dev *cdev = qdl->cdev;



	qed_recovery_process(cdev);



	return 0;

}



static const struct devlink_health_reporter_ops qed_fw_fatal_reporter_ops = {

		.name = "fw_fatal",

		.recover = qed_fw_fatal_reporter_recover,

};



#define QED_REPORTER_FW_GRACEFUL_PERIOD 1200000

drivers/net/ethernet/qlogic/qed/qed_main.c

+1 −1
Original line number Diff line number Diff line
@@ -2817,7 +2817,7 @@ static int qed_set_led(struct qed_dev *cdev, enum qed_led_mode mode) 
	return status;

}



static int qed_recovery_process(struct qed_dev *cdev)

int qed_recovery_process(struct qed_dev *cdev)

{

	struct qed_hwfn *p_hwfn = QED_LEADING_HWFN(cdev);

	struct qed_ptt *p_ptt;

drivers/net/ethernet/qlogic/qede/qede_main.c

+0 −10
Original line number Diff line number Diff line
@@ -2595,8 +2595,6 @@ static void qede_atomic_hw_err_handler(struct qede_dev *edev) 


static void qede_generic_hw_err_handler(struct qede_dev *edev)

{

	struct qed_dev *cdev = edev->cdev;



	DP_NOTICE(edev,

		  "Generic sleepable HW error handling started - err_flags 0x%lx\n",

		  edev->err_flags);
@@ -2604,14 +2602,6 @@ static void qede_generic_hw_err_handler(struct qede_dev *edev) 
	if (edev->devlink)

		edev->ops->common->report_fatal_error(edev->devlink, edev->last_err_type);



	/* Trigger a recovery process.

	 * This is placed in the sleep requiring section just to make

	 * sure it is the last one, and that all the other operations

	 * were completed.

	 */

	if (test_bit(QEDE_ERR_IS_RECOVERABLE, &edev->err_flags))

		edev->ops->common->recovery_process(cdev);



	clear_bit(QEDE_ERR_IS_HANDLED, &edev->err_flags);



	DP_NOTICE(edev, "Generic sleepable HW error handling is done\n");