Hi Felipe, Today's linux-next merge of the usb-gadget tree got a conflict in drivers/usb/musb/musb_cppi41.c between commit c58d80f523ff ("usb: musb: Ensure that cppi41 timer gets armed on premature DMA TX irq") from the usb.current tree and commit 50aea6fca771 ("usb: musb: cppi41: fire hrtimer according to programmed channel length") from the usb-gadget tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx diff --cc drivers/usb/musb/musb_cppi41.c index 5341bb223b7c,adfffe884891..000000000000 --- a/drivers/usb/musb/musb_cppi41.c +++ b/drivers/usb/musb/musb_cppi41.c @@@ -312,15 -271,13 +271,13 @@@ static void cppi41_dma_callback(void *p goto out; } } - if (is_isoc(hw_ep, 0)) { - schedule_work(&cppi41_channel->dma_completion); - goto out; - } list_add_tail(&cppi41_channel->tx_check, &controller->early_tx_list); - if (!hrtimer_active(&controller->early_tx)) { + if (!hrtimer_is_queued(&controller->early_tx)) { + unsigned long usecs = cppi41_channel->total_len / 10; + hrtimer_start_range_ns(&controller->early_tx, - ktime_set(0, 140 * NSEC_PER_USEC), + ktime_set(0, usecs * NSEC_PER_USEC), 40 * NSEC_PER_USEC, HRTIMER_MODE_REL); }
Attachment:
signature.asc
Description: PGP signature