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 BBD8CA054C for ; Fri, 14 Feb 2020 18:04:53 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B3BB7100C; Fri, 14 Feb 2020 18:04:53 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id DF208100C for ; Fri, 14 Feb 2020 18:04:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581699892; 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=ZEN62vbCWPJcw0+YEhV8ZIPYsjbyf0vGYwVrf4GYEww=; b=Su+bmIXqjBmFe8YxCkadc3aau8hOF61Uf3o4XN11YpMqoe82WJMH6V4QxlEtaZy4c19Gi8 sG+QpPOjnlP9NtdOG0AUAEbk/JW7ifRTZHrc+6UhBPhlreoeFbfcQspjmLVnB3tFZku2oF MGyZeTwO8ZkKLP+uidJZTOF9u6TUiec= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-270-3HfNI2yrPba3jkMYDpFhUQ-1; Fri, 14 Feb 2020 12:04:48 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D32F118C35AC; Fri, 14 Feb 2020 17:04:47 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2E03A84BCD; Fri, 14 Feb 2020 17:04:45 +0000 (UTC) From: Kevin Traynor To: Kalesh AP Cc: Somnath Kotur , dpdk stable Date: Fri, 14 Feb 2020 17:03:10 +0000 Message-Id: <20200214170337.25093-16-ktraynor@redhat.com> In-Reply-To: <20200214170337.25093-1-ktraynor@redhat.com> References: <20200214170337.25093-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: 3HfNI2yrPba3jkMYDpFhUQ-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'net/bnxt: use macro for PCI log format' has been queued to LTS release 18.11.7 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 LTS release 18.11.7 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/20/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 rebasi= ng (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/925656b9fea38136b8= cd0e35825640c0c133fec4 Thanks. Kevin. --- >From 925656b9fea38136b8cd0e35825640c0c133fec4 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 ed7f1f44b9..6d7c430030 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -2910,7 +2910,7 @@ bnxt_get_eeprom_length_op(struct rte_eth_dev *dev) =09uint32_t entry_length; =20 -=09PMD_DRV_LOG(INFO, "%04x:%02x:%02x:%02x\n", -=09=09bp->pdev->addr.domain, bp->pdev->addr.bus, -=09=09bp->pdev->addr.devid, bp->pdev->addr.function); +=09PMD_DRV_LOG(INFO, PCI_PRI_FMT "\n", +=09=09 bp->pdev->addr.domain, bp->pdev->addr.bus, +=09=09 bp->pdev->addr.devid, bp->pdev->addr.function); =20 =09rc =3D bnxt_hwrm_nvm_get_dir_info(bp, &dir_entries, &entry_length); @@ -2929,8 +2929,8 @@ bnxt_get_eeprom_op(struct rte_eth_dev *dev, =09uint32_t offset; =20 -=09PMD_DRV_LOG(INFO, "%04x:%02x:%02x:%02x in_eeprom->offset =3D %d " -=09=09"len =3D %d\n", bp->pdev->addr.domain, -=09=09bp->pdev->addr.bus, bp->pdev->addr.devid, -=09=09bp->pdev->addr.function, in_eeprom->offset, in_eeprom->length); +=09PMD_DRV_LOG(INFO, PCI_PRI_FMT " in_eeprom->offset =3D %d len =3D %d\n", +=09=09 bp->pdev->addr.domain, bp->pdev->addr.bus, +=09=09 bp->pdev->addr.devid, bp->pdev->addr.function, +=09=09 in_eeprom->offset, in_eeprom->length); =20 =09if (in_eeprom->offset =3D=3D 0) /* special offset value to get director= y */ @@ -3000,8 +3000,8 @@ bnxt_set_eeprom_op(struct rte_eth_dev *dev, =09uint16_t type, ext, ordinal, attr; =20 -=09PMD_DRV_LOG(INFO, "%04x:%02x:%02x:%02x in_eeprom->offset =3D %d " -=09=09"len =3D %d\n", bp->pdev->addr.domain, -=09=09bp->pdev->addr.bus, bp->pdev->addr.devid, -=09=09bp->pdev->addr.function, in_eeprom->offset, in_eeprom->length); +=09PMD_DRV_LOG(INFO, PCI_PRI_FMT " in_eeprom->offset =3D %d len =3D %d\n", +=09=09 bp->pdev->addr.domain, bp->pdev->addr.bus, +=09=09 bp->pdev->addr.devid, bp->pdev->addr.function, +=09=09 in_eeprom->offset, in_eeprom->length); =20 =09if (!BNXT_PF(bp)) { --=20 2.21.1 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092020-02-14 17:02:37.929448169 +0000 +++ 0016-net-bnxt-use-macro-for-PCI-log-format.patch=092020-02-14 17:02:36.= 948408001 +0000 @@ -1 +1 @@ -From 537a053a79196db4999f7d956d00f822e95e9969 Mon Sep 17 00:00:00 2001 +From 925656b9fea38136b8cd0e35825640c0c133fec4 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 537a053a79196db4999f7d956d00f822e95e9969 ] + @@ -7 +8,0 @@ -Cc: stable@dpdk.org @@ -16 +17 @@ -index 26614186f5..ba3f0a7d96 100644 +index ed7f1f44b9..6d7c430030 100644 @@ -19,2 +20,2 @@ -@@ -3594,7 +3594,7 @@ bnxt_get_eeprom_length_op(struct rte_eth_dev *dev) - =09=09return rc; +@@ -2910,7 +2910,7 @@ bnxt_get_eeprom_length_op(struct rte_eth_dev *dev) + =09uint32_t entry_length; @@ -30,2 +31,2 @@ -@@ -3618,8 +3618,8 @@ bnxt_get_eeprom_op(struct rte_eth_dev *dev, - =09=09return rc; +@@ -2929,8 +2929,8 @@ bnxt_get_eeprom_op(struct rte_eth_dev *dev, + =09uint32_t offset; @@ -43,2 +44,2 @@ -@@ -3694,8 +3694,8 @@ bnxt_set_eeprom_op(struct rte_eth_dev *dev, - =09=09return rc; +@@ -3000,8 +3000,8 @@ bnxt_set_eeprom_op(struct rte_eth_dev *dev, + =09uint16_t type, ext, ordinal, attr;