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

Commit f5408ac7 authored by Bryan O'Sullivan's avatar Bryan O'Sullivan Committed by Roland Dreier
Browse files

IB/ipath: On unrecoverable errors, force link down, LEDs off 



If the chip is no longer usable, LEDs should be turned off so system
can be found easily in the cluster.

Also some minor reorganizing so both chips print hardware error
message at same point and only if there were unrecovered errors

Signed-off-by: default avatarDave Olson <dave.olson@qlogic.com>
Signed-off-by: default avatarBryan O'Sullivan <bryan.osullivan@qlogic.com>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 27b044a8

drivers/infiniband/hw/ipath/ipath_iba6110.c

+11 −1
Original line number Diff line number Diff line
@@ -43,6 +43,9 @@ 
#include "ipath_kernel.h"

#include "ipath_registers.h"



static void ipath_setup_ht_setextled(struct ipath_devdata *, u64, u64);





/*

 * This lists the InfiniPath registers, in the actual chip layout.

 * This structure should never be directly accessed.
@@ -572,9 +575,14 @@ static void ipath_ht_handle_hwerrors(struct ipath_devdata *dd, char *msg, 
		 * make the complaint once, in case it's stuck

		 * or recurring, and we get here multiple

		 * times.

		 * force link down, so switch knows, and

		 * LEDs are turned off

		 */

		ipath_dev_err(dd, "%s hardware error\n", msg);

		if (dd->ipath_flags & IPATH_INITTED) {

			ipath_set_linkstate(dd, IPATH_IB_LINKDOWN);

			ipath_setup_ht_setextled(dd,

				INFINIPATH_IBCS_L_STATE_DOWN,

				INFINIPATH_IBCS_LT_STATE_DISABLED);

			ipath_dev_err(dd, "Fatal Hardware Error (freeze "

					  "mode), no longer usable, SN %.16s\n",

					  dd->ipath_serial);
@@ -592,6 +600,8 @@ static void ipath_ht_handle_hwerrors(struct ipath_devdata *dd, char *msg, 
	}

	else

		*msg = 0; /* recovered from all of them */

	if (*msg)

		ipath_dev_err(dd, "%s hardware error\n", msg);

	if (isfatal && !ipath_diag_inuse && dd->ipath_freezemsg)

		/*

		 * for status file; if no trailing brace is copied,

drivers/infiniband/hw/ipath/ipath_iba6120.c

+10 −1
Original line number Diff line number Diff line
@@ -43,6 +43,8 @@ 
#include "ipath_kernel.h"

#include "ipath_registers.h"



static void ipath_setup_pe_setextled(struct ipath_devdata *, u64, u64);



/*

 * This file contains all the chip-specific register information and

 * access functions for the QLogic InfiniPath PCI-Express chip.
@@ -407,8 +409,14 @@ static void ipath_pe_handle_hwerrors(struct ipath_devdata *dd, char *msg, 
			 * if any set that we aren't ignoring only make the

			 * complaint once, in case it's stuck or recurring,

			 * and we get here multiple times

			 * Force link down, so switch knows, and

			 * LEDs are turned off

			 */

			if (dd->ipath_flags & IPATH_INITTED) {

				ipath_set_linkstate(dd, IPATH_IB_LINKDOWN);

				ipath_setup_pe_setextled(dd,

					INFINIPATH_IBCS_L_STATE_DOWN,

					INFINIPATH_IBCS_LT_STATE_DISABLED);

				ipath_dev_err(dd, "Fatal Hardware Error (freeze "

					      "mode), no longer usable, SN %.16s\n",

						  dd->ipath_serial);
@@ -482,6 +490,7 @@ static void ipath_pe_handle_hwerrors(struct ipath_devdata *dd, char *msg, 
				 dd->ipath_hwerrmask);

	}



	if (*msg)

		ipath_dev_err(dd, "%s hardware error\n", msg);

	if (isfatal && !ipath_diag_inuse && dd->ipath_freezemsg) {

		/*