From patchwork Mon Jun 4 06:09:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stewart Smith X-Patchwork-Id: 924823 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40zl0B2LYQz9rxs for ; Mon, 4 Jun 2018 16:10:02 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 40zl096V7mzF0lJ for ; Mon, 4 Jun 2018 16:10:01 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=linux.ibm.com (client-ip=148.163.156.1; helo=mx0a-001b2d01.pphosted.com; envelope-from=stewart@linux.ibm.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 40zl033tJ0zDrYf for ; Mon, 4 Jun 2018 16:09:55 +1000 (AEST) Received: from pps.filterd (m0098393.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w5469GB6001786 for ; Mon, 4 Jun 2018 02:09:52 -0400 Received: from e36.co.us.ibm.com (e36.co.us.ibm.com [32.97.110.154]) by mx0a-001b2d01.pphosted.com with ESMTP id 2jcuxkfd4u-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 04 Jun 2018 02:09:52 -0400 Received: from localhost by e36.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 4 Jun 2018 00:09:52 -0600 Received: from b03cxnp08028.gho.boulder.ibm.com (9.17.130.20) by e36.co.us.ibm.com (192.168.1.136) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Mon, 4 Jun 2018 00:09:49 -0600 Received: from b03ledav003.gho.boulder.ibm.com (b03ledav003.gho.boulder.ibm.com [9.17.130.234]) by b03cxnp08028.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w5469mHM6685178 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Sun, 3 Jun 2018 23:09:48 -0700 Received: from b03ledav003.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 756D86A057 for ; Mon, 4 Jun 2018 00:09:48 -0600 (MDT) Received: from b03ledav003.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0C0B16A054 for ; Mon, 4 Jun 2018 00:09:46 -0600 (MDT) Received: from birb.localdomain (unknown [9.102.53.161]) by b03ledav003.gho.boulder.ibm.com (Postfix) with SMTP for ; Mon, 4 Jun 2018 00:09:46 -0600 (MDT) Received: by birb.localdomain (Postfix, from userid 1000) id 872F34EC62E; Mon, 4 Jun 2018 16:09:36 +1000 (AEST) From: Stewart Smith To: skiboot@lists.ozlabs.org Date: Mon, 4 Jun 2018 16:09:35 +1000 X-Mailer: git-send-email 2.17.1 X-TM-AS-GCONF: 00 x-cbid: 18060406-0020-0000-0000-00000E168F2C X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00009126; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000265; SDB=6.01042044; UDB=6.00533554; IPR=6.00821175; MB=3.00021450; MTD=3.00000008; XFM=3.00000015; UTC=2018-06-04 06:09:50 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18060406-0021-0000-0000-000061BD787D Message-Id: <20180604060935.7346-1-stewart@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2018-06-04_05:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1805220000 definitions=main-1806040077 Subject: [Skiboot] [PATCH] Quieten console output on boot X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" We print out a whole bunch of things on boot, most of which aren't interesting, so we should *not* print them instead. Printing things like what CPUs we found and what PCI devices we found *are* useful, so continue to do that. But we don't need to splat out a bunch of things that are always going to be true. Signed-off-by: Stewart Smith --- core/console.c | 2 +- core/nvram.c | 4 ++-- hdata/spira.c | 2 +- hw/bt.c | 2 +- hw/lpc-uart.c | 2 +- hw/nx-compress.c | 2 +- hw/slw.c | 2 +- hw/vas.c | 2 +- hw/xscom.c | 6 +++--- libstb/secureboot.c | 4 ++-- libstb/trustedboot.c | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/core/console.c b/core/console.c index e8256758927a..0e9bc4593cc2 100644 --- a/core/console.c +++ b/core/console.c @@ -338,7 +338,7 @@ void init_opal_console(void) opal_con_driver = &dummy_opal_con; } - prlog(PR_NOTICE, "OPAL: Using %s\n", opal_con_driver->name); + prlog(PR_INFO, "OPAL: Using %s\n", opal_con_driver->name); if (opal_con_driver->init) opal_con_driver->init(); diff --git a/core/nvram.c b/core/nvram.c index 1c3cdfaf4d93..c2158216a91b 100644 --- a/core/nvram.c +++ b/core/nvram.c @@ -170,9 +170,9 @@ void nvram_init(void) prerror("NVRAM: Error %d retrieving nvram info\n", rc); return; } - printf("NVRAM: Size is %d KB\n", nvram_size >> 10); + prlog(PR_INFO, "NVRAM: Size is %d KB\n", nvram_size >> 10); if (nvram_size > 0x100000) { - printf("NVRAM: Cropping to 1MB !\n"); + prlog(PR_WARNING, "NVRAM: Cropping to 1MB !\n"); nvram_size = 0x100000; } diff --git a/hdata/spira.c b/hdata/spira.c index b3894672efea..d459df7c8cec 100644 --- a/hdata/spira.c +++ b/hdata/spira.c @@ -1631,7 +1631,7 @@ static void fixup_spira(void) if (!HDIF_check(&spiras->hdr, SPIRAS_HDIF_SIG)) return; - prlog(PR_NOTICE, "SPIRA-S found.\n"); + prlog(PR_DEBUG, "SPIRA-S found.\n"); spira.ntuples.sp_subsys = spiras->ntuples.sp_subsys; spira.ntuples.ipl_parms = spiras->ntuples.ipl_parms; diff --git a/hw/bt.c b/hw/bt.c index ce87e2bcf791..338a9da58635 100644 --- a/hw/bt.c +++ b/hw/bt.c @@ -657,7 +657,7 @@ void bt_init(void) list_head_init(&bt.msgq); bt.queue_len = 0; - prlog(PR_NOTICE, "Interface initialized, IO 0x%04x\n", bt.base_addr); + prlog(PR_INFO, "Interface initialized, IO 0x%04x\n", bt.base_addr); ipmi_register_backend(&bt_backend); diff --git a/hw/lpc-uart.c b/hw/lpc-uart.c index 74a86b1342ca..365bf3e27094 100644 --- a/hw/lpc-uart.c +++ b/hw/lpc-uart.c @@ -605,7 +605,7 @@ void early_uart_init(void) if (uart_init_hw(baud, clk)) { set_console(&uart_con_driver); - prlog(PR_NOTICE, "UART: Using UART at %p\n", mmio_uart_base); + prlog(PR_DEBUG, "UART: Using UART at %p\n", mmio_uart_base); } else { prerror("UART: Early init failed!"); mmio_uart_base = NULL; diff --git a/hw/nx-compress.c b/hw/nx-compress.c index 161870dac59e..62fb0edef77f 100644 --- a/hw/nx-compress.c +++ b/hw/nx-compress.c @@ -281,7 +281,7 @@ void nx_create_compress_node(struct dt_node *node) if (dt_node_is_compatible(node, "ibm,power9-nx")) { u64 cfg_mmio, cfg_txwc, cfg_uctrl, cfg_dma; - printf("Found ibm,power9-nx\n"); + prlog(PR_DEBUG, "Found ibm,power9-nx\n"); cfg_mmio = pb_base + NX_P9_UMAC_VAS_MMIO_BAR; cfg_dma = pb_base + NX_P9_DMA_VAS_MMIO_BAR; cfg_txwc = pb_base + NX_P9_UMAC_TX_WINDOW_CONTEXT_BAR; diff --git a/hw/slw.c b/hw/slw.c index 49bcd839915f..0612290289ae 100644 --- a/hw/slw.c +++ b/hw/slw.c @@ -1012,7 +1012,7 @@ void add_cpu_idle_state_properties(void) } } - prlog(PR_NOTICE, "SLW: Enabling: %s\n", states[i].name); + prlog(PR_INFO, "SLW: Enabling: %s\n", states[i].name); /* * If a state is supported add each of its property diff --git a/hw/vas.c b/hw/vas.c index d8c2b380124b..376e42d499c1 100644 --- a/hw/vas.c +++ b/hw/vas.c @@ -466,7 +466,7 @@ static int init_vas_inst(struct dt_node *np, bool enable) create_mm_dt_node(chip); - prlog(PR_NOTICE, "VAS: Initialized chip %d\n", chip->id); + prlog(PR_INFO, "VAS: Initialized chip %d\n", chip->id); return 0; } diff --git a/hw/xscom.c b/hw/xscom.c index 05012780aafe..05b2c14f02ca 100644 --- a/hw/xscom.c +++ b/hw/xscom.c @@ -814,7 +814,7 @@ static void xscom_init_chip_info(struct proc_chip *chip) default: rev = 0; } - printf("P9 DD%i.%i%d detected\n", 0xf & (chip->ec_level >> 4), + prlog(PR_INFO,"P9 DD%i.%i%d detected\n", 0xf & (chip->ec_level >> 4), chip->ec_level & 0xf, rev); chip->ec_rev = rev; } @@ -900,9 +900,9 @@ void xscom_init(void) chip_name = chip_names[chip->type]; /* 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", + prlog(PR_NOTICE, "CHIP: Chip ID %04x type: %s DD%x.%x%d\n", gcid, chip_name, chip->ec_level >> 4, - chip->ec_level & 0xf); + chip->ec_level & 0xf, chip->ec_rev); prlog(PR_DEBUG, "XSCOM: Base address: 0x%llx\n", chip->xscom_base); } diff --git a/libstb/secureboot.c b/libstb/secureboot.c index 348acf57c489..4f6a301d5e67 100644 --- a/libstb/secureboot.c +++ b/libstb/secureboot.c @@ -102,14 +102,14 @@ void secureboot_init(void) return; } - prlog(PR_NOTICE, "Found %s\n", compat); + prlog(PR_DEBUG, "Found %s\n", compat); if (nvram_query_eq("force-secure-mode", "always")) { secure_mode = true; prlog(PR_NOTICE, "secure mode on (FORCED by nvram)\n"); } else { secure_mode = dt_has_node_property(node, "secure-enabled", NULL); - prlog(PR_NOTICE, "secure mode %s\n", + prlog(PR_INFO, "secure mode %s\n", secure_mode ? "on" : "off"); } diff --git a/libstb/trustedboot.c b/libstb/trustedboot.c index 151e4e167e65..8fa11790f993 100644 --- a/libstb/trustedboot.c +++ b/libstb/trustedboot.c @@ -106,7 +106,7 @@ void trustedboot_init(void) prlog(PR_NOTICE, "trusted mode on (FORCED by nvram)\n"); } else { trusted_mode = dt_has_node_property(node, "trusted-enabled", NULL); - prlog(PR_NOTICE, "trusted mode %s\n", + prlog(PR_INFO, "trusted mode %s\n", trusted_mode ? "on" : "off"); }