openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging/rdma/hfi1: Get port type from configuration file 

The current code employs a heuristic to guess the port type.
The canonical location to identify the port type of the
designed platform is from the platform configuration data.

This patch uses the previously fetched port type from the platform
configuration and removes the now obsolete heuristic routine
and its associated defines.

Reviewed-by: Arthur Kepner <arthur.kepner@intel.com>
Signed-off-by: Easwar Hariharan <easwar.hariharan@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
This commit is contained in:
Easwar Hariharan 2016-02-03 14:31:22 -08:00 committed by Doug Ledford
parent 8ebd4cf185
commit 1d01cf33e3
2 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/staging/rdma/hfi1/mad.c
View File

@ -503,16 +503,6 @@ void read_ltp_rtt(struct hfi1_devdata *dd)
write_lcb_cache(DC_LCB_STS_ROUND_TRIP_LTP_CNT, reg); write_lcb_cache(DC_LCB_STS_ROUND_TRIP_LTP_CNT, reg);
} }
static u8 __opa_porttype(struct hfi1_pportdata *ppd)
{
if (qsfp_mod_present(ppd)) {
if (ppd->qsfp_info.cache_valid)
return OPA_PORT_TYPE_STANDARD;
return OPA_PORT_TYPE_DISCONNECTED;
}
return OPA_PORT_TYPE_UNKNOWN;
}
static int __subn_get_opa_portinfo(struct opa_smp *smp, u32 am, u8 *data, static int __subn_get_opa_portinfo(struct opa_smp *smp, u32 am, u8 *data,
struct ib_device *ibdev, u8 port, struct ib_device *ibdev, u8 port,
u32 *resp_len) u32 *resp_len)
@ -583,7 +573,7 @@ static int __subn_get_opa_portinfo(struct opa_smp *smp, u32 am, u8 *data,
if (start_of_sm_config && (state == IB_PORT_INIT)) if (start_of_sm_config && (state == IB_PORT_INIT))
ppd->is_sm_config_started = 1; ppd->is_sm_config_started = 1;
pi->port_phys_conf = __opa_porttype(ppd) & 0xf; pi->port_phys_conf = (ppd->port_type & 0xf);
#if PI_LED_ENABLE_SUP #if PI_LED_ENABLE_SUP
pi->port_states.ledenable_offlinereason = ppd->neighbor_normal << 4; pi->port_states.ledenable_offlinereason = ppd->neighbor_normal << 4;

15
drivers/staging/rdma/hfi1/opa_compat.h
View File

@ -111,19 +111,4 @@ enum opa_port_phys_state {
/* values 12-15 are reserved/ignored */ /* values 12-15 are reserved/ignored */
}; };
/* OPA_PORT_TYPE_* definitions - these belong in opa_port_info.h */
#define OPA_PORT_TYPE_UNKNOWN 0
#define OPA_PORT_TYPE_DISCONNECTED 1
/* port is not currently usable, CableInfo not available */
#define OPA_PORT_TYPE_FIXED 2
/* A fixed backplane port in a director class switch. All OPA ASICS */
#define OPA_PORT_TYPE_VARIABLE 3
/* A backplane port in a blade system, possibly mixed configuration */
#define OPA_PORT_TYPE_STANDARD 4
/* implies a SFF-8636 defined format for CableInfo (QSFP) */
#define OPA_PORT_TYPE_SI_PHOTONICS 5
/* A silicon photonics module implies TBD defined format for CableInfo
* as defined by Intel SFO group */
/* 6 - 15 are reserved */
#endif /* _LINUX_H */ #endif /* _LINUX_H */