printk_foo -> printk(BIOS_FOO, ...)

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5266 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

1 files changed, 20 insertions, 20 deletions

diff --git a/src/devices/hypertransport.c b/src/devices/hypertransport.c
index f5ac1a6c27..bb91249908 100644
--- a/src/devices/hypertransport.c
+++ b/src/devices/hypertransport.c
@@ -192,11 +192,11 @@ static int ht_setup_link(struct ht_link *prev, device_t dev, unsigned pos)
 		unsigned new_freq;
 		pci_write_config8(cur->dev, cur->pos + cur->freq_off, freq);
 		reset_needed = 1;
-		printk_spew("HyperT FreqP old %x new %x\n",old_freq,freq);
+		printk(BIOS_SPEW, "HyperT FreqP old %x new %x\n",old_freq,freq);
 		new_freq = pci_read_config8(cur->dev, cur->pos + cur->freq_off);
 		new_freq &= 0x0f;
 		if (new_freq != freq) {
-			printk_err("%s Hypertransport frequency would not set wanted: %x got: %x\n",
+			printk(BIOS_ERR, "%s Hypertransport frequency would not set wanted: %x got: %x\n",
 				dev_path(dev), freq, new_freq);
 		}
 	}
@@ -206,10 +206,10 @@ static int ht_setup_link(struct ht_link *prev, device_t dev, unsigned pos)
 		pci_write_config8(cur->dev, cur->pos + cur->config_off + 1,
 			present_width);
 		reset_needed = 1;
-		printk_spew("HyperT widthP old %x new %x\n",old_width, present_width);
+		printk(BIOS_SPEW, "HyperT widthP old %x new %x\n",old_width, present_width);
 		new_width = pci_read_config8(cur->dev, cur->pos + cur->config_off + 1);
 		if (new_width != present_width) {
-			printk_err("%s Hypertransport width would not set wanted: %x got: %x\n",
+			printk(BIOS_ERR, "%s Hypertransport width would not set wanted: %x got: %x\n",
 				dev_path(dev), present_width, new_width);
 		}
 	}
@@ -221,11 +221,11 @@ static int ht_setup_link(struct ht_link *prev, device_t dev, unsigned pos)
 		unsigned new_freq;
 		pci_write_config8(prev->dev, prev->pos + prev->freq_off, freq);
 		reset_needed = 1;
-		printk_spew("HyperT freqU old %x new %x\n", old_freq, freq);
+		printk(BIOS_SPEW, "HyperT freqU old %x new %x\n", old_freq, freq);
 		new_freq = pci_read_config8(prev->dev, prev->pos + prev->freq_off);
 		new_freq &= 0x0f;
 		if (new_freq != freq) {
-			printk_err("%s Hypertransport frequency would not set wanted: %x got: %x\n",
+			printk(BIOS_ERR, "%s Hypertransport frequency would not set wanted: %x got: %x\n",
 				dev_path(prev->dev), freq, new_freq);
 		}
 	}
@@ -234,10 +234,10 @@ static int ht_setup_link(struct ht_link *prev, device_t dev, unsigned pos)
 		unsigned new_width;
 		pci_write_config8(prev->dev, prev->pos + prev->config_off + 1, upstream_width);
 		reset_needed = 1;
-		printk_spew("HyperT widthU old %x new %x\n", old_width, upstream_width);
+		printk(BIOS_SPEW, "HyperT widthU old %x new %x\n", old_width, upstream_width);
 		new_width = pci_read_config8(prev->dev, prev->pos + prev->config_off + 1);
 		if (new_width != upstream_width) {
-			printk_err("%s Hypertransport width would not set wanted: %x got: %x\n",
+			printk(BIOS_ERR, "%s Hypertransport width would not set wanted: %x got: %x\n",
 				dev_path(prev->dev), upstream_width, new_width);
 		}
 	}
@@ -273,7 +273,7 @@ static unsigned ht_lookup_slave_capability(struct device *dev)
 		if (pos) {
 			unsigned flags;
 			flags = pci_read_config16(dev, pos + PCI_CAP_FLAGS);
-			printk_spew("flags: 0x%04x\n", flags);
+			printk(BIOS_SPEW, "flags: 0x%04x\n", flags);
 			if ((flags >> 13) == 0) {
 				/* Entry is a Slave secondary, success... */
 				break;
@@ -317,7 +317,7 @@ static void ht_collapse_early_enumeration(struct bus *bus, unsigned offset_uniti
 			pci_write_config16(prev.dev, prev.pos + prev.ctrl_off, ctrl);
 			ctrl = pci_read_config16(prev.dev, prev.pos + prev.ctrl_off);
 			if (ctrl & ((1 << 4) | (1 << 8))) {
-				printk_alert("Detected error on Hypertransport Link\n");
+				printk(BIOS_ALERT, "Detected error on Hypertransport Link\n");
 				return;
 			}
 		}
@@ -371,7 +371,7 @@ static void ht_collapse_early_enumeration(struct bus *bus, unsigned offset_uniti
 		flags = pci_read_config16(&dummy, pos + PCI_CAP_FLAGS);
 		flags &= ~0x1f;
 		pci_write_config16(&dummy, pos + PCI_CAP_FLAGS, flags);
-		printk_spew("Collapsing %s [%04x/%04x]\n", 
+		printk(BIOS_SPEW, "Collapsing %s [%04x/%04x]\n", 
 			dev_path(&dummy), dummy.vendor, dummy.device);
 	}
 }
@@ -441,7 +441,7 @@ unsigned int hypertransport_scan_chain(struct bus *bus,
 				pci_write_config16(prev.dev, prev.pos + prev.ctrl_off, ctrl);
 				ctrl = pci_read_config16(prev.dev, prev.pos + prev.ctrl_off);
 				if (ctrl & ((1 << 4) | (1 << 8))) {
-					printk_alert("Detected error on Hypertransport Link\n");
+					printk(BIOS_ALERT, "Detected error on Hypertransport Link\n");
 					goto end_of_chain;
 				}
 			}
@@ -462,7 +462,7 @@ unsigned int hypertransport_scan_chain(struct bus *bus,
 		/* Find the hypertransport link capability */
 		pos = ht_lookup_slave_capability(dev);
 		if (pos == 0) {
-			printk_err("%s Hypertransport link capability not found", 
+			printk(BIOS_ERR, "%s Hypertransport link capability not found", 
 				dev_path(dev));
 			break;
 		}
@@ -507,7 +507,7 @@ unsigned int hypertransport_scan_chain(struct bus *bus,
 			last_func = func;
 		}
 		/* Compute the number of unitids consumed */
-		printk_spew("%s count: %04x static_count: %04x\n", 
+		printk(BIOS_SPEW, "%s count: %04x static_count: %04x\n", 
 			dev_path(dev), count, static_count);
 		if (count < static_count) {
 			count = static_count;
@@ -532,7 +532,7 @@ unsigned int hypertransport_scan_chain(struct bus *bus,
 		/* Setup the hypetransport link */
 		bus->reset_needed |= ht_setup_link(&prev, dev, pos);
 
-		printk_debug("%s [%04x/%04x] %s next_unitid: %04x\n",
+		printk(BIOS_DEBUG, "%s [%04x/%04x] %s next_unitid: %04x\n",
 			dev_path(dev),
 			dev->vendor, dev->device, 
 			(dev->enabled? "enabled": "disabled"), next_unitid);
@@ -541,10 +541,10 @@ unsigned int hypertransport_scan_chain(struct bus *bus,
  end_of_chain:
 #if OPT_HT_LINK == 1
 	if(bus->reset_needed) {
-		printk_info("HyperT reset needed\n");
+		printk(BIOS_INFO, "HyperT reset needed\n");
 	}
 	else {
-		printk_debug("HyperT reset not needed\n");
+		printk(BIOS_DEBUG, "HyperT reset not needed\n");
 	}
 #endif
 
@@ -563,7 +563,7 @@ unsigned int hypertransport_scan_chain(struct bus *bus,
 
 		ht_unitid_base[ht_dev_num-1] = CONFIG_HT_CHAIN_END_UNITID_BASE; // update last one
 		
-		printk_debug(" unitid: %04x --> %04x\n",
+		printk(BIOS_DEBUG, " unitid: %04x --> %04x\n",
 				real_last_unitid, CONFIG_HT_CHAIN_END_UNITID_BASE);
 
         }
@@ -583,9 +583,9 @@ unsigned int hypertransport_scan_chain(struct bus *bus,
 	if(old_devices) {
 		device_t left;
 		for(left = old_devices; left; left = left->sibling) {
-			printk_debug("%s\n", dev_path(left));
+			printk(BIOS_DEBUG, "%s\n", dev_path(left));
 		}
-		printk_err("HT: Left over static devices.  Check your Config.lb\n");
+		printk(BIOS_ERR, "HT: Left over static devices.  Check your Config.lb\n");
 		if(last_func  && !last_func->sibling) // put back the left over static device, and let pci_scan_bus disable it
 			last_func->sibling = old_devices; 
 	}