@@ -394,87 +394,17 @@ MODULE_PARM_DESC(quirks, "Chip quirks (default = 0"
394394 ")" );
395395
396396#define OHCI_PARAM_DEBUG_AT_AR 1
397- #define OHCI_PARAM_DEBUG_SELFIDS 2
398397
399398static int param_debug ;
400399module_param_named (debug , param_debug , int , 0644 );
401400MODULE_PARM_DESC (debug , "Verbose logging, deprecated in v6.11 kernel or later. (default = 0"
402401 ", AT/AR events = " __stringify (OHCI_PARAM_DEBUG_AT_AR )
403- ", self - IDs = " __stringify(OHCI_PARAM_DEBUG_SELFIDS)
404402 ", or a combination, or all = -1)" );
405403
406404static bool param_remote_dma ;
407405module_param_named (remote_dma , param_remote_dma , bool , 0444 );
408406MODULE_PARM_DESC (remote_dma , "Enable unfiltered remote DMA (default = N)" );
409407
410- static void log_selfids (struct fw_ohci * ohci , int generation , int self_id_count )
411- {
412- static const char * const speed [] = {
413- [0 ] = "S100" , [1 ] = "S200" , [2 ] = "S400" , [3 ] = "beta" ,
414- };
415- static const char * const power [] = {
416- [0 ] = "+0W" , [1 ] = "+15W" , [2 ] = "+30W" , [3 ] = "+45W" ,
417- [4 ] = "-3W" , [5 ] = " ?W" , [6 ] = "-3..-6W" , [7 ] = "-3..-10W" ,
418- };
419- static const char port [] = {
420- [PHY_PACKET_SELF_ID_PORT_STATUS_NONE ] = '.' ,
421- [PHY_PACKET_SELF_ID_PORT_STATUS_NCONN ] = '-' ,
422- [PHY_PACKET_SELF_ID_PORT_STATUS_PARENT ] = 'p' ,
423- [PHY_PACKET_SELF_ID_PORT_STATUS_CHILD ] = 'c' ,
424- };
425- struct self_id_sequence_enumerator enumerator = {
426- .cursor = ohci -> self_id_buffer ,
427- .quadlet_count = self_id_count ,
428- };
429-
430- if (likely (!(param_debug & OHCI_PARAM_DEBUG_SELFIDS )))
431- return ;
432-
433- ohci_notice (ohci , "%d selfIDs, generation %d, local node ID %04x\n" ,
434- self_id_count , generation , ohci -> node_id );
435-
436- while (enumerator .quadlet_count > 0 ) {
437- unsigned int quadlet_count ;
438- unsigned int port_index ;
439- const u32 * s ;
440- int i ;
441-
442- s = self_id_sequence_enumerator_next (& enumerator , & quadlet_count );
443- if (IS_ERR (s ))
444- break ;
445-
446- ohci_notice (ohci ,
447- "selfID 0: %08x, phy %d [%c%c%c] %s gc=%d %s %s%s%s\n" ,
448- * s ,
449- phy_packet_self_id_get_phy_id (* s ),
450- port [self_id_sequence_get_port_status (s , quadlet_count , 0 )],
451- port [self_id_sequence_get_port_status (s , quadlet_count , 1 )],
452- port [self_id_sequence_get_port_status (s , quadlet_count , 2 )],
453- speed [* s >> 14 & 3 ], * s >> 16 & 63 ,
454- power [* s >> 8 & 7 ], * s >> 22 & 1 ? "L" : "" ,
455- * s >> 11 & 1 ? "c" : "" , * s & 2 ? "i" : "" );
456-
457- port_index = 3 ;
458- for (i = 1 ; i < quadlet_count ; ++ i ) {
459- ohci_notice (ohci ,
460- "selfID n: %08x, phy %d [%c%c%c%c%c%c%c%c]\n" ,
461- s [i ],
462- phy_packet_self_id_get_phy_id (s [i ]),
463- port [self_id_sequence_get_port_status (s , quadlet_count , port_index )],
464- port [self_id_sequence_get_port_status (s , quadlet_count , port_index + 1 )],
465- port [self_id_sequence_get_port_status (s , quadlet_count , port_index + 2 )],
466- port [self_id_sequence_get_port_status (s , quadlet_count , port_index + 3 )],
467- port [self_id_sequence_get_port_status (s , quadlet_count , port_index + 4 )],
468- port [self_id_sequence_get_port_status (s , quadlet_count , port_index + 5 )],
469- port [self_id_sequence_get_port_status (s , quadlet_count , port_index + 6 )],
470- port [self_id_sequence_get_port_status (s , quadlet_count , port_index + 7 )]
471- );
472-
473- port_index += 8 ;
474- }
475- }
476- }
477-
478408static const char * evts [] = {
479409 [0x00 ] = "evt_no_status" , [0x01 ] = "-reserved-" ,
480410 [0x02 ] = "evt_long_packet" , [0x03 ] = "evt_missing_ack" ,
@@ -2163,8 +2093,6 @@ static void bus_reset_work(struct work_struct *work)
21632093 if (free_rom )
21642094 dmam_free_coherent (ohci -> card .device , CONFIG_ROM_SIZE , free_rom , free_rom_bus );
21652095
2166- log_selfids (ohci , generation , self_id_count );
2167-
21682096 fw_core_handle_bus_reset (& ohci -> card , ohci -> node_id , generation ,
21692097 self_id_count , ohci -> self_id_buffer ,
21702098 ohci -> csr_state_setclear_abdicate );
0 commit comments