usb: xhci: Fix DMA address calculation in queue_trb
We need to get the DMA address before incrementing the pointer, as that might move us onto another segment. Signed-off-by: Hector Martin <marcan@marcan.st> Reviewed-by: Marek Vasut <marex@denx.de>
This commit is contained in:
parent
2fd7037122
commit
a14843fdac
|
@ -202,6 +202,7 @@ static dma_addr_t queue_trb(struct xhci_ctrl *ctrl, struct xhci_ring *ring,
|
||||||
bool more_trbs_coming, unsigned int *trb_fields)
|
bool more_trbs_coming, unsigned int *trb_fields)
|
||||||
{
|
{
|
||||||
struct xhci_generic_trb *trb;
|
struct xhci_generic_trb *trb;
|
||||||
|
dma_addr_t addr;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
trb = &ring->enqueue->generic;
|
trb = &ring->enqueue->generic;
|
||||||
|
@ -211,9 +212,11 @@ static dma_addr_t queue_trb(struct xhci_ctrl *ctrl, struct xhci_ring *ring,
|
||||||
|
|
||||||
xhci_flush_cache((uintptr_t)trb, sizeof(struct xhci_generic_trb));
|
xhci_flush_cache((uintptr_t)trb, sizeof(struct xhci_generic_trb));
|
||||||
|
|
||||||
|
addr = xhci_trb_virt_to_dma(ring->enq_seg, (union xhci_trb *)trb);
|
||||||
|
|
||||||
inc_enq(ctrl, ring, more_trbs_coming);
|
inc_enq(ctrl, ring, more_trbs_coming);
|
||||||
|
|
||||||
return xhci_trb_virt_to_dma(ring->enq_seg, (union xhci_trb *)trb);
|
return addr;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue
Block a user