Commit ec036eb9 authored by Sudarsana Reddy Kalluru's avatar Sudarsana Reddy Kalluru Committed by David S. Miller
Browse files

qed: Display port_id in the UFP debug messages. 



MFW sends UFP notifications mostly during the device init phase and PFs
might not be assigned with a name by this time. Hence capturing port-id in
the debug messages would help in finding which PF the ufp notification was
sent to.

Also, fixed a minor scemantic issue in a debug print.

Signed-off-by: default avatarSudarsana Reddy Kalluru <Sudarsana.Kalluru@cavium.com>
Signed-off-by: default avatarAriel Elior <Ariel.Elior@cavium.com>
Signed-off-by: default avatarMichal Kalderon <Michal.Kalderon@cavium.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 77f06aac

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

+13 −7
Original line number Original line Diff line number Diff line
@@ -1641,7 +1641,9 @@ void qed_mcp_read_ufp_config(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt) 
	val = (port_cfg & OEM_CFG_CHANNEL_TYPE_MASK) >>

	val = (port_cfg & OEM_CFG_CHANNEL_TYPE_MASK) >>

		OEM_CFG_CHANNEL_TYPE_OFFSET;

		OEM_CFG_CHANNEL_TYPE_OFFSET;

	if (val != OEM_CFG_CHANNEL_TYPE_STAGGED)

	if (val != OEM_CFG_CHANNEL_TYPE_STAGGED)

		DP_NOTICE(p_hwfn, "Incorrect UFP Channel type  %d\n", val);

		DP_NOTICE(p_hwfn,

			  "Incorrect UFP Channel type  %d port_id 0x%02x\n",

			  val, MFW_PORT(p_hwfn));





	val = (port_cfg & OEM_CFG_SCHED_TYPE_MASK) >> OEM_CFG_SCHED_TYPE_OFFSET;

	val = (port_cfg & OEM_CFG_SCHED_TYPE_MASK) >> OEM_CFG_SCHED_TYPE_OFFSET;

	if (val == OEM_CFG_SCHED_TYPE_ETS) {

	if (val == OEM_CFG_SCHED_TYPE_ETS) {
@@ -1650,7 +1652,9 @@ void qed_mcp_read_ufp_config(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt) 
		p_hwfn->ufp_info.mode = QED_UFP_MODE_VNIC_BW;

		p_hwfn->ufp_info.mode = QED_UFP_MODE_VNIC_BW;

	} else {

	} else {

		p_hwfn->ufp_info.mode = QED_UFP_MODE_UNKNOWN;

		p_hwfn->ufp_info.mode = QED_UFP_MODE_UNKNOWN;

		DP_NOTICE(p_hwfn, "Unknown UFP scheduling mode %d\n", val);

		DP_NOTICE(p_hwfn,

			  "Unknown UFP scheduling mode %d port_id 0x%02x\n",

			  val, MFW_PORT(p_hwfn));

	}

	}





	qed_mcp_get_shmem_func(p_hwfn, p_ptt, &shmem_info, MCP_PF_ID(p_hwfn));

	qed_mcp_get_shmem_func(p_hwfn, p_ptt, &shmem_info, MCP_PF_ID(p_hwfn));
@@ -1665,13 +1669,15 @@ void qed_mcp_read_ufp_config(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt) 
		p_hwfn->ufp_info.pri_type = QED_UFP_PRI_OS;

		p_hwfn->ufp_info.pri_type = QED_UFP_PRI_OS;

	} else {

	} else {

		p_hwfn->ufp_info.pri_type = QED_UFP_PRI_UNKNOWN;

		p_hwfn->ufp_info.pri_type = QED_UFP_PRI_UNKNOWN;

		DP_NOTICE(p_hwfn, "Unknown Host priority control %d\n", val);

		DP_NOTICE(p_hwfn,

			  "Unknown Host priority control %d port_id 0x%02x\n",

			  val, MFW_PORT(p_hwfn));

	}

	}





	DP_NOTICE(p_hwfn,

	DP_NOTICE(p_hwfn,

		  "UFP shmem config: mode = %d tc = %d pri_type = %d\n",

		  "UFP shmem config: mode = %d tc = %d pri_type = %d port_id 0x%02x\n",

		  p_hwfn->ufp_info.mode,

		  p_hwfn->ufp_info.mode, p_hwfn->ufp_info.tc,

		  p_hwfn->ufp_info.tc, p_hwfn->ufp_info.pri_type);

		  p_hwfn->ufp_info.pri_type, MFW_PORT(p_hwfn));

}

}





static int

static int

CRA Git | Maintained and supported by SUSTech CRA and CCSE