From patchwork Thu May 3 02:42:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Satish Kumar Nagireddy X-Patchwork-Id: 49170 X-Patchwork-Delegate: laurent.pinchart@ideasonboard.com Received: from vger.kernel.org ([209.132.180.67]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fE4DK-0000EL-VD; Thu, 03 May 2018 02:43:23 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752019AbeECCnU (ORCPT + 1 other); Wed, 2 May 2018 22:43:20 -0400 Received: from mail-cys01nam02on0088.outbound.protection.outlook.com ([104.47.37.88]:53216 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751987AbeECCnM (ORCPT ); Wed, 2 May 2018 22:43:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector1-xilinx-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=i+0D+Y0PCcCSQaxd+Y/iqJQHqTiVM+NdGzumBtEA3MQ=; b=tzveGCe0ZXqJSj+f7NE7vKTGkbp6KgkaNaRjXQpYC06xfc+rYiQjZPH7TJOwzbZRnBPCwQT8tUcd42D175XaGar/UyBeWS1DqttLGsG+X8A4J6ZKcJpu//CFGdHFhfqz29IrtZY9RGseCKKhIF/JNODUdhp4qoUmqi1F8AH2a4o= Received: from BN6PR02CA0037.namprd02.prod.outlook.com (2603:10b6:404:5f::23) by SN1PR02MB1678.namprd02.prod.outlook.com (2a01:111:e400:5230::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.715.18; Thu, 3 May 2018 02:43:10 +0000 Received: from CY1NAM02FT054.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::208) by BN6PR02CA0037.outlook.office365.com (2603:10b6:404:5f::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.735.16 via Frontend Transport; Thu, 3 May 2018 02:43:09 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.83) smtp.mailfrom=xilinx.com; ideasonboard.com; dkim=none (message not signed) header.d=none;ideasonboard.com; dmarc=bestguesspass action=none header.from=xilinx.com; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.60.83 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.83; helo=xsj-pvapsmtpgw01; Received: from xsj-pvapsmtpgw01 (149.199.60.83) by CY1NAM02FT054.mail.protection.outlook.com (10.152.74.100) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.715.13 via Frontend Transport; Thu, 3 May 2018 02:43:09 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66] helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from ) id 1fE4D6-0004xF-KS; Wed, 02 May 2018 19:43:08 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1fE4D1-00058K-Cf; Wed, 02 May 2018 19:43:03 -0700 Received: from xsj-pvapsmtp01 (mailman.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id w432gtNN009731; Wed, 2 May 2018 19:42:55 -0700 Received: from [172.19.2.23] (helo=xsjsatishna50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1fE4Cs-00057Q-Vd; Wed, 02 May 2018 19:42:54 -0700 From: Satish Kumar Nagireddy To: , , , CC: Vishal Sagar , Satish Kumar Nagireddy Subject: [PATCH v5 3/8] xilinx: v4l: dma: Terminate DMA when media pipeline fail to start Date: Wed, 2 May 2018 19:42:48 -0700 Message-ID: <8d18eea81b7d477d3802ebf185f995082f948ac5.1525312401.git.satish.nagireddy.nagireddy@xilinx.com> X-Mailer: git-send-email 2.1.1 In-Reply-To: References: X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.2.0.1013-23620.005 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.83; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(39850400004)(39380400002)(346002)(396003)(376002)(2980300002)(438002)(199004)(189003)(476003)(2616005)(81166006)(81156014)(446003)(2906002)(118296001)(316002)(51416003)(7696005)(106466001)(63266004)(26005)(8676002)(110136005)(36386004)(5660300001)(186003)(426003)(11346002)(305945005)(126002)(336012)(48376002)(77096007)(8936002)(76176011)(486006)(50466002)(2201001)(106002)(59450400001)(54906003)(478600001)(9786002)(16586007)(356003)(47776003)(72206003)(36756003)(6636002)(6666003)(50226002)(4326008)(107886003)(107986001)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR02MB1678; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; LANG:en; PTR:unknown-60-83.xilinx.com; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: 1; CY1NAM02FT054; 1:fdoS0/trKonboBBbryvVTLsiSe7qwrXmp4bSU6nevN6Z8CzbcZEzvRgIizUVkFiCRh+lJSk5Z57GP1qRAb25uhzDTXw/bPz3N0JPEsZxR+zy0FUBwksdCnN9gEPKdnBf MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4608076)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060); SRVR:SN1PR02MB1678; X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1678; 3:DYLtaCTFQikgbfM4Vb6EATo6THyA1cE02d3x2VVny5Jkdb6/E8KNxQz1nKf2ZLRg8A/ShxpWZkNGaxWooDoajYoWmM1X9Zrpop27PiWpaxa91yeBMkH80XtbhpJ+wAAvJps3PZTVsfuMYtIxHGEFD59KjC7AuBzu1j67Z8DmJFcveMpJku0f7ff773Y/De6HtBymoEYmmPLgEJp9e0uEieGt7SVQPSGBFO+D0E76is+XFSoERP+2P4oOBEpS8G5RnwvX37/PEXweLeZBGRu70F+6Z0pqhM1T9bbANyD4fd5E85j/fx4n6VM7PA67ijg5sau6Ui6A62e98IuYI1aXTIvsd2p420QheTt1XlORtlo=; 25:MXow4lk1AUzVaRPwmvX6/GMlg5bRDJytAGNk0LxjqSfPR1egBy5+MHSPikOT+RIghBtSzYydB2WfWl1dzQInWP3X6IRDPea1unTgtt3VpvO2hINRjtDHdSOxyL9KeyyjMrFhtTX3IADexrtx6Rx0qNXUfFbEJ5k8BKasGWxn0VViV4ve2Sd86IAgGglC5fl64PpAIBar3q+Khm7qUynWT3C1lUxyw2ZIsRKa0mPF218hSd7fk7t6wgv+O406DbMrZbfgjjNOGsa1ave/WbEPVtSFnYetaXo0cwI7jg80dQs4IA4QY8OwtG3RmqRrdLWLQRmlUmRrBweaegGUFSLErQ== X-MS-TrafficTypeDiagnostic: SN1PR02MB1678: X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1678; 31:QogiGofNyQoJ4Sbu/uL5yjFsLoQ7phMCNA0D76uwCL44YaLyrpTdCr9zqehFgo6DO/IXT6HE45GbXbUXOpXvG7mPg6SBsBW5Xz7gc4YZ1UktmkQaEjgpwweDsigiRRaSy/baKyzpy9yK65MkoRvGr9gYeLx+1rIpCXw32g6KdEYhEl/nATE3+sChwG8ffd9tmxWQJ6LOyRwpVlq2/YC6ieV5JE3wCfPYuhA+hCVQJ9s=; 20:izHZYeHmLEc8/vhcYvqnI7/3Kevqg4bWrew8uiAwrjEOmDzEqopd0slNhht+fhPP/q5BQtKC/fk5N7umENSW4+X6Hv/EKsol8C5hf03x07lmO4sdKnF0WWDcsQCVWEE6/Ouw6n+xjZdgvyJtRED5f467yi/jRxBm0BwlypucqtiJjIj0Yxt8ch0ldYq1NfSEsql3h+BnPLiVlEdp7CeW3A8AkMEtn6yVv/V988jD6FLkOQ+d1WtMIPl4861Q/enIiOBMZuPYHxopERUtvqpF9TDuUBcvG5bJ6+4lYR2gxWI1R6dOZIAyvGe0z+1pZFwX24jnKUvDAMuZW5K5kvDptiadW2oxbwCrBYmjWkxMpliZCZDDEq5MbbZwdRorvU2n+mQ9jQbBOTau+aozLLvAAp+XMo7MnEx33CNQCbRtPHZOJaj6S9XRFb95GE6eQ4TI5itgt5pbP4G8nOcbY2CrFFmo/1odkHc5pSw1S7veLyBh30p9jUGNc39c6mhgfpDu X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(192813158149592); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231254)(944501410)(52105095)(93006095)(93004095)(3002001)(10201501046)(6055026)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(20161123560045)(20161123564045)(6072148)(201708071742011); SRVR:SN1PR02MB1678; BCL:0; PCL:0; RULEID:; SRVR:SN1PR02MB1678; X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1678; 4:YLigfFAlzolloEJM3mYlz1jE/tMeKRs3ck98VCfs52+tV9lYp63vTIDQrzkDCFVpwVZAfDbFgDcdOmUqhhMkD9t7fNhFgywdJ2oVmYHoHvxxPnuR/T2sWuUrdu0JsjW8CF6G34WGxOuaa9ZTbrTQjrJ2XnapNOSCujJepTXcb2CbmX+bcM1+i4e/bLkgYtKk6BNpZehEAOfoCd9Axz/vP2rGYiyj3mNNd+9iHkY8tPHZFoEJ5Xm04Cm7LpgNNNc7ebOsdKWiRQ1ra3PgDt2s6KDZR8VIuYEVM0bEFrzL4gzvIulgeZTwJHYMoUAgWVrl X-Forefront-PRVS: 066153096A X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR02MB1678; 23:yGCGlf4JNGYaLpUztofdhZhwTyyCfsznpcQjXiwQy?= =?us-ascii?Q?fczBCKwGJ781bDM+sZN7lZYxe+/ZoS2D/xUi38x0nb0C5UWK1g0e2JybCw8d?= =?us-ascii?Q?HY4cgRYOrr1KenDFhE1/eNx+zjd+ufvvAo9hJsRUFrTLZrViOh0UmLrvOGyR?= =?us-ascii?Q?l1k08hje5qLx1MAnTGi4hHjbRGXvd1XUx8nc4yO+PMUpB+CkfqSMSgKgSQLT?= =?us-ascii?Q?KgtblrfoJ4+cc1Esu/I4i07UVodeJBqEirdo4wlaY/qGFI0l15zavnJilMRy?= =?us-ascii?Q?UaANxtQq9oLPpWcj2FXnVq2iGqEXWwY+U8fE/wOzgMS5UiCNVmFoAmNsNFwQ?= =?us-ascii?Q?+1Z9rRVHY5AbXjgGhRM7ruYLI3YqazPRA18a6FV6Hb//UAiggVyPK+rJKw4X?= =?us-ascii?Q?MUxVZ1KsUarYNNvz9sCUYvMIqX0iu6v0llXHUFRpFi7UshxFlb9DxXHn6mDK?= =?us-ascii?Q?4+lrfcTV/uqlG4ThBy1ZAM+k5rJAS7U9tf/PHQlrhp4k5vhojqnyz/2t5mRK?= =?us-ascii?Q?GKB2hOcQOhVxuhdg9GqkfJQSwltTchIRPyFFwkvc4ta7WfTviEvDtuMzB7SE?= =?us-ascii?Q?ou+z7Bdp71YE8iMbQCtJ6tLXeLuLSnlApdh7bXXd8wUqIahzysOapGZ/Ij//?= =?us-ascii?Q?+7KKYICM/Ackd7UahCchxHzQaCvL+ZZLyCSeA3JOPpT7GLWyn+GXOSK/tlk2?= =?us-ascii?Q?HVJEJ0n/Pu5pFEhS7PIeePjSNMTotLNsXe6WNYI1Vwm43QeY+0ALKFchUJ21?= =?us-ascii?Q?RdZhTxpCOyULVijqjeptyGqA8akoeMTN/1XLpSd0zU3mfSmbwzq13/pAdsMy?= =?us-ascii?Q?MxkIUS25LobnRAsMQqmZCnExL3VbFonFFOlB7Cv4fRNnWOEbWSNlu4wmOhIk?= =?us-ascii?Q?aKXMpPvnn34I9fft4DDcqsOJC+kSQxs8DY4elqWYONHqzHydweMsvhpjl75e?= =?us-ascii?Q?KRo9Y7t2wfQAl6p8NwMi9p2RETLzTb+XqMsulO1jzd130FwFz8j4/P1Ma7HH?= =?us-ascii?Q?dmX1wK8/ey2wXL5acR9CCAaeACZ2MulWrB9lywjxo/lUimq94GH47CFZNsl1?= =?us-ascii?Q?JxaJwIW5qtxozYfMVLb5OGtKcXuhQwzQn09i4+PVyYGrXsi+AxCgeuyts22R?= =?us-ascii?Q?hLCkJjYxHcDJ7ZJOsYf1C6PDOLg6X3/JafMmj8WoWThfUk7XuoQZnf7VvRUs?= =?us-ascii?Q?OZSDcDZg+9WQP23EGWWoG3Gu/i1QIJC37nqkvmHBaDCIiD/XBnHCSX4lB2Dq?= =?us-ascii?Q?JnnZkKnq12JbhItjEY=3D?= X-Microsoft-Antispam-Message-Info: gcbBUoD6zFtOBCwnoXlTeDk5eE7J54Hc8qsgS5UWWR1+RsmcWq/P1mmx0KMBe9FvfjSkeyUVwCLqYr51QUX12XJvf92HTzKnE3xRKtlIL5R47+I8MI1XyaobH7XIdnRjzbXAP0QFfJvW5FtIYj3JiasuEwl3KKhIsnpT50BbAUtKtQ5DL4AyYdKIMXW9jKl3 X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1678; 6:mUPgHdQMRQrho4duS1yFXNAmsWWZLir7XA7V/lfBwbOZNv5nM6/2Wv8X1Z8MuR4OvNZjePXWKIeMZkpKcwfBSm2RM1Q3i8UiA/TpD2ytDbMxMT0srzcQYySZmc0k0BbIlFyAQbw1YAZDoNOQ0+EmYlSiUDRIYcnGIq1GvtFSqf0ONLjU+H+zixRx1WwRghvmjrxy+DLf0yUdXyLj0jkso82DTE6+ixTsYoPINkKKNhJzLMVqV6xsYGL4w9VxW52eH0GmplH8ZzCOK7gGAV/2LyDbOxaPoRNui5lzcWtfhSwRwEN3kdLZgV1LXnnUIAThKY4YQCJ52BXBqlPq5Q2/W+lcBBWtkGsfpm9rJGL/BLIVhRN0nco61Za5d5aQR0/xepfsdtcXNQctHcvVlc7NG5nQhIC4Qj6ZbxFBQBSQceRXr24MPMS6GK51FP7rxqnWTSYAqoi0qOyDjztiByWSNQ==; 5:dOLaCpc/+j7ANpBSQtdLFOerGM2PdaNc/jbKZBSVPHaEIzPjgV+8fWKvsNaJqpV0GwXMscwiM7zeOMRahZkf5ZPTxCCdmJ6L9zRWBCOFhrl4DYhgH80TiCKrmpWLUbgEgx+Px3pPLev9RBNUaoPkMGVJZxOB/jvwafdg/TyAFzk=; 24:MHOi44EyLel1G205KcM0ZOpxZnw8hkuiWR/ORnWmhc/ZKQ7xdHKyY2zN9Tm3wU264bCpWZLAmWoQ5Dnaw3AfrEh60EzTbsS6bHEeA2Na4V8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1678; 7:wooNlHR71+AVxqCsp7R7881fSjGsDrU39BhDeqPthpwG/aSgV3V20o0fduTOCzaS0PmOGe7D5niz8Fs7Knv6XBzE3wUJ8cpyFF1Yb4IexmRmsREykHZzOKTn/tu4oubbSAJEsTtxC3xFFhKx6RGIGIj6QYLpqxez0BovKTgPERBu8WwWJYp0/KHbnlp97ajP9IPfR391XRfveDuWBCiDJCedKASbBSOVV3FjMf/fQjFXO+g3LcJyv2B9lkC24ejn X-MS-Office365-Filtering-Correlation-Id: d6a7348a-9e6d-4d1d-acf3-08d5b09f9b2e X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 May 2018 02:43:09.0734 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d6a7348a-9e6d-4d1d-acf3-08d5b09f9b2e X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.83]; Helo=[xsj-pvapsmtpgw01] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR02MB1678 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: Vishal Sagar If an incorrectly configured media pipeline is started, the allocated dma descriptors aren't freed. This leads to kernel oops when pipeline is configured correctly and run subsequently. This patch also replaces dmaengine_terminate_all() with dmaengine_terminate_sync() as the former one is deprecated. Signed-off-by: Vishal Sagar Signed-off-by: Satish Kumar Nagireddy --- drivers/media/platform/xilinx/xilinx-dma.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/xilinx/xilinx-dma.c b/drivers/media/platform/xilinx/xilinx-dma.c index 5426efe..727dc6e 100644 --- a/drivers/media/platform/xilinx/xilinx-dma.c +++ b/drivers/media/platform/xilinx/xilinx-dma.c @@ -437,6 +437,7 @@ static int xvip_dma_start_streaming(struct vb2_queue *vq, unsigned int count) media_pipeline_stop(&dma->video.entity); error: + dmaengine_terminate_sync(dma->dma); /* Give back all queued buffers to videobuf2. */ spin_lock_irq(&dma->queued_lock); list_for_each_entry_safe(buf, nbuf, &dma->queued_bufs, queue) { @@ -458,7 +459,7 @@ static void xvip_dma_stop_streaming(struct vb2_queue *vq) xvip_pipeline_set_stream(pipe, false); /* Stop and reset the DMA engine. */ - dmaengine_terminate_all(dma->dma); + dmaengine_terminate_sync(dma->dma); /* Cleanup the pipeline and mark it as being stopped. */ xvip_pipeline_cleanup(pipe);