xhci features for usb-next
Subsystems (6)
cover xhci features for usb-next
Hi Greg
Some xhci features for usb-next.
Among other small changes add support for a xHCI controller by Zhaoxin, rework free trb and ring expansion code, and get rid of obsolete XHCI_PLAT quirk which was used to prevent MSI setup for non-PCI hosts.
Thanks
Mathias
Mathias Nyman (6):
xhci: Add usb cold attach (CAS) as a reason to resume root hub.
xhci: Don't require a valid get_quirks() function pointer during xhci
setup
xhci: get rid of XHCI_PLAT quirk that used to prevent MSI setup
xhci: split allocate interrupter into separate alloacte and add parts
xhci: Fix transfer ring expansion size calculation
xhci: Stop unnecessary tracking of free trbs in a ring
Udipto Goswami (1):
usb: xhci: Remove unused udev from xhci_log_ctx trace event
Weitao Wang (4):
xhci: Fix resume issue of some ZHAOXIN hosts
xhci: Fix TRB prefetch issue of ZHAOXIN hosts
xhci: Show ZHAOXIN xHCI root hub speed correctly
xhci: Add ZHAOXIN xHCI host U1/U2 feature support
drivers/usb/host/xhci-histb.c | 12 +-- drivers/usb/host/xhci-mem.c | 132 ++++++++++++++++++-------------- drivers/usb/host/xhci-mtk.c | 6 -- drivers/usb/host/xhci-pci.c | 20 +++-- drivers/usb/host/xhci-plat.c | 7 +- drivers/usb/host/xhci-ring.c | 137 ++++++++++++++++++---------------- drivers/usb/host/xhci-tegra.c | 1 - drivers/usb/host/xhci-trace.h | 9 +-- drivers/usb/host/xhci.c | 48 ++++++------ drivers/usb/host/xhci.h | 7 +- 10 files changed, 189 insertions(+), 190 deletions(-)
Signature · 1 line
2.25.1
PATCH 1/11 usb: xhci: Remove unused udev from xhci_log_ctx trace event
From: Udipto Goswami <[email protected]>
xhci_log_ctx event is not utilizing the extracted udev to print out anything, hence removing it.
--- drivers/usb/host/xhci-trace.h | 4 ---- 1 file changed, 4 deletions(-)
drivers/usb/host/xhci-trace.h +0 -4
@@ -80,20 +80,16 @@ DECLARE_EVENT_CLASS(xhci_log_ctx, __field(dma_addr_t, ctx_dma) __field(u8 *, ctx_va) __field(unsigned, ctx_ep_num) - __field(int, slot_id) __dynamic_array(u32, ctx_data, ((HCC_64BYTE_CONTEXT(xhci->hcc_params) + 1) * 8) * ((ctx->type == XHCI_CTX_TYPE_INPUT) + ep_num + 1)) ),TP_fast_assign ( - struct usb_device *udev; - udev =to_usb_device (xhci_to_hcd (xhci)->self.controller); __entry->ctx_64 = HCC_64BYTE_CONTEXT(xhci->hcc_params); __entry->ctx_type = ctx->type; __entry->ctx_dma = ctx->dma; __entry->ctx_va = ctx->bytes; - __entry->slot_id = udev->slot_id; __entry->ctx_ep_num = ep_num; memcpy(__get_dynamic_array(ctx_data), ctx->bytes, ((HCC_64BYTE_CONTEXT(xhci->hcc_params) + 1) * 32) *
Signature · 1 line
2.25.1
PATCH 2/11 xhci: Add usb cold attach (CAS) as a reason to resume root hub.
In reply to Mathias NymanCheck for the cold attach (CAS) bit while checking for other usb3 roothub port changes during host resume.
The CAS bit is set if a USB 3 device is connected while the host is suspended in such a way it can't perform proper link training and progress the link to the enabled U0 state.
If the CAS bit set we want to resume the root hub, and reset and enumerate the newly connected device.
--- drivers/usb/host/xhci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/host/xhci.c +1 -1
@@ -833,7 +833,7 @@ static bool xhci_pending_portevent(struct xhci_hcd *xhci) ports = xhci->usb3_rhub.ports;while (port_index--) { portsc =readl (ports[port_index]->addr); -if (portsc &PORT_CHANGE_MASK || +if (portsc & (PORT_CHANGE_MASK |PORT_CAS ) || (portsc &PORT_PLS_MASK ) ==XDEV_RESUME )return true; }
Signature · 1 line
2.25.1
PATCH 3/11 xhci: Don't require a valid get_quirks() function pointer during xhci setup
In reply to Mathias NymanNot all platforms drivers need to set up custom quirks during the xhci generic setup. Allow them to pass NULL as the function pointer when calling xhci_gen_setup()
--- drivers/usb/host/xhci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/usb/host/xhci.c +2 -1
@@ -5181,7 +5181,8 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks) xhci->quirks |= quirks; -get_quirks (dev, xhci); +if (get_quirks) +get_quirks (dev, xhci);/* In xhci controllers which follow xhci 1.0 spec gives a spurious * success event after a short transfer. This quirk will ignore such
Signature · 1 line
2.25.1
PATCH 4/11 xhci: get rid of XHCI_PLAT quirk that used to prevent MSI setup
In reply to Mathias NymanThe XHCI_PLAT quirk was only needed to ensure non-PCI xHC host avoided setting up MSI interrupts in generic xhci codepaths.
The MSI setup code is now moved to PCI specific xhci-pci.c file so the quirk is no longer needed.
Remove setting the XHCI_PLAT quirk for HiSilocon SoC xHC, NVIDIA Tegra xHC, MediaTek xHC, the generic xhci-plat driver, and the checks for XHCI_PLAT in xhci-pci.c MSI setup code.
--- drivers/usb/host/xhci-histb.c | 12 +----------- drivers/usb/host/xhci-mtk.c | 6 ------ drivers/usb/host/xhci-pci.c | 7 ------- drivers/usb/host/xhci-plat.c | 7 +------ drivers/usb/host/xhci-tegra.c | 1 - drivers/usb/host/xhci.h | 2 +- 6 files changed, 3 insertions(+), 32 deletions(-)
drivers/usb/host/xhci-histb.c +1 -11
@@ -164,16 +164,6 @@ static void xhci_histb_host_disable(struct xhci_hcd_histb *histb)clk_disable_unprepare (histb->bus_clk); } -static void xhci_histb_quirks (struct device *dev,struct xhci_hcd *xhci) -{ -/* -* As of now platform drivers don't provide MSI support so we ensure -* here that the generic code does not try to make a pci_dev from our -* dev struct in order to setup MSI -*/ - xhci->quirks |=XHCI_PLAT ; -} -/* called during probe() after chip reset completes */ static int xhci_histb_setup (struct usb_hcd *hcd) {
@@ -186,7 +176,7 @@ static int xhci_histb_setup(struct usb_hcd *hcd)return ret; } -return xhci_gen_setup (hcd, xhci_histb_quirks); +return xhci_gen_setup (hcd,NULL ); }static const struct xhci_driver_overrides xhci_histb_overrides__initconst = {
drivers/usb/host/xhci-mtk.c +0 -6
@@ -418,12 +418,6 @@ static void xhci_mtk_quirks(struct device *dev, struct xhci_hcd *xhci)struct usb_hcd *hcd =xhci_to_hcd (xhci);struct xhci_hcd_mtk *mtk =hcd_to_mtk (hcd); -/* -* As of now platform drivers don't provide MSI support so we ensure -* here that the generic code does not try to make a pci_dev from our -* dev struct in order to setup MSI -*/ - xhci->quirks |=XHCI_PLAT ; xhci->quirks |=XHCI_MTK_HOST ;/* * MTK host controller gives a spurious successful event after a
drivers/usb/host/xhci-pci.c +0 -7
@@ -108,9 +108,6 @@ static void xhci_cleanup_msix(struct xhci_hcd *xhci)struct usb_hcd *hcd =xhci_to_hcd (xhci);struct pci_dev *pdev =to_pci_dev (hcd->self.controller); -if (xhci->quirks &XHCI_PLAT ) -return ; -/* return if using legacy interrupt */ if (hcd->irq >0 )return ;
@@ -208,10 +205,6 @@ static int xhci_try_enable_msi(struct usb_hcd *hcd)struct pci_dev *pdev;int ret; -/* The xhci platform device has set up IRQs through usb_add_hcd. */ -if (xhci->quirks &XHCI_PLAT ) -return 0 ; - pdev =to_pci_dev (xhci_to_hcd (xhci)->self.controller);/* * Some Fresco Logic host controllers advertise MSI, but fail to
drivers/usb/host/xhci-plat.c +1 -6
@@ -78,12 +78,7 @@ static void xhci_plat_quirks(struct device *dev, struct xhci_hcd *xhci) {struct xhci_plat_priv *priv =xhci_to_priv (xhci); -/* -* As of now platform drivers don't provide MSI support so we ensure -* here that the generic code does not try to make a pci_dev from our -* dev struct in order to setup MSI -*/ - xhci->quirks |=XHCI_PLAT | priv->quirks; + xhci->quirks |= priv->quirks; }/* called during probe() after chip reset completes */
drivers/usb/host/xhci-tegra.c +0 -1
@@ -2663,7 +2663,6 @@ static void tegra_xhci_quirks(struct device *dev, struct xhci_hcd *xhci) {struct tegra_xusb *tegra =dev_get_drvdata (dev); - xhci->quirks |=XHCI_PLAT ;if (tegra && tegra->soc->lpm_support) xhci->quirks |=XHCI_LPM_SUPPORT ; }
drivers/usb/host/xhci.h +1 -1
@@ -1874,7 +1874,7 @@ struct xhci_hcd {#define XHCI_SPURIOUS_REBOOT BIT_ULL(13)#define XHCI_COMP_MODE_QUIRK BIT_ULL(14)#define XHCI_AVOID_BEI BIT_ULL(15) -#define XHCI_PLAT BIT_ULL(16) +#define XHCI_PLAT BIT_ULL(16)/* Deprecated */ #define XHCI_SLOW_SUSPEND BIT_ULL(17)#define XHCI_SPURIOUS_WAKEUP BIT_ULL(18)/* For controllers with a broken beyond repair streams implementation */
Signature · 1 line
2.25.1
PATCH 5/11 xhci: split allocate interrupter into separate alloacte and add parts
In reply to Mathias NymanThe current function that both allocates and adds the interrupter isn't optimal when using several interrupters. The array of interrupters need to be protected with a lock while adding or removing interrupters. If memory is allocated under the default xhci spinlock then GFP_KERNEL can't be used.
There is no need to allocate the interrupter memory under the lock, so split this code into separate unlocked allocate part, and a lock protected add part.
--- drivers/usb/host/xhci-mem.c | 78 +++++++++++++++++++------------------ 1 file changed, 41 insertions(+), 37 deletions(-)
drivers/usb/host/xhci-mem.c +41 -37
@@ -1831,13 +1831,15 @@ xhci_free_interrupter(struct xhci_hcd *xhci, struct xhci_interrupter *ir)* low or high 32 bits of ERSTBA immediately causes the controller to * dereference the partially cleared 64 bit address, causing IOMMU error. */ - tmp =readl (&ir->ir_set->erst_size); - tmp &=ERST_SIZE_MASK ; -writel (tmp, &ir->ir_set->erst_size); - - tmp64 =xhci_read_64 (xhci, &ir->ir_set->erst_dequeue); - tmp64 &= (u64 )ERST_PTR_MASK ; -xhci_write_64 (xhci, tmp64, &ir->ir_set->erst_dequeue); +if (ir->ir_set) { + tmp =readl (&ir->ir_set->erst_size); + tmp &=ERST_SIZE_MASK ; +writel (tmp, &ir->ir_set->erst_size); + + tmp64 =xhci_read_64 (xhci, &ir->ir_set->erst_dequeue); + tmp64 &= (u64 )ERST_PTR_MASK ; +xhci_write_64 (xhci, tmp64, &ir->ir_set->erst_dequeue); + }/* free interrrupter event ring */ if (ir->event_ring)
@@ -2227,43 +2229,50 @@ static int xhci_setup_port_arrays(struct xhci_hcd *xhci, gfp_t flags) }static struct xhci_interrupter * -xhci_alloc_interrupter (struct xhci_hcd *xhci,unsigned int intr_num,gfp_t flags) +xhci_alloc_interrupter (struct xhci_hcd *xhci,gfp_t flags) {struct device *dev =xhci_to_hcd (xhci)->self.sysdev;struct xhci_interrupter *ir; -u64 erst_base; -u32 erst_size;int ret; -if (intr_num > xhci->max_interrupters) { -xhci_warn (xhci,"Can't allocate interrupter %d, max interrupters %d\n" , - intr_num, xhci->max_interrupters); -return NULL ; - } - -if (xhci->interrupter) { -xhci_warn (xhci,"Can't allocate already set up interrupter %d\n" , intr_num); -return NULL ; - } - ir =kzalloc_node (sizeof (*ir), flags,dev_to_node (dev));if (!ir)return NULL ; - ir->ir_set = &xhci->run_regs->ir_set[intr_num]; ir->event_ring =xhci_ring_alloc (xhci,ERST_NUM_SEGS ,1 ,TYPE_EVENT ,0 , flags);if (!ir->event_ring) { -xhci_warn (xhci,"Failed to allocate interrupter %d event ring\n" , intr_num); - goto fail_ir; +xhci_warn (xhci,"Failed to allocate interrupter event ring\n" ); +kfree (ir); +return NULL ; } ret =xhci_alloc_erst (xhci, ir->event_ring, &ir->erst, flags);if (ret) { -xhci_warn (xhci,"Failed to allocate interrupter %d erst\n" , intr_num); - goto fail_ev; +xhci_warn (xhci,"Failed to allocate interrupter erst\n" ); +xhci_ring_free (xhci, ir->event_ring); +kfree (ir); +return NULL ; + } + +return ir; +} + +static int +xhci_add_interrupter (struct xhci_hcd *xhci,struct xhci_interrupter *ir, +unsigned int intr_num) +{ +u64 erst_base; +u32 erst_size; +if (intr_num > xhci->max_interrupters) { +xhci_warn (xhci,"Can't add interrupter %d, max interrupters %d\n" , + intr_num, xhci->max_interrupters); +return -EINVAL ; } + + ir->ir_set = &xhci->run_regs->ir_set[intr_num]; +/* 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 ;
@@ -2278,14 +2287,7 @@ xhci_alloc_interrupter(struct xhci_hcd *xhci, unsigned int intr_num, gfp_t flags/* Set the event ring dequeue address of this interrupter */ xhci_set_hc_event_deq (xhci, ir); -return ir; - -fail_ev: -xhci_ring_free (xhci, ir->event_ring); -fail_ir: -kfree (ir); - -return NULL ; +return 0 ; }int xhci_mem_init (struct xhci_hcd *xhci,gfp_t flags)
@@ -2407,15 +2409,17 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags)"// Doorbell array is located at offset 0x%x from cap regs base addr" , val); xhci->dba = (void __iomem *) xhci->cap_regs + val; -/* Set ir_set to interrupt register set 0 */ -/* allocate and set up primary interrupter with an event ring. */ +/* Allocate and set up primary interrupter 0 with an event ring. */ xhci_dbg_trace (xhci, trace_xhci_dbg_init,"Allocating primary event ring" ); - xhci->interrupter =xhci_alloc_interrupter (xhci,0 , flags); + xhci->interrupter =xhci_alloc_interrupter (xhci, flags);if (!xhci->interrupter) goto fail; +if (xhci_add_interrupter (xhci, xhci->interrupter,0 )) + goto fail; + xhci->isoc_bei_interval =AVOID_BEI_INTERVAL_MAX ;/*
Signature · 1 line
2.25.1
PATCH 6/11 xhci: Fix transfer ring expansion size calculation
In reply to Mathias NymanThe amount of new TRBs needed is calculated incorrectly when expanding a transfer ring.
The room_on_ring() helper will correctly report that the ring needs expansion if the enqueue pointer is about to reach the dequeue segment. If enqueue reaches the dequeue segment then there is no easy way to expand the ring by adding new segments between enqueue and dequeue.
This leads to ring expansion even if num_trbs_free is larger than num_trbs we are queueing.
As a result we try to store a negative number in a unsigned int, leading to a huge percieved trb need, and doubling of ring size.
Rework and rename the room_on_ring() to a helper that checks if ring needs expansion, and return number of new segments needed. Don't rely on the tracked ring->num_trbs_free value as turns out it has been unreliable. Use ring enqueue and dequeue positions to determine expansion need.
The unsigned int issue was first reported first Chao zeng, and a bit later seen in a real world bug.
--- drivers/usb/host/xhci-mem.c | 14 ++------ drivers/usb/host/xhci-ring.c | 64 +++++++++++++++++++++++------------- 2 files changed, 45 insertions(+), 33 deletions(-)
drivers/usb/host/xhci-mem.c +3 -11
@@ -422,22 +422,14 @@ void xhci_free_endpoint_ring(struct xhci_hcd *xhci,* Allocate a new ring which has same segment numbers and link the two rings. */ int xhci_ring_expansion (struct xhci_hcd *xhci,struct xhci_ring *ring, -unsigned int num_trbs,gfp_t flags) +unsigned int num_new_segs,gfp_t flags) {struct xhci_segment *first;struct xhci_segment *last; -unsigned int num_segs; -unsigned int num_segs_needed;int ret; - num_segs_needed = (num_trbs + (TRBS_PER_SEGMENT -1 ) -1 ) / - (TRBS_PER_SEGMENT -1 ); - -/* Allocate number of segments we needed, or double the ring size */ - num_segs =max (ring->num_segs, num_segs_needed); - ret =xhci_alloc_segments_for_ring (xhci, &first, &last, - num_segs, ring->cycle_state, ring->type, + num_new_segs, ring->cycle_state, ring->type, ring->bounce_buf_len, flags);if (ret)return -ENOMEM ;
@@ -457,7 +449,7 @@ int xhci_ring_expansion(struct xhci_hcd *xhci, struct xhci_ring *ring,return ret; } -xhci_link_rings (xhci, ring, first, last, num_segs); +xhci_link_rings (xhci, ring, first, last, num_new_segs);trace_xhci_ring_expansion (ring); xhci_dbg_trace(xhci, trace_xhci_dbg_ring_expansion, "ring expansion succeed, now has %d segments",
drivers/usb/host/xhci-ring.c +42 -22
97 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH 7/11 xhci: Stop unnecessary tracking of free trbs in a ring
In reply to Mathias NymanTrying to keep track of free trbs in a ring by adding and subtracting deltas each time a enqueue or dequeue is increased or moved has proven to be buggy and complicated, especially over long periods of time.
Recently a bug in counting free trbs was fixed, now taking into account cancelled URBs that were turned into no-ops, preventing free_trbs to slowly wander off causing unnecessary ring expansion. See commit fe82f16aafda ("xhci: Fix incorrect tracking of free space on transfer rings")
Turns out its a lot easier to just calculate the numer of free TRB based on ring size and the current enqueue and dequeue pointer values. This is currently only needed for the command ring as multi segment transfer rings already ensures there is enough room the ring during the ring expansion check.
We could get rid of the ring->num_trbs_free entry completely, but as the xhci DbC code also uses it we don't clean that up in this patch.
--- drivers/usb/host/xhci-mem.c | 1 - drivers/usb/host/xhci-ring.c | 75 +++++++++++++++-------------------- drivers/usb/host/xhci-trace.h | 5 +-- drivers/usb/host/xhci.h | 3 +- 4 files changed, 35 insertions(+), 49 deletions(-)
drivers/usb/host/xhci-mem.c +0 -1
@@ -143,7 +143,6 @@ static void xhci_link_rings(struct xhci_hcd *xhci, struct xhci_ring *ring,xhci_link_segments (ring->enq_seg, first, ring->type, chain_links);xhci_link_segments (last, next, ring->type, chain_links); ring->num_segs += num_segs; - ring->num_trbs_free += (TRBS_PER_SEGMENT -1 ) * num_segs;if (ring->type !=TYPE_EVENT && ring->enq_seg == ring->last_seg) { ring->last_seg->trbs[TRBS_PER_SEGMENT -1 ].link.control
drivers/usb/host/xhci-ring.c +33 -42
158 lines not on this page · raw message
drivers/usb/host/xhci-trace.h +1 -4
@@ -458,7 +458,6 @@ DECLARE_EVENT_CLASS(xhci_log_ring, __field(unsigned int, num_segs) __field(unsigned int, stream_id) __field(unsigned int, cycle_state) - __field(unsigned int, num_trbs_free) __field(unsigned int, bounce_buf_len) ), TP_fast_assign(
@@ -469,18 +468,16 @@ DECLARE_EVENT_CLASS(xhci_log_ring, __entry->enq_seg = ring->enq_seg->dma; __entry->deq_seg = ring->deq_seg->dma; __entry->cycle_state = ring->cycle_state; - __entry->num_trbs_free = ring->num_trbs_free; __entry->bounce_buf_len = ring->bounce_buf_len; __entry->enq =xhci_trb_virt_to_dma (ring->enq_seg, ring->enqueue); __entry->deq =xhci_trb_virt_to_dma (ring->deq_seg, ring->dequeue); ), -TP_printk ("%s %p: enq %pad(%pad) deq %pad(%pad) segs %d stream %d free_trbs %d bounce %d cycle %d" , +TP_printk ("%s %p: enq %pad(%pad) deq %pad(%pad) segs %d stream %d bounce %d cycle %d" ,xhci_ring_type_string (__entry->type), __entry->ring, &__entry->enq, &__entry->enq_seg, &__entry->deq, &__entry->deq_seg, __entry->num_segs, __entry->stream_id, - __entry->num_trbs_free, __entry->bounce_buf_len, __entry->cycle_state )
drivers/usb/host/xhci.h +1 -2
@@ -1633,8 +1633,7 @@ struct xhci_ring {u32 cycle_state;unsigned int stream_id;unsigned int num_segs; -unsigned int num_trbs_free; -unsigned int num_trbs_free_temp; +unsigned int num_trbs_free;/* used only by xhci DbC */ unsigned int bounce_buf_len;enum xhci_ring_type type;bool last_td_was_short;
Signature · 1 line
2.25.1
PATCH 8/11 xhci: Fix resume issue of some ZHAOXIN hosts
In reply to Mathias NymanFrom: Weitao Wang <[email protected]>
On ZHAOXIN ZX-100 project, xHCI can't work normally after resume from system Sx state. To fix this issue, when resume from system Sx state, reinitialize xHCI instead of restore.
So, Add XHCI_RESET_ON_RESUME quirk for ZX-100 to fix issue of resuming from system Sx state.
--- drivers/usb/host/xhci-pci.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/usb/host/xhci-pci.c +5 -0
@@ -521,6 +521,11 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) pdev->device == PCI_DEVICE_ID_AMD_PROMONTORYA_4)) xhci->quirks |= XHCI_NO_SOFT_RETRY; +if (pdev->vendor ==PCI_VENDOR_ID_ZHAOXIN ) { +if (pdev->device ==0x9202 ) + xhci->quirks |=XHCI_RESET_ON_RESUME ; + } +/* xHC spec requires PCI devices to support D3hot and D3cold */ if (xhci->hci_version >=0x120 ) xhci->quirks |=XHCI_DEFAULT_PM_RUNTIME_ALLOW ;
Signature · 1 line
2.25.1
PATCH 9/11 xhci: Fix TRB prefetch issue of ZHAOXIN hosts
In reply to Mathias NymanFrom: Weitao Wang <[email protected]>
On some ZHAOXIN hosts, xHCI will prefetch TRB for performance improvement. However this TRB prefetch mechanism may cross page boundary, which may access memory not allocated by xHCI driver. In order to fix this issue, two pages was allocated for a segment and only the first page will be used. And add a quirk XHCI_ZHAOXIN_TRB_FETCH for this issue.
--- drivers/usb/host/xhci-mem.c | 8 ++++++-- drivers/usb/host/xhci-pci.c | 7 ++++++- drivers/usb/host/xhci.h | 1 + 3 files changed, 13 insertions(+), 3 deletions(-)
drivers/usb/host/xhci-mem.c +6 -2
@@ -2345,8 +2345,12 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags)* and our use of dma addresses in the trb_address_map radix tree needs * TRB_SEGMENT_SIZE alignment, so we pick the greater alignment need. */ - xhci->segment_pool =dma_pool_create ("xHCI ring segments" , dev, -TRB_SEGMENT_SIZE ,TRB_SEGMENT_SIZE , xhci->page_size); +if (xhci->quirks &XHCI_ZHAOXIN_TRB_FETCH ) + xhci->segment_pool =dma_pool_create ("xHCI ring segments" , dev, +TRB_SEGMENT_SIZE *2 ,TRB_SEGMENT_SIZE *2 , xhci->page_size *2 ); +else + xhci->segment_pool =dma_pool_create ("xHCI ring segments" , dev, +TRB_SEGMENT_SIZE ,TRB_SEGMENT_SIZE , xhci->page_size);/* See Table 46 and Note on Figure 55 */ xhci->device_pool = dma_pool_create("xHCI input/output contexts", dev,
drivers/usb/host/xhci-pci.c +6 -1
@@ -522,8 +522,13 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) xhci->quirks |=XHCI_NO_SOFT_RETRY ;if (pdev->vendor ==PCI_VENDOR_ID_ZHAOXIN ) { -if (pdev->device ==0x9202 ) +if (pdev->device ==0x9202 ) { xhci->quirks |=XHCI_RESET_ON_RESUME ; + xhci->quirks |=XHCI_ZHAOXIN_TRB_FETCH ; + } + +if (pdev->device ==0x9203 ) + xhci->quirks |=XHCI_ZHAOXIN_TRB_FETCH ; }/* xHC spec requires PCI devices to support D3hot and D3cold */
drivers/usb/host/xhci.h +1 -0
@@ -1904,6 +1904,7 @@ struct xhci_hcd {#define XHCI_EP_CTX_BROKEN_DCS BIT_ULL(42)#define XHCI_SUSPEND_RESUME_CLKS BIT_ULL(43)#define XHCI_RESET_TO_DEFAULT BIT_ULL(44) +#define XHCI_ZHAOXIN_TRB_FETCH BIT_ULL(45)unsigned int num_active_eps;unsigned int limit_active_eps;
Signature · 1 line
2.25.1
PATCH 10/11 xhci: Show ZHAOXIN xHCI root hub speed correctly
In reply to Mathias NymanFrom: Weitao Wang <[email protected]>
Some ZHAOXIN xHCI controllers follow usb3.1 spec, but only support gen1 speed 5Gbps. While in Linux kernel, if xHCI suspport usb3.1, root hub speed will show on 10Gbps.
To fix this issue of ZHAOXIN xHCI platforms, read usb speed ID supported by xHCI to determine root hub speed. And add a quirk XHCI_ZHAOXIN_HOST for this issue.
[fix warning about uninitialized symbol -Mathias]
--- drivers/usb/host/xhci-mem.c | 31 ++++++++++++++++++++++++------- drivers/usb/host/xhci-pci.c | 2 ++ drivers/usb/host/xhci.h | 1 + 3 files changed, 27 insertions(+), 7 deletions(-)
drivers/usb/host/xhci-mem.c +24 -7
@@ -1961,7 +1961,7 @@ static void xhci_add_in_port(struct xhci_hcd *xhci, unsigned int num_ports, {u32 temp, port_offset, port_count;int i; -u8 major_revision, minor_revision; +u8 major_revision, minor_revision, tmp_minor_revision;struct xhci_hub *rhub;struct device *dev =xhci_to_hcd (xhci)->self.sysdev;struct xhci_port_cap *port_cap;
@@ -1981,6 +1981,15 @@ static void xhci_add_in_port(struct xhci_hcd *xhci, unsigned int num_ports,*/ if (minor_revision >0x00 && minor_revision <0x10 ) minor_revision <<=4 ; +/* +* Some zhaoxin's xHCI controller that follow usb3.1 spec +* but only support Gen1. +*/ +if (xhci->quirks &XHCI_ZHAOXIN_HOST ) { + tmp_minor_revision = minor_revision; + minor_revision =0 ; + } + }else if (major_revision <=0x02 ) { rhub = &xhci->usb2_rhub; }else {
@@ -1989,10 +1998,6 @@ static void xhci_add_in_port(struct xhci_hcd *xhci, unsigned int num_ports,/* Ignoring port protocol we can't understand. FIXME */ return ; } - rhub->maj_rev =XHCI_EXT_PORT_MAJOR (temp); - -if (rhub->min_rev < minor_revision) - rhub->min_rev = minor_revision;/* Port offset and count in the third dword, see section 7.2 */ temp =readl (addr +2 );
@@ -2010,8 +2015,6 @@ static void xhci_add_in_port(struct xhci_hcd *xhci, unsigned int num_ports,if (xhci->num_port_caps > max_caps)return ; - port_cap->maj_rev = major_revision; - port_cap->min_rev = minor_revision; port_cap->psi_count =XHCI_EXT_PORT_PSIC (temp);if (port_cap->psi_count) {
@@ -2032,6 +2035,11 @@ static void xhci_add_in_port(struct xhci_hcd *xhci, unsigned int num_ports, XHCI_EXT_PORT_PSIV(port_cap->psi[i - 1]))) port_cap->psi_uid_count++; +if (xhci->quirks &XHCI_ZHAOXIN_HOST && + major_revision ==0x03 && +XHCI_EXT_PORT_PSIV (port_cap->psi[i]) >=5 ) + minor_revision = tmp_minor_revision; + xhci_dbg(xhci, "PSIV:%d PSIE:%d PLT:%d PFD:%d LP:%d PSIM:%d\n", XHCI_EXT_PORT_PSIV(port_cap->psi[i]), XHCI_EXT_PORT_PSIE(port_cap->psi[i]),
@@ -2041,6 +2049,15 @@ static void xhci_add_in_port(struct xhci_hcd *xhci, unsigned int num_ports, XHCI_EXT_PORT_PSIM(port_cap->psi[i])); } } + + rhub->maj_rev = major_revision; + +if (rhub->min_rev < minor_revision) + rhub->min_rev = minor_revision; + + port_cap->maj_rev = major_revision; + port_cap->min_rev = minor_revision; +/* cache usb2 port capabilities */ if (major_revision <0x03 && xhci->num_ext_caps < max_caps) xhci->ext_caps[xhci->num_ext_caps++] = temp;
drivers/usb/host/xhci-pci.c +2 -0
@@ -522,6 +522,8 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) xhci->quirks |=XHCI_NO_SOFT_RETRY ;if (pdev->vendor ==PCI_VENDOR_ID_ZHAOXIN ) { + xhci->quirks |=XHCI_ZHAOXIN_HOST ; +if (pdev->device ==0x9202 ) { xhci->quirks |=XHCI_RESET_ON_RESUME ; xhci->quirks |=XHCI_ZHAOXIN_TRB_FETCH ;
drivers/usb/host/xhci.h +1 -0
@@ -1905,6 +1905,7 @@ struct xhci_hcd {#define XHCI_SUSPEND_RESUME_CLKS BIT_ULL(43)#define XHCI_RESET_TO_DEFAULT BIT_ULL(44)#define XHCI_ZHAOXIN_TRB_FETCH BIT_ULL(45) +#define XHCI_ZHAOXIN_HOST BIT_ULL(46)unsigned int num_active_eps;unsigned int limit_active_eps;
Signature · 1 line
2.25.1
PATCH 11/11 xhci: Add ZHAOXIN xHCI host U1/U2 feature support
In reply to Mathias NymanFrom: Weitao Wang <[email protected]>
Add U1/U2 feature support of xHCI for ZHAOXIN.
Since both INTEL and ZHAOXIN need to check the tier where the device is located to determine whether to enabled U1/U2, remove the previous INTEL U1/U2 tier policy and add common policy in xhci_check_tier_policy. If vendor has specific U1/U2 enable policy,quirks can be add to declare.
--- drivers/usb/host/xhci-pci.c | 1 + drivers/usb/host/xhci.c | 43 ++++++++++++++++--------------------- 2 files changed, 19 insertions(+), 25 deletions(-)
drivers/usb/host/xhci-pci.c +1 -0
@@ -523,6 +523,7 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)if (pdev->vendor ==PCI_VENDOR_ID_ZHAOXIN ) { xhci->quirks |=XHCI_ZHAOXIN_HOST ; + xhci->quirks |=XHCI_LPM_SUPPORT ;if (pdev->device ==0x9202 ) { xhci->quirks |=XHCI_RESET_ON_RESUME ;
drivers/usb/host/xhci.c +18 -25
69 lines not on this page · raw message
Signature · 1 line
2.25.1