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 4EC10A046B for ; Tue, 23 Jul 2019 03:01:31 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 22FCB1BEED; Tue, 23 Jul 2019 03:01:31 +0200 (CEST) Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id 85D2E1B998 for ; Tue, 23 Jul 2019 03:01:29 +0200 (CEST) Received: from Internal Mail-Server by MTLPINE2 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 23 Jul 2019 04:01:24 +0300 Received: from scfae-sc-2.mti.labs.mlnx (scfae-sc-2.mti.labs.mlnx [10.101.0.96]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id x6N11Heo026580; Tue, 23 Jul 2019 04:01:23 +0300 From: Yongseok Koh To: Ivan Malov Cc: Andrew Rybchenko , dpdk stable Date: Mon, 22 Jul 2019 17:59:31 -0700 Message-Id: <20190723010115.6446-4-yskoh@mellanox.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190723010115.6446-1-yskoh@mellanox.com> References: <20190723010115.6446-1-yskoh@mellanox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/sfc: log port ID as 16-bit unsigned integer on panic' has been queued to LTS release 17.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 17.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objection by 07/27/19. So please shout if anyone has objection. 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. Yongseok --- >From a95ec939a85130bd235c53bb87c33b1c4eb381be Mon Sep 17 00:00:00 2001 From: Ivan Malov Date: Thu, 7 Feb 2019 12:17:24 +0000 Subject: [PATCH] net/sfc: log port ID as 16-bit unsigned integer on panic [ upstream commit 5e48db8c53cf2b6de1c944c392f33bc60e414c17 ] Fixes: f8244c6399d9 ("ethdev: increase port id range") Signed-off-by: Ivan Malov Signed-off-by: Andrew Rybchenko --- drivers/net/sfc/sfc_debug.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/sfc/sfc_debug.h b/drivers/net/sfc/sfc_debug.h index 92eba9c382..338c1cd553 100644 --- a/drivers/net/sfc/sfc_debug.h +++ b/drivers/net/sfc/sfc_debug.h @@ -49,7 +49,8 @@ do { \ const struct sfc_adapter *_sa = (sa); \ \ - rte_panic("sfc " PCI_PRI_FMT " #%" PRIu8 ": " fmt "\n", \ + rte_panic("sfc " PCI_PRI_FMT \ + " #%" PRIu16 ": " fmt "\n", \ _sa->pci_addr.domain, _sa->pci_addr.bus, \ _sa->pci_addr.devid, _sa->pci_addr.function, \ _sa->port_id, ##args); \ -- 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-07-22 17:55:06.750532322 -0700 +++ 0004-net-sfc-log-port-ID-as-16-bit-unsigned-integer-on-pa.patch 2019-07-22 17:55:05.739467000 -0700 @@ -1,10 +1,11 @@ -From 5e48db8c53cf2b6de1c944c392f33bc60e414c17 Mon Sep 17 00:00:00 2001 +From a95ec939a85130bd235c53bb87c33b1c4eb381be Mon Sep 17 00:00:00 2001 From: Ivan Malov Date: Thu, 7 Feb 2019 12:17:24 +0000 Subject: [PATCH] net/sfc: log port ID as 16-bit unsigned integer on panic +[ upstream commit 5e48db8c53cf2b6de1c944c392f33bc60e414c17 ] + Fixes: f8244c6399d9 ("ethdev: increase port id range") -Cc: stable@dpdk.org Signed-off-by: Ivan Malov Signed-off-by: Andrew Rybchenko @@ -13,10 +14,10 @@ 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/sfc/sfc_debug.h b/drivers/net/sfc/sfc_debug.h -index 6b600ff4d5..62f3937e8a 100644 +index 92eba9c382..338c1cd553 100644 --- a/drivers/net/sfc/sfc_debug.h +++ b/drivers/net/sfc/sfc_debug.h -@@ -27,7 +27,8 @@ +@@ -49,7 +49,8 @@ do { \ const struct sfc_adapter *_sa = (sa); \ \