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 82050A0A0E for ; Mon, 10 May 2021 18:04:37 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 370B74110A; Mon, 10 May 2021 18:04:37 +0200 (CEST) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam08on2052.outbound.protection.outlook.com [40.107.100.52]) by mails.dpdk.org (Postfix) with ESMTP id 8C3F04003E for ; Mon, 10 May 2021 18:04:36 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=I1xujaUYKKDXkOBNTd2JnaXQbw4cx6nI/TMLTpdOnixuoCFg6Fb2y2do3NqwCDn8ZPHvdsTbU9stHcavnlTnquweo9X95xW2ZB+i2/MZ347CeAKehRVGEqq2arGz6WXlZsx6r+zZV0lGXrOy1WKGAQLD37CQvqmhH9orvGdYKdkoQdRCnpQbFpclyYIN2n+XiY909YBIQL+t4t8kZj9OPQWTDVWt3dxzOhEJUu/H5y0TNfw0vxwloYZCGhqtV9TqJFqhq5RZ1N42LXaE8b8oKDilsAdpMWjLx9JwWHT+4KV8t+XnhE01IHlL+I0+A7bzI5GCu9a0DntUOEkSJDh4yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=MiAZkKKnuVy8KazVe2fDm2DpaX55bi2MR3YJd05x13Q=; b=JT6Q0rh8FizTdMJEfpg3SFmCFiIZ792g7Vy4qM3pfj9QCw3ow9cjyxGCajtDFXFc4IlGxxZ6IiIg018vpJEl5mcy4fJYsD/z5bIzDsJDTm8WjMGGV9JGXiF1fzdz7KoiYNKw54qIX9qrh+ahzs7kcFXDO7n8sgL7y6NFX6OOhIIe0P+ZUxj279nWwoDBAFN2m9g/IHd4vkc0j92bEdcbFVgm7p1oQWbV52CLd9W5+mPnPTmAb8QLCH+nOopEVGGwZ77xqfYWmIM/iYwPDLzuyu4JotPqPo3yEqdoauPjP8ISPpL04CoQXp1o0RyJCo+tyKGub3PglaFLLu4+FPDbuw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=MiAZkKKnuVy8KazVe2fDm2DpaX55bi2MR3YJd05x13Q=; b=hKoaWvmi2L0vs0p31uhPBAlwITgAogYgM9cz48LYHsy9d7l064xztzzii1shI0LtQaHtEW7a8d0mM/IKc59Z2/0R4+uuWLhcCECfLmKqwMWUQN8AFc/xwl+L1HVZ5ZcIs1BHeaP2AS3gi5ma8hu3qz8H9OkwbQUFX8nvi8JgWwUGTPRgblAMDHm4b7+ma1fGPJCGEHEFPg8VJcA3As3Sp1NXQh36KWi4i9ShAn0OXyr42jqjVbjfrDFMk49/lwvQ5iMFBTWY7RSZSDOGn8ctvKjFNmCKHet053ao+j6+o/dquXbEOe/u88wZcJZBV2pbvOevHAK4xh6o6bUVgz368Q== Received: from BN8PR07CA0021.namprd07.prod.outlook.com (2603:10b6:408:ac::34) by MN2PR12MB3822.namprd12.prod.outlook.com (2603:10b6:208:166::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24; Mon, 10 May 2021 16:04:35 +0000 Received: from BN8NAM11FT064.eop-nam11.prod.protection.outlook.com (2603:10b6:408:ac:cafe::87) by BN8PR07CA0021.outlook.office365.com (2603:10b6:408:ac::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:04:35 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by BN8NAM11FT064.mail.protection.outlook.com (10.13.176.160) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:04:34 +0000 Received: from nvidia.com (172.20.145.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 10 May 2021 16:04:33 +0000 From: Xueming Li To: Andrew Boyer CC: Luca Boccassi , dpdk stable Date: Mon, 10 May 2021 23:59:24 +0800 Message-ID: <20210510160258.30982-15-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510160258.30982-1-xuemingl@nvidia.com> References: <20210510160258.30982-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.145.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d438dfd1-fe3a-4168-da90-08d913cd4e28 X-MS-TrafficTypeDiagnostic: MN2PR12MB3822: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IF1d9GI3lP8KwniHmLebHwllBgyO7Z0JfZGtL0iMmlwuxWrrfJQ2Ebhivz8rZ599tqmJy33yNEomVDdJJwhcJ3t9/FsxL0i33kbTPeyRlN6EvKgFHrEuWYP4r+dl84whrmq3DEPs2FZTY3GkOBpvNmEMa0kHURT1fNnbL9xS+VXQps306/et/A+uPQjhcx5vYqKCQsTSaVWhkb/4Q5WU/gZAhBF3SmqOmR/ymvpzV48peTXqXg8SF9V3xc5VNmBaC2WnNV9+kzo7daQmJYy+7VEGKLeQtYtkx5pUv/O1DBCrn5FxDD0e7FnztvEPn0/dxuLeL9tVKiTtepEyJdheLJUrPI5uaZ9Q7ZcfNPDcB22KNM9qVZK+Ug3BzWk/Pe6JUGvBq89dbs0aVnaAINb3fsHg0vpU+CDn+Yd0egXWM6eemUWWI+fRVeYvRjCQGarIWpsmIXLzzrzC/+Mrd/LRClM9K9hZc0RmS8RaT4GaVCMU71TBH9n9DSozsAv/vuYhbOnwh+ArUFXLkYuQuGX1BN6RWkheneVd9lXJbkdmwUVc9yBJj5eJIfy36szOhT/NgrTKgHbx5FLyW/uAvvmVWOY6/kDz5Kvm/sUOXFnAfOqrGal5pf+zFhHzg9ilKUPtX27X8+Hay+mwLHI5TMPkwtbQh97attr5auheD1crWYN0+Wpsg5S0lDt2jZ4EsEUVr6EwjfDXE1yJ6sHdXLFZuNEl4yrqKI5iAj5DOc9VjsUnwC9OezU2azBEBQmCS4UVwD8P3UxIvj9eT9qphvU2Zw== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(39860400002)(396003)(136003)(376002)(346002)(36840700001)(46966006)(70206006)(70586007)(316002)(82310400003)(26005)(6916009)(36756003)(8676002)(8936002)(83380400001)(2906002)(54906003)(36860700001)(186003)(36906005)(47076005)(16526019)(86362001)(55016002)(53546011)(2616005)(5660300002)(336012)(6286002)(478600001)(6666004)(1076003)(356005)(426003)(4326008)(7636003)(7696005)(966005)(82740400003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:04:34.8260 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d438dfd1-fe3a-4168-da90-08d913cd4e28 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT064.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB3822 Subject: [dpdk-stable] patch 'net/ionic: fix completion type in lif init' has been queued to stable release 20.11.2 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 20.11.2 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/12/21. 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. Queued patches are on a temporary branch at: https://github.com/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/7a866f25e6aa059dca294bb85f5bf07c3b9b584e Thanks. Xueming Li --- >From 7a866f25e6aa059dca294bb85f5bf07c3b9b584e Mon Sep 17 00:00:00 2001 From: Andrew Boyer Date: Tue, 16 Feb 2021 12:35:40 -0800 Subject: [PATCH] net/ionic: fix completion type in lif init Cc: Luca Boccassi [ upstream commit 656bfc9a4e3d377ebf160132242d1bb2b5f9b8b2 ] The completion type was wrong. Don't check the completion if the wait timed out. Fixes: 669c8de67c88 ("net/ionic: support basic LIF") Signed-off-by: Andrew Boyer --- drivers/net/ionic/ionic_lif.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/ionic/ionic_lif.c b/drivers/net/ionic/ionic_lif.c index 5894f3505a..33a5977ced 100644 --- a/drivers/net/ionic/ionic_lif.c +++ b/drivers/net/ionic/ionic_lif.c @@ -1470,17 +1470,18 @@ int ionic_lif_init(struct ionic_lif *lif) { struct ionic_dev *idev = &lif->adapter->idev; - struct ionic_q_init_comp comp; + struct ionic_lif_init_comp comp; int err; memset(&lif->stats_base, 0, sizeof(lif->stats_base)); ionic_dev_cmd_lif_init(idev, lif->index, lif->info_pa); err = ionic_dev_cmd_wait_check(idev, IONIC_DEVCMD_TIMEOUT); - ionic_dev_cmd_comp(idev, &comp); if (err) return err; + ionic_dev_cmd_comp(idev, &comp); + lif->hw_index = comp.hw_index; err = ionic_lif_adminq_init(lif); -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-10 23:59:27.106608800 +0800 +++ 0016-net-ionic-fix-completion-type-in-lif-init.patch 2021-05-10 23:59:26.330000000 +0800 @@ -1 +1 @@ -From 656bfc9a4e3d377ebf160132242d1bb2b5f9b8b2 Mon Sep 17 00:00:00 2001 +From 7a866f25e6aa059dca294bb85f5bf07c3b9b584e Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 656bfc9a4e3d377ebf160132242d1bb2b5f9b8b2 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -18 +20 @@ -index b8023e0632..cd220abee2 100644 +index 5894f3505a..33a5977ced 100644 @@ -21 +23 @@ -@@ -1605,17 +1605,18 @@ int +@@ -1470,17 +1470,18 @@ int @@ -31 +33 @@ - ionic_dev_cmd_lif_init(idev, lif->info_pa); + ionic_dev_cmd_lif_init(idev, lif->index, lif->info_pa); @@ -39 +41 @@ - lif->hw_index = rte_cpu_to_le_16(comp.hw_index); + lif->hw_index = comp.hw_index;