From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id BE25EA0093 for ; Tue, 19 May 2020 15:07:35 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B50B21D603; Tue, 19 May 2020 15:07:35 +0200 (CEST) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by dpdk.org (Postfix) with ESMTP id DC9AB1D603 for ; Tue, 19 May 2020 15:07:33 +0200 (CEST) Received: by mail-wm1-f67.google.com with SMTP id m185so3477074wme.3 for ; Tue, 19 May 2020 06:07:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8DlJF8ox1iXM0SUFoTuri9sHZjqwKuzbIipXI9kIBMU=; b=Seqd722CIRhvUggyWX7w4sScKHbwPqiaYG1NWPQoTGM5ztVQrO2N3UjOfAwTGvKuvK iPAylNhhytRKwwcbi+8rpQBKGVJ5UikCIsGHwCEs34/78f0OfphBK6qAzo/Mxp4bstX1 j1RkOq3qC3RYMdd3Tuw7/685NcwaxmGu+Kauc5VNIqLdVWwBoxJuHegHlfY+VOs3IfFl 25cciK9rvRjO7Ccf72nToa4fawlEvuaffdffAM1oSael/BlIqzQdcdiXCwaPcMslMHTz Qq+TUzxkipEDAZB8htQmJogMkLQhgm9FHDko/zYCq299/1QbovybvvPcnpiQszj9EWZc GBAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8DlJF8ox1iXM0SUFoTuri9sHZjqwKuzbIipXI9kIBMU=; b=WsfVLR+yaP5g/JzrhVhTTa2YeMnt+ObWx+YTenlWzQ0kBRd454SSaQNjSLwp0Xvaul RrHuJfyFn++CR0OwzE8dHVMpRVKMF2CftiCi88N2PTwCSxinUy/DNgh9y0ObAFyzPwWe JoKAq/Me3RZwQhOustsNPkA2J9YedDlh7HR7rJ/ry8NkX+u6Oy39KwCgWdD0iwJnatJB RZZvVBP6L9Ew69LPKGiCC+zffV9/X6abeVTN+gYF1r6GyagA3MjYAbBsscpErXmsCLDq D0i9RNetKQRPL05WeZeRYD/akuPzvOt2D9k6/ZAhn7985NlyzhT9PxnxAHwh3hBQXfj7 ZOow== X-Gm-Message-State: AOAM531yyJlDB+gDzdxsAXAvBCS4zR5IFdRIj/Uu/TsIF9+MUP6mwyyM 7EEhOGgRfjuKmNypss5O+CQ= X-Google-Smtp-Source: ABdhPJwbg3LaBrv0vIEXPM98Lgh/a9Fa4pepI9de8vBHpwlzwHk+rMXOCOuBKlvzh8AVBn8va3WKnw== X-Received: by 2002:a05:600c:22d3:: with SMTP id 19mr5734058wmg.161.1589893653627; Tue, 19 May 2020 06:07:33 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id q144sm4157880wme.0.2020.05.19.06.07.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:07:33 -0700 (PDT) From: luca.boccassi@gmail.com To: Stephen Hemminger Cc: Ferruh Yigit , dpdk stable Date: Tue, 19 May 2020 14:02:46 +0100 Message-Id: <20200519130549.112823-31-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/dpaa: use dynamic log type' has been queued to stable release 19.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/21/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From 3e0d3b1204c39870f13a74db6c19e6778a74b6a4 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 30 Mar 2020 21:41:55 -0700 Subject: [PATCH] net/dpaa: use dynamic log type [ upstream commit b7c7ff6e3b34ac088237f85cf4ac5cc30c859a18 ] The static PMD logtype should not be used by drivers. Instead, use existing log macros in this driver. Also use standard rte_ether routine to format ether address. Fixes: 37f9b54bd3cf ("net/dpaa: support Tx and Rx queue setup") Signed-off-by: Stephen Hemminger Reviewed-by: Ferruh Yigit --- drivers/net/dpaa/dpaa_ethdev.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c index fce9ce2feb..5f81968d80 100644 --- a/drivers/net/dpaa/dpaa_ethdev.c +++ b/drivers/net/dpaa/dpaa_ethdev.c @@ -881,8 +881,8 @@ dpaa_dev_rx_queue_count(struct rte_eth_dev *dev, uint16_t rx_queue_id) PMD_INIT_FUNC_TRACE(); if (qman_query_fq_frm_cnt(rxq, &frm_cnt) == 0) { - RTE_LOG(DEBUG, PMD, "RX frame count for q(%d) is %u\n", - rx_queue_id, frm_cnt); + DPAA_PMD_DEBUG("RX frame count for q(%d) is %u", + rx_queue_id, frm_cnt); } return frm_cnt; } @@ -996,8 +996,7 @@ dpaa_dev_add_mac_addr(struct rte_eth_dev *dev, ret = fman_if_add_mac_addr(dpaa_intf->fif, addr->addr_bytes, index); if (ret) - RTE_LOG(ERR, PMD, "error: Adding the MAC ADDR failed:" - " err = %d", ret); + DPAA_PMD_ERR("Adding the MAC ADDR failed: err = %d", ret); return 0; } @@ -1023,7 +1022,7 @@ dpaa_dev_set_mac_addr(struct rte_eth_dev *dev, ret = fman_if_add_mac_addr(dpaa_intf->fif, addr->addr_bytes, 0); if (ret) - RTE_LOG(ERR, PMD, "error: Setting the MAC ADDR failed %d", ret); + DPAA_PMD_ERR("Setting the MAC ADDR failed %d", ret); return ret; } @@ -1306,6 +1305,7 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev) struct fman_if *fman_intf; struct fman_if_bpool *bp, *tmp_bp; uint32_t cgrid[DPAA_MAX_NUM_PCD_QUEUES]; + char eth_buf[RTE_ETHER_ADDR_FMT_SIZE]; PMD_INIT_FUNC_TRACE(); @@ -1457,15 +1457,9 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev) /* copy the primary mac address */ rte_ether_addr_copy(&fman_intf->mac_addr, ð_dev->data->mac_addrs[0]); + rte_ether_format_addr(eth_buf, sizeof(eth_buf), &fman_intf->mac_addr); - RTE_LOG(INFO, PMD, "net: dpaa: %s: %02x:%02x:%02x:%02x:%02x:%02x\n", - dpaa_device->name, - fman_intf->mac_addr.addr_bytes[0], - fman_intf->mac_addr.addr_bytes[1], - fman_intf->mac_addr.addr_bytes[2], - fman_intf->mac_addr.addr_bytes[3], - fman_intf->mac_addr.addr_bytes[4], - fman_intf->mac_addr.addr_bytes[5]); + DPAA_PMD_INFO("net: dpaa: %s: %s", dpaa_device->name, eth_buf); /* Disable RX mode */ fman_if_discard_rx_errors(fman_intf); @@ -1578,8 +1572,7 @@ rte_dpaa_probe(struct rte_dpaa_driver *dpaa_drv __rte_unused, if (!is_global_init && (rte_eal_process_type() == RTE_PROC_PRIMARY)) { if (access("/tmp/fmc.bin", F_OK) == -1) { - RTE_LOG(INFO, PMD, - "* FMC not configured.Enabling default mode\n"); + DPAA_PMD_INFO("* FMC not configured.Enabling default mode"); default_q = 1; } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:45.864418507 +0100 +++ 0031-net-dpaa-use-dynamic-log-type.patch 2020-05-19 14:04:44.168647502 +0100 @@ -1,15 +1,16 @@ -From b7c7ff6e3b34ac088237f85cf4ac5cc30c859a18 Mon Sep 17 00:00:00 2001 +From 3e0d3b1204c39870f13a74db6c19e6778a74b6a4 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 30 Mar 2020 21:41:55 -0700 Subject: [PATCH] net/dpaa: use dynamic log type +[ upstream commit b7c7ff6e3b34ac088237f85cf4ac5cc30c859a18 ] + The static PMD logtype should not be used by drivers. Instead, use existing log macros in this driver. Also use standard rte_ether routine to format ether address. Fixes: 37f9b54bd3cf ("net/dpaa: support Tx and Rx queue setup") -Cc: stable@dpdk.org Signed-off-by: Stephen Hemminger Reviewed-by: Ferruh Yigit