usb: early: xhci-dbc: Handle out-of-bound
cover usb: early: xhci-dbc: Handle out-of-bound
Small series to handle xhci-xdbc caps if the offset and out-of-bounds for fixed time boot mappings. Previous discussion is at [1].
However, RFC because it doesn't completely work for me. Patch 3/3 WIP, makes it partially work (xdbc being recognized at host side) but still something is OFF. 3/3 might contain a clue which we can probably discuss in reviews.
[1]: https://lore.kernel.org/linux-usb/[email protected]/
Umang Jain (3):
usb: early: xhci-dbc: Track early_ioremap size separately
early: usb: xhci-dbc: Handle out of bounds xhci-xdbc capability
WIP: early: xhci-xdbc: Map lower and with 0 offset to partially work
drivers/usb/early/xhci-dbc.c | 77 ++++++++++++++++++++++++++++-------- drivers/usb/early/xhci-dbc.h | 1 + 2 files changed, 61 insertions(+), 17 deletions(-)
Signature · 1 line
2.53.0
RFC PATCH 1/3 usb: early: xhci-dbc: Track early_ioremap size separately
early_ioremap() only allows to map a fixed number of boot time mappings, hence, the mapped size should be tracked separately from the PCIe base address and size.
--- drivers/usb/early/xhci-dbc.c | 13 +++++++------ drivers/usb/early/xhci-dbc.h | 1 + 2 files changed, 8 insertions(+), 6 deletions(-)
drivers/usb/early/xhci-dbc.c +7 -6
@@ -86,6 +86,7 @@ static void __iomem * __init xdbc_map_pci_mmio(u32 bus, u32 dev, u32 func) xdbc.xhci_start = val64; xdbc.xhci_length = sz64; base =early_ioremap (val64, sz64); + xdbc.xhci_base_length = sz64;return base; }
@@ -643,9 +644,9 @@ int __init early_xdbc_parse_parameter(char *s, int keep_early) offset =xhci_find_next_ext_cap (xdbc.xhci_base,0 ,XHCI_EXT_CAPS_DEBUG );if (!offset) {pr_notice ("xhci host doesn't support debug capability\n" ); -early_iounmap (xdbc.xhci_base, xdbc.xhci_length); +early_iounmap (xdbc.xhci_base, xdbc.xhci_base_length); xdbc.xhci_base =NULL ; - xdbc.xhci_length =0 ; + xdbc.xhci_base_length =0 ;return -ENODEV ; }
@@ -682,9 +683,9 @@ int __init early_xdbc_setup_hardware(void) xdbc.table_base =NULL ; xdbc.out_buf =NULL ; -early_iounmap (xdbc.xhci_base, xdbc.xhci_length); +early_iounmap (xdbc.xhci_base, xdbc.xhci_base_length); xdbc.xhci_base =NULL ; - xdbc.xhci_length =0 ; + xdbc.xhci_base_length =0 ; }return ret;
@@ -987,7 +988,7 @@ static int __init xdbc_init(void) }raw_spin_lock_irqsave (&xdbc.lock, flags); -early_iounmap (xdbc.xhci_base, xdbc.xhci_length); +early_iounmap (xdbc.xhci_base, xdbc.xhci_base_length); xdbc.xhci_base = base; offset =xhci_find_next_ext_cap (xdbc.xhci_base,0 ,XHCI_EXT_CAPS_DEBUG ); xdbc.xdbc_reg = (struct xdbc_regs __iomem *)(xdbc.xhci_base + offset);
@@ -1004,7 +1005,7 @@ static int __init xdbc_init(void)memblock_phys_free (xdbc.table_dma,PAGE_SIZE );memblock_phys_free (xdbc.out_dma,PAGE_SIZE );writel (0 , &xdbc.xdbc_reg->control); -early_iounmap (xdbc.xhci_base, xdbc.xhci_length); +early_iounmap (xdbc.xhci_base, xdbc.xhci_base_length);return ret; }
drivers/usb/early/xhci-dbc.h +1 -0
@@ -144,6 +144,7 @@ struct xdbc_state {u32 dev;u32 func;void __iomem *xhci_base; +size_t xhci_base_length;u64 xhci_start;size_t xhci_length;int port_number;
Signature · 1 line
2.53.0
RFC PATCH 2/3 early: usb: xhci-dbc: Handle out of bounds xhci-xdbc capability
In reply to Umang JainCurrently, the early xhci-dbc assumes that the extended capability can be mapped within the fixed boot time mappings dictated by NR_FIX_BTMAPS.
This patch iterates over the PCI BAR address size to find and map xhci-xdbc capability which could be out-of-bounds otherwise, in xdbc_map_pci_mmio(). The iterations map the maximum allowed boot time mappings (fixmap size) at a time and search for xhci-xdbc capability offset, till the end of the bar address size.
--- drivers/usb/early/xhci-dbc.c | 47 +++++++++++++++++++++++++++++++++--- 1 file changed, 44 insertions(+), 3 deletions(-)
drivers/usb/early/xhci-dbc.c +44 -3
@@ -35,10 +35,13 @@ static bool early_console_keep;static inline void xdbc_trace (const char *fmt, ...) { }#endif /* XDBC_TRACE */ +#define XDBC_MAPPING_SIZE 56 +static void __iomem *__init xdbc_map_pci_mmio (u32 bus,u32 dev,u32 func) { -u64 val64, sz64, mask64; +u64 val64, sz64, mask64, fixmap_size, mapped_size;void __iomem *base; +int offset;u32 val, sz;u8 byte;
@@ -85,8 +88,46 @@ static void __iomem * __init xdbc_map_pci_mmio(u32 bus, u32 dev, u32 func) xdbc.xhci_start = val64; xdbc.xhci_length = sz64; - base =early_ioremap (val64, sz64); - xdbc.xhci_base_length = sz64; + + fixmap_size =NR_FIX_BTMAPS <<PAGE_SHIFT ; +if (sz64 < fixmap_size) { + xdbc.xhci_base_length = sz64; +return early_ioremap (val64, sz64); + } + +/* +* Base address size is greater than fixed size boot mappings, +* hence iterate over the region one fixmap_size at a time. +*/ + base =early_ioremap (val64, fixmap_size); + offset =xhci_find_next_ext_cap (base,0 ,0 ); + mapped_size = fixmap_size; + +while (mapped_size <= sz64) { + val =readl (base + offset); +if (XHCI_EXT_CAPS_ID (val) ==XHCI_EXT_CAPS_DEBUG ) { +if (offset +XDBC_MAPPING_SIZE > fixmap_size) { +early_iounmap (base, fixmap_size); + base =early_ioremap (val64 + offset,XDBC_MAPPING_SIZE ); + } +break ; + } + +/* +* Find offset to next xhci-ext capability, remap if the offset +* is out of bounds of the already mapped region. +*/ + offset =xhci_find_next_ext_cap (base, offset,0 ); +if (!offset) { +early_iounmap (base, fixmap_size); + base =early_ioremap (val64 + mapped_size, fixmap_size); + mapped_size += fixmap_size; + + offset =xhci_find_next_ext_cap (base,0 ,0 ); + } + } + + xdbc.xhci_base_length = fixmap_size;return base; }
Signature · 1 line
2.53.0
Re: [RFC PATCH v1 2/3] early: usb: xhci-dbc: Handle out of bounds xhci-xdbc capability
Hi
Quoted 10 lines · Umang Jain
Currently, the early xhci-dbc assumes that the extended capability can be mapped within the fixed boot time mappings dictated by
NR_FIX_BTMAPS.This patch iterates over the PCI BAR address size to find and map xhci-xdbc capability which could be out-of-bounds otherwise, in
xdbc_map_pci_mmio(). The iterations map the maximum allowed boot time mappings (fixmap size) at a time and search for xhci-xdbc capability offset, till the end of the bar address size.
Patch 1/3 can probably be merged into this one.
Quoted 10 lines
Signed-off-by Umang Jain <[email protected]>--- drivers/usb/early/xhci-dbc.c | 47 +++++++++++++++++++++++++++++++++--- 1 file changed, 44 insertions(+), 3 deletions(-)drivers/usb/early/xhci-dbc.c +0
-0
drivers/usb/early/xhci-dbc.c static bool early_console_keep; · line 39
Quoted 5 lines
drivers/usb/early/xhci-dbc.c +2
-0@@ -35,10 +35,13 @@ static bool early_console_keep;static inline void xdbc_trace (const char *fmt, ...) { }#endif /* XDBC_TRACE */ +#define XDBC_MAPPING_SIZE 56 +
I know spec says 56 bytes, but when looking at the Debug capability structure in xhci section 7.6.8. it looks like 64 bytes.
Quoted 26 lines
drivers/usb/early/xhci-dbc.c +13
-3static void __iomem *__init xdbc_map_pci_mmio (u32 bus,u32 dev,u32 func) { -u64 val64, sz64, mask64; +u64 val64, sz64, mask64, fixmap_size, mapped_size;void __iomem *base; +int offset;u32 val, sz;u8 byte;@@ -85,8 +88,46 @@ static void __iomem * __init xdbc_map_pci_mmio(u32 bus, u32 dev, u32 func) xdbc.xhci_start = val64; xdbc.xhci_length = sz64; - base =early_ioremap (val64, sz64); - xdbc.xhci_base_length = sz64; + + fixmap_size =NR_FIX_BTMAPS <<PAGE_SHIFT ; +if (sz64 < fixmap_size) { + xdbc.xhci_base_length = sz64; +return early_ioremap (val64, sz64); + } + +/* +* Base address size is greater than fixed size boot mappings, +* hence iterate over the region one fixmap_size at a time. +*/
drivers/usb/early/xhci-dbc.c static void __iomem * __init xdbc_map_pci_mmio(u32 bus, u32 dev, u32 func) · line 111
Quoted 10 lines
drivers/usb/early/xhci-dbc.c +10
-0+ base =early_ioremap (val64, fixmap_size); + offset =xhci_find_next_ext_cap (base,0 ,0 ); + mapped_size = fixmap_size; + +while (mapped_size <= sz64) { + val =readl (base + offset); +if (XHCI_EXT_CAPS_ID (val) ==XHCI_EXT_CAPS_DEBUG ) { +if (offset +XDBC_MAPPING_SIZE > fixmap_size) { +early_iounmap (base, fixmap_size); + base =early_ioremap (val64 + offset,XDBC_MAPPING_SIZE );
Took a closer look and it turns out we do sometimes need to touch registers in other extended capabilities. Mainly BIOS handoff in XHCI_EXT_CAPS_LEGACY and port reset in XHCI_EXT_CAPS_PROTOCOL
In the case where xHC size is larger than early_ioremap() allows I would just early_ioremap() maximum allowed size once, starting from xdbc.xhci_start. Then walk the extended capabilities list ensuring DbC and the other needed capabilities are inside this maximum allowed size.early_iounmap() and fail if not.
This way we can also access the normal xHC host registers in case we need to reset the controller, or ensure the 'controller not ready' bit is clear.
Thanks
Mathias
RFC PATCH 3/3 WIP: early: xhci-xdbc: Map lower and with 0 offset to partially work
In reply to Umang JainMap the area slightly lower than max fixmap. Detect the offset of xhci xdbc cap and remap it again, so that the offset becomes 0.
----
Quoted 2 lines
Quoted 2 lines
This is investigation patch to get early xdbc attached to host successfully. Without this, the xdbc doesn't attach to host.
on host:
[180056.895751] usb usb4-port2: attempt power cycle [180059.049494] usb 4-2: Device not responding to setup address. [180059.262513] usb 4-2: Device not responding to setup address. [180059.463201] usb 4-2: device not accepting address 81, error -71 [180059.651391] usb 4-2: Device not responding to setup address. [180059.862171] usb 4-2: Device not responding to setup address. [180060.065072] usb 4-2: device not accepting address 82, error -71
on target:
[ 5.779884] xhci_dbc:xdbc_start: waiting for device configuration timed out [ 5.779891] xhci_dbc:early_xdbc_setup_hardware: failed to setup the connection to host
----
This patches atleast makes the target attach to xhci host at /dev/ttyUSB0. It's meant to debug and discuss the core issue as a "clue".
--- drivers/usb/early/xhci-dbc.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-)
drivers/usb/early/xhci-dbc.c +12 -11
@@ -95,6 +95,9 @@ static void __iomem * __init xdbc_map_pci_mmio(u32 bus, u32 dev, u32 func)return early_ioremap (val64, sz64); } +/* Do not fill all fixed page slots in one go. */ + fixmap_size = fixmap_size /2 ; +/* * Base address size is greater than fixed size boot mappings, * hence iterate over the region one fixmap_size at a time.
@@ -110,6 +113,14 @@ static void __iomem * __init xdbc_map_pci_mmio(u32 bus, u32 dev, u32 func)early_iounmap (base, fixmap_size); base =early_ioremap (val64 + offset,XDBC_MAPPING_SIZE ); } + +pr_notice ("Found CAPS_DEBUG: mapped size: %llu, \ +fixmap_size: %llu, offset: %d, page_size:%d\n" , + mapped_size, fixmap_size, offset,1 <<PAGE_SHIFT ); + +early_iounmap (base, fixmap_size); + base =early_ioremap (val64+offset, fixmap_size); +break ; }
@@ -681,17 +692,7 @@ int __init early_xdbc_parse_parameter(char *s, int keep_early)if (!xdbc.xhci_base)return -EINVAL ; -/* Locate DbC registers: */ - offset =xhci_find_next_ext_cap (xdbc.xhci_base,0 ,XHCI_EXT_CAPS_DEBUG ); -if (!offset) { -pr_notice ("xhci host doesn't support debug capability\n" ); -early_iounmap (xdbc.xhci_base, xdbc.xhci_base_length); - xdbc.xhci_base =NULL ; - xdbc.xhci_base_length =0 ; - -return -ENODEV ; - } - xdbc.xdbc_reg = (struct xdbc_regs __iomem *)(xdbc.xhci_base + offset); + xdbc.xdbc_reg = (struct xdbc_regs __iomem *)(xdbc.xhci_base);return 0 ; }
Signature · 1 line
2.53.0