Commit d9d9434a authored by Maher Sanalla's avatar Maher Sanalla Committed by Leon Romanovsky
Browse files

IB/hfi1: Remove state transition log message and opa_lstate_name() 



Remove the state transition log message from the hfi1 driver, as
the IB core now logs the same information when handling a cache
update event.

While at it, replace the hfi1-specific opa_lstate_name() function with
the ib_verbs equivalent function, ib_port_state_to_str(), for converting
IB port state to a string.

Signed-off-by: default avatarMaher Sanalla <msanalla@nvidia.com>
Link: https://patch.msgid.link/64e48bef00630e33f4b8c830cb7d9a69aedc34dc.1738586601.git.leon@kernel.org


Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
parent 1fd119c6

drivers/infiniband/hw/hfi1/chip.c

+0 −18
Original line number Diff line number Diff line
@@ -12882,22 +12882,6 @@ u32 chip_to_opa_pstate(struct hfi1_devdata *dd, u32 chip_pstate) 
	}

}



/* return the OPA port logical state name */

const char *opa_lstate_name(u32 lstate)

{

	static const char * const port_logical_names[] = {

		"PORT_NOP",

		"PORT_DOWN",

		"PORT_INIT",

		"PORT_ARMED",

		"PORT_ACTIVE",

		"PORT_ACTIVE_DEFER",

	};

	if (lstate < ARRAY_SIZE(port_logical_names))

		return port_logical_names[lstate];

	return "unknown";

}



/* return the OPA port physical state name */

const char *opa_pstate_name(u32 pstate)

{
@@ -12956,8 +12940,6 @@ static void update_statusp(struct hfi1_pportdata *ppd, u32 state) 
			break;

		}

	}

	dd_dev_info(ppd->dd, "logical state changed to %s (0x%x)\n",

		    opa_lstate_name(state), state);

}



/**

drivers/infiniband/hw/hfi1/chip.h

+0 −1
Original line number Diff line number Diff line
@@ -771,7 +771,6 @@ int is_bx(struct hfi1_devdata *dd); 
bool is_urg_masked(struct hfi1_ctxtdata *rcd);

u32 read_physical_state(struct hfi1_devdata *dd);

u32 chip_to_opa_pstate(struct hfi1_devdata *dd, u32 chip_pstate);

const char *opa_lstate_name(u32 lstate);

const char *opa_pstate_name(u32 pstate);

u32 driver_pstate(struct hfi1_pportdata *ppd);

u32 driver_lstate(struct hfi1_pportdata *ppd);

drivers/infiniband/hw/hfi1/driver.c

+1 −1
Original line number Diff line number Diff line
@@ -968,7 +968,7 @@ static bool __set_armed_to_active(struct hfi1_packet *packet) 
		if (hwstate != IB_PORT_ACTIVE) {

			dd_dev_info(packet->rcd->dd,

				    "Unexpected link state %s\n",

				    opa_lstate_name(hwstate));

				    ib_port_state_to_str(hwstate));

			return false;

		}

drivers/infiniband/hw/hfi1/mad.c

+2 −2
Original line number Diff line number Diff line
@@ -1160,8 +1160,8 @@ static int port_states_transition_allowed(struct hfi1_pportdata *ppd, 
	if (ret == HFI_TRANSITION_DISALLOWED ||

	    ret == HFI_TRANSITION_UNDEFINED) {

		pr_warn("invalid logical state transition %s -> %s\n",

			opa_lstate_name(logical_old),

			opa_lstate_name(logical_new));

			ib_port_state_to_str(logical_old),

			ib_port_state_to_str(logical_new));

		return ret;

	}