tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'firewire-fixes-6.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394

Pull firewire fixes from Takashi Sakamoto:
"The firewire-ohci kernel module has a parameter for verbose kernel
logging. It is well-known that it logs the spurious IRQ for bus-reset
event due to the unmasked register for IRQ event. This update fixes
the issue"

* tag 'firewire-fixes-6.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
firewire: ohci: mask bus reset interrupts between ISR and bottom half

Linus Torvalds 6c6e47d6 104db052

+5 -1
+5 -1
drivers/firewire/ohci.c
··· 2060 2060 2061 2061 ohci->generation = generation; 2062 2062 reg_write(ohci, OHCI1394_IntEventClear, OHCI1394_busReset); 2063 + if (param_debug & OHCI_PARAM_DEBUG_BUSRESETS) 2064 + reg_write(ohci, OHCI1394_IntMaskSet, OHCI1394_busReset); 2063 2065 2064 2066 if (ohci->quirks & QUIRK_RESET_PACKET) 2065 2067 ohci->request_generation = generation; ··· 2127 2125 return IRQ_NONE; 2128 2126 2129 2127 /* 2130 - * busReset and postedWriteErr must not be cleared yet 2128 + * busReset and postedWriteErr events must not be cleared yet 2131 2129 * (OHCI 1.1 clauses 7.2.3.2 and 13.2.8.1) 2132 2130 */ 2133 2131 reg_write(ohci, OHCI1394_IntEventClear, 2134 2132 event & ~(OHCI1394_busReset | OHCI1394_postedWriteErr)); 2135 2133 log_irqs(ohci, event); 2134 + if (event & OHCI1394_busReset) 2135 + reg_write(ohci, OHCI1394_IntMaskClear, OHCI1394_busReset); 2136 2136 2137 2137 if (event & OHCI1394_selfIDComplete) 2138 2138 queue_work(selfid_workqueue, &ohci->bus_reset_work);