firewire: ohci: remove obsolete debug logging for selfID sequence
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>
Thu, 21 Aug 2025 00:30:15 +0000 (09:30 +0900)
committerTakashi Sakamoto <o-takashi@sakamocchi.jp>
Fri, 22 Aug 2025 00:53:48 +0000 (09:53 +0900)
A commit 677ceae19073 ("firewire: core: add tracepoints event for
self_id_sequence") added the "firewire:self_id_sequence" event in v6.11.
A commit 526e21a2aa6f ("firewire: ohci: add tracepoints event for data
of Self-ID DMA") added the "firewire_ohci:self_id_complete" event in
v6.12.

These tracepoints replace the equivalent debug logging. This commit
removes the logging.

Link: https://lore.kernel.org/r/20250821003017.186752-3-o-takashi@sakamocchi.jp
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
drivers/firewire/ohci.c

index d3ed43f..8cecdf4 100644 (file)
@@ -394,87 +394,17 @@ MODULE_PARM_DESC(quirks, "Chip quirks (default = 0"
        ")");
 
 #define OHCI_PARAM_DEBUG_AT_AR         1
-#define OHCI_PARAM_DEBUG_SELFIDS       2
 
 static int param_debug;
 module_param_named(debug, param_debug, int, 0644);
 MODULE_PARM_DESC(debug, "Verbose logging, deprecated in v6.11 kernel or later. (default = 0"
        ", AT/AR events = "     __stringify(OHCI_PARAM_DEBUG_AT_AR)
-       ", self-IDs = "         __stringify(OHCI_PARAM_DEBUG_SELFIDS)
        ", or a combination, or all = -1)");
 
 static bool param_remote_dma;
 module_param_named(remote_dma, param_remote_dma, bool, 0444);
 MODULE_PARM_DESC(remote_dma, "Enable unfiltered remote DMA (default = N)");
 
-static void log_selfids(struct fw_ohci *ohci, int generation, int self_id_count)
-{
-       static const char *const speed[] = {
-               [0] = "S100", [1] = "S200", [2] = "S400",    [3] = "beta",
-       };
-       static const char *const power[] = {
-               [0] = "+0W",  [1] = "+15W", [2] = "+30W",    [3] = "+45W",
-               [4] = "-3W",  [5] = " ?W",  [6] = "-3..-6W", [7] = "-3..-10W",
-       };
-       static const char port[] = {
-               [PHY_PACKET_SELF_ID_PORT_STATUS_NONE] = '.',
-               [PHY_PACKET_SELF_ID_PORT_STATUS_NCONN] = '-',
-               [PHY_PACKET_SELF_ID_PORT_STATUS_PARENT] = 'p',
-               [PHY_PACKET_SELF_ID_PORT_STATUS_CHILD] = 'c',
-       };
-       struct self_id_sequence_enumerator enumerator = {
-               .cursor = ohci->self_id_buffer,
-               .quadlet_count = self_id_count,
-       };
-
-       if (likely(!(param_debug & OHCI_PARAM_DEBUG_SELFIDS)))
-               return;
-
-       ohci_notice(ohci, "%d selfIDs, generation %d, local node ID %04x\n",
-                   self_id_count, generation, ohci->node_id);
-
-       while (enumerator.quadlet_count > 0) {
-               unsigned int quadlet_count;
-               unsigned int port_index;
-               const u32 *s;
-               int i;
-
-               s = self_id_sequence_enumerator_next(&enumerator, &quadlet_count);
-               if (IS_ERR(s))
-                       break;
-
-               ohci_notice(ohci,
-                   "selfID 0: %08x, phy %d [%c%c%c] %s gc=%d %s %s%s%s\n",
-                   *s,
-                   phy_packet_self_id_get_phy_id(*s),
-                   port[self_id_sequence_get_port_status(s, quadlet_count, 0)],
-                   port[self_id_sequence_get_port_status(s, quadlet_count, 1)],
-                   port[self_id_sequence_get_port_status(s, quadlet_count, 2)],
-                   speed[*s >> 14 & 3], *s >> 16 & 63,
-                   power[*s >> 8 & 7], *s >> 22 & 1 ? "L" : "",
-                   *s >> 11 & 1 ? "c" : "", *s & 2 ? "i" : "");
-
-               port_index = 3;
-               for (i = 1; i < quadlet_count; ++i) {
-                       ohci_notice(ohci,
-                           "selfID n: %08x, phy %d [%c%c%c%c%c%c%c%c]\n",
-                           s[i],
-                           phy_packet_self_id_get_phy_id(s[i]),
-                           port[self_id_sequence_get_port_status(s, quadlet_count, port_index)],
-                           port[self_id_sequence_get_port_status(s, quadlet_count, port_index + 1)],
-                           port[self_id_sequence_get_port_status(s, quadlet_count, port_index + 2)],
-                           port[self_id_sequence_get_port_status(s, quadlet_count, port_index + 3)],
-                           port[self_id_sequence_get_port_status(s, quadlet_count, port_index + 4)],
-                           port[self_id_sequence_get_port_status(s, quadlet_count, port_index + 5)],
-                           port[self_id_sequence_get_port_status(s, quadlet_count, port_index + 6)],
-                           port[self_id_sequence_get_port_status(s, quadlet_count, port_index + 7)]
-                       );
-
-                       port_index += 8;
-               }
-       }
-}
-
 static const char *evts[] = {
        [0x00] = "evt_no_status",       [0x01] = "-reserved-",
        [0x02] = "evt_long_packet",     [0x03] = "evt_missing_ack",
@@ -2163,8 +2093,6 @@ static void bus_reset_work(struct work_struct *work)
        if (free_rom)
                dmam_free_coherent(ohci->card.device, CONFIG_ROM_SIZE, free_rom, free_rom_bus);
 
-       log_selfids(ohci, generation, self_id_count);
-
        fw_core_handle_bus_reset(&ohci->card, ohci->node_id, generation,
                                 self_id_count, ohci->self_id_buffer,
                                 ohci->csr_state_setclear_abdicate);