Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Sasha Levin <Alexander.Levin@microsoft.com>
To:     "stable@vger.kernel.org" <stable@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
CC:     Golan Ben Ami <golan.ben.ami@intel.com>,
        Luca Coelho <luciano.coelho@intel.com>,
        Sasha Levin <Alexander.Levin@microsoft.com>
Subject: [PATCH AUTOSEL 4.18 14/88] iwlwifi: cancel the injective function
 between hw pointers to tfd entry index
Thread-Topic: [PATCH AUTOSEL 4.18 14/88] iwlwifi: cancel the injective
 function between hw pointers to tfd entry index
Thread-Index: AQHURkLBpOqnI0eYYU61q4y8UMkajg==
Date:   Fri, 7 Sep 2018 00:36:02 +0000
Message-ID: <20180907003547.57567-14-alexander.levin@microsoft.com>
References: <20180907003547.57567-1-alexander.levin@microsoft.com>
In-Reply-To: <20180907003547.57567-1-alexander.levin@microsoft.com>
Accept-Language: en-US
Content-Language: en-US
received-spf: None (protection.outlook.com: microsoft.com does not designate
 permitted sender hosts)
spamdiagnosticoutput: 1:99
spamdiagnosticmetadata: NSPM
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: a4c42eb9-92d4-4327-ff51-08d61459e417
X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Sep 2018 00:36:02.9655
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR21MB0773
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Golan Ben Ami <golan.ben.ami@intel.com>

[ Upstream commit f5955a6cc3862a02d46f50b723c3172d24d749a5 ]

Nowadays, the tfd queue max size is 2^8, and the reserved size in the
command header sequence field for the tfd entry index is 8 bits,
allowing an injective function from the hw pointers to the tfd entry index
in the sequence field.

In 22560 devices the tfd queue max size is 2^16, meaning that
the hw pointers are 16 bit long (allowing to point to each entry
in the tfd queue). However, the reserved space in the sequence field for
the tfd entry doesn't change, and we are limited to 8 bit.
This requires cancelling the injective function from hw pointer to
tfd entry in the sequence number.

Use iwl_pcie_get_cmd_index to wrap the hw pointer's to the n_window
size, which is maximum 256 in tx queues, and so, keep the injective
function between the window wrapped hw pointers to tfd entry index in
the sequence.

Signed-off-by: Golan Ben Ami <golan.ben.ami@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
---
 drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 12 ++++++++----
 drivers/net/wireless/intel/iwlwifi/pcie/tx.c       | 11 ++++++++---
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/internal.h b/drivers/n=
et/wireless/intel/iwlwifi/pcie/internal.h
index 45ea32796cda..92b38a21cd10 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/internal.h
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/internal.h
@@ -660,7 +660,7 @@ static inline void iwl_enable_fw_load_int(struct iwl_tr=
ans *trans)
 	}
 }
=20
-static inline u8 iwl_pcie_get_cmd_index(struct iwl_txq *q, u32 index)
+static inline u8 iwl_pcie_get_cmd_index(const struct iwl_txq *q, u32 index=
)
 {
 	return index & (q->n_window - 1);
 }
@@ -730,9 +730,13 @@ static inline void iwl_stop_queue(struct iwl_trans *tr=
ans,
=20
 static inline bool iwl_queue_used(const struct iwl_txq *q, int i)
 {
-	return q->write_ptr >=3D q->read_ptr ?
-		(i >=3D q->read_ptr && i < q->write_ptr) :
-		!(i < q->read_ptr && i >=3D q->write_ptr);
+	int index =3D iwl_pcie_get_cmd_index(q, i);
+	int r =3D iwl_pcie_get_cmd_index(q, q->read_ptr);
+	int w =3D iwl_pcie_get_cmd_index(q, q->write_ptr);
+
+	return w >=3D r ?
+		(index >=3D r && index < w) :
+		!(index < r && index >=3D w);
 }
=20
 static inline bool iwl_is_rfkill_set(struct iwl_trans *trans)
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c b/drivers/net/wir=
eless/intel/iwlwifi/pcie/tx.c
index 473fe7ccb07c..11bd7ce2be8e 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c
@@ -1225,9 +1225,13 @@ static void iwl_pcie_cmdq_reclaim(struct iwl_trans *=
trans, int txq_id, int idx)
 	struct iwl_txq *txq =3D trans_pcie->txq[txq_id];
 	unsigned long flags;
 	int nfreed =3D 0;
+	u16 r;
=20
 	lockdep_assert_held(&txq->lock);
=20
+	idx =3D iwl_pcie_get_cmd_index(txq, idx);
+	r =3D iwl_pcie_get_cmd_index(txq, txq->read_ptr);
+
 	if ((idx >=3D TFD_QUEUE_SIZE_MAX) || (!iwl_queue_used(txq, idx))) {
 		IWL_ERR(trans,
 			"%s: Read index for DMA queue txq id (%d), index %d is out of range [0-=
%d] %d %d.\n",
@@ -1236,12 +1240,13 @@ static void iwl_pcie_cmdq_reclaim(struct iwl_trans =
*trans, int txq_id, int idx)
 		return;
 	}
=20
-	for (idx =3D iwl_queue_inc_wrap(idx); txq->read_ptr !=3D idx;
-	     txq->read_ptr =3D iwl_queue_inc_wrap(txq->read_ptr)) {
+	for (idx =3D iwl_queue_inc_wrap(idx); r !=3D idx;
+	     r =3D iwl_queue_inc_wrap(r)) {
+		txq->read_ptr =3D iwl_queue_inc_wrap(txq->read_ptr);
=20
 		if (nfreed++ > 0) {
 			IWL_ERR(trans, "HCMD skipped: index (%d) %d %d\n",
-				idx, txq->write_ptr, txq->read_ptr);
+				idx, txq->write_ptr, r);
 			iwl_force_nmi(trans);
 		}
 	}
--=20
2.17.1