From c02b4fc9db3c3c1e263027382697b566127f66bb Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Mon, 22 Mar 2010 11:42:32 +0000 Subject: printk_foo -> printk(BIOS_FOO, ...) Signed-off-by: Stefan Reinauer Acked-by: Ronald G. Minnich git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5266 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/southbridge/sis/sis966/sis761.c | 14 +++++++------- src/southbridge/sis/sis966/sis966_aza.c | 20 ++++++++++---------- src/southbridge/sis/sis966/sis966_early_smbus.c | 16 ++++++++-------- src/southbridge/sis/sis966/sis966_ide.c | 4 ++-- src/southbridge/sis/sis966/sis966_lpc.c | 10 +++++----- src/southbridge/sis/sis966/sis966_nic.c | 20 ++++++++++---------- src/southbridge/sis/sis966/sis966_sata.c | 2 +- src/southbridge/sis/sis966/sis966_usb2.c | 2 +- 8 files changed, 44 insertions(+), 44 deletions(-) (limited to 'src/southbridge/sis') diff --git a/src/southbridge/sis/sis966/sis761.c b/src/southbridge/sis/sis966/sis761.c index b4eb48d559f2..43a235b01fa0 100644 --- a/src/southbridge/sis/sis966/sis761.c +++ b/src/southbridge/sis/sis966/sis761.c @@ -72,27 +72,27 @@ static inline msr_t rdmsr(unsigned index) static void sis761_read_resources(device_t dev) { /* Read the generic PCI resources */ - printk_debug("sis761_read_resources ------->\n"); + printk(BIOS_DEBUG, "sis761_read_resources ------->\n"); pci_dev_read_resources(dev); /* If we are not the first processor don't allocate the gart apeture */ if (dev->path.pci.devfn != PCI_DEVFN(0x0, 0)) { - printk_debug("sis761_not_the_first_processor !!!\n"); + printk(BIOS_DEBUG, "sis761_not_the_first_processor !!!\n"); return; } - printk_debug("sis761_read_resources <-------\n"); + printk(BIOS_DEBUG, "sis761_read_resources <-------\n"); return; } static void sis761_set_resources(device_t dev) { - printk_debug("sis761_set_resources ------->\n"); + printk(BIOS_DEBUG, "sis761_set_resources ------->\n"); /* Set the generic PCI resources */ pci_dev_set_resources(dev); - printk_debug("sis761_set_resources <-------\n"); + printk(BIOS_DEBUG, "sis761_set_resources <-------\n"); } static void sis761_init(struct device *dev) @@ -102,14 +102,14 @@ static void sis761_init(struct device *dev) needs_reset = 0; - printk_debug("sis761_init: ---------->\n"); + printk(BIOS_DEBUG, "sis761_init: ---------->\n"); msr = rdmsr(0xC001001A); pci_write_config16(dev, 0x8E, msr.lo >> 16); // Topbound pci_write_config8(dev, 0x7F, 0x08); // ACPI Base outb(inb(0x856) | 0x40, 0x856); // Auto-Reset Function - printk_debug("sis761_init: <----------\n"); + printk(BIOS_DEBUG, "sis761_init: <----------\n"); } diff --git a/src/southbridge/sis/sis966/sis966_aza.c b/src/southbridge/sis/sis966/sis966_aza.c index 1dc91ae45d47..013f5895c149 100644 --- a/src/southbridge/sis/sis966/sis966_aza.c +++ b/src/southbridge/sis/sis966/sis966_aza.c @@ -101,23 +101,23 @@ static int codec_detect(uint8_t *base) int idx=0; /* 1 */ // controller reset - printk_debug("controller reset\n"); + printk(BIOS_DEBUG, "controller reset\n"); set_bits(base + 0x08, 1, 1); do{ dword = read32(base + 0x08)&0x1; - if(idx++>1000) { printk_debug("controller reset fail !!! \n"); break;} + if(idx++>1000) { printk(BIOS_DEBUG, "controller reset fail !!! \n"); break;} } while (dword !=1); dword=send_verb(base,0x000F0000); // get codec VendorId and DeviceId if(dword==0) { - printk_debug("No codec!\n"); + printk(BIOS_DEBUG, "No codec!\n"); return 0; } - printk_debug("Codec ID = %lx\n", dword); + printk(BIOS_DEBUG, "Codec ID = %lx\n", dword); dword=0x1; return dword; @@ -219,20 +219,20 @@ static void codec_init(uint8_t *base, int addr) dword = read32(base + 0x64); /* 2 */ - printk_debug("codec viddid: %08x\n", dword); + printk(BIOS_DEBUG, "codec viddid: %08x\n", dword); verb_size = find_verb(dword, &verb); if(!verb_size) { - printk_debug("No verb!\n"); + printk(BIOS_DEBUG, "No verb!\n"); return; } - printk_debug("verb_size: %d\n", verb_size); + printk(BIOS_DEBUG, "verb_size: %d\n", verb_size); /* 3 */ for(i=0; ibase; - printk_debug("base = %08x\n", base); + printk(BIOS_DEBUG, "base = %08x\n", base); codec_mask = codec_detect(base); if(codec_mask) { - printk_debug("codec_mask = %02x\n", codec_mask); + printk(BIOS_DEBUG, "codec_mask = %02x\n", codec_mask); codecs_init(base, codec_mask); } diff --git a/src/southbridge/sis/sis966/sis966_early_smbus.c b/src/southbridge/sis/sis966/sis966_early_smbus.c index cb6358bf8b35..98b824f88a51 100644 --- a/src/southbridge/sis/sis966/sis966_early_smbus.c +++ b/src/southbridge/sis/sis966/sis966_early_smbus.c @@ -481,23 +481,23 @@ void sis_init_stage2(void) // ========================== NB ============================= - printk_debug("Init NorthBridge sis761 -------->\n"); + printk(BIOS_DEBUG, "Init NorthBridge sis761 -------->\n"); dev = pci_locate_device(PCI_ID(PCI_VENDOR_ID_SIS, PCI_DEVICE_ID_SIS_SIS761), 0); msr = rdmsr(0xC001001A); - printk_debug("Memory Top Bound %lx\n",msr.lo ); + printk(BIOS_DEBUG, "Memory Top Bound %lx\n",msr.lo ); temp16=(pci_read_config8(dev, 0x4C) & 0xE0) >> 5; temp16=0x0001<<(temp16-1); temp16<<=8; - printk_debug("Integrated VGA Shared memory size=%dM bytes\n", temp16 >> 4); + printk(BIOS_DEBUG, "Integrated VGA Shared memory size=%dM bytes\n", temp16 >> 4); pci_write_config16(dev, 0x8E, (msr.lo >> 16) -temp16*1); pci_write_config8(dev, 0x7F, 0x08); // ACPI Base outb(inb(0x856) | 0x40, 0x856); // Auto-Reset Function // ========================== ACPI ============================= i=0; - printk_debug("Init ACPI -------->\n"); + printk(BIOS_DEBUG, "Init ACPI -------->\n"); do { temp8 = inb(0x800 + SiS_ACPI_2_init[i][0]); temp8 &= SiS_ACPI_2_init[i][1]; @@ -507,7 +507,7 @@ void sis_init_stage2(void) }while(SiS_ACPI_2_init[i][0] != 0); // ========================== Misc ============================= - printk_debug("Init Misc -------->\n"); + printk(BIOS_DEBUG, "Init Misc -------->\n"); dev = pci_locate_device(PCI_ID(PCI_VENDOR_ID_SIS, PCI_DEVICE_ID_SIS_SIS966_LPC), 0); /* R77h Internal PCI Device Enable 1 (Power On Value = 0h) @@ -533,7 +533,7 @@ void sis_init_stage2(void) pci_write_config8(dev, 0x7E, 0x00); // azalia controller enable temp8=inb(0x878)|0x4; //bit2=1 enable Azalia =0 enable AC97 outb(temp8, 0x878); // ACPI select AC97 or HDA controller - printk_debug("Audio select %x\n",inb(0x878)); + printk(BIOS_DEBUG, "Audio select %x\n",inb(0x878)); dev = pci_locate_device(PCI_ID(PCI_VENDOR_ID_SIS, PCI_DEVICE_ID_SIS_SIS966_SATA), 0); @@ -550,7 +550,7 @@ static void enable_smbus(void) { device_t dev; uint8_t temp8; - printk_debug("enable_smbus -------->\n"); + printk(BIOS_DEBUG, "enable_smbus -------->\n"); dev = pci_locate_device(PCI_ID(PCI_VENDOR_ID_SIS, PCI_DEVICE_ID_SIS_SIS966_LPC), 0); @@ -561,7 +561,7 @@ static void enable_smbus(void) temp8=pci_read_config8(dev, 0x76); // Enable SMBUS pci_write_config8(dev, 0x76, temp8 | 0x03); - printk_debug("enable_smbus <--------\n"); + printk(BIOS_DEBUG, "enable_smbus <--------\n"); } static int smbus_read_byte(unsigned device, unsigned address) diff --git a/src/southbridge/sis/sis966/sis966_ide.c b/src/southbridge/sis/sis966/sis966_ide.c index 62841e50985a..1ee583f8892b 100644 --- a/src/southbridge/sis/sis966/sis966_ide.c +++ b/src/southbridge/sis/sis966/sis966_ide.c @@ -123,12 +123,12 @@ print_debug("IDE_INIT:---------->\n"); if (conf->ide1_enable) { /* Enable secondary ide interface */ word |= (1<<0); - printk_debug("IDE1 \t"); + printk(BIOS_DEBUG, "IDE1 \t"); } if (conf->ide0_enable) { /* Enable primary ide interface */ word |= (1<<1); - printk_debug("IDE0\n"); + printk(BIOS_DEBUG, "IDE0\n"); } word |= (1<<12); diff --git a/src/southbridge/sis/sis966/sis966_lpc.c b/src/southbridge/sis/sis966/sis966_lpc.c index 0786fcda79e0..c23e6289706d 100644 --- a/src/southbridge/sis/sis966/sis966_lpc.c +++ b/src/southbridge/sis/sis966/sis966_lpc.c @@ -92,7 +92,7 @@ static void lpc_init(device_t dev) int on; int nmi_option; - printk_debug("LPC_INIT -------->\n"); + printk(BIOS_DEBUG, "LPC_INIT -------->\n"); pc_keyboard_init(0); lpc_usb_legacy_init(dev); @@ -109,7 +109,7 @@ static void lpc_init(device_t dev) byte |= 0x40; } pci_write_config8(dev, PREVIOUS_POWER_STATE, byte); - printk_info("set power %s after power fail\n", on?"on":"off"); + printk(BIOS_INFO, "set power %s after power fail\n", on?"on":"off"); /* Throttle the CPU speed down for testing */ on = SLOW_CPU_OFF; @@ -121,7 +121,7 @@ static void lpc_init(device_t dev) outl(((on<<1)+0x10) ,(pm10_bar + 0x10)); dword = inl(pm10_bar + 0x10); on = 8-on; - printk_debug("Throttling CPU %2d.%1.1d percent.\n", + printk(BIOS_DEBUG, "Throttling CPU %2d.%1.1d percent.\n", (on*12)+(on>>1),(on&1)*5); } @@ -151,7 +151,7 @@ static void lpc_init(device_t dev) /* Initialize isa dma */ isa_dma_init(); - printk_debug("LPC_INIT <--------\n"); + printk(BIOS_DEBUG, "LPC_INIT <--------\n"); } static void sis966_lpc_read_resources(device_t dev) @@ -214,7 +214,7 @@ static void sis966_lpc_enable_childrens_resources(device_t dev) if(!(res->flags & IORESOURCE_IO)) continue; base = res->base; end = resource_end(res); - printk_debug("sis966 lpc decode:%s, base=0x%08x, end=0x%08x\n",dev_path(child),base, end); + printk(BIOS_DEBUG, "sis966 lpc decode:%s, base=0x%08x, end=0x%08x\n",dev_path(child),base, end); switch(base) { case 0x3f8: // COM1 reg |= (1<<0); break; diff --git a/src/southbridge/sis/sis966/sis966_nic.c b/src/southbridge/sis/sis966/sis966_nic.c index 9fadcf941948..62017360e748 100644 --- a/src/southbridge/sis/sis966/sis966_nic.c +++ b/src/southbridge/sis/sis966/sis966_nic.c @@ -75,12 +75,12 @@ static void readApcMacAddr(void) outl(0x80001048,0xcf8); outl((inl(0xcfc) & 0xfffffffd),0xcfc ); // enable IO78/79h for APC Index/Data - printk_debug("MAC addr in APC = "); + printk(BIOS_DEBUG, "MAC addr in APC = "); for(i = 0x9 ; i <=0xe ; i++) { - printk_debug("%2.2x",readApcByte(i)); + printk(BIOS_DEBUG, "%2.2x",readApcByte(i)); } - printk_debug("\n"); + printk(BIOS_DEBUG, "\n"); /* Set APC Reload */ writeApcByte(0x7,readApcByte(0x7)&0xf7); @@ -192,7 +192,7 @@ static int phy_read(uint32_t base, unsigned phy_addr, unsigned phy_reg) mdelay(20); ulValue = read32(base+0x44); } while((ulValue & SMI_REQUEST) != 0); - //printk_debug("base %x cmd %lx ret val %lx\n", tmp,Read_Cmd,ulValue); + //printk(BIOS_DEBUG, "base %x cmd %lx ret val %lx\n", tmp,Read_Cmd,ulValue); usData=(ulValue>>16); @@ -227,7 +227,7 @@ static int phy_detect(uint32_t base,uint16_t *PhyAddr) //BOOL PHY_Detect() if(!bFoundPhy) { - printk_debug("PHY not found !!!! \n"); + printk(BIOS_DEBUG, "PHY not found !!!! \n"); } *PhyAddr=PhyAddress; @@ -270,15 +270,15 @@ static void nic_init(struct device *dev) if(!res) { - printk_debug("NIC Cannot find resource..\r\n"); + printk(BIOS_DEBUG, "NIC Cannot find resource..\r\n"); return; } base = res->base; - printk_debug("NIC base address %lx\n",base); + printk(BIOS_DEBUG, "NIC base address %lx\n",base); if(!(val=phy_detect(base,&PhyAddr))) { - printk_debug("PHY detect fail !!!!\r\n"); + printk(BIOS_DEBUG, "PHY detect fail !!!!\r\n"); return; } @@ -291,7 +291,7 @@ static void nic_init(struct device *dev) // if that is valid we will use that - printk_debug("EEPROM contents %x \n",ReadEEprom( dev, base, 0LL)); + printk(BIOS_DEBUG, "EEPROM contents %x \n",ReadEEprom( dev, base, 0LL)); for(i=0;i<3;i++) { //status = smbus_read_byte(dev_eeprom, i); ulValue=ReadEEprom( dev, base, i+3L); @@ -302,7 +302,7 @@ static void nic_init(struct device *dev) } }else{ // read MAC address from firmware - printk_debug("EEPROM invalid!!\nReg 0x38h=%.8lx \n",ulValue); + printk(BIOS_DEBUG, "EEPROM invalid!!\nReg 0x38h=%.8lx \n",ulValue); MacAddr[0]=read16(0xffffffc0); // mac address store at here MacAddr[1]=read16(0xffffffc2); MacAddr[2]=read16(0xffffffc4); diff --git a/src/southbridge/sis/sis966/sis966_sata.c b/src/southbridge/sis/sis966/sis966_sata.c index b15869c677ee..7fcee82f29eb 100644 --- a/src/southbridge/sis/sis966/sis966_sata.c +++ b/src/southbridge/sis/sis966/sis966_sata.c @@ -141,7 +141,7 @@ for (i=0;i<10;i++){ temp32=0; temp32= pci_read_config32(dev, 0xC0); for ( j=0;j<0xFFFF;j++); - printk_debug("status= %x\n",temp32); + printk(BIOS_DEBUG, "status= %x\n",temp32); if (((temp32&0xF) == 0x3) || ((temp32&0xF) == 0x0)) break; } diff --git a/src/southbridge/sis/sis966/sis966_usb2.c b/src/southbridge/sis/sis966/sis966_usb2.c index 35dec1345321..437583d12f50 100644 --- a/src/southbridge/sis/sis966/sis966_usb2.c +++ b/src/southbridge/sis/sis966/sis966_usb2.c @@ -95,7 +95,7 @@ static void usb2_init(struct device *dev) return; base =(uint8_t *) res->base; - printk_debug("base = %08x\n", base); + printk(BIOS_DEBUG, "base = %08x\n", base); write32(base+0x20, 0x2); //----------------------------------------------------------- -- cgit v1.2.3