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 A6B6AA0A0E for ; Mon, 10 May 2021 18:11:30 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A19B741104; Mon, 10 May 2021 18:11:30 +0200 (CEST) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam08on2054.outbound.protection.outlook.com [40.107.101.54]) by mails.dpdk.org (Postfix) with ESMTP id C5F7A40140 for ; Mon, 10 May 2021 18:11:28 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jVpt8QPrW0JJdopjzjCGeQYbszTA2BWMWqTDelhC8383g4RokUVUVI6NWuKKMVNVDB1nbdHTymlr2WBsfzn/ynJpwYS/uDD1a0x/V84NSBQfE9+VVHEU1cBGaOiMY7ZE9D7BvgaE84nG+p9f9OHci+KrqMuZOEokVx52zYBlbh+KU0E2rX3JPny4cxLA0gqVBYTNwgGCXjJMBxkJWjV/w/vFqNSxS/CbFD+6dQzuUR29FLY9rD9U1oJjlVU19ngQkuW1ySxV7sWUn3SOzXI2Yq4Fyv1LcIFNVpI3uYxoPkpLfhv7an1poJUIS4DbSPZq+CMw3q0Bf5UPjm+AUf1YqA== 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=vO4sHoYxZfjG8C2BqqAWGRYixzFu9E3igh1ceKPR/bY=; b=OkDw/xU/pwrxOhH7a4FBvC/o4PcJc8jPHM8tMGSURI+N1EExcMPhMMPVqmqkFFOcYi9O2UKiyc5SEy31tUOKIqjQZwgU3ZA4ZVsVr0VXhGmKevHtOVnx8e5Dyefcb3M0y8hszBGd7mpIGIa3puATDfediouViYw2k5FLT0xqPqd49m3Lcr2jko1EMEowAMqie56AFK9j9jP3v8wGWXDJTjUTxld7qpv66BSfnHhw0oGVs2Vdg0fGGD7i1wtKDjxWp8aqnXlKZUMSj4NIKvvwKf7j19eDaVOpLk1XDMPcIgebLsB5oNF+qvskirtDX3KiII8vzpGHqqFJpEBMSPecQQ== 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=vO4sHoYxZfjG8C2BqqAWGRYixzFu9E3igh1ceKPR/bY=; b=nXCwLXyDryAGXFlDTtjoF/KH7GFO1bIO61KjhTQs4nSkNLVX/rT0u4n6sSTql+DFXeQdRdHHKgkOCbtxx3IWd78c/6AlJjKQKleHpbQeGGdMb4PC87+kvobcNq2Dx6TBij005WnQ18w3WBXvxsN11Sztr0ccCBBbVB2Ti17ifWngv2dcHbD6fTrqjIRyl41kJKQWJGa/H/vwhbUUvM8HsmLMMMFOsubkyMSlOSz66ylhdqyYsiM8HNKIGB/ax4u6VZYbSpyLr7sgbUGZPRGwfbEMJUnzBjzVmoilp20DusWTKJuOeLXUdK0LL5qXy9Z6Ez86vX9lLz+zai4gPnXMtw== Received: from MW4PR03CA0049.namprd03.prod.outlook.com (2603:10b6:303:8e::24) by CY4PR12MB1928.namprd12.prod.outlook.com (2603:10b6:903:128::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.27; Mon, 10 May 2021 16:11:27 +0000 Received: from CO1NAM11FT059.eop-nam11.prod.protection.outlook.com (2603:10b6:303:8e:cafe::8e) by MW4PR03CA0049.outlook.office365.com (2603:10b6:303:8e::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24 via Frontend Transport; Mon, 10 May 2021 16:11:27 +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 CO1NAM11FT059.mail.protection.outlook.com (10.13.174.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:11:27 +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:11:24 +0000 From: Xueming Li To: Ed Czeck CC: Luca Boccassi , dpdk stable Date: Tue, 11 May 2021 00:00:32 +0800 Message-ID: <20210510160258.30982-83-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: 20b517e5-c4ee-4c26-d057-08d913ce43e2 X-MS-TrafficTypeDiagnostic: CY4PR12MB1928: 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: ZQmQjc+Lto8tTXY9C2qeTkSRZM3xR6TTihsYFJUA8veayGpt5q48cb/dDjVV3Gxb8JYNN6wTKcwE2xA9yzSjqaBsnF5Lcl6LW6u5uNyBvNr3A3x3t+uKas9rDSeCAdwARBBRzIjvhOxJ9iIYLxLjbSvskYsvfDTI6KJiy1wDDswoOC2f+YKibK6MHLzoxlXuar77D3nlPxdck8CY92T3huaSZm759nFzQC6FbBTSrYDvRVLG77C+zZRGf9BIUjWfIwPTiBFcfyZhXm/ZSzQroYgi1gucbPXTnbR9vTfyZ5yL2m2Joqmlsk1Qx9zH6XYiLw4pqi7diO5JV8jx2eTt1epopAlBHj+Wq6A/3Tb1A8TLrCaZUi4oikioCPphQCpyLCMYfjPafkffxrK+1hIuPmB26yHCi5DirRkAoIe/9o1czUEKLAlykKRe1mVev+mEjhRyuLwFSZ8gDA9Gup2f3EQk6jdlXuTvKwIg2qAr09GFUyS2wXeGg6SlF9hI+Q9EmO/Q7oAQnu/arDdvQVTN68RAJlNJQfxk4OD1v2KeVxarwMuTJit6fObCAs72Z+hZYAZuzhTDn4Bp1WsFgzAjeCff8TJY/+gOwunv98X6Kug6Sxoye5Y4+xIn++wvHmtG4T2FSMGEyRq9bmx96PJ4woBtKw/wRwWQm/Y/gsJ957oBVkZtQcxiLJA7lBHBKO0KdLQQ6liVNhX1f5uUyuU8OiuXLdXgCQVuxoBT6+yBMPy14lnvRidiPxsG3ptea8HoG5gzaQpr6CcF/sdoDoIXFQ== 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)(136003)(346002)(376002)(396003)(46966006)(36840700001)(1076003)(82310400003)(82740400003)(70206006)(6666004)(83380400001)(336012)(426003)(36906005)(316002)(7636003)(54906003)(2616005)(356005)(8676002)(36860700001)(186003)(478600001)(53546011)(15650500001)(26005)(55016002)(6916009)(966005)(16526019)(86362001)(6286002)(47076005)(4326008)(2906002)(36756003)(7696005)(70586007)(8936002)(5660300002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:11:27.1665 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 20b517e5-c4ee-4c26-d057-08d913ce43e2 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: CO1NAM11FT059.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1928 Subject: [dpdk-stable] patch 'net/ark: update packet director initial state' 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/f6beb20cd91f62f127c71ba5499dfaacc0ad0027 Thanks. Xueming Li --- >From f6beb20cd91f62f127c71ba5499dfaacc0ad0027 Mon Sep 17 00:00:00 2001 From: Ed Czeck Date: Thu, 18 Mar 2021 13:36:55 -0400 Subject: [PATCH] net/ark: update packet director initial state Cc: Luca Boccassi [ upstream commit 3b4f34f6b6071524a3de6a1db316eca65b4804ca ] Fixes: b33ccdb17f55 ("net/ark: provide API for hardware modules MPU RQP and pktdir") Signed-off-by: Ed Czeck --- drivers/net/ark/ark_ethdev.c | 1 + drivers/net/ark/ark_pktdir.c | 2 +- drivers/net/ark/ark_pktdir.h | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/ark/ark_ethdev.c b/drivers/net/ark/ark_ethdev.c index a658993512..0156eeb66e 100644 --- a/drivers/net/ark/ark_ethdev.c +++ b/drivers/net/ark/ark_ethdev.c @@ -321,6 +321,7 @@ eth_ark_dev_init(struct rte_eth_dev *dev) ark->rqpacing = (struct ark_rqpace_t *)(ark->bar0 + ARK_RCPACING_BASE); ark->started = 0; + ark->pkt_dir_v = ARK_PKT_DIR_INIT_VAL; ARK_PMD_LOG(INFO, "Sys Ctrl Const = 0x%x HW Commit_ID: %08x\n", ark->sysctrl.t32[4], diff --git a/drivers/net/ark/ark_pktdir.c b/drivers/net/ark/ark_pktdir.c index 25e1218310..dbfd2924bd 100644 --- a/drivers/net/ark/ark_pktdir.c +++ b/drivers/net/ark/ark_pktdir.c @@ -22,7 +22,7 @@ ark_pktdir_init(void *base) return inst; } inst->regs = (struct ark_pkt_dir_regs *)base; - inst->regs->ctrl = 0x00110110; /* POR state */ + inst->regs->ctrl = ARK_PKT_DIR_INIT_VAL; /* POR state */ return inst; } diff --git a/drivers/net/ark/ark_pktdir.h b/drivers/net/ark/ark_pktdir.h index 4afd128f95..b5577cebb3 100644 --- a/drivers/net/ark/ark_pktdir.h +++ b/drivers/net/ark/ark_pktdir.h @@ -7,7 +7,7 @@ #include -#define ARK_PKTDIR_BASE_ADR 0xa0000 +#define ARK_PKT_DIR_INIT_VAL 0x0110 typedef void *ark_pkt_dir_t; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-10 23:59:28.777676000 +0800 +++ 0084-net-ark-update-packet-director-initial-state.patch 2021-05-10 23:59:26.440000000 +0800 @@ -1 +1 @@ -From 3b4f34f6b6071524a3de6a1db316eca65b4804ca Mon Sep 17 00:00:00 2001 +From f6beb20cd91f62f127c71ba5499dfaacc0ad0027 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 3b4f34f6b6071524a3de6a1db316eca65b4804ca ] @@ -7 +9,0 @@ -Cc: stable@dpdk.org @@ -17 +19 @@ -index ef650a4658..477e1de02d 100644 +index a658993512..0156eeb66e 100644