firewire: ohci: add bus-reset event for initial set of handled irq

In the former commits, the spurious interrupt events are suppressed as
possible, by unset bus-reset event from the set of handled irq. The change
was written with the less-intrusive style, thus it firstly works at the
second time to handle the event. But it is slightly inconvenient.

This commit adds the event for the initial set of irq to handle. As a
result, the event can be handled even if it is the first time. The change
has a benefit that the OHCI_PARAM_DEBUG_BUSRESETS bit in debug module
parameter is always effective.

Tested-by: Adam Goldman <adamg@pobox.com>
Link: https://lore.kernel.org/r/20240501073238.72769-2-o-takashi@sakamocchi.jp
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>

diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
index c8891aa70a51eecb8567c9ee6dd6c3f76e7b999e..9794b22db6407f72fccee26bee48608dc81a96cd 100644 (file)
--- a/drivers/firewire/ohci.c
+++ b/drivers/firewire/ohci.c
@@ -394,7 +394,7 @@ MODULE_PARM_DESC(quirks, "Chip quirks (default = 0"
 #define OHCI_PARAM_DEBUG_AT_AR         1
 #define OHCI_PARAM_DEBUG_SELFIDS       2
 #define OHCI_PARAM_DEBUG_IRQS          4
-#define OHCI_PARAM_DEBUG_BUSRESETS     8 /* only effective before chip init */
+#define OHCI_PARAM_DEBUG_BUSRESETS     8
 
 static int param_debug;
 module_param_named(debug, param_debug, int, 0644);
@@ -2066,8 +2066,7 @@ static void bus_reset_work(struct work_struct *work)
 
        ohci->generation = generation;
        reg_write(ohci, OHCI1394_IntEventClear, OHCI1394_busReset);
-       if (param_debug & OHCI_PARAM_DEBUG_BUSRESETS)
-               reg_write(ohci, OHCI1394_IntMaskSet, OHCI1394_busReset);
+       reg_write(ohci, OHCI1394_IntMaskSet, OHCI1394_busReset);
 
        if (ohci->quirks & QUIRK_RESET_PACKET)
                ohci->request_generation = generation;
@@ -2139,6 +2138,7 @@ static irqreturn_t irq_handler(int irq, void *data)
        reg_write(ohci, OHCI1394_IntEventClear,
                  event & ~(OHCI1394_busReset | OHCI1394_postedWriteErr));
        log_irqs(ohci, event);
+       // The flag is masked again at bus_reset_work() scheduled by selfID event.
        if (event & OHCI1394_busReset)
                reg_write(ohci, OHCI1394_IntMaskClear, OHCI1394_busReset);
 
@@ -2478,9 +2478,8 @@ static int ohci_enable(struct fw_card *card,
                OHCI1394_cycleInconsistent |
                OHCI1394_unrecoverableError |
                OHCI1394_cycleTooLong |
-               OHCI1394_masterIntEnable;
-       if (param_debug & OHCI_PARAM_DEBUG_BUSRESETS)
-               irqs |= OHCI1394_busReset;
+               OHCI1394_masterIntEnable |
+               OHCI1394_busReset;
        reg_write(ohci, OHCI1394_IntMaskSet, irqs);
 
        reg_write(ohci, OHCI1394_HCControlSet,