[5/9] usb: xhci: rework Event Ring Segment Table Size mask

Message ID	20250408115752.1344901-6-niklas.neronin@linux.intel.com
State	New
Headers	show Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E7F9D26A1BD for <linux-usb@vger.kernel.org>; Tue, 8 Apr 2025 11:59:53 +0000 (UTC) From: Niklas Neronin <niklas.neronin@linux.intel.com> To: mathias.nyman@linux.intel.com Cc: linux-usb@vger.kernel.org, Niklas Neronin <niklas.neronin@linux.intel.com> Subject: [PATCH 5/9] usb: xhci: rework Event Ring Segment Table Size mask Date: Tue, 8 Apr 2025 14:57:48 +0300 Message-ID: <20250408115752.1344901-6-niklas.neronin@linux.intel.com> In-Reply-To: <20250408115752.1344901-1-niklas.neronin@linux.intel.com> References: <20250408115752.1344901-1-niklas.neronin@linux.intel.com> Precedence: bulk MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	usb: xhci: enhancements to Interrupt Register Set code \| expand [0/9] usb: xhci: enhancements to Interrupt Register Set code [1/9] usb: xhci: set requested IMODI to the closest supported value [2/9] usb: xhci: improve Interrupt Management register macros [3/9] usb: xhci: guarantee that IMAN register is flushed [4/9] usb: xhci: remove '0' write to write-1-to-clear register [5/9] usb: xhci: rework Event Ring Segment Table Size mask [6/9] usb: xhci: rework Event Ring Segment Table Address mask [7/9] usb: xhci: cleanup IMOD register comments [8/9] usb: xhci: rename 'irq_pending' to 'iman' [9/9] usb: xhci: rename 'irq_control' to 'imod'

Message ID

20250408115752.1344901-6-niklas.neronin@linux.intel.com

State

New

Headers

From: Niklas Neronin <niklas.neronin@linux.intel.com>
To: mathias.nyman@linux.intel.com
Cc: linux-usb@vger.kernel.org,
	Niklas Neronin <niklas.neronin@linux.intel.com>
Subject: [PATCH 5/9] usb: xhci: rework Event Ring Segment Table Size mask
Date: Tue,  8 Apr 2025 14:57:48 +0300
Message-ID: <20250408115752.1344901-6-niklas.neronin@linux.intel.com>
In-Reply-To: <20250408115752.1344901-1-niklas.neronin@linux.intel.com>
References: <20250408115752.1344901-1-niklas.neronin@linux.intel.com>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Series

usb: xhci: enhancements to Interrupt Register Set code | expand

Commit Message

Niklas Neronin April 8, 2025, 11:57 a.m. UTC

Event Ring Segment Table Size Register contain two fields:
 - Bits 15:0:	Event Ring Segment Table Size
 - Bits 31:16:	RsvdZ (Reserved and Zero)

The current mask 'ERST_SIZE_MASK' refers to the RsvdZ bits (31:16).
Change the mask to refer to bits 15:0, which are the Event Ring Segment
Table Size bits.

Signed-off-by: Niklas Neronin <niklas.neronin@linux.intel.com>
---
 drivers/usb/host/xhci-mem.c | 4 ++--
 drivers/usb/host/xhci.h     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
index ebbf5f039902..b6a2b0c01eb2 100644
--- a/drivers/usb/host/xhci-mem.c
+++ b/drivers/usb/host/xhci-mem.c
@@ -1802,7 +1802,7 @@  xhci_remove_interrupter(struct xhci_hcd *xhci, struct xhci_interrupter *ir)
 	 */
 	if (ir->ir_set) {
 		tmp = readl(&ir->ir_set->erst_size);
-		tmp &= ERST_SIZE_MASK;
+		tmp &= ~ERST_SIZE_MASK;
 		writel(tmp, &ir->ir_set->erst_size);
 
 		xhci_write_64(xhci, ERST_EHB, &ir->ir_set->erst_dequeue);
@@ -2306,7 +2306,7 @@  xhci_add_interrupter(struct xhci_hcd *xhci, struct xhci_interrupter *ir,
 
 	/* set ERST count with the number of entries in the segment table */
 	erst_size = readl(&ir->ir_set->erst_size);
-	erst_size &= ERST_SIZE_MASK;
+	erst_size &= ~ERST_SIZE_MASK;
 	erst_size |= ir->event_ring->num_segs;
 	writel(erst_size, &ir->ir_set->erst_size);
 
diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
index 20e5b6ebbab1..5e5b71958745 100644
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@ -252,8 +252,8 @@  struct xhci_intr_reg {
 #define ER_IRQ_COUNTER_MASK	(0xffff << 16)
 
 /* erst_size bitmasks */
-/* Preserve bits 16:31 of erst_size */
-#define	ERST_SIZE_MASK		(0xffff << 16)
+/* bits 15:0 - Event Ring Segment Table Size, number of ERST entries */
+#define	ERST_SIZE_MASK		(0xffff)
 
 /* erst_base bitmasks */
 #define ERST_BASE_RSVDP		(GENMASK_ULL(5, 0))

[5/9] usb: xhci: rework Event Ring Segment Table Size mask

Commit Message

Patch