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

Commit e04951eb authored by Michael J. Ruhl's avatar Michael J. Ruhl Committed by Jason Gunthorpe
Browse files

IB/hfi1: Move UnsupportedVL bits definitions to the correct header 



The UnsupportedVL SendCtrl register bit information is defined in
the module rather than the chip register header file.

Move the defines to the appropriate header file.

Reviewed-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: default avatarMichael J. Ruhl <michael.j.ruhl@intel.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 6e68c899

drivers/infiniband/hw/hfi1/chip_registers.h

+4 −0
Original line number Diff line number Diff line
@@ -878,6 +878,10 @@ 
#define SEND_CTRL (TXE + 0x000000000000)

#define SEND_CTRL_CM_RESET_SMASK 0x4ull

#define SEND_CTRL_SEND_ENABLE_SMASK 0x1ull

#define SEND_CTRL_UNSUPPORTED_VL_SHIFT 3

#define SEND_CTRL_UNSUPPORTED_VL_MASK 0xFFull

#define SEND_CTRL_UNSUPPORTED_VL_SMASK (SEND_CTRL_UNSUPPORTED_VL_MASK \

		<< SEND_CTRL_UNSUPPORTED_VL_SHIFT)

#define SEND_CTRL_VL_ARBITER_ENABLE_SMASK 0x2ull

#define SEND_CTXT_CHECK_ENABLE (TXE + 0x000000100080)

#define SEND_CTXT_CHECK_ENABLE_CHECK_BYPASS_VL_MAPPING_SMASK 0x80ull

drivers/infiniband/hw/hfi1/pio.c

+0 −8
Original line number Diff line number Diff line
@@ -71,14 +71,6 @@ void __cm_reset(struct hfi1_devdata *dd, u64 sendctrl) 
	}

}



/* defined in header release 48 and higher */

#ifndef SEND_CTRL_UNSUPPORTED_VL_SHIFT

#define SEND_CTRL_UNSUPPORTED_VL_SHIFT 3

#define SEND_CTRL_UNSUPPORTED_VL_MASK 0xffull

#define SEND_CTRL_UNSUPPORTED_VL_SMASK (SEND_CTRL_UNSUPPORTED_VL_MASK \

		<< SEND_CTRL_UNSUPPORTED_VL_SHIFT)

#endif



/* global control of PIO send */

void pio_send_control(struct hfi1_devdata *dd, int op)

{