david/ipxe
david/ipxe
Archived
1
0
Fork 0
Code

[pci] Standardise debug message format

Browse Source 
Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown 2010-11-24 16:59:46 +00:00
parent 66679fe7df
commit ef0376483c
2 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/drivers/bus/pci.c
View File

@ -64,8 +64,9 @@ static unsigned long pci_bar ( struct pci_device *pci, unsigned int reg ) {
if ( sizeof ( unsigned long ) > sizeof ( uint32_t ) ) { if ( sizeof ( unsigned long ) > sizeof ( uint32_t ) ) {
return ( ( ( uint64_t ) high << 32 ) | low ); return ( ( ( uint64_t ) high << 32 ) | low );
} else { } else {
DBG ( "Unhandled 64-bit BAR %08x%08x\n", DBGC ( pci, PCI_FMT " unhandled 64-bit BAR "
high, low ); "%08x%08x\n",
PCI_ARGS ( pci ), high, low );
return PCI_BASE_ADDRESS_MEM_TYPE_64; return PCI_BASE_ADDRESS_MEM_TYPE_64;
} }
} }
@ -148,19 +149,16 @@ void adjust_pci_device ( struct pci_device *pci ) {
new_command = ( pci_command | PCI_COMMAND_MASTER | new_command = ( pci_command | PCI_COMMAND_MASTER |
PCI_COMMAND_MEM | PCI_COMMAND_IO ); PCI_COMMAND_MEM | PCI_COMMAND_IO );
if ( pci_command != new_command ) { if ( pci_command != new_command ) {
DBG ( "PCI BIOS has not enabled device %02x:%02x.%x! " DBGC ( pci, PCI_FMT " device not enabled by BIOS! Updating "
"Updating PCI command %04x->%04x\n", pci->bus, "PCI command %04x->%04x\n",
PCI_SLOT ( pci->devfn ), PCI_FUNC ( pci->devfn ), PCI_ARGS ( pci ), pci_command, new_command );
pci_command, new_command );
pci_write_config_word ( pci, PCI_COMMAND, new_command ); pci_write_config_word ( pci, PCI_COMMAND, new_command );
} }
pci_read_config_byte ( pci, PCI_LATENCY_TIMER, &pci_latency); pci_read_config_byte ( pci, PCI_LATENCY_TIMER, &pci_latency);
if ( pci_latency < 32 ) { if ( pci_latency < 32 ) {
DBG ( "PCI device %02x:%02x.%x latency timer is unreasonably " DBGC ( pci, PCI_FMT " latency timer is unreasonably low at "
"low at %d. Setting to 32.\n", pci->bus, "%d. Setting to 32.\n", PCI_ARGS ( pci ), pci_latency );
PCI_SLOT ( pci->devfn ), PCI_FUNC ( pci->devfn ),
pci_latency );
pci_write_config_byte ( pci, PCI_LATENCY_TIMER, 32); pci_write_config_byte ( pci, PCI_LATENCY_TIMER, 32);
} }
} }
@ -180,10 +178,9 @@ static int pci_probe ( struct pci_device *pci ) {
unsigned int i; unsigned int i;
int rc; int rc;
DBG ( "Adding PCI device %02x:%02x.%x (%04x:%04x mem %lx io %lx " DBGC ( pci, PCI_FMT " is %04x:%04x mem %lx io %lx irq %d\n",
"irq %d)\n", pci->bus, PCI_SLOT ( pci->devfn ), PCI_ARGS ( pci ), pci->vendor, pci->device, pci->membase,
PCI_FUNC ( pci->devfn ), pci->vendor, pci->device, pci->ioaddr, pci->irq );
pci->membase, pci->ioaddr, pci->irq );
for_each_table_entry ( driver, PCI_DRIVERS ) { for_each_table_entry ( driver, PCI_DRIVERS ) {
for ( i = 0 ; i < driver->id_count ; i++ ) { for ( i = 0 ; i < driver->id_count ; i++ ) {
@ -196,16 +193,18 @@ static int pci_probe ( struct pci_device *pci ) {
continue; continue;
pci->driver = driver; pci->driver = driver;
pci->driver_name = id->name; pci->driver_name = id->name;
DBG ( "...using driver %s\n", pci->driver_name ); DBGC ( pci, "...using driver %s\n", pci->driver_name );
if ( ( rc = driver->probe ( pci, id ) ) != 0 ) { if ( ( rc = driver->probe ( pci, id ) ) != 0 ) {
DBG ( "......probe failed\n" ); DBGC ( pci, "......probe failed: %s\n",
strerror ( rc ) );
continue; continue;
} }
DBGC ( pci, PCI_FMT " added\n", PCI_ARGS ( pci ) );
return 0; return 0;
} }
} }
DBG ( "...no driver found\n" ); DBGC ( pci, "...no driver found\n" );
return -ENOTTY; return -ENOTTY;
} }
@ -216,8 +215,7 @@ static int pci_probe ( struct pci_device *pci ) {
*/ */
static void pci_remove ( struct pci_device *pci ) { static void pci_remove ( struct pci_device *pci ) {
pci->driver->remove ( pci ); pci->driver->remove ( pci );
DBG ( "Removed PCI device %02x:%02x.%x\n", pci->bus, DBGC ( pci, PCI_FMT " removed\n", PCI_ARGS ( pci ) );
PCI_SLOT ( pci->devfn ), PCI_FUNC ( pci->devfn ) );
} }
/** /**

7
src/include/ipxe/pci.h
View File

@ -374,6 +374,13 @@ struct pci_driver {
#define PCI_ROM( _vendor, _device, _name, _description, _data ) \ #define PCI_ROM( _vendor, _device, _name, _description, _data ) \
PCI_ID( _vendor, _device, _name, _description, _data ) PCI_ID( _vendor, _device, _name, _description, _data )
/** PCI device debug message format */
#define PCI_FMT "PCI %02x:%02x.%x"
/** PCI device debug message arguments */
#define PCI_ARGS( pci ) \
(pci)->bus, PCI_SLOT ( (pci)->devfn ), PCI_FUNC ( (pci)->devfn )
extern void adjust_pci_device ( struct pci_device *pci ); extern void adjust_pci_device ( struct pci_device *pci );
extern unsigned long pci_bar_start ( struct pci_device *pci, extern unsigned long pci_bar_start ( struct pci_device *pci,
unsigned int reg ); unsigned int reg );