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 D4ED3A051C for ; Tue, 11 Feb 2020 12:39:13 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CDA0B1BF95; Tue, 11 Feb 2020 12:39:13 +0100 (CET) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id CC5951BF95 for ; Tue, 11 Feb 2020 12:39:12 +0100 (CET) Received: by mail-wr1-f68.google.com with SMTP id t2so11969523wrr.1 for ; Tue, 11 Feb 2020 03:39:12 -0800 (PST) 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=0WREGJv8MjKUf4ysJq+ydxQ37/DPtQnxmbnEECk/5i4=; b=R+1b3mCflaQoZpx5h76Yl6Dk/V3Jix6iDAgnl8BHCMnnw/71wQ0GNmxUBMFUIkhj5u zMr/s/YcPgr/8LZh76oejJAMXULA3z3U5MTiv/iGuqkvfzGAV+wiU185pPMpDEdI61W3 9rwkrQ7Qhhhu/UqDWYumXXIqs2xD3HB5n5Eq36le9tAF6+nasQpiI9GUSo2jyXC1Duts NtqTJAU5ZFsaARFAgQ0aJqCYMdZkdwECp/sm/cmARoB3BKfV0PBAQWTcxP2qQulRmZye n9uWM9ovpnkfTZMJDL4eEpK9s71wXwr3lsCPTv5G8c7oSrIi672S3/lWLtfJXDHiJN8t x0VQ== 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=0WREGJv8MjKUf4ysJq+ydxQ37/DPtQnxmbnEECk/5i4=; b=JpVmJClW7t42vGF8h4tJ9YsN5X4Eh2fCoRp6G5VDiQMawLKhi5hvGqqCJKOCYopR5Z NnZVLare68tWYXY6WtiFmed0RaEzBQn6WSNzgPGl2DcAsxkxIP5doVaRJ/gVvENXGujw F77P+ldhNgnxIk5Z0SZMjQDA4Qo/xAxgBg9MU0kA4KgVB1xj7IHUDga9IC4KMifwhkTX Hdn8bnj/L428BGhYBNHqjzHNfQApN2YZQgnHlQ27Rd2v1njmNeS+c3qyven5/g0Tx8aa xfzBw5rNzhZ5msBb/ISBLFLO9D0AS1mp5HHAfcEUQg8IVrW/q44Ha8hU2a1bIjdTL20g YszQ== X-Gm-Message-State: APjAAAVXd1biM3WUedFQDc1xeKKQhhpuG3lURvZPiQI5Xkgki7XqAHv7 c1SQyF7YzZMNmI5QhdG1F+A= X-Google-Smtp-Source: APXvYqzUgpn2uw4swrc4bhXPZDFIucRSPb42qWXEksXHzrfw2R2IoUA70V1RxC2vdEQu/3c44znAgA== X-Received: by 2002:a5d:6390:: with SMTP id p16mr8573892wru.170.1581421152520; Tue, 11 Feb 2020 03:39:12 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id e1sm5026800wrt.84.2020.02.11.03.39.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 03:39:12 -0800 (PST) From: luca.boccassi@gmail.com To: Kalesh AP Cc: Somnath Kotur , dpdk stable Date: Tue, 11 Feb 2020 11:21:20 +0000 Message-Id: <20200211112216.3929-134-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200211112216.3929-1-luca.boccassi@gmail.com> References: <20200211112216.3929-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bnxt: use macro for PCI log format' has been queued to stable release 19.11.1 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.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/13/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 b2dca262c8bbdbe69e8755fb56233ed32413de6d Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Thu, 16 Jan 2020 18:34:53 +0530 Subject: [PATCH] net/bnxt: use macro for PCI log format [ upstream commit 537a053a79196db4999f7d956d00f822e95e9969 ] Fixes: 19e6af01bb36 ("net/bnxt: support get/set EEPROM") Signed-off-by: Kalesh AP Reviewed-by: Somnath Kotur --- drivers/net/bnxt/bnxt_ethdev.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 517ae3e861..59400f3139 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -3517,9 +3517,9 @@ bnxt_get_eeprom_length_op(struct rte_eth_dev *dev) if (rc) return rc; - PMD_DRV_LOG(INFO, "%04x:%02x:%02x:%02x\n", - bp->pdev->addr.domain, bp->pdev->addr.bus, - bp->pdev->addr.devid, bp->pdev->addr.function); + PMD_DRV_LOG(INFO, PCI_PRI_FMT "\n", + bp->pdev->addr.domain, bp->pdev->addr.bus, + bp->pdev->addr.devid, bp->pdev->addr.function); rc = bnxt_hwrm_nvm_get_dir_info(bp, &dir_entries, &entry_length); if (rc != 0) @@ -3541,10 +3541,10 @@ bnxt_get_eeprom_op(struct rte_eth_dev *dev, if (rc) return rc; - PMD_DRV_LOG(INFO, "%04x:%02x:%02x:%02x in_eeprom->offset = %d " - "len = %d\n", bp->pdev->addr.domain, - bp->pdev->addr.bus, bp->pdev->addr.devid, - bp->pdev->addr.function, in_eeprom->offset, in_eeprom->length); + PMD_DRV_LOG(INFO, PCI_PRI_FMT " in_eeprom->offset = %d len = %d\n", + bp->pdev->addr.domain, bp->pdev->addr.bus, + bp->pdev->addr.devid, bp->pdev->addr.function, + in_eeprom->offset, in_eeprom->length); if (in_eeprom->offset == 0) /* special offset value to get directory */ return bnxt_get_nvram_directory(bp, in_eeprom->length, @@ -3617,10 +3617,10 @@ bnxt_set_eeprom_op(struct rte_eth_dev *dev, if (rc) return rc; - PMD_DRV_LOG(INFO, "%04x:%02x:%02x:%02x in_eeprom->offset = %d " - "len = %d\n", bp->pdev->addr.domain, - bp->pdev->addr.bus, bp->pdev->addr.devid, - bp->pdev->addr.function, in_eeprom->offset, in_eeprom->length); + PMD_DRV_LOG(INFO, PCI_PRI_FMT " in_eeprom->offset = %d len = %d\n", + bp->pdev->addr.domain, bp->pdev->addr.bus, + bp->pdev->addr.devid, bp->pdev->addr.function, + in_eeprom->offset, in_eeprom->length); if (!BNXT_PF(bp)) { PMD_DRV_LOG(ERR, "NVM write not supported from a VF\n"); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-11 11:17:43.356623509 +0000 +++ 0134-net-bnxt-use-macro-for-PCI-log-format.patch 2020-02-11 11:17:38.644005910 +0000 @@ -1,10 +1,11 @@ -From 537a053a79196db4999f7d956d00f822e95e9969 Mon Sep 17 00:00:00 2001 +From b2dca262c8bbdbe69e8755fb56233ed32413de6d Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Thu, 16 Jan 2020 18:34:53 +0530 Subject: [PATCH] net/bnxt: use macro for PCI log format +[ upstream commit 537a053a79196db4999f7d956d00f822e95e9969 ] + Fixes: 19e6af01bb36 ("net/bnxt: support get/set EEPROM") -Cc: stable@dpdk.org Signed-off-by: Kalesh AP Reviewed-by: Somnath Kotur @@ -13,10 +14,10 @@ 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c -index 26614186f5..ba3f0a7d96 100644 +index 517ae3e861..59400f3139 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c -@@ -3593,9 +3593,9 @@ bnxt_get_eeprom_length_op(struct rte_eth_dev *dev) +@@ -3517,9 +3517,9 @@ bnxt_get_eeprom_length_op(struct rte_eth_dev *dev) if (rc) return rc; @@ -29,7 +30,7 @@ rc = bnxt_hwrm_nvm_get_dir_info(bp, &dir_entries, &entry_length); if (rc != 0) -@@ -3617,10 +3617,10 @@ bnxt_get_eeprom_op(struct rte_eth_dev *dev, +@@ -3541,10 +3541,10 @@ bnxt_get_eeprom_op(struct rte_eth_dev *dev, if (rc) return rc; @@ -44,7 +45,7 @@ if (in_eeprom->offset == 0) /* special offset value to get directory */ return bnxt_get_nvram_directory(bp, in_eeprom->length, -@@ -3693,10 +3693,10 @@ bnxt_set_eeprom_op(struct rte_eth_dev *dev, +@@ -3617,10 +3617,10 @@ bnxt_set_eeprom_op(struct rte_eth_dev *dev, if (rc) return rc;