diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2017-06-24 14:17:22 -0500 |
---|---|---|
committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2017-06-26 14:28:58 +1000 |
commit | 7fab123bff59c44650b4b9c6a45c4884ed7ea2bd (patch) | |
tree | 9292560e8147aa9a347308415cfafa7395a6be4f /hw | |
parent | 562a10caf48c91c673f5e78289894dfbfe326884 (diff) | |
download | skiboot-7fab123bff59c44650b4b9c6a45c4884ed7ea2bd.zip skiboot-7fab123bff59c44650b4b9c6a45c4884ed7ea2bd.tar.gz skiboot-7fab123bff59c44650b4b9c6a45c4884ed7ea2bd.tar.bz2 |
Big log level reduction...
90% of what we print isn't useful to a normal user. This
dramatically reduces the amount of messages printed by
OPAL in normal circumstances.
We still need to add a way to bump the log level at boot
based on a BMC scratch register or some HDAT property.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Michael Neuling <mikey@neuling.org>
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Diffstat (limited to 'hw')
-rw-r--r-- | hw/lpc.c | 7 | ||||
-rw-r--r-- | hw/phb4.c | 18 | ||||
-rw-r--r-- | hw/phys-map.c | 2 | ||||
-rw-r--r-- | hw/psi.c | 4 | ||||
-rw-r--r-- | hw/slw.c | 4 | ||||
-rw-r--r-- | hw/xscom.c | 16 |
6 files changed, 24 insertions, 27 deletions
@@ -1186,8 +1186,8 @@ static void lpc_init_chip_p9(struct dt_node *opb_node) val &= 0xf0000000; opb_write(lpc, opb_master_reg_base + 0xc, val, 4); - printf("LPC[%03x]: Initialized, access via MMIO @%p\n", - gcid, lpc->mbase); + prlog(PR_INFO, "LPC[%03x]: Initialized\n", gcid); + prlog(PR_DEBUG,"access via MMIO @%p\n", lpc->mbase); chip->lpc = lpc; } @@ -1210,7 +1210,8 @@ void lpc_init(void) } } if (lpc_default_chip_id >= 0) - printf("LPC: Default bus on chip 0x%x\n", lpc_default_chip_id); + prlog(PR_DEBUG, "Default bus on chip 0x%x\n", + lpc_default_chip_id); if (has_lpc) { opal_register(OPAL_LPC_WRITE, opal_lpc_write, 5); @@ -308,9 +308,10 @@ static int64_t phb4_rc_write(struct phb4 *p, uint32_t offset, uint8_t sz, break; } - if (old != oldold) - PHBDBG(p, "Rewrote %x to %x for reg %x for W1C\n", - oldold, old, reg); + if (old != oldold) { + PHBLOGCFG(p, "Rewrote %x to %x for reg %x for W1C\n", + oldold, old, reg); + } if (sz == 1) { shift = (offset & 3) << 3; @@ -4259,7 +4260,7 @@ static void phb4_probe_stack(struct dt_node *stk_node, uint32_t pec_index, stk_index = dt_prop_get_u32(stk_node, "reg"); phb_num = dt_prop_get_u32(stk_node, "ibm,phb-index"); path = dt_get_path(stk_node); - prlog(PR_NOTICE, "PHB: Chip %d Found PHB4 PBCQ%d Stack %d at %s\n", + prlog(PR_INFO, "PHB: Chip %d Found PHB4 PBCQ%d Stack %d at %s\n", gcid, pec_index, stk_index, path); free(path); @@ -4297,11 +4298,6 @@ static void phb4_probe_stack(struct dt_node *stk_node, uint32_t pec_index, xscom_write(gcid, nest_stack + XPEC_NEST_STK_MMIO_BAR1_MASK, mmio1_bmask << 8); bar_en |= XPEC_NEST_STK_BAR_EN_MMIO0 | XPEC_NEST_STK_BAR_EN_MMIO1; - prlog(PR_ERR, "PHB[%d:%d] PHB@0x%016llx IRQ@0x%016llx\n", - gcid, phb_num, phb_bar, irq_bar); - prlog(PR_ERR, "PHB[%d:%d] MMIO0@0x%016llx MMIO1@0x%016llx \n", - gcid, phb_num, mmio0_bar, mmio1_bar); - /* Build MMIO windows list */ mmio_win_sz = 0; if (mmio0_bar) { @@ -4328,13 +4324,13 @@ static void phb4_probe_stack(struct dt_node *stk_node, uint32_t pec_index, /* Check ETU reset */ xscom_read(gcid, pci_stack + XPEC_PCI_STK_ETU_RESET, &val); - prlog_once(PR_ERR, "ETU reset: %llx\n", val); + prlog_once(PR_DEBUG, "ETU reset: %llx\n", val); xscom_write(gcid, pci_stack + XPEC_PCI_STK_ETU_RESET, 0); time_wait_ms(1); // show we can read phb mmio space foo = (void *)(phb_bar + 0x800); // phb version register - prlog_once(PR_ERR, "Version reg: 0x%016llx\n", in_be64(foo)); + prlog_once(PR_DEBUG, "Version reg: 0x%016llx\n", in_be64(foo)); /* Create PHB node */ reg[0] = phb_bar; diff --git a/hw/phys-map.c b/hw/phys-map.c index 0fbd60d..8cccbf0 100644 --- a/hw/phys-map.c +++ b/hw/phys-map.c @@ -195,7 +195,7 @@ void phys_map_init(void) phys_map = &phys_map_nimbus; } - prlog(PR_NOTICE, "Assigning physical memory map table for %s\n", name); + prlog(PR_DEBUG, "Assigning physical memory map table for %s\n", name); } @@ -1108,8 +1108,8 @@ static bool psi_init_psihb(struct dt_node *psihb) psi_init_interrupts(psi); psi_create_mm_dtnode(psi); - printf("PSI[0x%03x]: Found PSI bridge [active=%d]\n", - psi->chip_id, psi->active); + prlog(PR_INFO, "PSI[0x%03x]: Found PSI bridge [active=%d]\n", + psi->chip_id, psi->active); return true; } @@ -307,7 +307,7 @@ static bool slw_set_overrides_p9(struct proc_chip *chip, struct cpu_thread *c) rc = xscom_read(chip->id, XSCOM_ADDR_P9_EC_SLAVE(core, EC_PPM_SPECIAL_WKUP_HYP), &tmp); - prlog(PR_NOTICE, "SLW: EC_PPM_SPECIAL_WKUP_HYP read 0x%016llx\n", tmp); + prlog(PR_DEBUG, "SLW: EC_PPM_SPECIAL_WKUP_HYP read 0x%016llx\n", tmp); rc = xscom_read(chip->id, XSCOM_ADDR_P9_EC_SLAVE(core, EC_PPM_SPECIAL_WKUP_OTR), &tmp); @@ -1145,7 +1145,7 @@ static void slw_init_chip_p9(struct proc_chip *chip) { struct cpu_thread *c; - prlog(PR_NOTICE, "SLW: Init chip 0x%x\n", chip->id); + prlog(PR_DEBUG, "SLW: Init chip 0x%x\n", chip->id); /* At power ON setup inits for power-mgt */ for_each_available_core_in_chip(c, chip->id) @@ -740,11 +740,11 @@ void xscom_init(void) else chip_name = chip_names[chip->type]; - printf("XSCOM: chip 0x%x at 0x%llx [%s DD%x.%x]\n", - gcid, chip->xscom_base, - chip_name, - chip->ec_level >> 4, - chip->ec_level & 0xf); + /* We keep a "CHIP" prefix to make the log more user-friendly */ + prlog(PR_NOTICE, "CHIP: Chip ID %04x type: %s DD%x.%x\n", + gcid, chip_name, chip->ec_level >> 4, + chip->ec_level & 0xf); + prlog(PR_DEBUG, "XSCOM: Base address: 0x%llx\n", chip->xscom_base); } /* Collect details to trigger xstop via XSCOM write */ @@ -752,10 +752,10 @@ void xscom_init(void) if (p) { xstop_xscom.addr = dt_property_get_cell(p, 0); xstop_xscom.fir_bit = dt_property_get_cell(p, 1); - prlog(PR_INFO, "XSTOP: XSCOM addr = 0x%llx, FIR bit = %lld\n", - xstop_xscom.addr, xstop_xscom.fir_bit); + prlog(PR_DEBUG, "XSTOP: XSCOM addr = 0x%llx, FIR bit = %lld\n", + xstop_xscom.addr, xstop_xscom.fir_bit); } else - prlog(PR_INFO, "XSTOP: ibm,sw-checkstop-fir prop not found\n"); + prlog(PR_DEBUG, "XSTOP: ibm,sw-checkstop-fir prop not found\n"); } void xscom_used_by_console(void) |