From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1B0CF4592F; Sat, 7 Sep 2024 16:56:04 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0497F40614; Sat, 7 Sep 2024 16:56:04 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 892F94060A for ; Sat, 7 Sep 2024 16:56:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1725720962; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fMVtBsPh5w5hYij3LH0FUkwtdIcnPhNhiWmJOfpkZ/A=; b=i9fWodYF1V8Hx13vzuD8kj2pKgaJ5rVcSqxOumPbsBDSa6yRmREnyJGikuqSwvpCUgJ6wK I4c5aPek6FqawynG+3Xck8+KG+jfvSoyDKOLI9YOxGVuSZ0ly8A+fgG3z8Toob7QKJ5BUk zFhbL4T7UknJ1QF7m6CuWpFP37WSWZg= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-607-a8OYbMr7P6Wy3tg813RKmA-1; Sat, 07 Sep 2024 10:55:58 -0400 X-MC-Unique: a8OYbMr7P6Wy3tg813RKmA-1 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7D66E19560B0; Sat, 7 Sep 2024 14:55:56 +0000 (UTC) Received: from dmarchan.redhat.com (unknown [10.45.226.65]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 474543000236; Sat, 7 Sep 2024 14:55:50 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: Nicolas Chautru , Gagandeep Singh , Hemant Agrawal , Jay Zhou , Ajit Khaparde , Somnath Kotur , Sachin Saxena , Matan Azrad , Viacheslav Ovsiienko , Harman Kalra , Maxime Coquelin , Chenbo Xia , Jakub Palider , Tomasz Duszynski Subject: [PATCH 10/11] drivers: split multilines log messages Date: Sat, 7 Sep 2024 16:54:30 +0200 Message-ID: <20240907145433.1479091-11-david.marchand@redhat.com> In-Reply-To: <20240907145433.1479091-1-david.marchand@redhat.com> References: <20240907145433.1479091-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Prepare for RTE_LOG_LINE conversion. Signed-off-by: David Marchand --- .../fpga_5gnr_fec/rte_fpga_5gnr_fec.c | 251 +++++++++--------- drivers/baseband/fpga_lte_fec/fpga_lte_fec.c | 24 +- drivers/crypto/caam_jr/caam_jr.c | 7 +- drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 54 ++-- drivers/crypto/virtio/virtio_cryptodev.c | 10 +- drivers/net/bnxt/bnxt_hwrm.c | 16 +- drivers/net/dpaa/dpaa_ethdev.c | 9 +- drivers/net/mlx4/mlx4_mr.c | 18 +- drivers/net/octeontx/octeontx_ethdev.c | 22 +- drivers/net/virtio/virtio_cvq.c | 19 +- .../net/virtio/virtio_user/virtio_user_dev.c | 30 +-- drivers/raw/cnxk_bphy/cnxk_bphy.c | 2 +- 12 files changed, 228 insertions(+), 234 deletions(-) diff --git a/drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c b/drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c index 3e04e44ba2..b4a97de967 100644 --- a/drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c +++ b/drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c @@ -100,49 +100,49 @@ print_static_reg_debug_info(void *mmio_base, uint8_t fpga_variant) static void vc_5gnr_print_dma_dec_desc_debug_info(union vc_5gnr_dma_desc *desc) { - rte_bbdev_log_debug("DMA response desc %p\n" - "\t-- done(%"PRIu32") | iter(%"PRIu32") | et_pass(%"PRIu32")" - " | crcb_pass (%"PRIu32") | error(%"PRIu32")\n" - "\t-- qm_idx(%"PRIu32") | max_iter(%"PRIu32") | " - "bg_idx (%"PRIu32") | harqin_en(%"PRIu32") | zc(%"PRIu32")\n" - "\t-- hbstroe_offset(%"PRIu32") | num_null (%"PRIu32") " - "| irq_en(%"PRIu32")\n" - "\t-- ncb(%"PRIu32") | desc_idx (%"PRIu32") | " - "drop_crc24b(%"PRIu32") | RV (%"PRIu32")\n" - "\t-- crc24b_ind(%"PRIu32") | et_dis (%"PRIu32")\n" - "\t-- harq_input_length(%"PRIu32") | rm_e(%"PRIu32")\n" - "\t-- cbs_in_op(%"PRIu32") | in_add (0x%08"PRIx32"%08"PRIx32")" - "| out_add (0x%08"PRIx32"%08"PRIx32")", - desc, + rte_bbdev_log_debug("DMA response desc %p", + desc); + rte_bbdev_log_debug("\t-- done(%"PRIu32") | iter(%"PRIu32") | et_pass(%"PRIu32")" + " | crcb_pass (%"PRIu32") | error(%"PRIu32")", (uint32_t)desc->dec_req.done, (uint32_t)desc->dec_req.iter, (uint32_t)desc->dec_req.et_pass, (uint32_t)desc->dec_req.crcb_pass, - (uint32_t)desc->dec_req.error, + (uint32_t)desc->dec_req.error); + rte_bbdev_log_debug("\t-- qm_idx(%"PRIu32") | max_iter(%"PRIu32") | " + "bg_idx (%"PRIu32") | harqin_en(%"PRIu32") | zc(%"PRIu32")", (uint32_t)desc->dec_req.qm_idx, (uint32_t)desc->dec_req.max_iter, (uint32_t)desc->dec_req.bg_idx, (uint32_t)desc->dec_req.harqin_en, - (uint32_t)desc->dec_req.zc, + (uint32_t)desc->dec_req.zc); + rte_bbdev_log_debug("\t-- hbstroe_offset(%"PRIu32") | num_null (%"PRIu32") " + "| irq_en(%"PRIu32")", (uint32_t)desc->dec_req.hbstroe_offset, (uint32_t)desc->dec_req.num_null, - (uint32_t)desc->dec_req.irq_en, + (uint32_t)desc->dec_req.irq_en); + rte_bbdev_log_debug("\t-- ncb(%"PRIu32") | desc_idx (%"PRIu32") | " + "drop_crc24b(%"PRIu32") | RV (%"PRIu32")", (uint32_t)desc->dec_req.ncb, (uint32_t)desc->dec_req.desc_idx, (uint32_t)desc->dec_req.drop_crc24b, - (uint32_t)desc->dec_req.rv, + (uint32_t)desc->dec_req.rv); + rte_bbdev_log_debug("\t-- crc24b_ind(%"PRIu32") | et_dis (%"PRIu32")", (uint32_t)desc->dec_req.crc24b_ind, - (uint32_t)desc->dec_req.et_dis, + (uint32_t)desc->dec_req.et_dis); + rte_bbdev_log_debug("\t-- harq_input_length(%"PRIu32") | rm_e(%"PRIu32")", (uint32_t)desc->dec_req.harq_input_length, - (uint32_t)desc->dec_req.rm_e, + (uint32_t)desc->dec_req.rm_e); + rte_bbdev_log_debug("\t-- cbs_in_op(%"PRIu32") | in_add (0x%08"PRIx32"%08"PRIx32")" + "| out_add (0x%08"PRIx32"%08"PRIx32")", (uint32_t)desc->dec_req.cbs_in_op, (uint32_t)desc->dec_req.in_addr_hi, (uint32_t)desc->dec_req.in_addr_lw, (uint32_t)desc->dec_req.out_addr_hi, (uint32_t)desc->dec_req.out_addr_lw); uint32_t *word = (uint32_t *) desc; - rte_bbdev_log_debug("%08"PRIx32"\n%08"PRIx32"\n%08"PRIx32"\n%08"PRIx32"\n" - "%08"PRIx32"\n%08"PRIx32"\n%08"PRIx32"\n%08"PRIx32"\n", + rte_bbdev_log_debug("%08"PRIx32", %08"PRIx32", %08"PRIx32", %08"PRIx32", " + "%08"PRIx32", %08"PRIx32", %08"PRIx32", %08"PRIx32, word[0], word[1], word[2], word[3], word[4], word[5], word[6], word[7]); } @@ -151,37 +151,12 @@ vc_5gnr_print_dma_dec_desc_debug_info(union vc_5gnr_dma_desc *desc) static void agx100_print_dma_dec_desc_debug_info(union agx100_dma_desc *desc) { - rte_bbdev_log_debug("DMA response desc %p\n" - "\t-- done(%"PRIu32") | tb_crc_pass(%"PRIu32") | cb_crc_all_pass(%"PRIu32")" + rte_bbdev_log_debug("DMA response desc %p", + desc); + rte_bbdev_log_debug("\t-- done(%"PRIu32") | tb_crc_pass(%"PRIu32") | cb_crc_all_pass(%"PRIu32")" " | cb_all_et_pass(%"PRIu32") | max_iter_ret(%"PRIu32") |" "cgb_crc_bitmap(%"PRIu32") | error_msg(%"PRIu32") | error_code(%"PRIu32") |" - "et_dis (%"PRIu32") | harq_in_en(%"PRIu32") | max_iter(%"PRIu32")\n" - "\t-- ncb(%"PRIu32") | bg_idx (%"PRIu32") | qm_idx (%"PRIu32")" - "| zc(%"PRIu32") | rv(%"PRIu32") | int_en(%"PRIu32")\n" - "\t-- max_cbg(%"PRIu32") | cbgti(%"PRIu32") | cbgfi(%"PRIu32") |" - "cbgs(%"PRIu32") | desc_idx(%"PRIu32")\n" - "\t-- ca(%"PRIu32") | c(%"PRIu32") | llr_pckg(%"PRIu32") |" - "syndrome_check_mode(%"PRIu32") | num_null(%"PRIu32")\n" - "\t-- ea(%"PRIu32") | eba(%"PRIu32")\n" - "\t-- hbstore_offset_out(%"PRIu32")\n" - "\t-- hbstore_offset_in(%"PRIu32") | en_slice_ts(%"PRIu32") |" - "en_host_ts(%"PRIu32") | en_cb_wr_status(%"PRIu32")" - " | en_output_sg(%"PRIu32") | en_input_sg(%"PRIu32") | tb_cb(%"PRIu32")" - " | crc24b_ind(%"PRIu32")| drop_crc24b(%"PRIu32")\n" - "\t-- harq_input_length_a(%"PRIu32") | harq_input_length_b(%"PRIu32")\n" - "\t-- input_slice_table_addr_lo(%"PRIu32")" - " | input_start_addr_lo(%"PRIu32")\n" - "\t-- input_slice_table_addr_hi(%"PRIu32")" - " | input_start_addr_hi(%"PRIu32")\n" - "\t-- input_slice_num(%"PRIu32") | input_length(%"PRIu32")\n" - "\t-- output_slice_table_addr_lo(%"PRIu32")" - " | output_start_addr_lo(%"PRIu32")\n" - "\t-- output_slice_table_addr_hi(%"PRIu32")" - " | output_start_addr_hi(%"PRIu32")\n" - "\t-- output_slice_num(%"PRIu32") | output_length(%"PRIu32")\n" - "\t-- enqueue_timestamp(%"PRIu32")\n" - "\t-- completion_timestamp(%"PRIu32")\n", - desc, + "et_dis (%"PRIu32") | harq_in_en(%"PRIu32") | max_iter(%"PRIu32")", (uint32_t)desc->dec_req.done, (uint32_t)desc->dec_req.tb_crc_pass, (uint32_t)desc->dec_req.cb_crc_all_pass, @@ -192,26 +167,38 @@ agx100_print_dma_dec_desc_debug_info(union agx100_dma_desc *desc) (uint32_t)desc->dec_req.error_code, (uint32_t)desc->dec_req.et_dis, (uint32_t)desc->dec_req.harq_in_en, - (uint32_t)desc->dec_req.max_iter, + (uint32_t)desc->dec_req.max_iter); + rte_bbdev_log_debug("\t-- ncb(%"PRIu32") | bg_idx (%"PRIu32") | qm_idx (%"PRIu32")" + "| zc(%"PRIu32") | rv(%"PRIu32") | int_en(%"PRIu32")", (uint32_t)desc->dec_req.ncb, (uint32_t)desc->dec_req.bg_idx, (uint32_t)desc->dec_req.qm_idx, (uint32_t)desc->dec_req.zc, (uint32_t)desc->dec_req.rv, - (uint32_t)desc->dec_req.int_en, + (uint32_t)desc->dec_req.int_en); + rte_bbdev_log_debug("\t-- max_cbg(%"PRIu32") | cbgti(%"PRIu32") | cbgfi(%"PRIu32") |" + "cbgs(%"PRIu32") | desc_idx(%"PRIu32")", (uint32_t)desc->dec_req.max_cbg, (uint32_t)desc->dec_req.cbgti, (uint32_t)desc->dec_req.cbgfi, (uint32_t)desc->dec_req.cbgs, - (uint32_t)desc->dec_req.desc_idx, + (uint32_t)desc->dec_req.desc_idx); + rte_bbdev_log_debug("\t-- ca(%"PRIu32") | c(%"PRIu32") | llr_pckg(%"PRIu32") |" + "syndrome_check_mode(%"PRIu32") | num_null(%"PRIu32")", (uint32_t)desc->dec_req.ca, (uint32_t)desc->dec_req.c, (uint32_t)desc->dec_req.llr_pckg, (uint32_t)desc->dec_req.syndrome_check_mode, - (uint32_t)desc->dec_req.num_null, + (uint32_t)desc->dec_req.num_null); + rte_bbdev_log_debug("\t-- ea(%"PRIu32") | eba(%"PRIu32")", (uint32_t)desc->dec_req.ea, - (uint32_t)desc->dec_req.eba, - (uint32_t)desc->dec_req.hbstore_offset_out, + (uint32_t)desc->dec_req.eba); + rte_bbdev_log_debug("\t-- hbstore_offset_out(%"PRIu32")", + (uint32_t)desc->dec_req.hbstore_offset_out); + rte_bbdev_log_debug("\t-- hbstore_offset_in(%"PRIu32") | en_slice_ts(%"PRIu32") |" + "en_host_ts(%"PRIu32") | en_cb_wr_status(%"PRIu32")" + " | en_output_sg(%"PRIu32") | en_input_sg(%"PRIu32") | tb_cb(%"PRIu32")" + " | crc24b_ind(%"PRIu32")| drop_crc24b(%"PRIu32")", (uint32_t)desc->dec_req.hbstore_offset_in, (uint32_t)desc->dec_req.en_slice_ts, (uint32_t)desc->dec_req.en_host_ts, @@ -220,29 +207,42 @@ agx100_print_dma_dec_desc_debug_info(union agx100_dma_desc *desc) (uint32_t)desc->dec_req.en_input_sg, (uint32_t)desc->dec_req.tb_cb, (uint32_t)desc->dec_req.crc24b_ind, - (uint32_t)desc->dec_req.drop_crc24b, + (uint32_t)desc->dec_req.drop_crc24b); + rte_bbdev_log_debug("\t-- harq_input_length_a(%"PRIu32") | harq_input_length_b(%"PRIu32")", (uint32_t)desc->dec_req.harq_input_length_a, - (uint32_t)desc->dec_req.harq_input_length_b, + (uint32_t)desc->dec_req.harq_input_length_b); + rte_bbdev_log_debug("\t-- input_slice_table_addr_lo(%"PRIu32")" + " | input_start_addr_lo(%"PRIu32")", (uint32_t)desc->dec_req.input_slice_table_addr_lo, - (uint32_t)desc->dec_req.input_start_addr_lo, + (uint32_t)desc->dec_req.input_start_addr_lo); + rte_bbdev_log_debug("\t-- input_slice_table_addr_hi(%"PRIu32")" + " | input_start_addr_hi(%"PRIu32")", (uint32_t)desc->dec_req.input_slice_table_addr_hi, - (uint32_t)desc->dec_req.input_start_addr_hi, + (uint32_t)desc->dec_req.input_start_addr_hi); + rte_bbdev_log_debug("\t-- input_slice_num(%"PRIu32") | input_length(%"PRIu32")", (uint32_t)desc->dec_req.input_slice_num, - (uint32_t)desc->dec_req.input_length, + (uint32_t)desc->dec_req.input_length); + rte_bbdev_log_debug("\t-- output_slice_table_addr_lo(%"PRIu32")" + " | output_start_addr_lo(%"PRIu32")", (uint32_t)desc->dec_req.output_slice_table_addr_lo, - (uint32_t)desc->dec_req.output_start_addr_lo, + (uint32_t)desc->dec_req.output_start_addr_lo); + rte_bbdev_log_debug("\t-- output_slice_table_addr_hi(%"PRIu32")" + " | output_start_addr_hi(%"PRIu32")", (uint32_t)desc->dec_req.output_slice_table_addr_hi, - (uint32_t)desc->dec_req.output_start_addr_hi, + (uint32_t)desc->dec_req.output_start_addr_hi); + rte_bbdev_log_debug("\t-- output_slice_num(%"PRIu32") | output_length(%"PRIu32")", (uint32_t)desc->dec_req.output_slice_num, - (uint32_t)desc->dec_req.output_length, - (uint32_t)desc->dec_req.enqueue_timestamp, + (uint32_t)desc->dec_req.output_length); + rte_bbdev_log_debug("\t-- enqueue_timestamp(%"PRIu32")", + (uint32_t)desc->dec_req.enqueue_timestamp); + rte_bbdev_log_debug("\t-- completion_timestamp(%"PRIu32")", (uint32_t)desc->dec_req.completion_timestamp); uint32_t *word = (uint32_t *) desc; - rte_bbdev_log_debug("%08"PRIx32"\n%08"PRIx32"\n%08"PRIx32"\n%08"PRIx32"\n" - "%08"PRIx32"\n%08"PRIx32"\n%08"PRIx32"\n%08"PRIx32"\n" - "%08"PRIx32"\n%08"PRIx32"\n%08"PRIx32"\n%08"PRIx32"\n" - "%08"PRIx32"\n%08"PRIx32"\n%08"PRIx32"\n%08"PRIx32"\n", + rte_bbdev_log_debug("%08"PRIx32", %08"PRIx32", %08"PRIx32", %08"PRIx32", " + "%08"PRIx32", %08"PRIx32", %08"PRIx32", %08"PRIx32", " + "%08"PRIx32", %08"PRIx32", %08"PRIx32", %08"PRIx32", " + "%08"PRIx32", %08"PRIx32", %08"PRIx32", %08"PRIx32, word[0], word[1], word[2], word[3], word[4], word[5], word[6], word[7], word[8], word[9], word[10], word[11], @@ -253,31 +253,28 @@ agx100_print_dma_dec_desc_debug_info(union agx100_dma_desc *desc) static void vc_5gnr_print_dma_enc_desc_debug_info(union vc_5gnr_dma_desc *desc) { - rte_bbdev_log_debug("DMA response desc %p\n" - "%"PRIu32" %"PRIu32"\n" - "K' %"PRIu32" E %"PRIu32" desc %"PRIu32" Z %"PRIu32"\n" - "BG %"PRIu32" Qm %"PRIu32" CRC %"PRIu32" IRQ %"PRIu32"\n" - "k0 %"PRIu32" Ncb %"PRIu32" F %"PRIu32"\n", - desc, + rte_bbdev_log_debug("DMA response desc %p", + desc); + rte_bbdev_log_debug("%"PRIu32" %"PRIu32, (uint32_t)desc->enc_req.done, - (uint32_t)desc->enc_req.error, - + (uint32_t)desc->enc_req.error); + rte_bbdev_log_debug("K' %"PRIu32" E %"PRIu32" desc %"PRIu32" Z %"PRIu32, (uint32_t)desc->enc_req.k_, (uint32_t)desc->enc_req.rm_e, (uint32_t)desc->enc_req.desc_idx, - (uint32_t)desc->enc_req.zc, - + (uint32_t)desc->enc_req.zc); + rte_bbdev_log_debug("BG %"PRIu32" Qm %"PRIu32" CRC %"PRIu32" IRQ %"PRIu32, (uint32_t)desc->enc_req.bg_idx, (uint32_t)desc->enc_req.qm_idx, (uint32_t)desc->enc_req.crc_en, - (uint32_t)desc->enc_req.irq_en, - + (uint32_t)desc->enc_req.irq_en); + rte_bbdev_log_debug("k0 %"PRIu32" Ncb %"PRIu32" F %"PRIu32, (uint32_t)desc->enc_req.k0, (uint32_t)desc->enc_req.ncb, (uint32_t)desc->enc_req.num_null); uint32_t *word = (uint32_t *) desc; - rte_bbdev_log_debug("%08"PRIx32"\n%08"PRIx32"\n%08"PRIx32"\n%08"PRIx32"\n" - "%08"PRIx32"\n%08"PRIx32"\n%08"PRIx32"\n%08"PRIx32"\n", + rte_bbdev_log_debug("%08"PRIx32", %08"PRIx32", %08"PRIx32", %08"PRIx32", " + "%08"PRIx32", %08"PRIx32", %08"PRIx32", %08"PRIx32, word[0], word[1], word[2], word[3], word[4], word[5], word[6], word[7]); } @@ -286,49 +283,37 @@ vc_5gnr_print_dma_enc_desc_debug_info(union vc_5gnr_dma_desc *desc) static void agx100_print_dma_enc_desc_debug_info(union agx100_dma_desc *desc) { - rte_bbdev_log_debug("DMA response desc %p\n" - "\t-- done(%"PRIu32") | error_msg(%"PRIu32") | error_code(%"PRIu32")\n" - "\t-- ncb(%"PRIu32") | bg_idx (%"PRIu32") | qm_idx (%"PRIu32")" - "| zc(%"PRIu32") | rv(%"PRIu32") | int_en(%"PRIu32")\n" - "\t-- max_cbg(%"PRIu32") | cbgti(%"PRIu32") | cbgs(%"PRIu32") | " - "desc_idx(%"PRIu32")\n" - "\t-- ca(%"PRIu32") | c(%"PRIu32") | num_null(%"PRIu32")\n" - "\t-- ea(%"PRIu32")\n" - "\t-- eb(%"PRIu32")\n" - "\t-- k_(%"PRIu32") | en_slice_ts(%"PRIu32") | en_host_ts(%"PRIu32") | " - "en_cb_wr_status(%"PRIu32") | en_output_sg(%"PRIu32") | " - "en_input_sg(%"PRIu32") | tb_cb(%"PRIu32") | crc_en(%"PRIu32")\n" - "\t-- input_slice_table_addr_lo(%"PRIu32")" - " | input_start_addr_lo(%"PRIu32")\n" - "\t-- input_slice_table_addr_hi(%"PRIu32")" - " | input_start_addr_hi(%"PRIu32")\n" - "\t-- input_slice_num(%"PRIu32") | input_length(%"PRIu32")\n" - "\t-- output_slice_table_addr_lo(%"PRIu32")" - " | output_start_addr_lo(%"PRIu32")\n" - "\t-- output_slice_table_addr_hi(%"PRIu32")" - " | output_start_addr_hi(%"PRIu32")\n" - "\t-- output_slice_num(%"PRIu32") | output_length(%"PRIu32")\n" - "\t-- enqueue_timestamp(%"PRIu32")\n" - "\t-- completion_timestamp(%"PRIu32")\n", - desc, + rte_bbdev_log_debug("DMA response desc %p", + desc); + rte_bbdev_log_debug("\t-- done(%"PRIu32") | error_msg(%"PRIu32") | error_code(%"PRIu32")", (uint32_t)desc->enc_req.done, (uint32_t)desc->enc_req.error_msg, - (uint32_t)desc->enc_req.error_code, + (uint32_t)desc->enc_req.error_code); + rte_bbdev_log_debug("\t-- ncb(%"PRIu32") | bg_idx (%"PRIu32") | qm_idx (%"PRIu32")" + "| zc(%"PRIu32") | rv(%"PRIu32") | int_en(%"PRIu32")", (uint32_t)desc->enc_req.ncb, (uint32_t)desc->enc_req.bg_idx, (uint32_t)desc->enc_req.qm_idx, (uint32_t)desc->enc_req.zc, (uint32_t)desc->enc_req.rv, - (uint32_t)desc->enc_req.int_en, + (uint32_t)desc->enc_req.int_en); + rte_bbdev_log_debug("\t-- max_cbg(%"PRIu32") | cbgti(%"PRIu32") | cbgs(%"PRIu32") | " + "desc_idx(%"PRIu32")", (uint32_t)desc->enc_req.max_cbg, (uint32_t)desc->enc_req.cbgti, (uint32_t)desc->enc_req.cbgs, - (uint32_t)desc->enc_req.desc_idx, + (uint32_t)desc->enc_req.desc_idx); + rte_bbdev_log_debug("\t-- ca(%"PRIu32") | c(%"PRIu32") | num_null(%"PRIu32")", (uint32_t)desc->enc_req.ca, (uint32_t)desc->enc_req.c, - (uint32_t)desc->enc_req.num_null, - (uint32_t)desc->enc_req.ea, - (uint32_t)desc->enc_req.eb, + (uint32_t)desc->enc_req.num_null); + rte_bbdev_log_debug("\t-- ea(%"PRIu32")", + (uint32_t)desc->enc_req.ea); + rte_bbdev_log_debug("\t-- eb(%"PRIu32")", + (uint32_t)desc->enc_req.eb); + rte_bbdev_log_debug("\t-- k_(%"PRIu32") | en_slice_ts(%"PRIu32") | en_host_ts(%"PRIu32") | " + "en_cb_wr_status(%"PRIu32") | en_output_sg(%"PRIu32") | " + "en_input_sg(%"PRIu32") | tb_cb(%"PRIu32") | crc_en(%"PRIu32")", (uint32_t)desc->enc_req.k_, (uint32_t)desc->enc_req.en_slice_ts, (uint32_t)desc->enc_req.en_host_ts, @@ -336,27 +321,39 @@ agx100_print_dma_enc_desc_debug_info(union agx100_dma_desc *desc) (uint32_t)desc->enc_req.en_output_sg, (uint32_t)desc->enc_req.en_input_sg, (uint32_t)desc->enc_req.tb_cb, - (uint32_t)desc->enc_req.crc_en, + (uint32_t)desc->enc_req.crc_en); + rte_bbdev_log_debug("\t-- input_slice_table_addr_lo(%"PRIu32")" + " | input_start_addr_lo(%"PRIu32")", (uint32_t)desc->enc_req.input_slice_table_addr_lo, - (uint32_t)desc->enc_req.input_start_addr_lo, + (uint32_t)desc->enc_req.input_start_addr_lo); + rte_bbdev_log_debug("\t-- input_slice_table_addr_hi(%"PRIu32")" + " | input_start_addr_hi(%"PRIu32")", (uint32_t)desc->enc_req.input_slice_table_addr_hi, - (uint32_t)desc->enc_req.input_start_addr_hi, + (uint32_t)desc->enc_req.input_start_addr_hi); + rte_bbdev_log_debug("\t-- input_slice_num(%"PRIu32") | input_length(%"PRIu32")", (uint32_t)desc->enc_req.input_slice_num, - (uint32_t)desc->enc_req.input_length, + (uint32_t)desc->enc_req.input_length); + rte_bbdev_log_debug("\t-- output_slice_table_addr_lo(%"PRIu32")" + " | output_start_addr_lo(%"PRIu32")", (uint32_t)desc->enc_req.output_slice_table_addr_lo, - (uint32_t)desc->enc_req.output_start_addr_lo, + (uint32_t)desc->enc_req.output_start_addr_lo); + rte_bbdev_log_debug("\t-- output_slice_table_addr_hi(%"PRIu32")" + " | output_start_addr_hi(%"PRIu32")", (uint32_t)desc->enc_req.output_slice_table_addr_hi, - (uint32_t)desc->enc_req.output_start_addr_hi, + (uint32_t)desc->enc_req.output_start_addr_hi); + rte_bbdev_log_debug("\t-- output_slice_num(%"PRIu32") | output_length(%"PRIu32")", (uint32_t)desc->enc_req.output_slice_num, - (uint32_t)desc->enc_req.output_length, - (uint32_t)desc->enc_req.enqueue_timestamp, + (uint32_t)desc->enc_req.output_length); + rte_bbdev_log_debug("\t-- enqueue_timestamp(%"PRIu32")", + (uint32_t)desc->enc_req.enqueue_timestamp); + rte_bbdev_log_debug("\t-- completion_timestamp(%"PRIu32")", (uint32_t)desc->enc_req.completion_timestamp); uint32_t *word = (uint32_t *) desc; - rte_bbdev_log_debug("%08"PRIx32"\n%08"PRIx32"\n%08"PRIx32"\n%08"PRIx32"\n" - "%08"PRIx32"\n%08"PRIx32"\n%08"PRIx32"\n%08"PRIx32"\n" - "%08"PRIx32"\n%08"PRIx32"\n%08"PRIx32"\n%08"PRIx32"\n" - "%08"PRIx32"\n%08"PRIx32"\n%08"PRIx32"\n%08"PRIx32"\n", + rte_bbdev_log_debug("%08"PRIx32", %08"PRIx32", %08"PRIx32", %08"PRIx32", " + "%08"PRIx32", %08"PRIx32", %08"PRIx32", %08"PRIx32", " + "%08"PRIx32", %08"PRIx32", %08"PRIx32", %08"PRIx32", " + "%08"PRIx32", %08"PRIx32", %08"PRIx32", %08"PRIx32, word[0], word[1], word[2], word[3], word[4], word[5], word[6], word[7], word[8], word[9], word[10], word[11], diff --git a/drivers/baseband/fpga_lte_fec/fpga_lte_fec.c b/drivers/baseband/fpga_lte_fec/fpga_lte_fec.c index a4a963f74d..d9373a072d 100644 --- a/drivers/baseband/fpga_lte_fec/fpga_lte_fec.c +++ b/drivers/baseband/fpga_lte_fec/fpga_lte_fec.c @@ -444,28 +444,28 @@ print_static_reg_debug_info(void *mmio_base) static void print_dma_dec_desc_debug_info(union fpga_dma_desc *desc) { - rte_bbdev_log_debug("DMA response desc %p\n" - "\t-- done(%"PRIu32") | iter(%"PRIu32") | crc_pass(%"PRIu32")" - " | error (%"PRIu32") | crc_type(%"PRIu32")\n" - "\t-- max_iter(%"PRIu32") | bypass_rm(%"PRIu32") | " - "irq_en (%"PRIu32") | drop_crc(%"PRIu32") | offset(%"PRIu32")\n" - "\t-- k(%"PRIu32") | in_len (%"PRIu16") | op_add(%p)\n" - "\t-- cbs_in_op(%"PRIu32") | in_add (0x%08"PRIx32"%08"PRIx32") | " - "out_add (0x%08"PRIx32"%08"PRIx32")", - desc, + rte_bbdev_log_debug("DMA response desc %p", + desc); + rte_bbdev_log_debug("\t-- done(%"PRIu32") | iter(%"PRIu32") | crc_pass(%"PRIu32")" + " | error (%"PRIu32") | crc_type(%"PRIu32")", (uint32_t)desc->dec_req.done, (uint32_t)desc->dec_req.iter, (uint32_t)desc->dec_req.crc_pass, (uint32_t)desc->dec_req.error, - (uint32_t)desc->dec_req.crc_type, + (uint32_t)desc->dec_req.crc_type); + rte_bbdev_log_debug("\t-- max_iter(%"PRIu32") | bypass_rm(%"PRIu32") | " + "irq_en (%"PRIu32") | drop_crc(%"PRIu32") | offset(%"PRIu32")", (uint32_t)desc->dec_req.max_iter, (uint32_t)desc->dec_req.bypass_rm, (uint32_t)desc->dec_req.irq_en, (uint32_t)desc->dec_req.drop_crc, - (uint32_t)desc->dec_req.offset, + (uint32_t)desc->dec_req.offset); + rte_bbdev_log_debug("\t-- k(%"PRIu32") | in_len (%"PRIu16") | op_add(%p)", (uint32_t)desc->dec_req.k, (uint16_t)desc->dec_req.in_len, - desc->dec_req.op_addr, + desc->dec_req.op_addr); + rte_bbdev_log_debug("\t-- cbs_in_op(%"PRIu32") | in_add (0x%08"PRIx32"%08"PRIx32") | " + "out_add (0x%08"PRIx32"%08"PRIx32")", (uint32_t)desc->dec_req.cbs_in_op, (uint32_t)desc->dec_req.in_addr_hi, (uint32_t)desc->dec_req.in_addr_lw, diff --git a/drivers/crypto/caam_jr/caam_jr.c b/drivers/crypto/caam_jr/caam_jr.c index 27cdbf5ed4..4082b3f422 100644 --- a/drivers/crypto/caam_jr/caam_jr.c +++ b/drivers/crypto/caam_jr/caam_jr.c @@ -123,9 +123,10 @@ void caam_jr_stats_get(struct rte_cryptodev *dev, stats->dequeued_count += qp[i]->rx_pkts; stats->enqueue_err_count += qp[i]->tx_errs; stats->dequeue_err_count += qp[i]->rx_errs; - CAAM_JR_INFO("extra stats:\n\tRX Poll ERR = %" PRIu64 - "\n\tTX Ring Full = %" PRIu64, - qp[i]->rx_poll_err, + CAAM_JR_INFO("extra stats:"); + CAAM_JR_INFO("\tRX Poll ERR = %" PRIu64, + qp[i]->rx_poll_err); + CAAM_JR_INFO("\tTX Ring Full = %" PRIu64, qp[i]->tx_ring_full); } } diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c index 99b6359e52..2cdf9308f8 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c @@ -348,11 +348,11 @@ build_authenc_gcm_sg_fd(dpaa2_sec_session *sess, DPAA2_SET_FD_COMPOUND_FMT(fd); DPAA2_SET_FD_FLC(fd, DPAA2_VADDR_TO_IOVA(flc)); - DPAA2_SEC_DP_DEBUG("GCM SG: auth_off: 0x%x/length %d, digest-len=%d\n" - "iv-len=%d data_off: 0x%x\n", + DPAA2_SEC_DP_DEBUG("GCM SG: auth_off: 0x%x/length %d, digest-len=%d", sym_op->aead.data.offset, sym_op->aead.data.length, - sess->digest_length, + sess->digest_length); + DPAA2_SEC_DP_DEBUG("iv-len=%d data_off: 0x%x", sess->iv.length, sym_op->m_src->data_off); @@ -506,11 +506,11 @@ build_authenc_gcm_fd(dpaa2_sec_session *sess, DPAA2_SET_FD_COMPOUND_FMT(fd); DPAA2_SET_FD_FLC(fd, DPAA2_VADDR_TO_IOVA(flc)); - DPAA2_SEC_DP_DEBUG("GCM: auth_off: 0x%x/length %d, digest-len=%d\n" - "iv-len=%d data_off: 0x%x\n", + DPAA2_SEC_DP_DEBUG("GCM: auth_off: 0x%x/length %d, digest-len=%d", sym_op->aead.data.offset, sym_op->aead.data.length, - sess->digest_length, + sess->digest_length); + DPAA2_SEC_DP_DEBUG("iv-len=%d data_off: 0x%x", sess->iv.length, sym_op->m_src->data_off); @@ -631,11 +631,12 @@ build_authenc_sg_fd(dpaa2_sec_session *sess, DPAA2_SET_FD_FLC(fd, DPAA2_VADDR_TO_IOVA(flc)); DPAA2_SEC_DP_DEBUG( - "AUTHENC SG: auth_off: 0x%x/length %d, digest-len=%d\n" - "cipher_off: 0x%x/length %d, iv-len=%d data_off: 0x%x\n", + "AUTHENC SG: auth_off: 0x%x/length %d, digest-len=%d", sym_op->auth.data.offset, sym_op->auth.data.length, - sess->digest_length, + sess->digest_length); + DPAA2_SEC_DP_DEBUG( + "cipher_off: 0x%x/length %d, iv-len=%d data_off: 0x%x", sym_op->cipher.data.offset, sym_op->cipher.data.length, sess->iv.length, @@ -791,11 +792,12 @@ build_authenc_fd(dpaa2_sec_session *sess, DPAA2_SET_FD_FLC(fd, DPAA2_VADDR_TO_IOVA(flc)); DPAA2_SEC_DP_DEBUG( - "AUTHENC: auth_off: 0x%x/length %d, digest-len=%d\n" - "cipher_off: 0x%x/length %d, iv-len=%d data_off: 0x%x\n", + "AUTHENC: auth_off: 0x%x/length %d, digest-len=%d", sym_op->auth.data.offset, sym_op->auth.data.length, - sess->digest_length, + sess->digest_length); + DPAA2_SEC_DP_DEBUG( + "cipher_off: 0x%x/length %d, iv-len=%d data_off: 0x%x", sym_op->cipher.data.offset, sym_op->cipher.data.length, sess->iv.length, @@ -3931,20 +3933,20 @@ void dpaa2_sec_stats_get(struct rte_cryptodev *dev, if (ret) { DPAA2_SEC_ERR("SEC counters failed"); } else { - DPAA2_SEC_INFO("dpseci hardware stats:" - "\n\tNum of Requests Dequeued = %" PRIu64 - "\n\tNum of Outbound Encrypt Requests = %" PRIu64 - "\n\tNum of Inbound Decrypt Requests = %" PRIu64 - "\n\tNum of Outbound Bytes Encrypted = %" PRIu64 - "\n\tNum of Outbound Bytes Protected = %" PRIu64 - "\n\tNum of Inbound Bytes Decrypted = %" PRIu64 - "\n\tNum of Inbound Bytes Validated = %" PRIu64, - counters.dequeued_requests, - counters.ob_enc_requests, - counters.ib_dec_requests, - counters.ob_enc_bytes, - counters.ob_prot_bytes, - counters.ib_dec_bytes, + DPAA2_SEC_INFO("dpseci hardware stats:"); + DPAA2_SEC_INFO("\tNum of Requests Dequeued = %" PRIu64, + counters.dequeued_requests); + DPAA2_SEC_INFO("\tNum of Outbound Encrypt Requests = %" PRIu64, + counters.ob_enc_requests); + DPAA2_SEC_INFO("\tNum of Inbound Decrypt Requests = %" PRIu64, + counters.ib_dec_requests); + DPAA2_SEC_INFO("\tNum of Outbound Bytes Encrypted = %" PRIu64, + counters.ob_enc_bytes); + DPAA2_SEC_INFO("\tNum of Outbound Bytes Protected = %" PRIu64, + counters.ob_prot_bytes); + DPAA2_SEC_INFO("\tNum of Inbound Bytes Decrypted = %" PRIu64, + counters.ib_dec_bytes); + DPAA2_SEC_INFO("\tNum of Inbound Bytes Validated = %" PRIu64, counters.ib_valid_bytes); } } diff --git a/drivers/crypto/virtio/virtio_cryptodev.c b/drivers/crypto/virtio/virtio_cryptodev.c index c0d3178b71..643921dc02 100644 --- a/drivers/crypto/virtio/virtio_cryptodev.c +++ b/drivers/crypto/virtio/virtio_cryptodev.c @@ -239,9 +239,8 @@ virtio_crypto_send_command(struct virtqueue *vq, vq->vq_free_cnt++; } - VIRTIO_CRYPTO_INIT_LOG_DBG("vq->vq_free_cnt=%d\n" - "vq->vq_desc_head_idx=%d", - vq->vq_free_cnt, vq->vq_desc_head_idx); + VIRTIO_CRYPTO_INIT_LOG_DBG("vq->vq_free_cnt=%d", vq->vq_free_cnt); + VIRTIO_CRYPTO_INIT_LOG_DBG("vq->vq_desc_head_idx=%d", vq->vq_desc_head_idx); /* get the result */ if (input->status != VIRTIO_CRYPTO_OK) { @@ -1057,9 +1056,8 @@ virtio_crypto_sym_clear_session( return; } - VIRTIO_CRYPTO_INIT_LOG_DBG("vq->vq_free_cnt=%d\n" - "vq->vq_desc_head_idx=%d", - vq->vq_free_cnt, vq->vq_desc_head_idx); + VIRTIO_CRYPTO_INIT_LOG_DBG("vq->vq_free_cnt=%d", vq->vq_free_cnt); + VIRTIO_CRYPTO_INIT_LOG_DBG("vq->vq_desc_head_idx=%d", vq->vq_desc_head_idx); VIRTIO_CRYPTO_SESSION_LOG_INFO("Close session %"PRIu64" successfully ", session->session_id); diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c index bcbcb56546..d14536e242 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -1828,16 +1828,16 @@ static int bnxt_hwrm_port_phy_qcfg(struct bnxt *bp, /* Display the captured P7 phy details */ if (BNXT_LINK_SPEEDS_V2(bp)) { - PMD_DRV_LOG_LINE(DEBUG, "Phytype:%d, Media_type:%d, Status: %d, Link Signal:%d\n" - "Active Fec: %d Support_speeds2:%x, Force_link_speedsv2:%x\n" - "Auto_link_speedsv2:%x, Active_lanes:%d", + PMD_DRV_LOG_LINE(DEBUG, "Phytype:%d, Media_type:%d, Status: %d, Link Signal:%d", link_info->phy_type, link_info->media_type, link_info->phy_link_status, - link_info->link_signal_mode, + link_info->link_signal_mode); + PMD_DRV_LOG_LINE(DEBUG, "Active Fec: %d Support_speeds2:%x, Force_link_speedsv2:%x", (resp->active_fec_signal_mode & HWRM_PORT_PHY_QCFG_OUTPUT_ACTIVE_FEC_MASK) >> 4, - link_info->support_speeds2, link_info->force_link_speeds2, + link_info->support_speeds2, link_info->force_link_speeds2); + PMD_DRV_LOG_LINE(DEBUG, "Auto_link_speedsv2:%x, Active_lanes:%d", link_info->auto_link_speeds2, link_info->active_lanes); @@ -1850,12 +1850,12 @@ static int bnxt_hwrm_port_phy_qcfg(struct bnxt *bp, desc = ((struct link_speeds2_tbl *) bnxt_get_hwrm_to_rte_speeds2_entry(link_info->link_speed))->desc; - PMD_DRV_LOG_LINE(INFO, "Link Speed: %s %s, Status: %s Signal-mode: %s\n" - "Media type: %s, Xcvr type: %s, Active FEC: %s Lanes: %d", + PMD_DRV_LOG_LINE(INFO, "Link Speed: %s %s, Status: %s Signal-mode: %s", desc, !(link_info->auto_mode) ? "Forced" : "AutoNegotiated", link_status_str[link_info->phy_link_status % MAX_LINK_STR], - signal_mode[link_info->link_signal_mode % MAX_SIG_MODE], + signal_mode[link_info->link_signal_mode % MAX_SIG_MODE]); + PMD_DRV_LOG_LINE(INFO, "Media type: %s, Xcvr type: %s, Active FEC: %s Lanes: %d", media_type[link_info->media_type % MAX_MEDIA_TYPE], bnxt_get_xcvr_type(rte_le_to_cpu_32 (resp->xcvr_identifier_type_tx_lpi_timer)), diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c index 060b8c678f..51f5422e0c 100644 --- a/drivers/net/dpaa/dpaa_ethdev.c +++ b/drivers/net/dpaa/dpaa_ethdev.c @@ -1200,11 +1200,12 @@ dpaa_eth_eventq_attach(const struct rte_eth_dev *dev, struct qman_fq *rxq = &dpaa_intf->rx_queues[eth_rx_queue_id]; struct qm_mcc_initfq opts = {0}; - if (dpaa_push_mode_max_queue) - DPAA_PMD_WARN("PUSH mode q and EVENTDEV are not compatible\n" - "PUSH mode already enabled for first %d queues.\n" - "To disable set DPAA_PUSH_QUEUES_NUMBER to 0", + if (dpaa_push_mode_max_queue) { + DPAA_PMD_WARN("PUSH mode q and EVENTDEV are not compatible"); + DPAA_PMD_WARN("PUSH mode already enabled for first %d queues.", dpaa_push_mode_max_queue); + DPAA_PMD_WARN("To disable set DPAA_PUSH_QUEUES_NUMBER to 0"); + } dpaa_poll_queue_default_config(&opts); diff --git a/drivers/net/mlx4/mlx4_mr.c b/drivers/net/mlx4/mlx4_mr.c index e95f45aa3e..2251c624ff 100644 --- a/drivers/net/mlx4/mlx4_mr.c +++ b/drivers/net/mlx4/mlx4_mr.c @@ -564,9 +564,9 @@ mlx4_mr_create_secondary(struct rte_eth_dev *dev, struct mlx4_mr_cache *entry, /* Lookup can't fail. */ MLX4_ASSERT(entry->lkey != UINT32_MAX); rte_rwlock_read_unlock(&priv->mr.rwlock); - DEBUG("port %u MR CREATED by primary process for %p:\n" - " [0x%" PRIxPTR ", 0x%" PRIxPTR "), lkey=0x%x", - dev->data->port_id, (void *)addr, + DEBUG("port %u MR CREATED by primary process for %p:", + dev->data->port_id, (void *)addr); + DEBUG(" [0x%" PRIxPTR ", 0x%" PRIxPTR "), lkey=0x%x", entry->start, entry->end, entry->lkey); return entry->lkey; } @@ -787,10 +787,10 @@ mlx4_mr_create_primary(struct rte_eth_dev *dev, struct mlx4_mr_cache *entry, MLX4_ASSERT((uintptr_t)mr->ibv_mr->addr == data.start); MLX4_ASSERT(mr->ibv_mr->length == len); LIST_INSERT_HEAD(&priv->mr.mr_list, mr, mr); - DEBUG("port %u MR CREATED (%p) for %p:\n" - " [0x%" PRIxPTR ", 0x%" PRIxPTR ")," + DEBUG("port %u MR CREATED (%p) for %p:", + dev->data->port_id, (void *)mr, (void *)addr); + DEBUG(" [0x%" PRIxPTR ", 0x%" PRIxPTR ")," " lkey=0x%x base_idx=%u ms_n=%u, ms_bmp_n=%u", - dev->data->port_id, (void *)mr, (void *)addr, data.start, data.end, rte_cpu_to_be_32(mr->ibv_mr->lkey), mr->ms_base_idx, mr->ms_n, mr->ms_bmp_n); /* Insert to the global cache table. */ @@ -1251,10 +1251,10 @@ mlx4_mr_update_ext_mp_cb(struct rte_mempool *mp, void *opaque, mr->ms_bmp_n = 1; rte_rwlock_write_lock(&priv->mr.rwlock); LIST_INSERT_HEAD(&priv->mr.mr_list, mr, mr); - DEBUG("port %u MR CREATED (%p) for external memory %p:\n" - " [0x%" PRIxPTR ", 0x%" PRIxPTR ")," + DEBUG("port %u MR CREATED (%p) for external memory %p:", + dev->data->port_id, (void *)mr, (void *)addr); + DEBUG(" [0x%" PRIxPTR ", 0x%" PRIxPTR ")," " lkey=0x%x base_idx=%u ms_n=%u, ms_bmp_n=%u", - dev->data->port_id, (void *)mr, (void *)addr, addr, addr + len, rte_cpu_to_be_32(mr->ibv_mr->lkey), mr->ms_base_idx, mr->ms_n, mr->ms_bmp_n); /* Insert to the global cache table. */ diff --git a/drivers/net/octeontx/octeontx_ethdev.c b/drivers/net/octeontx/octeontx_ethdev.c index c802b2c389..3b8d717797 100644 --- a/drivers/net/octeontx/octeontx_ethdev.c +++ b/drivers/net/octeontx/octeontx_ethdev.c @@ -1389,17 +1389,17 @@ octeontx_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t qidx, rte_free(rxq); return ret; } - PMD_RX_LOG(DEBUG, "Port %d Rx pktbuf configured:\n" - "\tmbuf_size:\t0x%0x\n" - "\twqe_skip:\t0x%0x\n" - "\tfirst_skip:\t0x%0x\n" - "\tlater_skip:\t0x%0x\n" - "\tcache_mode:\t%s\n", - port, - pktbuf_conf.mbuff_size, - pktbuf_conf.wqe_skip, - pktbuf_conf.first_skip, - pktbuf_conf.later_skip, + PMD_RX_LOG(DEBUG, "Port %d Rx pktbuf configured:", + port); + PMD_RX_LOG(DEBUG, "\tmbuf_size:\t0x%0x", + pktbuf_conf.mbuff_size); + PMD_RX_LOG(DEBUG, "\twqe_skip:\t0x%0x", + pktbuf_conf.wqe_skip); + PMD_RX_LOG(DEBUG, "\tfirst_skip:\t0x%0x", + pktbuf_conf.first_skip); + PMD_RX_LOG(DEBUG, "\tlater_skip:\t0x%0x", + pktbuf_conf.later_skip); + PMD_RX_LOG(DEBUG, "\tcache_mode:\t%s", (pktbuf_conf.cache_mode == PKI_OPC_MODE_STT) ? "STT" : diff --git a/drivers/net/virtio/virtio_cvq.c b/drivers/net/virtio/virtio_cvq.c index 5e457f5fd0..657b0692b2 100644 --- a/drivers/net/virtio/virtio_cvq.c +++ b/drivers/net/virtio/virtio_cvq.c @@ -92,16 +92,11 @@ virtio_send_command_packed(struct virtnet_ctl *cvq, vq->vq_packed.used_wrap_counter ^= 1; } - PMD_INIT_LOG(DEBUG, "vq->vq_free_cnt=%d\n" - "vq->vq_avail_idx=%d\n" - "vq->vq_used_cons_idx=%d\n" - "vq->vq_packed.cached_flags=0x%x\n" - "vq->vq_packed.used_wrap_counter=%d", - vq->vq_free_cnt, - vq->vq_avail_idx, - vq->vq_used_cons_idx, - vq->vq_packed.cached_flags, - vq->vq_packed.used_wrap_counter); + PMD_INIT_LOG(DEBUG, "vq->vq_free_cnt=%d", vq->vq_free_cnt); + PMD_INIT_LOG(DEBUG, "vq->vq_avail_idx=%d", vq->vq_avail_idx); + PMD_INIT_LOG(DEBUG, "vq->vq_used_cons_idx=%d", vq->vq_used_cons_idx); + PMD_INIT_LOG(DEBUG, "vq->vq_packed.cached_flags=0x%x", vq->vq_packed.cached_flags); + PMD_INIT_LOG(DEBUG, "vq->vq_packed.used_wrap_counter=%d", vq->vq_packed.used_wrap_counter); result = cvq->hdr_mz->addr; return result; @@ -183,8 +178,8 @@ virtio_send_command_split(struct virtnet_ctl *cvq, vq->vq_free_cnt++; } - PMD_INIT_LOG(DEBUG, "vq->vq_free_cnt=%d\nvq->vq_desc_head_idx=%d", - vq->vq_free_cnt, vq->vq_desc_head_idx); + PMD_INIT_LOG(DEBUG, "vq->vq_free_cnt=%d", vq->vq_free_cnt); + PMD_INIT_LOG(DEBUG, "vq->vq_desc_head_idx=%d", vq->vq_desc_head_idx); result = cvq->hdr_mz->addr; return result; diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c index e8642be86b..2997d2bd26 100644 --- a/drivers/net/virtio/virtio_user/virtio_user_dev.c +++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c @@ -1197,21 +1197,21 @@ virtio_user_dev_update_status(struct virtio_user_dev *dev) ret = dev->ops->get_status(dev, &status); if (!ret) { dev->status = status; - PMD_INIT_LOG(DEBUG, "Updated Device Status(0x%08x):\n" - "\t-RESET: %u\n" - "\t-ACKNOWLEDGE: %u\n" - "\t-DRIVER: %u\n" - "\t-DRIVER_OK: %u\n" - "\t-FEATURES_OK: %u\n" - "\t-DEVICE_NEED_RESET: %u\n" - "\t-FAILED: %u", - dev->status, - (dev->status == VIRTIO_CONFIG_STATUS_RESET), - !!(dev->status & VIRTIO_CONFIG_STATUS_ACK), - !!(dev->status & VIRTIO_CONFIG_STATUS_DRIVER), - !!(dev->status & VIRTIO_CONFIG_STATUS_DRIVER_OK), - !!(dev->status & VIRTIO_CONFIG_STATUS_FEATURES_OK), - !!(dev->status & VIRTIO_CONFIG_STATUS_DEV_NEED_RESET), + PMD_INIT_LOG(DEBUG, "Updated Device Status(0x%08x):", + dev->status); + PMD_INIT_LOG(DEBUG, "\t-RESET: %u", + (dev->status == VIRTIO_CONFIG_STATUS_RESET)); + PMD_INIT_LOG(DEBUG, "\t-ACKNOWLEDGE: %u", + !!(dev->status & VIRTIO_CONFIG_STATUS_ACK)); + PMD_INIT_LOG(DEBUG, "\t-DRIVER: %u", + !!(dev->status & VIRTIO_CONFIG_STATUS_DRIVER)); + PMD_INIT_LOG(DEBUG, "\t-DRIVER_OK: %u", + !!(dev->status & VIRTIO_CONFIG_STATUS_DRIVER_OK)); + PMD_INIT_LOG(DEBUG, "\t-FEATURES_OK: %u", + !!(dev->status & VIRTIO_CONFIG_STATUS_FEATURES_OK)); + PMD_INIT_LOG(DEBUG, "\t-DEVICE_NEED_RESET: %u", + !!(dev->status & VIRTIO_CONFIG_STATUS_DEV_NEED_RESET)); + PMD_INIT_LOG(DEBUG, "\t-FAILED: %u", !!(dev->status & VIRTIO_CONFIG_STATUS_FAILED)); } else if (ret != -ENOTSUP) { PMD_INIT_LOG(ERR, "(%s) Failed to get backend status", dev->path); diff --git a/drivers/raw/cnxk_bphy/cnxk_bphy.c b/drivers/raw/cnxk_bphy/cnxk_bphy.c index 57f77297a8..0c26cfbbe6 100644 --- a/drivers/raw/cnxk_bphy/cnxk_bphy.c +++ b/drivers/raw/cnxk_bphy/cnxk_bphy.c @@ -332,7 +332,7 @@ bphy_rawdev_probe(struct rte_pci_driver *pci_drv, return 0; if (!pci_dev->mem_resource[0].addr) { - CNXK_BPHY_LOG(ERR, "BARs have invalid values: BAR0 %p\n BAR2 %p", + CNXK_BPHY_LOG(ERR, "BARs have invalid values: BAR0 %p BAR2 %p", pci_dev->mem_resource[0].addr, pci_dev->mem_resource[2].addr); return -ENODEV; } -- 2.46.0