From patchwork Tue Mar 10 11:31:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robin Gong X-Patchwork-Id: 203577 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DATE_IN_FUTURE_06_12, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 28ECDC10F25 for ; Tue, 10 Mar 2020 03:30:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EDC6720728 for ; Tue, 10 Mar 2020 03:30:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="dfAZrqhC" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726467AbgCJDa4 (ORCPT ); Mon, 9 Mar 2020 23:30:56 -0400 Received: from mail-am6eur05on2049.outbound.protection.outlook.com ([40.107.22.49]:22155 "EHLO EUR05-AM6-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726403AbgCJDa4 (ORCPT ); Mon, 9 Mar 2020 23:30:56 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PhvoiOBEzba78uN/Yi4WWkLC0uyyAPle0PLHa8rnm/foz8P9HB+2Db8D2oXRBfnGpmB8qp9iqpyOZpjuCsczVym2kbXGMSFo5ADa2wKiIHtoTbEg3SBYzGwyq/UzQqnLhUy3STrkq/LC72rp7fMCFiWtogfTzHWoVtZw6ppyBNuEnIjf9V2MDMgm01VXAPEWzCC60WyCMf+U3O5Mr3+8oorJM+bZejL26Im3O8bRzNx0zpCFBT7k0g3u/9VdTS8fyIhsmAo9Yl5uBbc0ebzuFbXK2tBh+FCs4S0JeGCzI3FoPuB15tWtHwP3BV5SyOyoc6eogvtWKMM/xqr+VF3Q8Q== 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=FmaOqlAu+Od1UaEzkfG/CTJ/xw25vOqDB9f4GmJ9K2w=; b=TiuxTuAI6Y9d3t+xlE9c89FdBqePb+ixSAdFA1SffTm55uWSC6ya4LK7gY+qdfmaGwp1N9d2ddo50VBBOOUOjFXbRHFiC1RnRbyVG9JZMuMMVcG2rbRmWkJ2TimI+ZHNKVgD5i8I/UMfUSEmFmEJSis16DkRq2fCC8KlFpxFdm+0blH02KDESmLjFzzXmyu+L/H1T6wTLHtQSvUsaUtqZGt07DtReeDa2Z0aU7nTlnptqour77ZvXbWidFJI94SAln0gAewdulc1gu2OVtLIEF+HeqJwAHjc3Or/vqDXzZNV1U2VjNt/CrUKOygqMMz9TQIZaxIqK6ZzB5tFEULfDg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=FmaOqlAu+Od1UaEzkfG/CTJ/xw25vOqDB9f4GmJ9K2w=; b=dfAZrqhCFV1Zv3KfKTBqlRfpIl8xhINxDMcxr4ZwYbA3QmVeRYZa478BPB2GhVeyu2k7Wm2B66dbEaxHkDmmcUy5ad9SXQVmVZrIvW3OtlD9oMpDXiq8ywjc39rC3CNtGbHmbB/fLtRlBtzOQyAYCZkYLRTc1h/Y1iTsQ3vjLsk= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=yibin.gong@nxp.com; Received: from VE1PR04MB6638.eurprd04.prod.outlook.com (20.179.232.15) by VE1PR04MB6621.eurprd04.prod.outlook.com (20.179.234.213) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2793.17; Tue, 10 Mar 2020 03:30:52 +0000 Received: from VE1PR04MB6638.eurprd04.prod.outlook.com ([fe80::490:6caa:24b:4a31]) by VE1PR04MB6638.eurprd04.prod.outlook.com ([fe80::490:6caa:24b:4a31%6]) with mapi id 15.20.2793.013; Tue, 10 Mar 2020 03:30:52 +0000 From: Robin Gong To: s.hauer@pengutronix.de, vkoul@kernel.org, shawnguo@kernel.org, u.kleine-koenig@pengutronix.de, broonie@kernel.org, robh+dt@kernel.org, festevam@gmail.com, dan.j.williams@intel.com, mark.rutland@arm.com, catalin.marinas@arm.com, will.deacon@arm.com, l.stach@pengutronix.de, martin.fuzzey@flowbird.group Cc: kernel@pengutronix.de, linux-spi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-imx@nxp.com, dmaengine@vger.kernel.org, devicetree@vger.kernel.org Subject: [RESEND v6 03/13] Revert "dmaengine: imx-sdma: refine to load context only once" Date: Tue, 10 Mar 2020 19:31:52 +0800 Message-Id: <1583839922-22699-4-git-send-email-yibin.gong@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1583839922-22699-1-git-send-email-yibin.gong@nxp.com> References: <1583839922-22699-1-git-send-email-yibin.gong@nxp.com> X-ClientProxiedBy: SG2PR06CA0241.apcprd06.prod.outlook.com (2603:1096:4:ac::25) To VE1PR04MB6638.eurprd04.prod.outlook.com (2603:10a6:803:119::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from robin-OptiPlex-790.ap.freescale.net (119.31.174.66) by SG2PR06CA0241.apcprd06.prod.outlook.com (2603:1096:4:ac::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.2793.15 via Frontend Transport; Tue, 10 Mar 2020 03:30:47 +0000 X-Mailer: git-send-email 2.7.4 X-Originating-IP: [119.31.174.66] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 0120f62f-f8c0-48fe-7641-08d7c4a36f5c X-MS-TrafficTypeDiagnostic: VE1PR04MB6621:|VE1PR04MB6621: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:119; X-Forefront-PRVS: 033857D0BD X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4636009)(136003)(39860400002)(346002)(366004)(376002)(396003)(199004)(189003)(4326008)(8936002)(6666004)(8676002)(81156014)(81166006)(2906002)(5660300002)(2616005)(7416002)(36756003)(66556008)(66946007)(6506007)(52116002)(316002)(956004)(26005)(478600001)(16526019)(186003)(66476007)(86362001)(6486002)(6512007)(921003)(1121003); DIR:OUT; SFP:1101; SCL:1; SRVR:VE1PR04MB6621; H:VE1PR04MB6638.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dqWW4f1M28EBxezPN7BONr1Wkl7ev90jwqLerNC//qTzm6dW2nV+qWsUVf8cRYkjvv4oogN+NF9eFNr0paW3AKYLvw9MhhmnsJ6BWG3sDT8ptqpnZyJMCZcSW/vOosH1y/y/sAvNKIq67vwMNf67NkzKsz4k3p5oBSud2ms7pNTgo6UazQfIab4dvmHc92vo15lFf9YIV3dicQzQSQiyJjB5Vkjj/DDZVgr9k0GaQkv25NOUObVfy8XZOjkSYKQ6tNj+i1IkwhZ4TaefY8Y4iOn6HF+hWyo3VTdhTGrgT4nspFFttXXOOga3AYQleLxuRfaJ/If1xo+NQnDgP8htqHz9qhOYDUTvsZOnnGFy54INAb3rv80Xi1Ymh1R2HBBa+Z3uO24kJcPkPRxHcOQJvUJsr0cZE+Ge6+GDOysJTX8uIg9KsNjrFQQfwosRj/9qgJG2aBJVaeB/EKWOyJfwhoBdYTVgvA83yfxkkt6C0SwdvSL6/xhMEVisH/bvncPS X-MS-Exchange-AntiSpam-MessageData: d5U+fpzIHn95PjsB81KNDHGJeSdSQEBPGofZO/DFOQI858Wl7Fp+lqtavYUtZVTM+lqmapBy+u2sVulqiL6oBWnuSdOQ+zBDi/Fzqb87OtXecQzIYbuHUF0U8056eHI6CrED4iY7MYGP3RDVZJH6dg== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0120f62f-f8c0-48fe-7641-08d7c4a36f5c X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Mar 2020 03:30:52.6626 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: UKX3aAnORZaii/BCBZNgwx5Fhgcnjuz7G3VtMLNLFQH/6/nNgEOkyccsEzwj8Qv0720FshaVh/I4fuGuuzdjjw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB6621 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org This reverts commit ad0d92d7ba6aecbe2705907c38ff8d8be4da1e9c, because in spi-imx case, burst length may be changed dynamically. Signed-off-by: Robin Gong --- drivers/dma/imx-sdma.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index 4d4477d..4c11c38 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -377,7 +377,6 @@ struct sdma_channel { unsigned long watermark_level; u32 shp_addr, per_addr; enum dma_status status; - bool context_loaded; struct imx_dma_data data; struct work_struct terminate_worker; }; @@ -984,9 +983,6 @@ static int sdma_load_context(struct sdma_channel *sdmac) int ret; unsigned long flags; - if (sdmac->context_loaded) - return 0; - if (sdmac->direction == DMA_DEV_TO_MEM) load_address = sdmac->pc_from_device; else if (sdmac->direction == DMA_DEV_TO_DEV) @@ -1029,8 +1025,6 @@ static int sdma_load_context(struct sdma_channel *sdmac) spin_unlock_irqrestore(&sdma->channel_0_lock, flags); - sdmac->context_loaded = true; - return ret; } @@ -1069,7 +1063,6 @@ static void sdma_channel_terminate_work(struct work_struct *work) vchan_get_all_descriptors(&sdmac->vc, &head); spin_unlock_irqrestore(&sdmac->vc.lock, flags); vchan_dma_desc_free_list(&sdmac->vc, &head); - sdmac->context_loaded = false; } static int sdma_terminate_all(struct dma_chan *chan)