usb: xhci: set page size to the xHCI-supported size

The current xHCI driver does not validate whether a page size of 4096
bytes is supported. Address the issue by setting the page size to the
value supported by the xHCI controller, as read from the Page Size
register. In the event of an unexpected value; default to a 4K page size.

Additionally, this commit removes unnecessary debug messages and instead
prints the supported and used page size once.

The xHCI controller supports page sizes of (2^{(n+12)}) bytes, where 'n'
is the Page Size Bit. Only one page size is supported, with a maximum
page size of 128 KB.

Signed-off-by: Niklas Neronin <niklas.neronin@linux.intel.com>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20250306144954.3507700-10-mathias.nyman@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
index dc5bcd8db4c0a781ab122916923ef523d8470286..a7fdfa00eb4847828b3581c3a239a46208a6ae5d 100644 (file)
--- a/drivers/usb/host/xhci-mem.c
+++ b/drivers/usb/host/xhci-mem.c
@@ -1953,7 +1953,6 @@ no_bw:
        xhci->interrupters = NULL;
 
        xhci->page_size = 0;
-       xhci->page_shift = 0;
        xhci->usb2_rhub.bus_state.bus_suspended = 0;
        xhci->usb3_rhub.bus_state.bus_suspended = 0;
 }
@@ -2372,6 +2371,22 @@ xhci_create_secondary_interrupter(struct usb_hcd *hcd, unsigned int segs,
 }
 EXPORT_SYMBOL_GPL(xhci_create_secondary_interrupter);
 
+static void xhci_hcd_page_size(struct xhci_hcd *xhci)
+{
+       u32 page_size;
+
+       page_size = readl(&xhci->op_regs->page_size) & XHCI_PAGE_SIZE_MASK;
+       if (!is_power_of_2(page_size)) {
+               xhci_warn(xhci, "Invalid page size register = 0x%x\n", page_size);
+               /* Fallback to 4K page size, since that's common */
+               page_size = 1;
+       }
+
+       xhci->page_size = page_size << 12;
+       xhci_dbg_trace(xhci, trace_xhci_dbg_init, "HCD page size set to %iK",
+                      xhci->page_size >> 10);
+}
+
 int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags)
 {
        struct xhci_interrupter *ir;
@@ -2379,7 +2394,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags)
        dma_addr_t      dma;
        unsigned int    val, val2;
        u64             val_64;
-       u32             page_size, temp;
+       u32             temp;
        int             i;
 
        INIT_LIST_HEAD(&xhci->cmd_list);
@@ -2388,20 +2403,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags)
        INIT_DELAYED_WORK(&xhci->cmd_timer, xhci_handle_command_timeout);
        init_completion(&xhci->cmd_ring_stop_completion);
 
-       page_size = readl(&xhci->op_regs->page_size);
-       xhci_dbg_trace(xhci, trace_xhci_dbg_init,
-                       "Supported page size register = 0x%x", page_size);
-       val = ffs(page_size) - 1;
-       if (val < 16)
-               xhci_dbg_trace(xhci, trace_xhci_dbg_init,
-                       "Supported page size of %iK", (1 << (val + 12)) / 1024);
-       else
-               xhci_warn(xhci, "WARN: no supported page size\n");
-       /* Use 4K pages, since that's common and the minimum the HC supports */
-       xhci->page_shift = 12;
-       xhci->page_size = 1 << xhci->page_shift;
-       xhci_dbg_trace(xhci, trace_xhci_dbg_init,
-                       "HCD page size set to %iK", xhci->page_size / 1024);
+       xhci_hcd_page_size(xhci);
 
        /*
         * Program the Number of Device Slots Enabled field in the CONFIG

diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
index 8c164340a2c35099cedd081558236df3b1b5d14c..5b8751b86008b1a54a0afcd0927a8fb8de4ad0a4 100644 (file)
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@ -211,6 +211,9 @@ struct xhci_op_regs {
 #define CONFIG_CIE             (1 << 9)
 /* bits 10:31 - reserved and should be preserved */
 
+/* bits 15:0 - HCD page shift bit */
+#define XHCI_PAGE_SIZE_MASK     0xffff
+
 /**
  * struct xhci_intr_reg - Interrupt Register Set
  * @irq_pending:       IMAN - Interrupt Management Register.  Used to enable
@@ -1514,10 +1517,7 @@ struct xhci_hcd {
        u16             max_interrupters;
        /* imod_interval in ns (I * 250ns) */
        u32             imod_interval;
-       /* 4KB min, 128MB max */
-       int             page_size;
-       /* Valid values are 12 to 20, inclusive */
-       int             page_shift;
+       u32             page_size;
        /* MSI-X/MSI vectors */
        int             nvecs;
        /* optional clocks */