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

Commit 3c2f85b8 authored by Easwar Hariharan's avatar Easwar Hariharan Committed by Greg Kroah-Hartman
Browse files

staging/rdma/hfi1: Remove QSFP_ENABLED from HFI capability mask 



The QSFP interface code has been running without issues and the flag is
never set to off. This patch removes the QSFP_ENABLED bit from HFI1_CAP.

Reviewed-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: default avatarEaswar Hariharan <easwar.hariharan@intel.com>
Signed-off-by: default avatarIra Weiny <ira.weiny@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 25d97dd5

drivers/staging/rdma/hfi1/chip.c

+1 −2
Original line number Diff line number Diff line
@@ -5714,8 +5714,7 @@ void init_qsfp(struct hfi1_pportdata *ppd) 
	u64 qsfp_mask;



	if (loopback == LOOPBACK_SERDES || loopback == LOOPBACK_LCB ||

			ppd->dd->icode == ICODE_FUNCTIONAL_SIMULATOR ||

			!HFI1_CAP_IS_KSET(QSFP_ENABLED)) {

			ppd->dd->icode == ICODE_FUNCTIONAL_SIMULATOR) {

		ppd->driver_link_ready = 1;

		return;

	}

drivers/staging/rdma/hfi1/common.h

+0 −2
Original line number Diff line number Diff line
@@ -147,7 +147,6 @@ 
				  HFI1_CAP_USE_SDMA_HEAD |		\

				  HFI1_CAP_EXTENDED_PSN |		\

				  HFI1_CAP_PRINT_UNIMPL |		\

				  HFI1_CAP_QSFP_ENABLED |		\

				  HFI1_CAP_NO_INTEGRITY |		\

				  HFI1_CAP_PKEY_CHECK) <<		\

				 HFI1_CAP_USER_SHIFT)
@@ -163,7 +162,6 @@ 
				 HFI1_CAP_SDMA |			\

				 HFI1_CAP_PRINT_UNIMPL |		\

				 HFI1_CAP_STATIC_RATE_CTRL |		\

				 HFI1_CAP_QSFP_ENABLED |		\

				 HFI1_CAP_PKEY_CHECK |			\

				 HFI1_CAP_MULTI_PKT_EGR |		\

				 HFI1_CAP_EXTENDED_PSN |		\

drivers/staging/rdma/hfi1/qsfp.c

+4 −9
Original line number Diff line number Diff line
@@ -403,17 +403,12 @@ static const char *pwr_codes = "1.5W2.0W2.5W3.5W"; 


int qsfp_mod_present(struct hfi1_pportdata *ppd)

{

	if (HFI1_CAP_IS_KSET(QSFP_ENABLED)) {

	struct hfi1_devdata *dd = ppd->dd;

	u64 reg;



		reg = read_csr(dd,

			dd->hfi1_id ? ASIC_QSFP2_IN : ASIC_QSFP1_IN);

	reg = read_csr(dd, dd->hfi1_id ? ASIC_QSFP2_IN : ASIC_QSFP1_IN);

	return !(reg & QSFP_HFI0_MODPRST_N);

}

	/* always return cable present */

	return 1;

}



/*

 * This function maps QSFP memory addresses in 128 byte chunks in the following

include/uapi/rdma/hfi/hfi1_user.h

+2 −2
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ 
#define HFI1_CAP_SDMA_AHG         (1UL <<  2) /* Enable SDMA AHG support */

#define HFI1_CAP_EXTENDED_PSN     (1UL <<  3) /* Enable Extended PSN support */

#define HFI1_CAP_HDRSUPP          (1UL <<  4) /* Enable Header Suppression */

/* 1UL << 5 reserved */

/* 1UL << 5 unused */

#define HFI1_CAP_USE_SDMA_HEAD    (1UL <<  6) /* DMA Hdr Q tail vs. use CSR */

#define HFI1_CAP_MULTI_PKT_EGR    (1UL <<  7) /* Enable multi-packet Egr buffs*/

#define HFI1_CAP_NODROP_RHQ_FULL  (1UL <<  8) /* Don't drop on Hdr Q full */
@@ -99,7 +99,7 @@ 
#define HFI1_CAP_NO_INTEGRITY     (1UL << 13) /* Enable ctxt integrity checks */

#define HFI1_CAP_PKEY_CHECK       (1UL << 14) /* Enable ctxt PKey checking */

#define HFI1_CAP_STATIC_RATE_CTRL (1UL << 15) /* Allow PBC.StaticRateControl */

#define HFI1_CAP_QSFP_ENABLED     (1UL << 16) /* Enable QSFP check during LNI */

/* 1UL << 16 unused */

#define HFI1_CAP_SDMA_HEAD_CHECK  (1UL << 17) /* SDMA head checking */

#define HFI1_CAP_EARLY_CREDIT_RETURN (1UL << 18) /* early credit return */