diff options
Diffstat (limited to 'src/southbridge/intel')
-rw-r--r-- | src/southbridge/intel/bd82x6x/early_smbus.c | 2 | ||||
-rw-r--r-- | src/southbridge/intel/esb6300/early_smbus.c | 4 | ||||
-rw-r--r-- | src/southbridge/intel/fsp_bd82x6x/early_smbus.c | 2 | ||||
-rw-r--r-- | src/southbridge/intel/fsp_rangeley/early_smbus.c | 2 | ||||
-rw-r--r-- | src/southbridge/intel/i3100/early_smbus.c | 2 | ||||
-rw-r--r-- | src/southbridge/intel/i82371eb/smbus.h | 4 | ||||
-rw-r--r-- | src/southbridge/intel/i82801ax/early_smbus.c | 2 | ||||
-rw-r--r-- | src/southbridge/intel/i82801bx/early_smbus.c | 2 | ||||
-rw-r--r-- | src/southbridge/intel/i82801cx/early_smbus.c | 2 | ||||
-rw-r--r-- | src/southbridge/intel/i82801dx/early_smbus.c | 14 | ||||
-rw-r--r-- | src/southbridge/intel/i82801ex/early_smbus.c | 8 | ||||
-rw-r--r-- | src/southbridge/intel/i82801gx/early_smbus.c | 2 | ||||
-rw-r--r-- | src/southbridge/intel/i82801ix/early_smbus.c | 2 | ||||
-rw-r--r-- | src/southbridge/intel/ibexpeak/early_smbus.c | 2 | ||||
-rw-r--r-- | src/southbridge/intel/lynxpoint/early_smbus.c | 2 | ||||
-rw-r--r-- | src/southbridge/intel/sch/early_smbus.c | 2 |
16 files changed, 26 insertions, 28 deletions
diff --git a/src/southbridge/intel/bd82x6x/early_smbus.c b/src/southbridge/intel/bd82x6x/early_smbus.c index 616e7c3ba4..7ba2e88449 100644 --- a/src/southbridge/intel/bd82x6x/early_smbus.c +++ b/src/southbridge/intel/bd82x6x/early_smbus.c @@ -52,7 +52,7 @@ void enable_smbus(void) /* Clear any lingering errors, so transactions can run. */ outb(inb(SMBUS_IO_BASE + SMBHSTSTAT), SMBUS_IO_BASE + SMBHSTSTAT); - print_debug("SMBus controller enabled.\n"); + printk(BIOS_DEBUG, "SMBus controller enabled.\n"); } int smbus_read_byte(unsigned device, unsigned address) diff --git a/src/southbridge/intel/esb6300/early_smbus.c b/src/southbridge/intel/esb6300/early_smbus.c index fbbf4d9479..9ad4f659bd 100644 --- a/src/southbridge/intel/esb6300/early_smbus.c +++ b/src/southbridge/intel/esb6300/early_smbus.c @@ -6,7 +6,7 @@ static void enable_smbus(void) { device_t dev = PCI_DEV(0x0, 0x1f, 0x3); - print_spew("SMBus controller enabled\n"); + printk(BIOS_SPEW, "SMBus controller enabled\n"); pci_write_config32(dev, 0x20, SMBUS_IO_BASE | 1); pci_write_config8(dev, 0x40, 1); pci_write_config8(dev, 0x4, 1); @@ -91,7 +91,7 @@ static int smbus_write_block(unsigned device, unsigned length, unsigned cmd, SMBUS_IO_BASE + SMBHSTSTAT); } - print_debug("SMBUS Block complete\n"); + printk(BIOS_DEBUG, "SMBUS Block complete\n"); return 0; } #endif diff --git a/src/southbridge/intel/fsp_bd82x6x/early_smbus.c b/src/southbridge/intel/fsp_bd82x6x/early_smbus.c index 3d347b4278..c5459cb68d 100644 --- a/src/southbridge/intel/fsp_bd82x6x/early_smbus.c +++ b/src/southbridge/intel/fsp_bd82x6x/early_smbus.c @@ -97,7 +97,7 @@ void enable_smbus(void) /* Clear any lingering errors, so transactions can run. */ outb(inb(SMBUS_IO_BASE + SMBHSTSTAT), SMBUS_IO_BASE + SMBHSTSTAT); - print_debug("SMBus controller enabled.\n"); + printk(BIOS_DEBUG, "SMBus controller enabled.\n"); } /** \brief generic smbus helper function to read & write to the smbus diff --git a/src/southbridge/intel/fsp_rangeley/early_smbus.c b/src/southbridge/intel/fsp_rangeley/early_smbus.c index c89d17663e..c1da54b6d0 100644 --- a/src/southbridge/intel/fsp_rangeley/early_smbus.c +++ b/src/southbridge/intel/fsp_rangeley/early_smbus.c @@ -52,7 +52,7 @@ void enable_smbus(void) /* Clear any lingering errors, so transactions can run. */ outb(inb(SMBUS_IO_BASE + SMBHSTSTAT), SMBUS_IO_BASE + SMBHSTSTAT); - print_debug("SMBus controller enabled.\n"); + printk(BIOS_DEBUG, "SMBus controller enabled.\n"); } int smbus_read_byte(unsigned device, unsigned address) diff --git a/src/southbridge/intel/i3100/early_smbus.c b/src/southbridge/intel/i3100/early_smbus.c index f06947c472..484627cb4c 100644 --- a/src/southbridge/intel/i3100/early_smbus.c +++ b/src/southbridge/intel/i3100/early_smbus.c @@ -26,7 +26,7 @@ static void enable_smbus(void) { device_t dev = PCI_DEV(0x0, 0x1f, 0x3); - print_spew("SMBus controller enabled\n"); + printk(BIOS_SPEW, "SMBus controller enabled\n"); pci_write_config32(dev, 0x20, SMBUS_IO_BASE | 1); pci_write_config8(dev, 0x40, 1); pci_write_config8(dev, 0x4, 1); diff --git a/src/southbridge/intel/i82371eb/smbus.h b/src/southbridge/intel/i82371eb/smbus.h index 6c7c6f4911..fd0221793e 100644 --- a/src/southbridge/intel/i82371eb/smbus.h +++ b/src/southbridge/intel/i82371eb/smbus.h @@ -104,9 +104,7 @@ int do_smbus_read_byte(unsigned smbus_io_base, unsigned device, unsigned address if (status_register & 0x04) { #if 0 - print_debug("Read fail "); - print_debug_hex16(status_register); - print_debug("\n"); + printk(BIOS_DEBUG, "Read fail %04x\n", status_register); #endif return SMBUS_ERROR; } diff --git a/src/southbridge/intel/i82801ax/early_smbus.c b/src/southbridge/intel/i82801ax/early_smbus.c index 878d5f6e7e..104875a6d1 100644 --- a/src/southbridge/intel/i82801ax/early_smbus.c +++ b/src/southbridge/intel/i82801ax/early_smbus.c @@ -50,7 +50,7 @@ void enable_smbus(void) /* Clear any lingering errors, so transactions can run. */ outb(inb(SMBUS_IO_BASE + SMBHSTSTAT), SMBUS_IO_BASE + SMBHSTSTAT); - print_debug("SMBus controller enabled\n"); + printk(BIOS_DEBUG, "SMBus controller enabled\n"); } int smbus_read_byte(u8 device, u8 address) diff --git a/src/southbridge/intel/i82801bx/early_smbus.c b/src/southbridge/intel/i82801bx/early_smbus.c index 26c9e85059..a87a4a7c2c 100644 --- a/src/southbridge/intel/i82801bx/early_smbus.c +++ b/src/southbridge/intel/i82801bx/early_smbus.c @@ -50,7 +50,7 @@ void enable_smbus(void) /* Clear any lingering errors, so transactions can run. */ outb(inb(SMBUS_IO_BASE + SMBHSTSTAT), SMBUS_IO_BASE + SMBHSTSTAT); - print_debug("SMBus controller enabled\n"); + printk(BIOS_DEBUG, "SMBus controller enabled\n"); } int smbus_read_byte(u8 device, u8 address) diff --git a/src/southbridge/intel/i82801cx/early_smbus.c b/src/southbridge/intel/i82801cx/early_smbus.c index b62db80f9c..5be63537af 100644 --- a/src/southbridge/intel/i82801cx/early_smbus.c +++ b/src/southbridge/intel/i82801cx/early_smbus.c @@ -5,7 +5,7 @@ static void enable_smbus(void) { device_t dev = PCI_DEV(0x0, 0x1f, 0x3); - print_debug("SMBus controller enabled\n"); + printk(BIOS_DEBUG, "SMBus controller enabled\n"); /* set smbus iobase */ pci_write_config32(dev, SMB_BASE, SMBUS_IO_BASE | PCI_BASE_ADDRESS_SPACE_IO); /* Set smbus enable */ diff --git a/src/southbridge/intel/i82801dx/early_smbus.c b/src/southbridge/intel/i82801dx/early_smbus.c index 6f4d4f8846..c61de85e5d 100644 --- a/src/southbridge/intel/i82801dx/early_smbus.c +++ b/src/southbridge/intel/i82801dx/early_smbus.c @@ -28,7 +28,7 @@ void enable_smbus(void) { device_t dev = PCI_DEV(0x0, 0x1f, 0x3); - print_debug("SMBus controller enabled\n"); + printk(BIOS_DEBUG, "SMBus controller enabled\n"); /* set smbus iobase */ pci_write_config32(dev, 0x20, SMBUS_IO_BASE | 1); /* Set smbus enable */ @@ -104,9 +104,9 @@ int smbus_read_byte(unsigned device, unsigned address) unsigned char global_status_register; unsigned char byte; - /* print_err("smbus_read_byte\n"); */ + /* printk(BIOS_ERR, "smbus_read_byte\n"); */ if (smbus_wait_until_ready() < 0) { - print_err("SMBUS not ready (-2)\n"); + printk(BIOS_ERR, "SMBUS not ready (-2)\n"); return -2; } @@ -132,13 +132,13 @@ int smbus_read_byte(unsigned device, unsigned address) SMBUS_IO_BASE + SMBHSTCTL); /* poll for it to start */ if (smbus_wait_until_active() < 0) { - print_err("SMBUS not active (-4)\n"); + printk(BIOS_ERR, "SMBUS not active (-4)\n"); return -4; } /* poll for transaction completion */ if (smbus_wait_until_done() < 0) { - print_err("SMBUS not completed (-3)\n"); + printk(BIOS_ERR, "SMBUS not completed (-3)\n"); return -3; } @@ -148,10 +148,10 @@ int smbus_read_byte(unsigned device, unsigned address) byte = inb(SMBUS_IO_BASE + SMBHSTDAT0); if (global_status_register != 2) { - //print_spew("%s: no device (%02x, %02x)\n", __func__, device, address); + //printk(BIOS_SPEW, "%s: no device (%02x, %02x)\n", __func__, device, address); return -1; } - //print_debug("%s: %02x@%02x = %02x\n", __func__, device, address, byte); + //printk(BIOS_DEBUG, "%s: %02x@%02x = %02x\n", __func__, device, address, byte); return byte; } diff --git a/src/southbridge/intel/i82801ex/early_smbus.c b/src/southbridge/intel/i82801ex/early_smbus.c index cdf1f62c57..979b8420a5 100644 --- a/src/southbridge/intel/i82801ex/early_smbus.c +++ b/src/southbridge/intel/i82801ex/early_smbus.c @@ -6,10 +6,10 @@ static void enable_smbus(void) { device_t dev = PCI_DEV(0x0, 0x1f, 0x3); - print_spew("SMBus controller enabled\n"); + printk(BIOS_SPEW, "SMBus controller enabled\n"); pci_write_config32(dev, 0x20, SMBUS_IO_BASE | 1); - print_debug_hex32(pci_read_config32(dev, 0x20)); + printk(BIOS_DEBUG, "%08x", pci_read_config32(dev, 0x20)); /* Set smbus enable */ pci_write_config8(dev, 0x40, 1); /* Set smbus iospace enable */ @@ -36,7 +36,7 @@ static void smbus_write_byte(unsigned device, unsigned address, unsigned char va return; } - print_debug("Unimplemented smbus_write_byte() called.\n"); + printk(BIOS_DEBUG, "Unimplemented smbus_write_byte() called.\n"); #if 0 /* setup transaction */ @@ -124,7 +124,7 @@ static int smbus_write_block(unsigned device, unsigned length, unsigned cmd, SMBUS_IO_BASE + SMBHSTSTAT); } - print_debug("SMBUS Block complete\n"); + printk(BIOS_DEBUG, "SMBUS Block complete\n"); return 0; } #endif diff --git a/src/southbridge/intel/i82801gx/early_smbus.c b/src/southbridge/intel/i82801gx/early_smbus.c index 8adc04df47..32eccae5a1 100644 --- a/src/southbridge/intel/i82801gx/early_smbus.c +++ b/src/southbridge/intel/i82801gx/early_smbus.c @@ -52,7 +52,7 @@ void enable_smbus(void) /* Clear any lingering errors, so transactions can run. */ outb(inb(SMBUS_IO_BASE + SMBHSTSTAT), SMBUS_IO_BASE + SMBHSTSTAT); - print_debug("SMBus controller enabled.\n"); + printk(BIOS_DEBUG, "SMBus controller enabled.\n"); } int smbus_read_byte(unsigned device, unsigned address) diff --git a/src/southbridge/intel/i82801ix/early_smbus.c b/src/southbridge/intel/i82801ix/early_smbus.c index 981ae5e224..0393c3d3f9 100644 --- a/src/southbridge/intel/i82801ix/early_smbus.c +++ b/src/southbridge/intel/i82801ix/early_smbus.c @@ -53,7 +53,7 @@ void enable_smbus(void) /* Clear any lingering errors, so transactions can run. */ outb(inb(SMBUS_IO_BASE + SMBHSTSTAT), SMBUS_IO_BASE + SMBHSTSTAT); - print_debug("SMBus controller enabled.\n"); + printk(BIOS_DEBUG, "SMBus controller enabled.\n"); } int smbus_read_byte(unsigned device, unsigned address) diff --git a/src/southbridge/intel/ibexpeak/early_smbus.c b/src/southbridge/intel/ibexpeak/early_smbus.c index f518f28ac2..cf02b9e6ee 100644 --- a/src/southbridge/intel/ibexpeak/early_smbus.c +++ b/src/southbridge/intel/ibexpeak/early_smbus.c @@ -52,7 +52,7 @@ void enable_smbus(void) /* Clear any lingering errors, so transactions can run. */ outb(inb(SMBUS_IO_BASE + SMBHSTSTAT), SMBUS_IO_BASE + SMBHSTSTAT); - print_debug("SMBus controller enabled.\n"); + printk(BIOS_DEBUG, "SMBus controller enabled.\n"); } int smbus_read_byte(unsigned device, unsigned address) diff --git a/src/southbridge/intel/lynxpoint/early_smbus.c b/src/southbridge/intel/lynxpoint/early_smbus.c index 616e7c3ba4..7ba2e88449 100644 --- a/src/southbridge/intel/lynxpoint/early_smbus.c +++ b/src/southbridge/intel/lynxpoint/early_smbus.c @@ -52,7 +52,7 @@ void enable_smbus(void) /* Clear any lingering errors, so transactions can run. */ outb(inb(SMBUS_IO_BASE + SMBHSTSTAT), SMBUS_IO_BASE + SMBHSTSTAT); - print_debug("SMBus controller enabled.\n"); + printk(BIOS_DEBUG, "SMBus controller enabled.\n"); } int smbus_read_byte(unsigned device, unsigned address) diff --git a/src/southbridge/intel/sch/early_smbus.c b/src/southbridge/intel/sch/early_smbus.c index 8adc04df47..32eccae5a1 100644 --- a/src/southbridge/intel/sch/early_smbus.c +++ b/src/southbridge/intel/sch/early_smbus.c @@ -52,7 +52,7 @@ void enable_smbus(void) /* Clear any lingering errors, so transactions can run. */ outb(inb(SMBUS_IO_BASE + SMBHSTSTAT), SMBUS_IO_BASE + SMBHSTSTAT); - print_debug("SMBus controller enabled.\n"); + printk(BIOS_DEBUG, "SMBus controller enabled.\n"); } int smbus_read_byte(unsigned device, unsigned address) |