leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IB/hfi1: Rename hdr2sc to hfi1_9B_get_sc5

Browse Source 
The function really returned the 5-bit sc value from
the header and rhf. hdr2sc didn't quite describe what it did.

Reviewed-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Reviewed-by: Don Hiatt <don.hiatt@intel.com>
Signed-off-by: Dasaratharaman Chandramouli <dasaratharaman.chandramouli@intel.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
This commit is contained in:
Dasaratharaman Chandramouli 2017-04-09 10:16:15 -07:00 committed by Doug Ledford
parent 3ca4fbc84a
commit aad559c21d
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/infiniband/hw/hfi1/driver.c
View File

@ -398,7 +398,7 @@ static void rcv_hdrerr(struct hfi1_ctxtdata *rcd, struct hfi1_pportdata *ppd,
u16 rlid; u16 rlid;
u8 svc_type, sl, sc5; u8 svc_type, sl, sc5;
sc5 = hdr2sc(rhdr, packet->rhf); sc5 = hfi1_9B_get_sc5(rhdr, packet->rhf);
sl = ibp->sc_to_sl[sc5]; sl = ibp->sc_to_sl[sc5];
lqpn = be32_to_cpu(bth[1]) & RVT_QPN_MASK; lqpn = be32_to_cpu(bth[1]) & RVT_QPN_MASK;
@ -493,7 +493,7 @@ void hfi1_process_ecn_slowpath(struct rvt_qp *qp, struct hfi1_packet *pkt,
return; return;
} }
sc = hdr2sc(hdr, pkt->rhf); sc = hfi1_9B_get_sc5(hdr, pkt->rhf);
bth1 = be32_to_cpu(ohdr->bth[1]); bth1 = be32_to_cpu(ohdr->bth[1]);
if (do_cnp && (bth1 & HFI1_FECN_SMASK)) { if (do_cnp && (bth1 & HFI1_FECN_SMASK)) {
@ -937,7 +937,8 @@ static inline int set_armed_to_active(struct hfi1_ctxtdata *rcd,
packet->rhf_addr); packet->rhf_addr);
u8 etype = rhf_rcv_type(packet->rhf); u8 etype = rhf_rcv_type(packet->rhf);
if (etype == RHF_RCV_TYPE_IB && hdr2sc(hdr, packet->rhf) != 0xf) { if (etype == RHF_RCV_TYPE_IB &&
hfi1_9B_get_sc5(hdr, packet->rhf) != 0xf) {
int hwstate = read_logical_state(dd); int hwstate = read_logical_state(dd);
if (hwstate != LSTATE_ACTIVE) { if (hwstate != LSTATE_ACTIVE) {

2
drivers/infiniband/hw/hfi1/hfi.h
View File

@ -1312,7 +1312,7 @@ static inline u32 driver_lstate(struct hfi1_pportdata *ppd)
void receive_interrupt_work(struct work_struct *work); void receive_interrupt_work(struct work_struct *work);
/* extract service channel from header and rhf */ /* extract service channel from header and rhf */
static inline int hdr2sc(struct ib_header *hdr, u64 rhf) static inline int hfi1_9B_get_sc5(struct ib_header *hdr, u64 rhf)
{ {
return ((be16_to_cpu(hdr->lrh[0]) >> 12) & 0xf) | return ((be16_to_cpu(hdr->lrh[0]) >> 12) & 0xf) |
((!!(rhf_dc_info(rhf))) << 4); ((!!(rhf_dc_info(rhf))) << 4);

2
drivers/infiniband/hw/hfi1/ud.c
View File

@ -680,7 +680,7 @@ void hfi1_ud_rcv(struct hfi1_packet *packet)
u32 tlen = packet->tlen; u32 tlen = packet->tlen;
struct rvt_qp *qp = packet->qp; struct rvt_qp *qp = packet->qp;
bool has_grh = rcv_flags & HFI1_HAS_GRH; bool has_grh = rcv_flags & HFI1_HAS_GRH;
u8 sc5 = hdr2sc(hdr, packet->rhf); u8 sc5 = hfi1_9B_get_sc5(hdr, packet->rhf);
u32 bth1; u32 bth1;
u8 sl_from_sc, sl; u8 sl_from_sc, sl;
u16 slid; u16 slid;

2
drivers/infiniband/hw/hfi1/verbs.c
View File

@ -1932,7 +1932,7 @@ void hfi1_cnp_rcv(struct hfi1_packet *packet)
return; return;
} }
sc5 = hdr2sc(hdr, packet->rhf); sc5 = hfi1_9B_get_sc5(hdr, packet->rhf);
sl = ibp->sc_to_sl[sc5]; sl = ibp->sc_to_sl[sc5];
lqpn = qp->ibqp.qp_num; lqpn = qp->ibqp.qp_num;