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 E835841D8D for ; Mon, 27 Feb 2023 08:17:54 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E4015410D3; Mon, 27 Feb 2023 08:17:54 +0100 (CET) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2065.outbound.protection.outlook.com [40.107.223.65]) by mails.dpdk.org (Postfix) with ESMTP id AED0D41151 for ; Mon, 27 Feb 2023 08:17:52 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oOXd2FjgkM1wSkkRGGR4dyLjb7hoWZBJUrW5P0yCQZlmc5pQYqQ9QADLC81OipHpVvLAV5CagA+X6TjS3ZGjMwHWALHwE/FXNXfCPjZRkihanE34AiDdBMuTUbW6F1cdTzKoL0fA/UgQIiHDf7+87AIjnuD8zMKwis6J1JOu2LC4VOmmvL9iBJVLOL+lsPshNOeq4g1YEFasv5jedmWWyWoHj3RltqWo8bXyX68GdpXGWDbL05WM+5Z08vVM8pJn7AHl+/pm6QY3Gwe0dmi6eLByUEcYYmQ3DOy9I+4xMJ4YBC4BqnYL6LUhG30TDzXvyRVLghL91Cbslrj+F3TItw== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=/rDvVO+70+wrZW08drMDOKdU94nXHBd8Ouskbd7sqvA=; b=EWWuMwT/+bNEZcanAARyTh/esVTvm0IRqQJG6fewQH1WeAQ4SqqR01z2Zy50LTPaQUOSTF70tvLRya1s1O/rstoBNL6/FsL/BCB0k1QwSGD2uhyHzCs4mw88H1gqVGysjFDm502GO4+HpQrF1IIgdFnRSKdHv7ZHkfrf18cIUrDHWIaIjgufIHTKpRwsKGutjAuUfAA0516vIYvSGOdTrem5cOO8FzX3bsLRf9RBifgZPLBcNiBWO5zFTDl1GmtkrhN4tYqbDYFHpAUH1x4YkB9I4Kd3Sek1exmpGFWiv/3ahCEvRansSSL6DaNjPVtaq3ZhIslumnjElNor7psuTw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject 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=/rDvVO+70+wrZW08drMDOKdU94nXHBd8Ouskbd7sqvA=; b=K5HHrg9p/HO2Z6GPk4ZzU7CUeKGMM3ImFB7/Z5OBhm3+KAOPq4iRq3/XPQcu/vVWkCerSLnKFPl75Pv+gkYZF0LeFbzTDtniZ6PcA3NsU0kt3vmfx8jWfCcTn6HO7FSoxBVpSjZ7d+nQcVwUk3S+7SJA+ZA2AKxe2z7jNvdaFHi25FyGYJvTjzvmdn/w96hHrs9cocf15bKVoblqdPvBl70d9YEMV6jWe/iJ8gn4/3OtYdmAIqwQmxSLu0FNOnxuxQHMXj9fIOmAdYizkfQJXzVvB2Qk+qLQLrE8zo7+AXCT3t7+/ZC/JKTuAkTuNnzefA0THSZ/cU7eXYm64rvZYQ== Received: from BL1PR13CA0136.namprd13.prod.outlook.com (2603:10b6:208:2bb::21) by DM4PR12MB8498.namprd12.prod.outlook.com (2603:10b6:8:183::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.29; Mon, 27 Feb 2023 07:17:51 +0000 Received: from BL02EPF00010208.namprd05.prod.outlook.com (2603:10b6:208:2bb:cafe::2a) by BL1PR13CA0136.outlook.office365.com (2603:10b6:208:2bb::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.16 via Frontend Transport; Mon, 27 Feb 2023 07:17:50 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by BL02EPF00010208.mail.protection.outlook.com (10.167.241.199) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.12 via Frontend Transport; Mon, 27 Feb 2023 07:17:50 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Sun, 26 Feb 2023 23:17:37 -0800 Received: from nvidia.com (10.126.231.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Sun, 26 Feb 2023 23:17:34 -0800 From: Xueming Li To: Bruce Richardson CC: Conor Walsh , Kevin Laatz , dpdk stable Subject: patch 'dma/ioat: fix error reporting on restart' has been queued to stable release 22.11.2 Date: Mon, 27 Feb 2023 15:01:01 +0800 Message-ID: <20230227070107.15664-153-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230227070107.15664-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230227070107.15664-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.37] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF00010208:EE_|DM4PR12MB8498:EE_ X-MS-Office365-Filtering-Correlation-Id: 84d6b556-d8db-49cd-0be1-08db1892bc6d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Aqlrk+GQPcrQsdwuV09BVEfVG0RVT2gGk1ydBg40gHTivHR/C8JDSmMMdHfZJBCtq1L4XckzPHmepZg3oSKzZZ2GoNbjxX6lS8iXHNs510ov9zUXuLs+PqXB3up4d6QIZ8YUL2cuSH5Cx4HCxSXJOp0fFk5fgWgFFkTYTWzxD2ferwDlNM0t57YKoFm0pDDN7UMBxLl9DaLMnaTgp42vS8jQ7bw3WUK9k4DHt5+gWYfNY3as+9YuTzYSmQHyGI3ZShIx2+prmP8VtvU3CdUiULFNx1EqjuSY1yKuQlJtwi0FE/Df/GrUXVHZVj1kOOCnW87coddPuwnC1ZrIvdge0qNICIsSAL5wPmF9iF7Y39rWH92fkTBsfUJjCiGx7sp1TtoTZMGS2hZvMnQTaJr/nffyElKy5dvWvSzcNOEwdNts3B4E9sEHlx6Zy5Phi87t+MLRCnbU4vYeWnqr2eC9juXm/Pk8eRURmJlsEw98U8kHVInMTRa2LUvwqPSa/hT06v9YmtGqwoXOIGakEBk+otNDOGdbJB+LPiA2pZwm0KZMcwsm9/lsTekBgBa5r83RY+2yAUrKcL/7F5iO5uCLPygO9pPOrpwiAAIrtoatWa63XMspDCv7EhObSWVgwb6t8tjt7Dwi9kHOn/druMJ01rUZtfCmP/K6Ac67qUbyt//Dqm/IuJcXC4x5suW4FmHoInfEYvHzknrlDSrV3sWdtK6OL2pMXo4zHtGuyVkiEharyQhSgzpJm5mB9FX/J91oD1OWerzBH7bqd6DcoELweLlDGY/JHEFpGCHKU84Z2ME= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230025)(4636009)(376002)(346002)(396003)(39860400002)(136003)(451199018)(36840700001)(40470700004)(46966006)(5660300002)(40460700003)(36756003)(86362001)(55016003)(40480700001)(8936002)(83380400001)(426003)(478600001)(47076005)(2616005)(336012)(82310400005)(6666004)(7696005)(966005)(16526019)(186003)(26005)(6286002)(53546011)(1076003)(70206006)(70586007)(41300700001)(356005)(8676002)(6916009)(4326008)(54906003)(36860700001)(82740400003)(7636003)(316002)(2906002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2023 07:17:50.6424 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 84d6b556-d8db-49cd-0be1-08db1892bc6d X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF00010208.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB8498 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 Hi, FYI, your patch has been queued to stable release 22.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 03/01/23. 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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=106e0f2637880f7e976713713ea978cf65e8455c Thanks. Xueming Li --- >From 106e0f2637880f7e976713713ea978cf65e8455c Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Thu, 16 Feb 2023 11:09:16 +0000 Subject: [PATCH] dma/ioat: fix error reporting on restart Cc: Xueming Li [ upstream commit d486f1dad1df34abb0d64dcc8d192675476581ed ] When the DMA device was stopped and restarted by the driver, the control register specifying the behaviour on error was not getting correctly reset. This caused unit tests to fail as explicitly introduced errors were got getting reported back. Fix by moving the setting of the register to the start function from the probe function. Fixes: 583f046dd404 ("dma/ioat: add start and stop") Signed-off-by: Bruce Richardson Reviewed-by: Conor Walsh Acked-by: Kevin Laatz --- drivers/dma/ioat/ioat_dmadev.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/dma/ioat/ioat_dmadev.c b/drivers/dma/ioat/ioat_dmadev.c index 072eb17cd9..57c18c081d 100644 --- a/drivers/dma/ioat/ioat_dmadev.c +++ b/drivers/dma/ioat/ioat_dmadev.c @@ -142,6 +142,9 @@ ioat_dev_start(struct rte_dma_dev *dev) ioat->regs->chainaddr = ioat->ring_addr; /* Inform hardware of where to write the status/completions. */ ioat->regs->chancmp = ioat->status_addr; + /* Ensure channel control is set to abort on error, so we get status writeback. */ + ioat->regs->chanctrl = IOAT_CHANCTRL_ANY_ERR_ABORT_EN | + IOAT_CHANCTRL_ERR_COMPLETION_EN; /* Prime the status register to be set to the last element. */ ioat->status = ioat->ring_addr + ((ioat->qcfg.nb_desc - 1) * DESC_SZ); @@ -682,8 +685,6 @@ ioat_dmadev_create(const char *name, struct rte_pci_device *dev) return -EIO; } } - ioat->regs->chanctrl = IOAT_CHANCTRL_ANY_ERR_ABORT_EN | - IOAT_CHANCTRL_ERR_COMPLETION_EN; dmadev->fp_obj->dev_private = ioat; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-27 14:08:45.760843700 +0800 +++ 0154-dma-ioat-fix-error-reporting-on-restart.patch 2023-02-27 14:08:40.959237000 +0800 @@ -1 +1 @@ -From d486f1dad1df34abb0d64dcc8d192675476581ed Mon Sep 17 00:00:00 2001 +From 106e0f2637880f7e976713713ea978cf65e8455c Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit d486f1dad1df34abb0d64dcc8d192675476581ed ] @@ -15 +17,0 @@ -Cc: stable@dpdk.org