From cec804251d4b4765bbcaa207f4c931fef350585e Mon Sep 17 00:00:00 2001 From: Stefan Roese Date: Fri, 15 Jan 2021 08:52:56 +0100 Subject: [PATCH] usb: xhci: Fix compare to use physical addresses in xhci_bulk_tx() Testing with v2021.01 on MIPS Octeon has shown, that the latest patch for the "short packet event trb handling" did introduce a bug on platforms with virtual address != physical address. This patch fixes this issue by using the correct address types in the compare (both physical in this case). Signed-off-by: Stefan Roese Cc: Aaron Williams Cc: Chandrakala Chavva Cc: Ran Wang Cc: Nicolas Saenz Julienne Cc: Marek Vasut Cc: Bin Meng --- drivers/usb/host/xhci-ring.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index d708fc928b..d6c47d579b 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -723,8 +723,8 @@ again: return -ETIMEDOUT; } - if ((uintptr_t)(le64_to_cpu(event->trans_event.buffer)) - != (uintptr_t)last_transfer_trb_addr) { + if ((uintptr_t)(le64_to_cpu(event->trans_event.buffer)) != + (uintptr_t)virt_to_phys(last_transfer_trb_addr)) { available_length -= (int)EVENT_TRB_LEN(le32_to_cpu(event->trans_event.transfer_len)); xhci_acknowledge_event(ctrl);