From: Grzegorz Morys <grzegorz.morys@intel.com>

Date: Sun, 13 Aug 2017 08:08:58 -0700

Subject: IB/hfi1: Remove HFI1_VERBS_31BIT_PSN option

Patch-mainline: v4.14-rc1

Git-commit: 6165467921a891bc79675cdb7f2791d8331f592c

References: bsc#1060463 FATE#323043

Remove HFI1_VERBS_31BIT_PSN Kconfig option leaving only 31-bit PSNs

available. The option was implemented in the early days of the driver

and is no longer needed.

Reviewed-by: Mike Marciniszyn <mike.marciniszyn@intel.com>

Signed-off-by: Grzegorz Morys <grzegorz.morys@intel.com>

Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>

Signed-off-by: Doug Ledford <dledford@redhat.com>

Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>

---

 drivers/infiniband/hw/hfi1/Kconfig |    7 -------

 drivers/infiniband/hw/hfi1/verbs.h |    5 -----

 2 files changed, 12 deletions(-)

--- a/drivers/infiniband/hw/hfi1/Kconfig

+++ b/drivers/infiniband/hw/hfi1/Kconfig

@@ -13,13 +13,6 @@ config HFI1_DEBUG_SDMA_ORDER

 	---help---

 	This is a debug flag to test for out of order

 	sdma completions for unit testing

-config HFI1_VERBS_31BIT_PSN

-	bool "HFI1 enable 31 bit PSN"

-	depends on INFINIBAND_HFI1

-	default y

-	---help---

-	Setting this enables 31 BIT PSN

-	For verbs RC/UC

 config SDMA_VERBOSITY

 	bool "Config SDMA Verbosity"

 	depends on INFINIBAND_HFI1

--- a/drivers/infiniband/hw/hfi1/verbs.h

+++ b/drivers/infiniband/hw/hfi1/verbs.h

@@ -280,13 +280,8 @@ int hfi1_process_mad(struct ib_device *i

  * necessarily be at least one bit less than

  * the container holding the PSN.

  */

-#ifndef CONFIG_HFI1_VERBS_31BIT_PSN

-#define PSN_MASK 0xFFFFFF

-#define PSN_SHIFT 8

-#else

 #define PSN_MASK 0x7FFFFFFF

 #define PSN_SHIFT 1

-#endif

 #define PSN_MODIFY_MASK 0xFFFFFF

 /*